X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=54c9c7834601b60927f22a68873a834d0c4fbff6;hb=015a372b105406afcbf4ca5995ea62115c1c65bf;hp=e3392df8baba5f320d52cb4aa61611d62dcd73df;hpb=a6b8118109995ae1b11f941af1b6f8290ed24f56;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index e3392df8ba..54c9c78346 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -1,7 +1,7 @@ /***************************************************************************** * ogg.c : ogg stream demux module for vlc ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN + * Copyright (C) 2001-2003 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -40,7 +40,10 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_description( _("Ogg stream demuxer" ) ); + set_shortname ( "OGG" ); + set_description( _("OGG demuxer" ) ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); set_capability( "demux2", 50 ); set_callbacks( Open, Close ); add_shortcut( "ogg" ); @@ -180,14 +183,9 @@ static int Open( vlc_object_t * p_this ) /* Check if we are dealing with an ogg stream */ - if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) + if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC; + if( strcmp( p_demux->psz_demux, "ogg" ) && memcmp( p_peek, "OggS", 4 ) ) { - msg_Err( p_demux, "cannot peek" ); - return VLC_EGENERIC; - } - if( strcmp( p_demux->psz_demux, "ogg" ) && strncmp( p_peek, "OggS", 4 ) ) - { - msg_Warn( p_demux, "ogg module discarded (invalid header)" ); return VLC_EGENERIC; } @@ -203,6 +201,20 @@ static int Open( vlc_object_t * p_this ) /* Begnning of stream, tell the demux to look for elementary streams. */ p_sys->i_eos = 0; + + if( ((input_thread_t* )(p_demux->p_parent ))->b_preparsing == VLC_TRUE ) + { + module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 ); + if( p_meta ) + { + vlc_meta_Merge( ((input_thread_t* )(p_demux->p_parent ))-> + input.p_item->p_meta, + (vlc_meta_t*)(p_demux->p_private ) ); + module_Unneed( p_demux, p_meta ); + } + return VLC_SUCCESS; + } + /* Initialize the Ogg physical bitstream parser */ ogg_sync_init( &p_sys->oy ); @@ -279,14 +291,14 @@ static int Demux( demux_t * p_demux ) { if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') && oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[1], "theora", 6 ) ) + ! memcmp( &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 ) ) + ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) ) { Ogg_ReadVorbisHeader( p_stream, &oggpacket ); p_stream->secondary_header_packets = 0; @@ -295,8 +307,6 @@ static int Demux( demux_t * p_demux ) { p_stream->secondary_header_packets = 0; } - - p_stream->secondary_header_packets--; } if( p_stream->b_reinit ) @@ -409,7 +419,7 @@ 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; - byte_t *p_buffer; + char *p_buffer; while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 ) { @@ -489,18 +499,21 @@ static void Ogg_DecodePacket( demux_t *p_demux, } if( p_oggpacket->bytes >= 7 && - ! strncmp ( &p_oggpacket->packet[0], "Annodex", 7 ) ) + ! memcmp ( &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 ) ) + ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) ) { /* it's an AnxData packet -- skip it (do nothing) */ return; } + if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) && + p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return; + /* Check the ES is selected */ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, p_stream->p_es, &b_selected ); @@ -516,21 +529,30 @@ static void Ogg_DecodePacket( demux_t *p_demux, case VLC_FOURCC( 'v','o','r','b' ): case VLC_FOURCC( 's','p','x',' ' ): case VLC_FOURCC( 't','h','e','o' ): - if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0; - break; + if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0; + break; case VLC_FOURCC( 'f','l','a','c' ): - if( p_stream->i_packets_backup == 2 ) - { - Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket ); - p_stream->b_force_backup = 0; - } - b_store_size = VLC_FALSE; - break; + 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; + if( p_oggpacket->bytes >= 9 ) + { + p_oggpacket->packet += 9; + p_oggpacket->bytes -= 9; + } + } + b_store_size = VLC_FALSE; + break; default: - p_stream->b_force_backup = 0; - break; + p_stream->b_force_backup = 0; + break; } /* Backup the ogg packet (likely an header packet) */ @@ -623,6 +645,9 @@ static void Ogg_DecodePacket( demux_t *p_demux, return; } + if( p_oggpacket->bytes <= 0 ) + return; + if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return; /* Normalize PTS */ @@ -655,12 +680,12 @@ static void Ogg_DecodePacket( demux_t *p_demux, /* 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; - + 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++ ) @@ -680,7 +705,10 @@ static void Ogg_DecodePacket( demux_t *p_demux, } i_header_len++; - p_block->i_buffer -= i_header_len; + if( p_block->i_buffer >= i_header_len ) + p_block->i_buffer -= i_header_len; + else + p_block->i_buffer = 0; } if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) ) @@ -733,6 +761,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) 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 ); @@ -755,14 +784,14 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) /* Check for Vorbis header */ if( oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) ) + ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) ) { 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 ) ) + ! memcmp( &oggpacket.packet[0], "Speex", 5 ) ) { Ogg_ReadSpeexHeader( p_stream, &oggpacket ); msg_Dbg( p_demux, "found speex header, channels: %i, " @@ -770,9 +799,9 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) p_stream->fmt.audio.i_channels, (int)p_stream->f_rate, p_stream->fmt.i_bitrate ); } - /* Check for Flac header */ + /* Check for Flac header (< version 1.1.1) */ else if( oggpacket.bytes >= 4 && - ! strncmp( &oggpacket.packet[0], "fLaC", 4 ) ) + ! memcmp( &oggpacket.packet[0], "fLaC", 4 ) ) { msg_Dbg( p_demux, "found FLAC header" ); @@ -784,9 +813,28 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) 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 && + ! memcmp( &oggpacket.packet[1], "FLAC", 4 ) && + ! memcmp( &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 ); + + p_stream->b_force_backup = 1; + + 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 ) ) + ! memcmp( &oggpacket.packet[1], "theora", 6 ) ) { Ogg_ReadTheoraHeader( p_stream, &oggpacket ); @@ -796,7 +844,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) } /* Check for Tarkin header */ else if( oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[1], "tarkin", 6 ) ) + ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) ) { oggpack_buffer opb; @@ -816,7 +864,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) } /* Check for Annodex header */ else if( oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[0], "Annodex", 7 ) ) + ! memcmp( &oggpacket.packet[0], "Annodex", 7 ) ) { Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, &oggpacket ); @@ -826,13 +874,13 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) } /* Check for Annodex header */ else if( oggpacket.bytes >= 7 && - ! strncmp( &oggpacket.packet[0], "AnxData", 7 ) ) + ! memcmp( &oggpacket.packet[0], "AnxData", 7 ) ) { Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, &oggpacket ); } else if( oggpacket.bytes >= 142 && - !strncmp( &oggpacket.packet[1], + !memcmp( &oggpacket.packet[1], "Direct Show Samples embedded in Ogg", 35 )) { /* Old header type */ @@ -850,6 +898,9 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) msg_Dbg( p_demux, "found video header of type: %.4s", (char *)&p_stream->fmt.i_codec ); + p_stream->fmt.video.i_frame_rate = 10000000; + p_stream->fmt.video.i_frame_rate_base = + GetQWLE((oggpacket.packet+164)); p_stream->f_rate = 10000000.0 / GetQWLE((oggpacket.packet+164)); p_stream->fmt.video.i_bits_per_pixel = @@ -949,6 +1000,9 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) msg_Dbg( p_demux, "found video header of type: %.4s", (char *)&p_stream->fmt.i_codec ); + p_stream->fmt.video.i_frame_rate = 10000000; + p_stream->fmt.video.i_frame_rate_base = + GetQWLE(&st->time_unit); p_stream->f_rate = 10000000.0 / GetQWLE(&st->time_unit); p_stream->fmt.video.i_bits_per_pixel = @@ -1179,6 +1233,9 @@ static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream, bs_read( &bitstream, 24 ); /* aspect_numerator */ bs_read( &bitstream, 24 ); /* aspect_denominator */ + p_stream->fmt.video.i_frame_rate = i_fps_numerator; + p_stream->fmt.video.i_frame_rate_base = i_fps_denominator; + bs_read( &bitstream, 8 ); /* colorspace */ p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 ); bs_read( &bitstream, 6 ); /* quality */ @@ -1252,6 +1309,7 @@ static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream, bs_t s; bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes ); + bs_read( &s, 1 ); if( bs_read( &s, 7 ) == 0 ) { @@ -1280,7 +1338,8 @@ 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 ) ) + if( p_oggpacket->bytes >= 28 && + !memcmp( &p_oggpacket->packet[0], "Annodex", 7 ) ) { oggpack_buffer opb; @@ -1298,7 +1357,8 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, timebase_numerator = GetQWLE( &p_oggpacket->packet[16] ); timebase_denominator = GetQWLE( &p_oggpacket->packet[24] ); } - else if( ! strncmp( &p_oggpacket->packet[0], "AnxData", 7 ) ) + else if( p_oggpacket->bytes >= 42 && + !memcmp( &p_oggpacket->packet[0], "AnxData", 7 ) ) { uint64_t granule_rate_numerator; uint64_t granule_rate_denominator; @@ -1311,14 +1371,21 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, p_stream->secondary_header_packets = GetDWLE( &p_oggpacket->packet[24] ); - msg_Dbg( p_this, "anxdata packet info: %qd/%qd, %d", - granule_rate_numerator, granule_rate_denominator, - p_stream->secondary_header_packets); - /* we are guaranteed that the first header field will be * the content-type (by the Annodex standard) */ - sscanf( &p_oggpacket->packet[28], "Content-Type: %1024s\r\n", - content_type_string ); + content_type_string[0] = '\0'; + if( !strncasecmp( (char*)(&p_oggpacket->packet[28]), "Content-Type: ", 14 ) ) + { + uint8_t *p = memchr( &p_oggpacket->packet[42], '\r', + p_oggpacket->bytes - 1 ); + if( p && p[0] == '\r' && p[1] == '\n' ) + sscanf( (char*)(&p_oggpacket->packet[42]), "%1024s\r\n", + content_type_string ); + } + + 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 ); p_stream->f_rate = (float) granule_rate_numerator / (float) granule_rate_denominator; @@ -1338,6 +1405,13 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, 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',' ' ); + + p_stream->b_force_backup = 1; + } else if( !strncmp(content_type_string, "video/x-theora", 14) ) { p_stream->fmt.i_cat = VIDEO_ES;