X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=f4043000b7ebcbe947f6563c2e7557ad2b491d0a;hb=91f2877dec9e00d081facbb7b12f610a9f329357;hp=9f1430bb4492b50e49ea2357d857f7fd2cb084b7;hpb=287b6a68e97c22762091077578835912558005a1;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index 9f1430bb44..f4043000b7 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -1,16 +1,17 @@ /***************************************************************************** - * ogg.c : ogg stream input module for vlc + * ogg.c : ogg stream demux module for vlc ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: ogg.c,v 1.41 2003/10/23 16:48:45 gbazin Exp $ + * Copyright (C) 2001-2003 VideoLAN + * $Id$ * * Authors: Gildas Bazin - * + * Andre Pang (Annodex support) + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -24,42 +25,50 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include - #include #include -#include - #include -#include /* BITMAPINFOHEADER, WAVEFORMATEX */ +#include "codecs.h" +#include "vlc_bits.h" + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +vlc_module_begin(); + set_description( _("Ogg stream demuxer" ) ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_capability( "demux2", 50 ); + set_callbacks( Open, Close ); + add_shortcut( "ogg" ); +vlc_module_end(); -#define OGG_BLOCK_SIZE 4096 /***************************************************************************** - * Definitions of structures and functions used by this plugins + * Definitions of structures and functions used by this plugins *****************************************************************************/ typedef struct logical_stream_s { ogg_stream_state os; /* logical stream of packets */ - int i_serial_no; - int i_cat; /* AUDIO_ES, VIDEO_ES */ - int i_activated; - vlc_fourcc_t i_fourcc; - vlc_fourcc_t i_codec; + es_format_t fmt; + es_out_id_t *p_es; + double f_rate; - es_descriptor_t *p_es; - int b_selected; /* newly selected */ + int i_serial_no; /* the header of some logical streams (eg vorbis) contain essential * data for the decoder. We back them up here in case we need to re-feed * them to the decoder. */ int b_force_backup; int i_packets_backup; - ogg_packet *p_packets_backup; + uint8_t *p_headers; + int i_headers; /* program clock reference (in units of 90kHz) derived from the previous * granulepos */ @@ -67,17 +76,13 @@ typedef struct logical_stream_s mtime_t i_interpolated_pcr; mtime_t i_previous_pcr; - /* info from logical streams */ - double f_rate; - int i_bitrate; - int i_channels; + /* Misc */ int b_reinit; - - /* codec specific stuff */ - BITMAPINFOHEADER *p_bih; - WAVEFORMATEX *p_wf; int i_theora_keyframe_granule_shift; + /* for Annodex logical bitstreams */ + int secondary_header_packets; + } logical_stream_t; struct demux_sys_t @@ -87,18 +92,15 @@ struct demux_sys_t int i_streams; /* number of logical bitstreams */ logical_stream_t **pp_stream; /* pointer to an array of logical streams */ - /* current audio and video es */ - logical_stream_t *p_stream_video; - logical_stream_t *p_stream_audio; - logical_stream_t *p_stream_spu; - /* program clock reference (in units of 90kHz) derived from the pcr of * the sub-streams */ mtime_t i_pcr; - int b_reinit; /* stream state */ - int b_eos; + int i_eos; + + /* bitrate */ + int i_bitrate; }; /* OggDS headers for the new header format (used in ogm files) */ @@ -107,7 +109,7 @@ typedef struct stream_header_video ogg_int32_t width; ogg_int32_t height; } stream_header_video; - + typedef struct stream_header_audio { ogg_int16_t channels; @@ -138,6 +140,8 @@ typedef struct stream_header } sh; } stream_header; +#define OGG_BLOCK_SIZE 4096 + /* Some defines from OggDS */ #define PACKET_TYPE_HEADER 0x01 #define PACKET_TYPE_BITS 0x07 @@ -148,121 +152,246 @@ typedef struct stream_header /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Activate ( vlc_object_t * ); -static void Deactivate( vlc_object_t * ); -static int Demux ( input_thread_t * ); -static int Control ( input_thread_t *, int, va_list ); - -/* Stream managment */ -static int Ogg_ElemStreamStart ( input_thread_t *, demux_sys_t *, int ); -static void Ogg_ElemStreamStop ( input_thread_t *, demux_sys_t *, int ); +static int Demux ( demux_t * ); +static int Control( demux_t *, int, va_list ); /* Bitstream manipulation */ -static int Ogg_Check ( input_thread_t *p_input ); -static int Ogg_ReadPage ( input_thread_t *, demux_sys_t *, ogg_page * ); +static int Ogg_ReadPage ( demux_t *, ogg_page * ); static void Ogg_UpdatePCR ( logical_stream_t *, ogg_packet * ); -static void Ogg_DecodePacket ( input_thread_t *p_input, - logical_stream_t *p_stream, ogg_packet * ); +static void Ogg_DecodePacket ( demux_t *, logical_stream_t *, ogg_packet * ); -static int Ogg_BeginningOfStream( input_thread_t *p_input, demux_sys_t *p_ogg); -static int Ogg_FindLogicalStreams( input_thread_t *p_input,demux_sys_t *p_ogg); -static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg ); +static int Ogg_BeginningOfStream( demux_t *p_demux ); +static int Ogg_FindLogicalStreams( demux_t *p_demux ); +static void Ogg_EndOfStream( demux_t *p_demux ); -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -vlc_module_begin(); - set_description( _("ogg stream demuxer" ) ); - set_capability( "demux", 50 ); - set_callbacks( Activate, Deactivate ); - add_shortcut( "ogg" ); -vlc_module_end(); +/* Logical bitstream headers */ +static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * ); +static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * ); +static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * ); /***************************************************************************** - * Stream managment + * Open: initializes ogg demux structures *****************************************************************************/ -static int Ogg_ElemStreamStart( input_thread_t *p_input, - demux_sys_t *p_ogg, int i_stream ) +static int Open( vlc_object_t * p_this ) { -#define p_stream p_ogg->pp_stream[i_stream] - if( !p_stream->p_es ) + demux_t *p_demux = (demux_t *)p_this; + demux_sys_t *p_sys; + uint8_t *p_peek; + + + /* Check if we are dealing with an ogg stream */ + if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC; + if( strcmp( p_demux->psz_demux, "ogg" ) && strncmp( p_peek, "OggS", 4 ) ) { - msg_Warn( p_input, "stream[%d] unselectable", i_stream ); - return( 0 ); + return VLC_EGENERIC; } - if( p_stream->i_activated ) + + /* Set exported functions */ + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; + p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + + memset( p_sys, 0, sizeof( demux_sys_t ) ); + p_sys->i_bitrate = 0; + p_sys->pp_stream = NULL; + + /* Begnning of stream, tell the demux to look for elementary streams. */ + p_sys->i_eos = 0; + + /* Initialize the Ogg physical bitstream parser */ + ogg_sync_init( &p_sys->oy ); + + return VLC_SUCCESS; +} + +/***************************************************************************** + * Close: frees unused data + *****************************************************************************/ +static void Close( vlc_object_t *p_this ) +{ + demux_t *p_demux = (demux_t *)p_this; + demux_sys_t *p_sys = p_demux->p_sys ; + + /* Cleanup the bitstream parser */ + ogg_sync_clear( &p_sys->oy ); + + Ogg_EndOfStream( p_demux ); + + free( p_sys ); +} + +/***************************************************************************** + * Demux: reads and demuxes data packets + ***************************************************************************** + * Returns -1 in case of error, 0 in case of EOF, 1 otherwise + *****************************************************************************/ +static int Demux( demux_t * p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + ogg_page oggpage; + ogg_packet oggpacket; + int i_stream; + + + if( p_sys->i_eos == p_sys->i_streams ) { - msg_Warn( p_input, "stream[%d] already selected", i_stream ); - return( 1 ); + if( p_sys->i_eos ) + { + msg_Dbg( p_demux, "end of a group of logical streams" ); + Ogg_EndOfStream( p_demux ); + } + + p_sys->i_eos = 0; + if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS ) return 0; + + msg_Dbg( p_demux, "beginning of a group of logical streams" ); + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); } - if( !p_stream->p_es->p_decoder_fifo ) + /* + * Demux an ogg page from the stream + */ + if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS ) { - vlc_mutex_lock( &p_input->stream.stream_lock ); - input_SelectES( p_input, p_stream->p_es ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); + return 0; /* EOF */ } - p_stream->i_activated = p_stream->p_es->p_decoder_fifo ? 1 : 0; - /* Feed the backup header to the decoder */ - if( !p_stream->b_force_backup ) + /* Test for End of Stream */ + if( ogg_page_eos( &oggpage ) ) p_sys->i_eos++; + + + for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) { - int i; - for( i = 0; i < p_stream->i_packets_backup; i++ ) + logical_stream_t *p_stream = p_sys->pp_stream[i_stream]; + + if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 ) + continue; + + while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) { - /* Set correct starting date in header packets */ - p_stream->p_packets_backup[i].granulepos = - p_stream->i_interpolated_pcr * p_stream->f_rate / 90000; + /* Read info from any secondary header packets, if there are any */ + if( p_stream->secondary_header_packets > 0 ) + { + if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') && + oggpacket.bytes >= 7 && + ! strncmp( &oggpacket.packet[1], "theora", 6 ) ) + { + Ogg_ReadTheoraHeader( p_stream, &oggpacket ); + p_stream->secondary_header_packets = 0; + } + else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') && + oggpacket.bytes >= 7 && + ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) ) + { + Ogg_ReadVorbisHeader( p_stream, &oggpacket ); + p_stream->secondary_header_packets = 0; + } + else if ( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) + { + p_stream->secondary_header_packets = 0; + } + } + + if( p_stream->b_reinit ) + { + /* If synchro is re-initialized we need to drop all the packets + * until we find a new dated one. */ + Ogg_UpdatePCR( p_stream, &oggpacket ); + + if( p_stream->i_pcr >= 0 ) + { + p_stream->b_reinit = 0; + } + else + { + p_stream->i_interpolated_pcr = -1; + continue; + } + + /* An Ogg/vorbis packet contains an end date granulepos */ + if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) || + p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) || + p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) ) + { + if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) + { + Ogg_DecodePacket( p_demux, p_stream, &oggpacket ); + } + else + { + es_out_Control( p_demux->out, ES_OUT_SET_PCR, + p_stream->i_pcr ); + } + continue; + } + } - Ogg_DecodePacket( p_input, p_stream, - &p_stream->p_packets_backup[i] ); + Ogg_DecodePacket( p_demux, p_stream, &oggpacket ); } + break; } - return( p_stream->i_activated ); -#undef p_stream -} + i_stream = 0; p_sys->i_pcr = -1; + for( ; i_stream < p_sys->i_streams; i_stream++ ) + { + logical_stream_t *p_stream = p_sys->pp_stream[i_stream]; -static void Ogg_ElemStreamStop( input_thread_t *p_input, - demux_sys_t *p_ogg, int i_stream ) -{ -#define p_stream p_ogg->pp_stream[i_stream] + if( p_stream->fmt.i_cat == SPU_ES ) + continue; + if( p_stream->i_interpolated_pcr < 0 ) + continue; - if( !p_stream->i_activated ) - { - msg_Warn( p_input, "stream[%d] already unselected", i_stream ); - return; + if( p_sys->i_pcr < 0 || p_stream->i_interpolated_pcr < p_sys->i_pcr ) + p_sys->i_pcr = p_stream->i_interpolated_pcr; } - if( p_stream->p_es->p_decoder_fifo ) + if( p_sys->i_pcr >= 0 ) { - vlc_mutex_lock( &p_input->stream.stream_lock ); - input_UnselectES( p_input, p_stream->p_es ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr ); } - p_stream->i_activated = 0; -#undef p_stream + return 1; } -/**************************************************************************** - * Ogg_Check: Check we are dealing with an ogg stream. - ****************************************************************************/ -static int Ogg_Check( input_thread_t *p_input ) +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( demux_t *p_demux, int i_query, va_list args ) { - u8 *p_peek; - int i_size = input_Peek( p_input, &p_peek, 4 ); + demux_sys_t *p_sys = p_demux->p_sys; + int64_t *pi64; + int i; - /* Check for the Ogg capture pattern */ - if( !(i_size>3) || !(p_peek[0] == 'O') || !(p_peek[1] == 'g') || - !(p_peek[2] == 'g') || !(p_peek[3] == 'S') ) - return VLC_EGENERIC; + switch( i_query ) + { + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = p_sys->i_pcr; + return VLC_SUCCESS; - /* FIXME: Capture pattern might not be enough so we can also check for the - * the first complete page */ + case DEMUX_SET_TIME: + return VLC_EGENERIC; - return VLC_SUCCESS; + case DEMUX_SET_POSITION: + for( i = 0; i < p_sys->i_streams; i++ ) + { + logical_stream_t *p_stream = p_sys->pp_stream[i]; + + /* we'll trash all the data until we find the next pcr */ + p_stream->b_reinit = 1; + p_stream->i_pcr = -1; + p_stream->i_interpolated_pcr = -1; + ogg_stream_reset( &p_stream->os ); + } + ogg_sync_reset( &p_sys->oy ); + + default: + return demux2_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate, + 1, i_query, args ); + } } /**************************************************************************** @@ -271,23 +400,21 @@ static int Ogg_Check( input_thread_t *p_input ) * Returns VLC_SUCCESS if a page has been read. An error might happen if we * are at the end of stream. ****************************************************************************/ -static int Ogg_ReadPage( input_thread_t *p_input, demux_sys_t *p_ogg, - ogg_page *p_oggpage ) +static int Ogg_ReadPage( demux_t *p_demux, ogg_page *p_oggpage ) { + demux_sys_t *p_ogg = p_demux->p_sys ; int i_read = 0; - data_packet_t *p_data; byte_t *p_buffer; while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 ) { - i_read = input_SplitBuffer( p_input, &p_data, OGG_BLOCK_SIZE ); + p_buffer = ogg_sync_buffer( &p_ogg->oy, OGG_BLOCK_SIZE ); + + i_read = stream_Read( p_demux->s, p_buffer, OGG_BLOCK_SIZE ); if( i_read <= 0 ) return VLC_EGENERIC; - p_buffer = ogg_sync_buffer( &p_ogg->oy, i_read ); - p_input->p_vlc->pf_memcpy( p_buffer, p_data->p_payload_start, i_read ); ogg_sync_wrote( &p_ogg->oy, i_read ); - input_DeletePacket( p_input->p_method_data, p_data ); } return VLC_SUCCESS; @@ -303,9 +430,9 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, /* Convert the granulepos into a pcr */ if( p_oggpacket->granulepos >= 0 ) { - if( p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) ) + if( p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) ) { - p_stream->i_pcr = p_oggpacket->granulepos * 90000 + p_stream->i_pcr = p_oggpacket->granulepos * I64C(1000000) / p_stream->f_rate; } else @@ -315,7 +442,7 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, ogg_int64_t pframe = p_oggpacket->granulepos - ( iframe << p_stream->i_theora_keyframe_granule_shift ); - p_stream->i_pcr = ( iframe + pframe ) * 90000 + p_stream->i_pcr = ( iframe + pframe ) * I64C(1000000) / p_stream->f_rate; } @@ -327,33 +454,59 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, /* no granulepos available, try to interpolate the pcr. * If we can't then don't touch the old value. */ - if( p_stream->i_cat == VIDEO_ES ) + if( p_stream->fmt.i_cat == VIDEO_ES ) /* 1 frame per packet */ - p_stream->i_interpolated_pcr += (90000 / p_stream->f_rate); - else if( p_stream->i_bitrate ) - p_stream->i_interpolated_pcr += ( p_oggpacket->bytes * 90000 - / p_stream->i_bitrate / 8 ); + p_stream->i_interpolated_pcr += (I64C(1000000) / p_stream->f_rate); + else if( p_stream->fmt.i_bitrate ) + p_stream->i_interpolated_pcr += + ( p_oggpacket->bytes * I64C(1000000) / + p_stream->fmt.i_bitrate / 8 ); } } /**************************************************************************** * Ogg_DecodePacket: Decode an Ogg packet. ****************************************************************************/ -static void Ogg_DecodePacket( input_thread_t *p_input, +static void Ogg_DecodePacket( demux_t *p_demux, logical_stream_t *p_stream, ogg_packet *p_oggpacket ) { - pes_packet_t *p_pes; - data_packet_t *p_data; - vlc_bool_t b_trash = VLC_FALSE; + block_t *p_block; + vlc_bool_t b_selected; int i_header_len = 0; - mtime_t i_pts; + mtime_t i_pts = -1, i_interpolated_pts; + + /* Sanity check */ + if( !p_oggpacket->bytes ) + { + msg_Dbg( p_demux, "discarding 0 sized packet" ); + return; + } + + if( p_oggpacket->bytes >= 7 && + ! strncmp ( &p_oggpacket->packet[0], "Annodex", 7 ) ) + { + /* it's an Annodex packet -- skip it (do nothing) */ + return; + } + else if( p_oggpacket->bytes >= 7 && + ! strncmp ( &p_oggpacket->packet[0], "AnxData", 7 ) ) + { + /* it's an AnxData packet -- skip it (do nothing) */ + return; + } + + /* Check the ES is selected */ + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, + p_stream->p_es, &b_selected ); if( p_stream->b_force_backup ) { - ogg_packet *p_packet_backup; + uint8_t *p_extra; + vlc_bool_t b_store_size = VLC_TRUE; + p_stream->i_packets_backup++; - switch( p_stream->i_fourcc ) + switch( p_stream->fmt.i_codec ) { case VLC_FOURCC( 'v','o','r','b' ): case VLC_FOURCC( 's','p','x',' ' ): @@ -361,159 +514,187 @@ static void Ogg_DecodePacket( input_thread_t *p_input, if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0; break; + case VLC_FOURCC( 'f','l','a','c' ): + if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 ) + { + Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket ); + p_stream->b_force_backup = 0; + } + else if( p_stream->fmt.audio.i_rate ) + { + p_stream->b_force_backup = 0; + p_oggpacket->packet += 9; p_oggpacket->bytes -= 9; + } + b_store_size = VLC_FALSE; + break; + default: p_stream->b_force_backup = 0; break; } /* Backup the ogg packet (likely an header packet) */ - p_stream->p_packets_backup = - realloc( p_stream->p_packets_backup, p_stream->i_packets_backup * - sizeof(ogg_packet) ); - - p_packet_backup = - &p_stream->p_packets_backup[p_stream->i_packets_backup - 1]; - - p_packet_backup->bytes = p_oggpacket->bytes; - p_packet_backup->granulepos = p_oggpacket->granulepos; - - if( p_oggpacket->granulepos >= 0 ) + p_stream->p_headers = + realloc( p_stream->p_headers, p_stream->i_headers + + p_oggpacket->bytes + (b_store_size ? 2 : 0) ); + p_extra = p_stream->p_headers + p_stream->i_headers; + if( b_store_size ) { - /* Because of vorbis granulepos scheme we must set the pcr for the - * 1st header packet so it doesn't get discarded in the - * packetizer */ - Ogg_UpdatePCR( p_stream, p_oggpacket ); + *(p_extra++) = p_oggpacket->bytes >> 8; + *(p_extra++) = p_oggpacket->bytes & 0xFF; } + memcpy( p_extra, p_oggpacket->packet, p_oggpacket->bytes ); + p_stream->i_headers += p_oggpacket->bytes + (b_store_size ? 2 : 0); - p_packet_backup->packet = malloc( p_oggpacket->bytes ); - if( !p_packet_backup->packet ) return; - memcpy( p_packet_backup->packet, p_oggpacket->packet, - p_oggpacket->bytes ); - } + if( !p_stream->b_force_backup ) + { + /* Last header received, commit changes */ + p_stream->fmt.i_extra = p_stream->i_headers; + p_stream->fmt.p_extra = + realloc( p_stream->fmt.p_extra, p_stream->i_headers ); + memcpy( p_stream->fmt.p_extra, p_stream->p_headers, + p_stream->i_headers ); + es_out_Control( p_demux->out, ES_OUT_SET_FMT, + p_stream->p_es, &p_stream->fmt ); + } - vlc_mutex_lock( &p_input->stream.control.control_lock ); - if( p_stream->i_cat == AUDIO_ES && p_input->stream.control.b_mute ) - { - b_trash = VLC_TRUE; + b_selected = VLC_FALSE; /* Discard the header packet */ } - vlc_mutex_unlock( &p_input->stream.control.control_lock ); /* Convert the pcr into a pts */ - if( p_stream->i_fourcc == VLC_FOURCC( 'v','o','r','b' ) || - p_stream->i_fourcc == VLC_FOURCC( 's','p','x',' ' ) ) + if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) || + p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) || + p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) ) { if( p_stream->i_pcr >= 0 ) { /* This is for streams where the granulepos of the header packets * doesn't match these of the data packets (eg. ogg web radios). */ if( p_stream->i_previous_pcr == 0 && - p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY * 9/100 ) - p_input->stream.p_selected_program->i_synchro_state = - SYNCHRO_REINIT; + p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY ) + { + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + + /* Call the pace control */ + es_out_Control( p_demux->out, ES_OUT_SET_PCR, + p_stream->i_pcr ); + } p_stream->i_previous_pcr = p_stream->i_pcr; - /* Call the pace control */ - if( p_input->stream.p_selected_program->i_synchro_state == - SYNCHRO_REINIT ) - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_stream->i_pcr ); + /* The granulepos is the end date of the sample */ + i_pts = p_stream->i_pcr; } + } - /* The granulepos is the end date of the sample */ - i_pts = ( p_stream->i_pcr < 0 ) ? 0 : - input_ClockGetTS( p_input, p_input->stream.p_selected_program, - p_stream->i_pcr ); + /* Convert the granulepos into the next pcr */ + i_interpolated_pts = p_stream->i_interpolated_pcr; + Ogg_UpdatePCR( p_stream, p_oggpacket ); - /* Convert the granulepos into the next pcr */ - Ogg_UpdatePCR( p_stream, p_oggpacket ); - } - else + if( p_stream->i_pcr >= 0 ) { - /* Convert the granulepos into the current pcr */ - Ogg_UpdatePCR( p_stream, p_oggpacket ); - - if( p_stream->i_pcr >= 0 ) + /* This is for streams where the granulepos of the header packets + * doesn't match these of the data packets (eg. ogg web radios). */ + if( p_stream->i_previous_pcr == 0 && + p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY ) { - /* This is for streams where the granulepos of the header packets - * doesn't match these of the data packets (eg. ogg web radios). */ - if( p_stream->i_previous_pcr == 0 && - p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY * 9/100 ) - p_input->stream.p_selected_program->i_synchro_state = - SYNCHRO_REINIT; - - p_stream->i_previous_pcr = p_stream->i_pcr; + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* Call the pace control */ - if( p_input->stream.p_selected_program->i_synchro_state == - SYNCHRO_REINIT ) - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_stream->i_pcr ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_stream->i_pcr ); } + } + + if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) && + p_stream->i_pcr >= 0 ) + { + p_stream->i_previous_pcr = p_stream->i_pcr; /* The granulepos is the start date of the sample */ - i_pts = ( p_stream->i_pcr < 0 ) ? 0 : - input_ClockGetTS( p_input, p_input->stream.p_selected_program, - p_stream->i_pcr ); + i_pts = p_stream->i_pcr; } - if( !p_stream->p_es->p_decoder_fifo || b_trash ) + if( !b_selected ) { /* This stream isn't currently selected so we don't need to decode it, * but we did need to store its pcr as it might be selected later on */ return; } - if( !( p_pes = input_NewPES( p_input->p_method_data ) ) ) + if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return; + + /* Normalize PTS */ + if( i_pts == 0 ) i_pts = 1; + else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = 1; + else if( i_pts == -1 ) i_pts = 0; + + if( p_stream->fmt.i_cat == AUDIO_ES ) + p_block->i_dts = p_block->i_pts = i_pts; + else if( p_stream->fmt.i_cat == SPU_ES ) { - return; + p_block->i_dts = p_block->i_pts = i_pts; + p_block->i_length = 0; } - if( !( p_data = input_NewPacket( p_input->p_method_data, - p_oggpacket->bytes ) ) ) + else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) ) + p_block->i_dts = p_block->i_pts = i_pts; + else { - input_DeletePES( p_input->p_method_data, p_pes ); - return; + p_block->i_dts = i_pts; + p_block->i_pts = 0; } - p_data->p_payload_end = p_data->p_payload_start + p_oggpacket->bytes; - p_pes->i_nb_data = 1; - p_pes->i_dts = p_pes->i_pts = i_pts; - p_pes->p_first = p_pes->p_last = p_data; - p_pes->i_pes_size = p_oggpacket->bytes; - - if( p_stream->i_cat == SPU_ES ) p_pes->i_dts = 0; - - if( p_stream->i_fourcc != VLC_FOURCC( 'v','o','r','b' ) && - p_stream->i_fourcc != VLC_FOURCC( 's','p','x',' ' ) && - p_stream->i_fourcc != VLC_FOURCC( 't','a','r','k' ) && - p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) ) + if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 't','a','r','k' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 'c','m','m','l' ) ) { - /* Remove the header from the packet */ + /* We remove the header from the packet */ i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6; i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1; - i_header_len++; - p_pes->i_pes_size -= i_header_len; + if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' )) + { + /* But with subtitles we need to retrieve the duration first */ + int i, lenbytes = 0; + + if( i_header_len > 0 && p_oggpacket->bytes >= i_header_len + 1 ) + { + for( i = 0, lenbytes = 0; i < i_header_len; i++ ) + { + lenbytes = lenbytes << 8; + lenbytes += *(p_oggpacket->packet + i_header_len - i); + } + } + if( p_oggpacket->bytes - 1 - i_header_len > 2 || + ( p_oggpacket->packet[i_header_len + 1] != ' ' && + p_oggpacket->packet[i_header_len + 1] != 0 && + p_oggpacket->packet[i_header_len + 1] != '\n' && + p_oggpacket->packet[i_header_len + 1] != '\r' ) ) + { + p_block->i_length = (mtime_t)lenbytes * 1000; + } + } + + i_header_len++; + p_block->i_buffer -= i_header_len; } - if( p_stream->i_fourcc == VLC_FOURCC( 't','a','r','k' ) ) + if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) ) { /* FIXME: the biggest hack I've ever done */ - msg_Warn( p_input, "tark pts: "I64Fd", granule: "I64Fd, - p_pes->i_pts, p_pes->i_dts ); + msg_Warn( p_demux, "tarkin pts: "I64Fd", granule: "I64Fd, + p_block->i_pts, p_block->i_dts ); msleep(10000); } - memcpy( p_data->p_payload_start, - p_oggpacket->packet + i_header_len, + memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len, p_oggpacket->bytes - i_header_len ); - p_data->p_payload_end = p_data->p_payload_start + p_pes->i_pes_size; - p_data->b_discard_payload = 0; - - input_DecodePES( p_stream->p_es->p_decoder_fifo, p_pes ); + es_out_Send( p_demux->out, p_stream->p_es, p_block ); } /**************************************************************************** @@ -526,13 +707,16 @@ static void Ogg_DecodePacket( input_thread_t *p_input, * * On success this function returns VLC_SUCCESS. ****************************************************************************/ -static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) +static int Ogg_FindLogicalStreams( demux_t *p_demux ) { + demux_sys_t *p_ogg = p_demux->p_sys ; ogg_packet oggpacket; ogg_page oggpage; int i_stream; - while( Ogg_ReadPage( p_input, p_ogg, &oggpage ) == VLC_SUCCESS ) +#define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1] + + while( Ogg_ReadPage( p_demux, &oggpage ) == VLC_SUCCESS ) { if( ogg_page_bos( &oggpage ) ) { @@ -546,10 +730,12 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) realloc( p_ogg->pp_stream, p_ogg->i_streams * sizeof(logical_stream_t *) ); -#define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1] - p_stream = malloc( sizeof(logical_stream_t) ); memset( p_stream, 0, sizeof(logical_stream_t) ); + p_stream->p_headers = 0; + p_stream->secondary_header_packets = 0; + + es_format_Init( &p_stream->fmt, 0, 0 ); /* Setup the logical stream */ p_stream->i_serial_no = ogg_page_serialno( &oggpage ); @@ -560,7 +746,7 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 ) { /* error. stream version mismatch perhaps */ - msg_Err( p_input, "Error reading first page of " + msg_Err( p_demux, "error reading first page of " "Ogg bitstream data" ); return VLC_EGENERIC; } @@ -572,158 +758,61 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) if( oggpacket.bytes >= 7 && ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) ) { - oggpack_buffer opb; - - msg_Dbg( p_input, "found vorbis header" ); - p_stream->i_cat = AUDIO_ES; - p_stream->i_fourcc = VLC_FOURCC( 'v','o','r','b' ); - - /* Signal that we want to keep a backup of the vorbis - * stream headers. They will be used when switching between - * audio streams. */ - p_stream->b_force_backup = 1; - - /* Cheat and get additionnal info ;) */ - oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes); - oggpack_adv( &opb, 88 ); - p_stream->i_channels = oggpack_read( &opb, 8 ); - p_stream->f_rate = oggpack_read( &opb, 32 ); - oggpack_adv( &opb, 32 ); - p_stream->i_bitrate = oggpack_read( &opb, 32 ); - { - char title[sizeof("Stream") + 10]; - input_info_category_t *p_cat; - sprintf( title, "Stream %d", p_ogg->i_streams ); - p_cat = input_InfoCategory( p_input, title ); - input_AddInfo( p_cat, _("Type"), _("Audio") ); - input_AddInfo( p_cat, _("Codec"), _("Vorbis") ); - input_AddInfo( p_cat, _("Sample Rate"), "%f", - p_stream->f_rate ); - input_AddInfo( p_cat, _("Channels"), "%d", - p_stream->i_channels ); - input_AddInfo( p_cat, _("Bit Rate"), "%d", - p_stream->i_bitrate ); - } + Ogg_ReadVorbisHeader( p_stream, &oggpacket ); + msg_Dbg( p_demux, "found vorbis header" ); } /* Check for Speex header */ else if( oggpacket.bytes >= 7 && ! strncmp( &oggpacket.packet[0], "Speex", 5 ) ) { - oggpack_buffer opb; + Ogg_ReadSpeexHeader( p_stream, &oggpacket ); + msg_Dbg( p_demux, "found speex header, channels: %i, " + "rate: %i, bitrate: %i", + p_stream->fmt.audio.i_channels, + (int)p_stream->f_rate, p_stream->fmt.i_bitrate ); + } + /* Check for Flac header (< version 1.1.1) */ + else if( oggpacket.bytes >= 4 && + ! strncmp( &oggpacket.packet[0], "fLaC", 4 ) ) + { + msg_Dbg( p_demux, "found FLAC header" ); + + /* Grrrr!!!! Did they really have to put all the + * important info in the second header packet!!! + * (STREAMINFO metadata is in the following packet) */ + p_stream->b_force_backup = 1; - p_stream->i_cat = AUDIO_ES; - p_stream->i_fourcc = VLC_FOURCC( 's','p','x',' ' ); + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' ); + } + /* Check for Flac header (>= version 1.1.1) */ + else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F && + ! strncmp( &oggpacket.packet[1], "FLAC", 4 ) && + ! strncmp( &oggpacket.packet[9], "fLaC", 4 ) ) + { + int i_packets = ((int)oggpacket.packet[7]) << 8 | + oggpacket.packet[8]; + msg_Dbg( p_demux, "found FLAC header version %i.%i " + "(%i header packets)", + oggpacket.packet[5], oggpacket.packet[6], + i_packets ); - /* Signal that we want to keep a backup of the vorbis - * stream headers. They will be used when switching between - * audio streams. */ p_stream->b_force_backup = 1; - /* Cheat and get additionnal info ;) */ - oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes); - oggpack_adv( &opb, 224 ); - oggpack_adv( &opb, 32 ); /* speex_version_id */ - oggpack_adv( &opb, 32 ); /* header_size */ - p_stream->f_rate = oggpack_read( &opb, 32 ); - oggpack_adv( &opb, 32 ); /* mode */ - oggpack_adv( &opb, 32 ); /* mode_bitstream_version */ - p_stream->i_channels = oggpack_read( &opb, 32 ); - p_stream->i_bitrate = oggpack_read( &opb, 32 ); - { - char title[sizeof("Stream") + 10]; - input_info_category_t *p_cat; - sprintf( title, "Stream %d", p_ogg->i_streams ); - p_cat = input_InfoCategory( p_input, title ); - input_AddInfo( p_cat, _("Type"), _("Audio") ); - input_AddInfo( p_cat, _("Codec"), _("Speex") ); - input_AddInfo( p_cat, _("Sample Rate"), "%f", - p_stream->f_rate ); - input_AddInfo( p_cat, _("Channels"), "%d", - p_stream->i_channels ); - input_AddInfo( p_cat, _("Bit Rate"), "%d", - p_stream->i_bitrate ); - msg_Dbg( p_input, "found speex header, channels: %i, " - "rate: %i, bitrate: %i", - p_stream->i_channels, - (int)p_stream->f_rate, p_stream->i_bitrate ); - } + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' ); + oggpacket.packet += 13; oggpacket.bytes -= 13; + Ogg_ReadFlacHeader( p_demux, p_stream, &oggpacket ); } /* Check for Theora header */ else if( oggpacket.bytes >= 7 && ! strncmp( &oggpacket.packet[1], "theora", 6 ) ) { -#ifdef HAVE_OGGPACKB - oggpack_buffer opb; - int i_fps_numerator; - int i_fps_denominator; - int i_keyframe_frequency_force; -#endif - - msg_Dbg( p_input, "found theora header" ); -#ifdef HAVE_OGGPACKB - p_stream->i_cat = VIDEO_ES; - p_stream->i_fourcc = VLC_FOURCC( 't','h','e','o' ); - - /* Signal that we want to keep a backup of the vorbis - * stream headers. They will be used when switching between - * audio streams. */ - p_stream->b_force_backup = 1; - - /* Cheat and get additionnal info ;) */ - oggpackB_readinit(&opb, oggpacket.packet, oggpacket.bytes); - oggpackB_adv( &opb, 56 ); - oggpackB_read( &opb, 8 ); /* major version num */ - oggpackB_read( &opb, 8 ); /* minor version num */ - oggpackB_read( &opb, 8 ); /* subminor version num */ - oggpackB_read( &opb, 16 ) /*<< 4*/; /* width */ - oggpackB_read( &opb, 16 ) /*<< 4*/; /* height */ - oggpackB_read( &opb, 24 ); /* frame width */ - oggpackB_read( &opb, 24 ); /* frame height */ - oggpackB_read( &opb, 8 ); /* x offset */ - oggpackB_read( &opb, 8 ); /* y offset */ - - i_fps_numerator = oggpackB_read( &opb, 32 ); - i_fps_denominator = oggpackB_read( &opb, 32 ); - oggpackB_read( &opb, 24 ); /* aspect_numerator */ - oggpackB_read( &opb, 24 ); /* aspect_denominator */ - i_keyframe_frequency_force = 1 << oggpackB_read( &opb, 5 ); - oggpackB_read( &opb, 8 ); /* colorspace */ - p_stream->i_bitrate = oggpackB_read( &opb, 24 ); - oggpackB_read( &opb, 6 ); /* quality */ - - /* granule_shift = i_log( frequency_force -1 ) */ - p_stream->i_theora_keyframe_granule_shift = 0; - i_keyframe_frequency_force--; - while( i_keyframe_frequency_force ) - { - p_stream->i_theora_keyframe_granule_shift++; - i_keyframe_frequency_force >>= 1; - } + Ogg_ReadTheoraHeader( p_stream, &oggpacket ); - p_stream->f_rate = ((float)i_fps_numerator) / - i_fps_denominator; - msg_Dbg( p_input, + msg_Dbg( p_demux, "found theora header, bitrate: %i, rate: %f", - p_stream->i_bitrate, p_stream->f_rate ); - { - char title[sizeof("Stream") + 10]; - input_info_category_t *p_cat; - sprintf( title, "Stream %d", p_ogg->i_streams ); - p_cat = input_InfoCategory( p_input, title ); - input_AddInfo( p_cat, _("Type"), _("Video") ); - input_AddInfo( p_cat, _("Codec"), _("Theora") ); - input_AddInfo( p_cat, _("Frame Rate"), "%f", - p_stream->f_rate ); - input_AddInfo( p_cat, _("Bit Rate"), "%d", - p_stream->i_bitrate ); - } -#else /* HAVE_OGGPACKB */ - msg_Dbg( p_input, "the ogg demuxer has been compiled " - "without support for the oggpackB extension." - "The theora stream won't be decoded." ); - free( p_stream ); - p_ogg->i_streams--; -#endif /* HAVE_OGGPACKB */ + p_stream->fmt.i_bitrate, p_stream->f_rate ); } /* Check for Tarkin header */ else if( oggpacket.bytes >= 7 && @@ -731,32 +820,36 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) { oggpack_buffer opb; - msg_Dbg( p_input, "found tarkin header" ); - p_stream->i_cat = VIDEO_ES; - p_stream->i_fourcc = VLC_FOURCC( 't','a','r','k' ); + msg_Dbg( p_demux, "found tarkin header" ); + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 't','a','r','k' ); /* Cheat and get additionnal info ;) */ oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes); oggpack_adv( &opb, 88 ); oggpack_adv( &opb, 104 ); - p_stream->i_bitrate = oggpack_read( &opb, 32 ); + p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 ); p_stream->f_rate = 2; /* FIXME */ - msg_Dbg( p_input, + msg_Dbg( p_demux, "found tarkin header, bitrate: %i, rate: %f", - p_stream->i_bitrate, p_stream->f_rate ); - { - char title[sizeof("Stream") + 10]; - input_info_category_t *p_cat; - sprintf( title, "Stream %d", p_ogg->i_streams ); - p_cat = input_InfoCategory( p_input, title ); - input_AddInfo( p_cat, _("Type"), _("Video") ); - input_AddInfo( p_cat, _("Codec"), _("tarkin") ); - input_AddInfo( p_cat, _("Sample Rate"), "%f", - p_stream->f_rate ); - input_AddInfo( p_cat, _("Bit Rate"), "%d", - p_stream->i_bitrate ); - } - + p_stream->fmt.i_bitrate, p_stream->f_rate ); + } + /* Check for Annodex header */ + else if( oggpacket.bytes >= 7 && + ! strncmp( &oggpacket.packet[0], "Annodex", 7 ) ) + { + Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, + &oggpacket ); + /* kill annodex track */ + free( p_stream ); + p_ogg->i_streams--; + } + /* Check for Annodex header */ + else if( oggpacket.bytes >= 7 && + ! strncmp( &oggpacket.packet[0], "AnxData", 7 ) ) + { + Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, + &oggpacket ); } else if( oggpacket.bytes >= 142 && !strncmp( &oggpacket.packet[1], @@ -768,172 +861,96 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) if( GetDWLE((oggpacket.packet+96)) == 0x05589f80 && oggpacket.bytes >= 184 ) { - p_stream->i_cat = VIDEO_ES; - - p_stream->p_bih = (BITMAPINFOHEADER *) - malloc( sizeof(BITMAPINFOHEADER) ); - if( !p_stream->p_bih ) - { - /* Mem allocation error, just ignore the stream */ - free( p_stream ); - p_ogg->i_streams--; - break; - } - p_stream->p_bih->biSize = sizeof(BITMAPINFOHEADER); - p_stream->p_bih->biCompression= p_stream->i_fourcc = + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( oggpacket.packet[68], oggpacket.packet[69], oggpacket.packet[70], oggpacket.packet[71] ); - msg_Dbg( p_input, "found video header of type: %.4s", - (char *)&p_stream->i_fourcc ); + msg_Dbg( p_demux, "found video header of type: %.4s", + (char *)&p_stream->fmt.i_codec ); p_stream->f_rate = 10000000.0 / GetQWLE((oggpacket.packet+164)); - p_stream->p_bih->biBitCount = + p_stream->fmt.video.i_bits_per_pixel = GetWLE((oggpacket.packet+182)); - if( !p_stream->p_bih->biBitCount ) - p_stream->p_bih->biBitCount=24; // hack, FIXME - p_stream->p_bih->biWidth = + if( !p_stream->fmt.video.i_bits_per_pixel ) + /* hack, FIXME */ + p_stream->fmt.video.i_bits_per_pixel = 24; + p_stream->fmt.video.i_width = GetDWLE((oggpacket.packet+176)); - p_stream->p_bih->biHeight = + p_stream->fmt.video.i_height = GetDWLE((oggpacket.packet+180)); - p_stream->p_bih->biPlanes= 1 ; - p_stream->p_bih->biSizeImage = - (p_stream->p_bih->biBitCount >> 3) * - p_stream->p_bih->biWidth * - p_stream->p_bih->biHeight; - - msg_Dbg( p_input, - "fps: %f, width:%i; height:%i, bitcount:%i", - p_stream->f_rate, p_stream->p_bih->biWidth, - p_stream->p_bih->biHeight, - p_stream->p_bih->biBitCount); - { - char title[sizeof("Stream") + 10]; - input_info_category_t *p_cat; - sprintf( title, "Stream %d", p_ogg->i_streams ); - p_cat = input_InfoCategory( p_input, title ); - input_AddInfo( p_cat, _("Type"), _("Video") ); - input_AddInfo( p_cat, _("Codec"), "%.4s", - (char *)&p_stream->i_fourcc ); - input_AddInfo( p_cat, _("Frame Rate"), "%f", - p_stream->f_rate ); - input_AddInfo( p_cat, _("Bit Count"), "%d", - p_stream->p_bih->biBitCount ); - input_AddInfo( p_cat, _("Width"), "%d", - p_stream->p_bih->biWidth ); - input_AddInfo( p_cat, _("Height"), "%d", - p_stream->p_bih->biHeight ); - } - p_stream->i_bitrate = 0; + + msg_Dbg( p_demux, + "fps: %f, width:%i; height:%i, bitcount:%i", + p_stream->f_rate, + p_stream->fmt.video.i_width, + p_stream->fmt.video.i_height, + p_stream->fmt.video.i_bits_per_pixel); + } /* Check for audio header (old format) */ else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 ) { unsigned int i_extra_size; + unsigned int i_format_tag; - p_stream->i_cat = AUDIO_ES; + p_stream->fmt.i_cat = AUDIO_ES; i_extra_size = GetWLE((oggpacket.packet+140)); - - p_stream->p_wf = (WAVEFORMATEX *) - malloc( sizeof(WAVEFORMATEX) + i_extra_size ); - if( !p_stream->p_wf ) + if( i_extra_size ) { - /* Mem allocation error, just ignore the stream */ - free( p_stream ); - p_ogg->i_streams--; - break; + p_stream->fmt.i_extra = i_extra_size; + p_stream->fmt.p_extra = malloc( i_extra_size ); + memcpy( p_stream->fmt.p_extra, + oggpacket.packet + 142, i_extra_size ); } - p_stream->p_wf->wFormatTag = - GetWLE((oggpacket.packet+124)); - p_stream->p_wf->nChannels = + i_format_tag = GetWLE((oggpacket.packet+124)); + p_stream->fmt.audio.i_channels = GetWLE((oggpacket.packet+126)); - p_stream->f_rate = p_stream->p_wf->nSamplesPerSec = + p_stream->f_rate = p_stream->fmt.audio.i_rate = GetDWLE((oggpacket.packet+128)); - p_stream->i_bitrate = p_stream->p_wf->nAvgBytesPerSec = - GetDWLE((oggpacket.packet+132)); - p_stream->i_bitrate *= 8; - p_stream->p_wf->nBlockAlign = + p_stream->fmt.i_bitrate = + GetDWLE((oggpacket.packet+132)) * 8; + p_stream->fmt.audio.i_blockalign = GetWLE((oggpacket.packet+136)); - p_stream->p_wf->wBitsPerSample = + p_stream->fmt.audio.i_bitspersample = GetWLE((oggpacket.packet+138)); - p_stream->p_wf->cbSize = i_extra_size; - if( i_extra_size > 0 ) - memcpy( p_stream->p_wf+sizeof(WAVEFORMATEX), - oggpacket.packet+142, i_extra_size ); + wf_tag_to_fourcc( i_format_tag, + &p_stream->fmt.i_codec, 0 ); - switch( p_stream->p_wf->wFormatTag ) + if( p_stream->fmt.i_codec == + VLC_FOURCC('u','n','d','f') ) { - case WAVE_FORMAT_PCM: - p_stream->i_fourcc = - VLC_FOURCC( 'a', 'r', 'a', 'w' ); - break; - case WAVE_FORMAT_MPEG: - case WAVE_FORMAT_MPEGLAYER3: - p_stream->i_fourcc = - VLC_FOURCC( 'm', 'p', 'g', 'a' ); - break; - case WAVE_FORMAT_A52: - p_stream->i_fourcc = - VLC_FOURCC( 'a', '5', '2', ' ' ); - break; - case WAVE_FORMAT_WMA1: - p_stream->i_fourcc = - VLC_FOURCC( 'w', 'm', 'a', '1' ); - break; - case WAVE_FORMAT_WMA2: - p_stream->i_fourcc = - VLC_FOURCC( 'w', 'm', 'a', '2' ); - break; - default: - p_stream->i_fourcc = VLC_FOURCC( 'm', 's', - ( p_stream->p_wf->wFormatTag >> 8 ) & 0xff, - p_stream->p_wf->wFormatTag & 0xff ); + p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's', + ( i_format_tag >> 8 ) & 0xff, + i_format_tag & 0xff ); } - msg_Dbg( p_input, "found audio header of type: %.4s", - (char *)&p_stream->i_fourcc ); - msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz " + msg_Dbg( p_demux, "found audio header of type: %.4s", + (char *)&p_stream->fmt.i_codec ); + msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz " "%dbits/sample %dkb/s", - p_stream->p_wf->wFormatTag, - p_stream->p_wf->nChannels, - p_stream->p_wf->nSamplesPerSec, - p_stream->p_wf->wBitsPerSample, - p_stream->p_wf->nAvgBytesPerSec * 8 / 1024 ); - { - char title[sizeof("Stream") + 10]; - input_info_category_t *p_cat; - sprintf( title, "Stream %d", p_ogg->i_streams ); - p_cat = input_InfoCategory( p_input, title ); - input_AddInfo( p_cat, _("Type"), _("Audio") ); - input_AddInfo( p_cat, _("Codec"), "%.4s", - (char *)&p_stream->i_fourcc ); - input_AddInfo( p_cat, _("Sample Rate"), "%d", - p_stream->p_wf->nSamplesPerSec ); - input_AddInfo( p_cat, _("Bit Rate"), "%d", - p_stream->p_wf->nAvgBytesPerSec * 8 - / 1024 ); - input_AddInfo( p_cat, _("Channels"), "%d", - p_stream->p_wf->nChannels ); - input_AddInfo( p_cat, _("Bits per Sample"), "%d", - p_stream->p_wf->wBitsPerSample ); - } + i_format_tag, + p_stream->fmt.audio.i_channels, + p_stream->fmt.audio.i_rate, + p_stream->fmt.audio.i_bitspersample, + p_stream->fmt.i_bitrate / 1024 ); } else { - msg_Dbg( p_input, "stream %d has an old header " + msg_Dbg( p_demux, "stream %d has an old header " "but is of an unknown type", p_ogg->i_streams-1 ); free( p_stream ); p_ogg->i_streams--; } } else if( (*oggpacket.packet & PACKET_TYPE_BITS ) - == PACKET_TYPE_HEADER && + == PACKET_TYPE_HEADER && oggpacket.bytes >= (int)sizeof(stream_header)+1 ) { stream_header *st = (stream_header *)(oggpacket.packet+1); @@ -941,160 +958,88 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) /* Check for video header (new format) */ if( !strncmp( st->streamtype, "video", 5 ) ) { - p_stream->i_cat = VIDEO_ES; + p_stream->fmt.i_cat = VIDEO_ES; /* We need to get rid of the header packet */ ogg_stream_packetout( &p_stream->os, &oggpacket ); - p_stream->p_bih = (BITMAPINFOHEADER *) - malloc( sizeof(BITMAPINFOHEADER) ); - if( !p_stream->p_bih ) - { - /* Mem allocation error, just ignore the stream */ - free( p_stream ); - p_ogg->i_streams--; - break; - } - p_stream->p_bih->biSize = sizeof(BITMAPINFOHEADER); - p_stream->p_bih->biCompression= - p_stream->i_fourcc = VLC_FOURCC( st->subtype[0], - st->subtype[1], - st->subtype[2], - st->subtype[3] ); - msg_Dbg( p_input, "found video header of type: %.4s", - (char *)&p_stream->i_fourcc ); + p_stream->fmt.i_codec = + VLC_FOURCC( st->subtype[0], st->subtype[1], + st->subtype[2], st->subtype[3] ); + msg_Dbg( p_demux, "found video header of type: %.4s", + (char *)&p_stream->fmt.i_codec ); p_stream->f_rate = 10000000.0 / GetQWLE(&st->time_unit); - p_stream->p_bih->biBitCount = + p_stream->fmt.video.i_bits_per_pixel = GetWLE(&st->bits_per_sample); - p_stream->p_bih->biWidth = + p_stream->fmt.video.i_width = GetDWLE(&st->sh.video.width); - p_stream->p_bih->biHeight = + p_stream->fmt.video.i_height = GetDWLE(&st->sh.video.height); - p_stream->p_bih->biPlanes= 1 ; - p_stream->p_bih->biSizeImage = - (p_stream->p_bih->biBitCount >> 3) * - p_stream->p_bih->biWidth * - p_stream->p_bih->biHeight; - - msg_Dbg( p_input, - "fps: %f, width:%i; height:%i, bitcount:%i", - p_stream->f_rate, p_stream->p_bih->biWidth, - p_stream->p_bih->biHeight, - p_stream->p_bih->biBitCount); - { - char title[sizeof("Stream") + 10]; - input_info_category_t *p_cat; - sprintf( title, "Stream %d", p_ogg->i_streams ); - p_cat = input_InfoCategory( p_input, title ); - input_AddInfo( p_cat, _("Type"), _("Video") ); - input_AddInfo( p_cat, _("Codec"), "%.4s", - (char *)&p_stream->i_fourcc ); - input_AddInfo( p_cat, _("Frame Rate"), "%f", - p_stream->f_rate ); - input_AddInfo( p_cat, _("Bit Count"), "%d", - p_stream->p_bih->biBitCount ); - input_AddInfo( p_cat, _("Width"), "%d", - p_stream->p_bih->biWidth ); - input_AddInfo( p_cat, _("Height"), "%d", - p_stream->p_bih->biHeight ); - } - p_stream->i_bitrate = 0; + msg_Dbg( p_demux, + "fps: %f, width:%i; height:%i, bitcount:%i", + p_stream->f_rate, + p_stream->fmt.video.i_width, + p_stream->fmt.video.i_height, + p_stream->fmt.video.i_bits_per_pixel ); } /* Check for audio header (new format) */ else if( !strncmp( st->streamtype, "audio", 5 ) ) { char p_buffer[5]; + int i_format_tag; - p_stream->i_cat = AUDIO_ES; + p_stream->fmt.i_cat = AUDIO_ES; /* We need to get rid of the header packet */ ogg_stream_packetout( &p_stream->os, &oggpacket ); - p_stream->p_wf = (WAVEFORMATEX *) - malloc( sizeof(WAVEFORMATEX) ); - if( !p_stream->p_wf ) + p_stream->fmt.i_extra = GetQWLE(&st->size) - + sizeof(stream_header); + if( p_stream->fmt.i_extra ) { - /* Mem allocation error, just ignore the stream */ - free( p_stream ); - p_ogg->i_streams--; - break; + p_stream->fmt.p_extra = + malloc( p_stream->fmt.i_extra ); + memcpy( p_stream->fmt.p_extra, st + 1, + p_stream->fmt.i_extra ); } memcpy( p_buffer, st->subtype, 4 ); p_buffer[4] = '\0'; - p_stream->p_wf->wFormatTag = strtol(p_buffer,NULL,16); - p_stream->p_wf->nChannels = + i_format_tag = strtol(p_buffer,NULL,16); + p_stream->fmt.audio.i_channels = GetWLE(&st->sh.audio.channels); - p_stream->f_rate = p_stream->p_wf->nSamplesPerSec = + p_stream->f_rate = p_stream->fmt.audio.i_rate = GetQWLE(&st->samples_per_unit); - p_stream->i_bitrate = p_stream->p_wf->nAvgBytesPerSec = - GetDWLE(&st->sh.audio.avgbytespersec); - p_stream->i_bitrate *= 8; - p_stream->p_wf->nBlockAlign = + p_stream->fmt.i_bitrate = + GetDWLE(&st->sh.audio.avgbytespersec) * 8; + p_stream->fmt.audio.i_blockalign = GetWLE(&st->sh.audio.blockalign); - p_stream->p_wf->wBitsPerSample = + p_stream->fmt.audio.i_bitspersample = GetWLE(&st->bits_per_sample); - p_stream->p_wf->cbSize = 0; - switch( p_stream->p_wf->wFormatTag ) + wf_tag_to_fourcc( i_format_tag, + &p_stream->fmt.i_codec, 0 ); + + if( p_stream->fmt.i_codec == + VLC_FOURCC('u','n','d','f') ) { - case WAVE_FORMAT_PCM: - p_stream->i_fourcc = - VLC_FOURCC( 'a', 'r', 'a', 'w' ); - break; - case WAVE_FORMAT_MPEG: - case WAVE_FORMAT_MPEGLAYER3: - p_stream->i_fourcc = - VLC_FOURCC( 'm', 'p', 'g', 'a' ); - break; - case WAVE_FORMAT_A52: - p_stream->i_fourcc = - VLC_FOURCC( 'a', '5', '2', ' ' ); - break; - case WAVE_FORMAT_WMA1: - p_stream->i_fourcc = - VLC_FOURCC( 'w', 'm', 'a', '1' ); - break; - case WAVE_FORMAT_WMA2: - p_stream->i_fourcc = - VLC_FOURCC( 'w', 'm', 'a', '2' ); - break; - default: - p_stream->i_fourcc = VLC_FOURCC( 'm', 's', - ( p_stream->p_wf->wFormatTag >> 8 ) & 0xff, - p_stream->p_wf->wFormatTag & 0xff ); + p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's', + ( i_format_tag >> 8 ) & 0xff, + i_format_tag & 0xff ); } - msg_Dbg( p_input, "found audio header of type: %.4s", - (char *)&p_stream->i_fourcc ); - msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz " + msg_Dbg( p_demux, "found audio header of type: %.4s", + (char *)&p_stream->fmt.i_codec ); + msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz " "%dbits/sample %dkb/s", - p_stream->p_wf->wFormatTag, - p_stream->p_wf->nChannels, - p_stream->p_wf->nSamplesPerSec, - p_stream->p_wf->wBitsPerSample, - p_stream->p_wf->nAvgBytesPerSec * 8 / 1024 ); - { - char title[sizeof("Stream") + 10]; - input_info_category_t *p_cat; - sprintf( title, "Stream %d", p_ogg->i_streams ); - p_cat = input_InfoCategory( p_input, title ); - input_AddInfo( p_cat, _("Type"), _("Audio") ); - input_AddInfo( p_cat, _("Codec"), "%.4s", - (char *)&p_stream->i_fourcc ); - input_AddInfo( p_cat, _("Sample Rate"), "%d", - p_stream->p_wf->nSamplesPerSec ); - input_AddInfo( p_cat, _("Bit Rate"), "%d", - p_stream->p_wf->nAvgBytesPerSec * 8 - / 1024 ); - input_AddInfo( p_cat, _("Channels"), "%d", - p_stream->p_wf->nChannels ); - input_AddInfo( p_cat, _("Bits per Sample"), "%d", - p_stream->p_wf->wBitsPerSample ); - } + i_format_tag, + p_stream->fmt.audio.i_channels, + p_stream->fmt.audio.i_rate, + p_stream->fmt.audio.i_bitspersample, + p_stream->fmt.i_bitrate / 1024 ); } /* Check for text (subtitles) header */ else if( !strncmp(st->streamtype, "text", 4) ) @@ -1102,15 +1047,14 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) /* We need to get rid of the header packet */ ogg_stream_packetout( &p_stream->os, &oggpacket ); - msg_Dbg( p_input, "found text subtitles header" ); - p_stream->i_cat = SPU_ES; - p_stream->i_fourcc = - VLC_FOURCC( 's', 'u', 'b', 't' ); + msg_Dbg( p_demux, "found text subtitles header" ); + p_stream->fmt.i_cat = SPU_ES; + p_stream->fmt.i_codec = VLC_FOURCC('s','u','b','t'); p_stream->f_rate = 1000; /* granulepos is in milisec */ } else { - msg_Dbg( p_input, "stream %d has a header marker " + msg_Dbg( p_demux, "stream %d has a header marker " "but is of an unknown type", p_ogg->i_streams-1 ); free( p_stream ); p_ogg->i_streams--; @@ -1118,15 +1062,13 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) } else { - msg_Dbg( p_input, "stream %d is of unknown type", + msg_Dbg( p_demux, "stream %d is of unknown type", p_ogg->i_streams-1 ); free( p_stream ); p_ogg->i_streams--; } -#undef p_stream - - if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS ) + if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS ) return VLC_EGENERIC; } @@ -1141,455 +1083,317 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg) break; } } + return VLC_SUCCESS; } } - return VLC_EGENERIC; -} - -/***************************************************************************** - * Activate: initializes ogg demux structures - *****************************************************************************/ -static int Activate( vlc_object_t * p_this ) -{ - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_ogg; - int b_forced; - - p_input->p_demux_data = NULL; - b_forced = ( ( *p_input->psz_demux )&& - ( !strncmp( p_input->psz_demux, "ogg", 10 ) ) ) ? 1 : 0; - - /* Check if we are dealing with an ogg stream */ - if( !b_forced && ( Ogg_Check( p_input ) != VLC_SUCCESS ) ) - return -1; - - /* Allocate p_ogg */ - if( !( p_ogg = malloc( sizeof( demux_sys_t ) ) ) ) - { - msg_Err( p_input, "out of memory" ); - goto error; - } - memset( p_ogg, 0, sizeof( demux_sys_t ) ); - p_input->p_demux_data = p_ogg; - p_ogg->pp_stream = NULL; - p_ogg->p_stream_video = NULL; - p_ogg->p_stream_audio = NULL; - p_ogg->p_stream_spu = NULL; - - /* Initialize the Ogg physical bitstream parser */ - ogg_sync_init( &p_ogg->oy ); - - /*Set exported functions */ - p_input->pf_demux = Demux; - p_input->pf_demux_control = Control; - - /* Initialize access plug-in structures. */ - if( p_input->i_mtu == 0 ) - { - /* Improve speed. */ - p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE; - } - - /* Create one program */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot init stream" ); - goto error; - } - if( input_AddProgram( p_input, 0, 0) == NULL ) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot add program" ); - goto error; - } - p_input->stream.p_selected_program = p_input->stream.pp_programs[0]; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - /* Begnning of stream, tell the demux to look for elementary streams. */ - p_ogg->b_eos = VLC_TRUE; - - return 0; - - error: - Deactivate( (vlc_object_t *)p_input ); - return -1; +#undef p_stream + return VLC_EGENERIC; } /**************************************************************************** * Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add * Elementary streams. ****************************************************************************/ -static int Ogg_BeginningOfStream( input_thread_t *p_input, demux_sys_t *p_ogg) +static int Ogg_BeginningOfStream( demux_t *p_demux ) { + demux_sys_t *p_ogg = p_demux->p_sys ; int i_stream; /* Find the logical streams embedded in the physical stream and * initialize our p_ogg structure. */ - if( Ogg_FindLogicalStreams( p_input, p_ogg ) != VLC_SUCCESS ) + if( Ogg_FindLogicalStreams( p_demux ) != VLC_SUCCESS ) { - msg_Warn( p_input, "couldn't find any ogg logical stream" ); + msg_Warn( p_demux, "couldn't find any ogg logical stream" ); return VLC_EGENERIC; } - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.i_mux_rate = 0; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + p_ogg->i_bitrate = 0; for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ ) { #define p_stream p_ogg->pp_stream[i_stream] - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_stream->p_es = input_AddES( p_input, - p_input->stream.p_selected_program, - i_stream, - p_stream->i_cat, NULL, 0 ); - p_input->stream.i_mux_rate += (p_stream->i_bitrate / ( 8 * 50 )); - vlc_mutex_unlock( &p_input->stream.stream_lock ); - p_stream->p_es->i_stream_id = i_stream; - p_stream->p_es->i_fourcc = p_stream->i_fourcc; - p_stream->p_es->p_waveformatex = (void*)p_stream->p_wf; - p_stream->p_es->p_bitmapinfoheader = (void*)p_stream->p_bih; - - p_stream->i_pcr = p_stream->i_previous_pcr = -1; - p_stream->b_reinit = 0; -#undef p_stream - } + p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt ); - for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) - { -#define p_stream p_ogg->pp_stream[i_stream] - switch( p_stream->p_es->i_cat ) + if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) { - case( VIDEO_ES ): - if( (p_ogg->p_stream_video == NULL) ) - { - p_ogg->p_stream_video = p_stream; - /* TODO add test to see if a decoder has been found */ - Ogg_ElemStreamStart( p_input, p_ogg, i_stream ); - } - break; - - case( AUDIO_ES ): - if( (p_ogg->p_stream_audio == NULL) ) - { - int i_audio = config_GetInt( p_input, "audio-channel" ); - if( i_audio == i_stream || i_audio <= 0 || - i_audio >= p_ogg->i_streams || - p_ogg->pp_stream[i_audio]->p_es->i_cat != AUDIO_ES ) - { - p_ogg->p_stream_audio = p_stream; - Ogg_ElemStreamStart( p_input, p_ogg, i_stream ); - } - } - break; + /* Set the CMML stream active */ + es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es ); + } - case( SPU_ES ): - if( (p_ogg->p_stream_spu == NULL) ) - { - /* for spu, default is none */ - int i_spu = config_GetInt( p_input, "spu-channel" ); - if( i_spu < 0 || i_spu >= p_ogg->i_streams || - p_ogg->pp_stream[i_spu]->p_es->i_cat != SPU_ES ) - { - break; - } - else if( i_spu == i_stream ) - { - p_ogg->p_stream_spu = p_stream; - Ogg_ElemStreamStart( p_input, p_ogg, i_stream ); - } - } - break; + p_ogg->i_bitrate += p_stream->fmt.i_bitrate; - default: - break; - } + p_stream->i_pcr = p_stream->i_previous_pcr = + p_stream->i_interpolated_pcr = -1; + p_stream->b_reinit = 0; #undef p_stream } - /* we select the first audio and video ES */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( !p_ogg->p_stream_video ) - { - msg_Warn( p_input, "no video stream found" ); - } - if( !p_ogg->p_stream_audio ) - { - msg_Warn( p_input, "no audio stream found!" ); - } - p_input->stream.p_selected_program->b_is_ok = 1; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - return VLC_SUCCESS; } /**************************************************************************** * Ogg_EndOfStream: clean up the ES when an End of Stream is detected. ****************************************************************************/ -static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg ) +static void Ogg_EndOfStream( demux_t *p_demux ) { - int i_stream, j; + demux_sys_t *p_ogg = p_demux->p_sys ; + int i_stream; #define p_stream p_ogg->pp_stream[i_stream] - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( p_input->stream.i_pgrm_number ) - while( p_input->stream.p_selected_program->i_es_number ) - { - input_DelES( p_input, - p_input->stream.p_selected_program->pp_es[0] ); - } - vlc_mutex_unlock( &p_input->stream.stream_lock ); -#undef p_stream - for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ ) { -#define p_stream p_ogg->pp_stream[i_stream] - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.i_mux_rate -= (p_stream->i_bitrate / ( 8 * 50 )); - vlc_mutex_unlock( &p_input->stream.stream_lock ); -#undef p_stream + if( p_stream->p_es ) + es_out_Del( p_demux->out, p_stream->p_es ); + + p_ogg->i_bitrate -= p_stream->fmt.i_bitrate; ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os ); - for( j = 0; j < p_ogg->pp_stream[i_stream]->i_packets_backup; j++ ) - { - free( p_ogg->pp_stream[i_stream]->p_packets_backup[j].packet ); - } - if( p_ogg->pp_stream[i_stream]->p_packets_backup) - free( p_ogg->pp_stream[i_stream]->p_packets_backup ); + if( p_ogg->pp_stream[i_stream]->p_headers) + free( p_ogg->pp_stream[i_stream]->p_headers ); -#if 0 /* hmmm, it's already freed in input_DelES() */ - if( p_ogg->pp_stream[i]->p_bih ) - free( p_ogg->pp_stream[i]->p_bih ); - if( p_ogg->pp_stream[i]->p_wf ) - free( p_ogg->pp_stream[i]->p_wf ); -#endif + es_format_Clean( &p_stream->fmt ); free( p_ogg->pp_stream[i_stream] ); } +#undef p_stream /* Reinit p_ogg */ if( p_ogg->pp_stream ) free( p_ogg->pp_stream ); p_ogg->pp_stream = NULL; p_ogg->i_streams = 0; - p_ogg->p_stream_video = NULL; - p_ogg->p_stream_audio = NULL; - p_ogg->p_stream_spu = NULL; } -/***************************************************************************** - * Deactivate: frees unused data - *****************************************************************************/ -static void Deactivate( vlc_object_t *p_this ) +static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data ; - - if( p_ogg ) + bs_t bitstream; + int i_fps_numerator; + int i_fps_denominator; + int i_keyframe_frequency_force; + + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' ); + + /* Signal that we want to keep a backup of the theora + * stream headers. They will be used when switching between + * audio streams. */ + p_stream->b_force_backup = 1; + + /* Cheat and get additionnal info ;) */ + bs_init( &bitstream, p_oggpacket->packet, p_oggpacket->bytes ); + bs_skip( &bitstream, 56 ); + bs_read( &bitstream, 8 ); /* major version num */ + bs_read( &bitstream, 8 ); /* minor version num */ + bs_read( &bitstream, 8 ); /* subminor version num */ + bs_read( &bitstream, 16 ) /*<< 4*/; /* width */ + bs_read( &bitstream, 16 ) /*<< 4*/; /* height */ + bs_read( &bitstream, 24 ); /* frame width */ + bs_read( &bitstream, 24 ); /* frame height */ + bs_read( &bitstream, 8 ); /* x offset */ + bs_read( &bitstream, 8 ); /* y offset */ + + i_fps_numerator = bs_read( &bitstream, 32 ); + i_fps_denominator = bs_read( &bitstream, 32 ); + bs_read( &bitstream, 24 ); /* aspect_numerator */ + bs_read( &bitstream, 24 ); /* aspect_denominator */ + + bs_read( &bitstream, 8 ); /* colorspace */ + p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 ); + bs_read( &bitstream, 6 ); /* quality */ + + i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 ); + + /* granule_shift = i_log( frequency_force -1 ) */ + p_stream->i_theora_keyframe_granule_shift = 0; + i_keyframe_frequency_force--; + while( i_keyframe_frequency_force ) { - /* Cleanup the bitstream parser */ - ogg_sync_clear( &p_ogg->oy ); - - Ogg_EndOfStream( p_input, p_ogg ); - - free( p_ogg ); + p_stream->i_theora_keyframe_granule_shift++; + i_keyframe_frequency_force >>= 1; } + + p_stream->f_rate = ((float)i_fps_numerator) / i_fps_denominator; } -/***************************************************************************** - * Demux: reads and demuxes data packets - ***************************************************************************** - * Returns -1 in case of error, 0 in case of EOF, 1 otherwise - *****************************************************************************/ -static int Demux( input_thread_t * p_input ) +static void Ogg_ReadVorbisHeader( logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) { - demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data; - ogg_page oggpage; - ogg_packet oggpacket; - int i_stream; - - if( p_ogg->b_eos ) - { - if( Ogg_BeginningOfStream( p_input, p_ogg ) != VLC_SUCCESS ) return 0; - p_ogg->b_eos = VLC_FALSE; + oggpack_buffer opb; + + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' ); + + /* Signal that we want to keep a backup of the vorbis + * stream headers. They will be used when switching between + * audio streams. */ + p_stream->b_force_backup = 1; + + /* Cheat and get additionnal info ;) */ + oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes); + oggpack_adv( &opb, 88 ); + p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 ); + p_stream->f_rate = p_stream->fmt.audio.i_rate = + oggpack_read( &opb, 32 ); + oggpack_adv( &opb, 32 ); + p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 ); +} - msg_Dbg( p_input, "beginning of a group of logical streams" ); +static void Ogg_ReadSpeexHeader( logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + oggpack_buffer opb; + + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' ); + + /* Signal that we want to keep a backup of the speex + * stream headers. They will be used when switching between + * audio streams. */ + p_stream->b_force_backup = 1; + + /* Cheat and get additionnal info ;) */ + oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes); + oggpack_adv( &opb, 224 ); + oggpack_adv( &opb, 32 ); /* speex_version_id */ + oggpack_adv( &opb, 32 ); /* header_size */ + p_stream->f_rate = p_stream->fmt.audio.i_rate = oggpack_read( &opb, 32 ); + oggpack_adv( &opb, 32 ); /* mode */ + oggpack_adv( &opb, 32 ); /* mode_bitstream_version */ + p_stream->fmt.audio.i_channels = oggpack_read( &opb, 32 ); + p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 ); +} - p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT; - input_ClockManageRef( p_input, p_input->stream.p_selected_program, 0 ); - } +static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + /* Parse the STREAMINFO metadata */ + bs_t s; -#define p_stream p_ogg->pp_stream[i_stream] + bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes ); - /* detect new selected/unselected streams */ - for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) + bs_read( &s, 1 ); + if( bs_read( &s, 7 ) == 0 ) { - if( p_stream->p_es ) + if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ ) { - if( p_stream->p_es->p_decoder_fifo && - !p_stream->i_activated ) - { - Ogg_ElemStreamStart( p_input, p_ogg, i_stream ); - } - else - if( !p_stream->p_es->p_decoder_fifo && - p_stream->i_activated ) - { - Ogg_ElemStreamStop( p_input, p_ogg, i_stream ); - } - } - } + bs_skip( &s, 80 ); + p_stream->f_rate = p_stream->fmt.audio.i_rate = bs_read( &s, 20 ); + p_stream->fmt.audio.i_channels = bs_read( &s, 3 ) + 1; - /* search for new video and audio stream to select - * if current have been unselected */ - if( ( !p_ogg->p_stream_video ) - || ( !p_ogg->p_stream_video->p_es->p_decoder_fifo ) ) - { - p_ogg->p_stream_video = NULL; - for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) - { - if( ( p_stream->i_cat == VIDEO_ES ) - &&( p_stream->p_es->p_decoder_fifo ) ) - { - p_ogg->p_stream_video = p_stream; - break; - } + msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i", + p_stream->fmt.audio.i_channels, (int)p_stream->f_rate ); } + else msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" ); + + /* Fake this as the last metadata block */ + *((uint8_t*)p_oggpacket->packet) |= 0x80; } - if( ( !p_ogg->p_stream_audio ) - ||( !p_ogg->p_stream_audio->p_es->p_decoder_fifo ) ) + else { - p_ogg->p_stream_audio = NULL; - for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) - { - if( ( p_stream->i_cat == AUDIO_ES ) - &&( p_stream->p_es->p_decoder_fifo ) ) - { - p_ogg->p_stream_audio = p_stream; - break; - } - } + /* This ain't a STREAMINFO metadata */ + msg_Dbg( p_demux, "Invalid FLAC STREAMINFO metadata" ); } +} - if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) +static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, + logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + if( ! strncmp( &p_oggpacket->packet[0], "Annodex", 7 ) ) { - msg_Warn( p_input, "synchro reinit" ); + oggpack_buffer opb; - for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) - { - /* we'll trash all the data until we find the next pcr */ - p_stream->b_reinit = 1; - p_stream->i_pcr = -1; - p_stream->i_interpolated_pcr = -1; - } - } + uint16_t major_version; + uint16_t minor_version; + uint64_t timebase_numerator; + uint64_t timebase_denominator; + Ogg_ReadTheoraHeader( p_stream, p_oggpacket ); - /* - * Demux an ogg page from the stream - */ - if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS ) - { - return 0; /* EOF */ + oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes); + oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */ + major_version = oggpack_read( &opb, 2*8 ); /* major version */ + minor_version = oggpack_read( &opb, 2*8 ); /* minor version */ + timebase_numerator = GetQWLE( &p_oggpacket->packet[16] ); + timebase_denominator = GetQWLE( &p_oggpacket->packet[24] ); } - - /* Test for End of Stream */ - if( ogg_page_eos( &oggpage ) ) + else if( ! strncmp( &p_oggpacket->packet[0], "AnxData", 7 ) ) { - msg_Dbg( p_input, "end of a group of logical streams" ); + uint64_t granule_rate_numerator; + uint64_t granule_rate_denominator; + char content_type_string[1024]; - Ogg_EndOfStream( p_input, p_ogg ); - p_ogg->b_eos = VLC_TRUE; - return 1; - } + /* Read in Annodex header fields */ - for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) - { - if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 ) - continue; + granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] ); + granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] ); + p_stream->secondary_header_packets = + GetDWLE( &p_oggpacket->packet[24] ); - while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) + /* we are guaranteed that the first header field will be + * the content-type (by the Annodex standard) */ + if( !strncasecmp( &p_oggpacket->packet[28], "Content-Type: ", 14 ) ) { - if( !p_stream->p_es ) - { - break; - } - - if( p_stream->b_reinit ) - { - /* If synchro is re-initialized we need to drop all the packets - * until we find a new dated one. */ - Ogg_UpdatePCR( p_stream, &oggpacket ); - - if( p_stream->i_pcr >= 0 ) - { - p_stream->b_reinit = 0; - } - else - { - p_stream->i_interpolated_pcr = -1; - continue; - } - - /* An Ogg/vorbis packet contains an end date granulepos */ - if( p_stream->i_fourcc == VLC_FOURCC( 'v','o','r','b' ) || - p_stream->i_fourcc == VLC_FOURCC( 's','p','x',' ' ) ) - { - if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) - { - Ogg_DecodePacket( p_input, p_stream, &oggpacket ); - } - continue; - } - } - - Ogg_DecodePacket( p_input, p_stream, &oggpacket ); + sscanf( &p_oggpacket->packet[42], "%1024s\r\n", + content_type_string ); } - break; - } - - i_stream = 0; p_ogg->i_pcr = -1; - for( ; i_stream < p_ogg->i_streams; i_stream++ ) - { - if( p_stream->i_cat == SPU_ES ) - continue; - if( p_stream->i_interpolated_pcr < 0 ) - continue; - if( p_ogg->i_pcr < 0 || p_stream->i_interpolated_pcr < p_ogg->i_pcr ) - p_ogg->i_pcr = p_stream->i_interpolated_pcr; - } + msg_Dbg( p_this, "AnxData packet info: "I64Fd" / "I64Fd", %d, ``%s''", + granule_rate_numerator, granule_rate_denominator, + p_stream->secondary_header_packets, content_type_string ); - if( p_input->stream.p_selected_program->i_synchro_state != SYNCHRO_REINIT ) - { - input_ClockManageRef( p_input, p_input->stream.p_selected_program, - p_ogg->i_pcr ); - } + p_stream->f_rate = (float) granule_rate_numerator / + (float) granule_rate_denominator; -#undef p_stream + /* What type of file do we have? + * strcmp is safe to use here because we've extracted + * content_type_string from the stream manually */ + if( !strncmp(content_type_string, "audio/x-wav", 11) ) + { + /* n.b. WAVs are unsupported right now */ + p_stream->fmt.i_cat = UNKNOWN_ES; + } + else if( !strncmp(content_type_string, "audio/x-vorbis", 14) ) + { + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' ); - return 1; -} + p_stream->b_force_backup = 1; + } + else if( !strncmp(content_type_string, "audio/x-speex", 14) ) + { + p_stream->fmt.i_cat = AUDIO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' ); -/***************************************************************************** - * Control: - *****************************************************************************/ -static int Control( input_thread_t *p_input, int i_query, va_list args ) -{ - demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data; - int64_t *pi64; + p_stream->b_force_backup = 1; + } + else if( !strncmp(content_type_string, "video/x-theora", 14) ) + { + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' ); - switch( i_query ) - { - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = p_ogg->i_pcr * 100 / 9; - return VLC_SUCCESS; + p_stream->b_force_backup = 1; + } + else if( !strncmp(content_type_string, "video/x-xvid", 14) ) + { + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'x','v','i','d' ); - default: - return demux_vaControlDefault( p_input, i_query, args ); + p_stream->b_force_backup = 1; + } + else if( !strncmp(content_type_string, "video/mpeg", 14) ) + { + /* n.b. MPEG streams are unsupported right now */ + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' ); + } + else if( !strncmp(content_type_string, "text/x-cmml", 11) ) + { + ogg_stream_packetout( &p_stream->os, p_oggpacket ); + p_stream->fmt.i_cat = SPU_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'c','m','m','l' ); + } } }