X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=577934ccff6ba45108c991eef80150f2ee499cd5;hb=0119302c2f2a5f727c439a5163bb6041a4f3adad;hp=907629faad5ddc482fb8132cd7f5c3bae84242b6;hpb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index 907629faad..577934ccff 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -39,6 +39,8 @@ #include #include +#include +#include "vorbis.h" /***************************************************************************** * Module descriptor @@ -46,15 +48,15 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_shortname ( "OGG" ); - set_description( N_("OGG demuxer" ) ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux", 50 ); - set_callbacks( Open, Close ); - add_shortcut( "ogg" ); -vlc_module_end(); +vlc_module_begin () + set_shortname ( "OGG" ) + set_description( N_("OGG demuxer" ) ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 50 ) + set_callbacks( Open, Close ) + add_shortcut( "ogg" ) +vlc_module_end () /***************************************************************************** @@ -65,6 +67,7 @@ typedef struct logical_stream_s ogg_stream_state os; /* logical stream of packets */ es_format_t fmt; + es_format_t fmt_old; /* format of old ES is reused */ es_out_id_t *p_es; double f_rate; @@ -85,14 +88,14 @@ typedef struct logical_stream_s mtime_t i_previous_pcr; /* Misc */ - int b_reinit; + bool b_reinit; int i_granule_shift; /* kate streams have the number of headers in the ID header */ int i_kate_num_headers; /* for Annodex logical bitstreams */ - int secondary_header_packets; + int i_secondary_header_packets; } logical_stream_t; @@ -103,32 +106,42 @@ struct demux_sys_t int i_streams; /* number of logical bitstreams */ logical_stream_t **pp_stream; /* pointer to an array of logical streams */ + logical_stream_t *p_old_stream; /* pointer to a old logical stream to avoid recreating it */ + /* program clock reference (in units of 90kHz) derived from the pcr of * the sub-streams */ mtime_t i_pcr; /* stream state */ + int i_bos; int i_eos; /* bitrate */ int i_bitrate; + + /* after reading all headers, the first data page is stuffed into the relevant stream, ready to use */ + bool b_page_waiting; + + /* */ + vlc_meta_t *p_meta; }; /* OggDS headers for the new header format (used in ogm files) */ -typedef struct stream_header_video +typedef struct { ogg_int32_t width; ogg_int32_t height; -} stream_header_video; +} stream_header_video_t; -typedef struct stream_header_audio +typedef struct { ogg_int16_t channels; + ogg_int16_t padding; ogg_int16_t blockalign; ogg_int32_t avgbytespersec; -} stream_header_audio; +} stream_header_audio_t; -typedef struct stream_header +typedef struct { char streamtype[8]; char subtype[4]; @@ -141,15 +154,16 @@ typedef struct stream_header ogg_int32_t buffersize; ogg_int16_t bits_per_sample; + ogg_int16_t padding; union { /* Video specific */ - stream_header_video video; + stream_header_video_t video; /* Audio specific */ - stream_header_audio audio; + stream_header_audio_t audio; } sh; -} stream_header; +} stream_header_t; #define OGG_BLOCK_SIZE 4096 @@ -175,6 +189,13 @@ static int Ogg_BeginningOfStream( demux_t *p_demux ); static int Ogg_FindLogicalStreams( demux_t *p_demux ); static void Ogg_EndOfStream( demux_t *p_demux ); +/* */ +static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream ); +static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream ); + +/* */ +static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers ); + /* Logical bitstream headers */ static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * ); static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * ); @@ -182,6 +203,7 @@ static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * ); static void Ogg_ReadKateHeader( 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 * ); +static bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * ); /***************************************************************************** * Open: initializes ogg demux structures @@ -204,16 +226,24 @@ static int Open( vlc_object_t * p_this ) p_demux->pf_demux = Demux; p_demux->pf_control = Control; p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; memset( p_sys, 0, sizeof( demux_sys_t ) ); p_sys->i_bitrate = 0; p_sys->pp_stream = NULL; + p_sys->p_old_stream = NULL; /* Begnning of stream, tell the demux to look for elementary streams. */ + p_sys->i_bos = 0; p_sys->i_eos = 0; /* Initialize the Ogg physical bitstream parser */ ogg_sync_init( &p_sys->oy ); + p_sys->b_page_waiting = false; + + /* */ + p_sys->p_meta = NULL; return VLC_SUCCESS; } @@ -231,6 +261,9 @@ static void Close( vlc_object_t *p_this ) Ogg_EndOfStream( p_demux ); + if( p_sys->p_old_stream ) + Ogg_LogicalStreamDelete( p_demux, p_sys->p_old_stream ); + free( p_sys ); } @@ -252,57 +285,85 @@ static int Demux( demux_t * p_demux ) if( p_sys->i_eos ) { msg_Dbg( p_demux, "end of a group of logical streams" ); + /* We keep the ES to try reusing it in Ogg_BeginningOfStream + * only 1 ES is supported (common case for ogg web radio) */ + if( p_sys->i_streams == 1 ) + { + p_sys->p_old_stream = p_sys->pp_stream[0]; + TAB_CLEAN( p_sys->i_streams, p_sys->pp_stream ); + } Ogg_EndOfStream( p_demux ); } p_sys->i_eos = 0; - if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS ) return 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 ); } /* - * Demux an ogg page from the stream + * The first data page of a physical stream is stored in the relevant logical stream + * in Ogg_FindLogicalStreams. Therefore, we must not read a page and only update the + * stream it belongs to if we haven't processed this first page yet. If we do, we + * will only process that first page whenever we find the second page for this stream. + * While this is fine for Vorbis and Theora, which are continuous codecs, which means + * the second page will arrive real quick, this is not fine for Kate, whose second + * data page will typically arrive much later. + * This means it is now possible to seek right at the start of a stream where the last + * logical stream is Kate, without having to wait for the second data page to unblock + * the first one, which is the one that triggers the 'no more headers to backup' code. + * And, as we all know, seeking without having backed up all headers is bad, since the + * codec will fail to initialize if it's missing its headers. */ - if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS ) + if( !p_sys->b_page_waiting) { - return 0; /* EOF */ + /* + * Demux an ogg page from the stream + */ + if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS ) + return 0; /* EOF */ + + /* Test for End of Stream */ + if( ogg_page_eos( &oggpage ) ) + p_sys->i_eos++; } - /* 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++ ) { logical_stream_t *p_stream = p_sys->pp_stream[i_stream]; - if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 ) - continue; + /* if we've just pulled page, look for the right logical stream */ + if( !p_sys->b_page_waiting ) + { + if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 ) + continue; + } while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) { /* Read info from any secondary header packets, if there are any */ - if( p_stream->secondary_header_packets > 0 ) + if( p_stream->i_secondary_header_packets > 0 ) { if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') && oggpacket.bytes >= 7 && ! memcmp( oggpacket.packet, "\x80theora", 7 ) ) { Ogg_ReadTheoraHeader( p_stream, &oggpacket ); - p_stream->secondary_header_packets = 0; + p_stream->i_secondary_header_packets = 0; } else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') && oggpacket.bytes >= 7 && ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) ) { Ogg_ReadVorbisHeader( p_stream, &oggpacket ); - p_stream->secondary_header_packets = 0; + p_stream->i_secondary_header_packets = 0; } - else if ( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) + else if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) { - p_stream->secondary_header_packets = 0; + p_stream->i_secondary_header_packets = 0; } } @@ -314,7 +375,7 @@ static int Demux( demux_t * p_demux ) if( p_stream->i_pcr >= 0 ) { - p_stream->b_reinit = 0; + p_stream->b_reinit = false; } else { @@ -342,11 +403,16 @@ static int Demux( demux_t * p_demux ) Ogg_DecodePacket( p_demux, p_stream, &oggpacket ); } - break; + + if( !p_sys->b_page_waiting ) + break; } - i_stream = 0; p_sys->i_pcr = -1; - for( ; i_stream < p_sys->i_streams; i_stream++ ) + /* if a page was waiting, it's now processed */ + p_sys->b_page_waiting = false; + + p_sys->i_pcr = -1; + for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) { logical_stream_t *p_stream = p_sys->pp_stream[i_stream]; @@ -360,10 +426,7 @@ static int Demux( demux_t * p_demux ) } if( p_sys->i_pcr >= 0 ) - { es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr ); - } - return 1; } @@ -374,12 +437,19 @@ static int Demux( demux_t * p_demux ) static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; + vlc_meta_t *p_meta; int64_t *pi64; bool *pb_bool; int i; switch( i_query ) { + case DEMUX_GET_META: + p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* ); + if( p_sys->p_meta ) + vlc_meta_Merge( p_meta, p_sys->p_meta ); + return VLC_SUCCESS; + case DEMUX_HAS_UNSUPPORTED_META: pb_bool = (bool*)va_arg( args, bool* ); *pb_bool = true; @@ -394,17 +464,27 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_EGENERIC; case DEMUX_SET_POSITION: + /* forbid seeking if we haven't initialized all logical bitstreams yet; + if we allowed, some headers would not get backed up and decoder init + would fail, making that logical stream unusable */ + if( p_sys->i_bos > 0 ) + { + return VLC_EGENERIC; + } + 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->b_reinit = true; p_stream->i_pcr = -1; p_stream->i_interpolated_pcr = -1; ogg_stream_reset( &p_stream->os ); } ogg_sync_reset( &p_sys->oy ); + /* XXX The break/return is missing on purpose as + * demux_vaControlHelper will do the last part of the job */ default: return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate, @@ -459,6 +539,12 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, p_stream->i_pcr = ( iframe + pframe ) * INT64_C(1000000) / p_stream->f_rate; } + else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) ) + { + ogg_int64_t i_dts = p_oggpacket->granulepos >> 31; + /* NB, OggDirac granulepos values are in units of 2*picturerate */ + p_stream->i_pcr = (i_dts/2) * INT64_C(1000000) / p_stream->f_rate; + } else { p_stream->i_pcr = p_oggpacket->granulepos * INT64_C(1000000) @@ -494,6 +580,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, bool b_selected; int i_header_len = 0; mtime_t i_pts = -1, i_interpolated_pts; + demux_sys_t *p_ogg = p_demux->p_sys; /* Sanity check */ if( !p_oggpacket->bytes ) @@ -524,7 +611,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, if( p_stream->b_force_backup ) { - uint8_t *p_extra; + uint8_t *p_sav; bool b_store_size = true; bool b_store_num_headers = false; @@ -568,33 +655,54 @@ static void Ogg_DecodePacket( demux_t *p_demux, /* Backup the ogg packet (likely an header packet) */ p_stream->p_headers = - realloc( p_stream->p_headers, p_stream->i_headers + + realloc( p_sav = p_stream->p_headers, p_stream->i_headers + p_oggpacket->bytes + (b_store_size ? 2 : 0) + (b_store_num_headers ? 1 : 0) ); - p_extra = p_stream->p_headers + p_stream->i_headers; - if( b_store_num_headers ) - { - /* Kate streams store the number of headers in the first header, - so we can't just test for 3 as Vorbis/Theora */ - *(p_extra++) = p_stream->i_kate_num_headers; - } - if( b_store_size ) + if( p_stream->p_headers ) { - *(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) + (b_store_num_headers ? 1 : 0); + uint8_t *p_extra = p_stream->p_headers + p_stream->i_headers; + + if( b_store_num_headers ) + { + /* Kate streams store the number of headers in the first header, + so we can't just test for 3 as Vorbis/Theora */ + *(p_extra++) = p_stream->i_kate_num_headers; + } + if( b_store_size ) + { + *(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) + (b_store_num_headers ? 1 : 0); - if( !p_stream->b_force_backup ) + if( !p_stream->b_force_backup ) + { + /* Last header received, commit changes */ + free( p_stream->fmt.p_extra ); + + p_stream->fmt.i_extra = p_stream->i_headers; + p_stream->fmt.p_extra = malloc( p_stream->i_headers ); + if( p_stream->fmt.p_extra ) + memcpy( p_stream->fmt.p_extra, p_stream->p_headers, + p_stream->i_headers ); + else + p_stream->fmt.i_extra = 0; + + if( Ogg_LogicalStreamResetEsFormat( p_demux, p_stream ) ) + es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT, + p_stream->p_es, &p_stream->fmt ); + + if( p_stream->i_headers > 0 ) + Ogg_ExtractMeta( p_demux, p_stream->fmt.i_codec, + p_stream->p_headers, p_stream->i_headers ); + + /* we're not at BOS anymore for this logical stream */ + p_ogg->i_bos--; + } + } + else { - /* 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 ); + p_stream->p_headers = p_sav; } b_selected = false; /* Discard the header packet */ @@ -630,17 +738,21 @@ static void Ogg_DecodePacket( demux_t *p_demux, i_interpolated_pts = p_stream->i_interpolated_pcr; Ogg_UpdatePCR( p_stream, p_oggpacket ); - if( p_stream->i_pcr >= 0 ) + /* SPU streams are typically discontinuous, do not mind large gaps */ + if( p_stream->fmt.i_cat != SPU_ES ) { - /* 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 ) + if( p_stream->i_pcr >= 0 ) { - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + /* 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 ) + { + 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 ); + /* Call the pace control */ + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_stream->i_pcr ); + } } } @@ -681,6 +793,19 @@ static void Ogg_DecodePacket( demux_t *p_demux, } else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) ) p_block->i_dts = p_block->i_pts = i_pts; + else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) ) + { + ogg_int64_t dts = p_oggpacket->granulepos >> 31; + ogg_int64_t delay = (p_oggpacket->granulepos >> 9) & 0x1fff; + + uint64_t u_pnum = dts + delay; + + p_block->i_dts = p_stream->i_pcr; + p_block->i_pts = 0; + /* NB, OggDirac granulepos values are in units of 2*picturerate */ + if( -1 != p_oggpacket->granulepos ) + p_block->i_pts = u_pnum * INT64_C(1000000) / p_stream->f_rate / 2; + } else { p_block->i_dts = i_pts; @@ -693,6 +818,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, 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' ) && + p_stream->fmt.i_codec != VLC_FOURCC( 'd','r','a','c' ) && p_stream->fmt.i_codec != VLC_FOURCC( 'k','a','t','e' ) ) { /* We remove the header from the packet */ @@ -760,8 +886,6 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) ogg_page oggpage; int i_stream; -#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 ) ) @@ -771,24 +895,27 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) * We found the beginning of our first logical stream. */ while( ogg_page_bos( &oggpage ) ) { - p_ogg->i_streams++; - p_ogg->pp_stream = - realloc( p_ogg->pp_stream, p_ogg->i_streams * - sizeof(logical_stream_t *) ); + logical_stream_t *p_stream; p_stream = malloc( sizeof(logical_stream_t) ); + if( !p_stream ) + return VLC_ENOMEM; + + TAB_APPEND( p_ogg->i_streams, p_ogg->pp_stream, p_stream ); + memset( p_stream, 0, sizeof(logical_stream_t) ); p_stream->p_headers = 0; - p_stream->secondary_header_packets = 0; + p_stream->i_secondary_header_packets = 0; es_format_Init( &p_stream->fmt, 0, 0 ); + es_format_Init( &p_stream->fmt_old, 0, 0 ); /* Setup the logical stream */ p_stream->i_serial_no = ogg_page_serialno( &oggpage ); ogg_stream_init( &p_stream->os, p_stream->i_serial_no ); /* Extract the initial header from the first page and verify - * the codec type of tis Ogg bitstream */ + * the codec type of this Ogg bitstream */ if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 ) { /* error. stream version mismatch perhaps */ @@ -860,6 +987,19 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) "found theora header, bitrate: %i, rate: %f", p_stream->fmt.i_bitrate, p_stream->f_rate ); } + /* Check for Dirac header */ + else if( oggpacket.bytes >= 5 && + ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) + { + if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) ) + msg_Dbg( p_demux, "found dirac header" ); + else + { + msg_Warn( p_demux, "found dirac header isn't decodable" ); + free( p_stream ); + p_ogg->i_streams--; + } + } /* Check for Tarkin header */ else if( oggpacket.bytes >= 7 && ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) ) @@ -898,8 +1038,8 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) &oggpacket ); } /* Check for Kate header */ - else if( oggpacket.bytes >= 9 && - ! memcmp( &oggpacket.packet[1], "kate\0\0\0\0", 8 ) ) + else if( oggpacket.bytes >= 8 && + ! memcmp( &oggpacket.packet[1], "kate\0\0\0", 7 ) ) { Ogg_ReadKateHeader( p_stream, &oggpacket ); msg_Dbg( p_demux, "found kate header" ); @@ -955,12 +1095,15 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) p_stream->fmt.i_cat = AUDIO_ES; i_extra_size = GetWLE((oggpacket.packet+140)); - if( i_extra_size ) + if( i_extra_size > 0 && i_extra_size < oggpacket.bytes - 142 ) { 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 ); + if( p_stream->fmt.p_extra ) + memcpy( p_stream->fmt.p_extra, + oggpacket.packet + 142, i_extra_size ); + else + p_stream->fmt.i_extra = 0; } i_format_tag = GetWLE((oggpacket.packet+124)); @@ -1005,15 +1148,27 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) p_ogg->i_streams--; } } - else if( (*oggpacket.packet & PACKET_TYPE_BITS ) - == PACKET_TYPE_HEADER && - oggpacket.bytes >= (int)sizeof(stream_header)+1 ) + else if( (*oggpacket.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER && + oggpacket.bytes >= 56+1 ) { - stream_header *st = (stream_header *)(oggpacket.packet+1); + stream_header_t tmp; + stream_header_t *st = &tmp; + + memcpy( st->streamtype, &oggpacket.packet[1+0], 8 ); + memcpy( st->subtype, &oggpacket.packet[1+8], 4 ); + st->size = GetDWLE( &oggpacket.packet[1+12] ); + st->time_unit = GetQWLE( &oggpacket.packet[1+16] ); + st->samples_per_unit = GetQWLE( &oggpacket.packet[1+24] ); + st->default_len = GetDWLE( &oggpacket.packet[1+32] ); + st->buffersize = GetDWLE( &oggpacket.packet[1+36] ); + st->bits_per_sample = GetWLE( &oggpacket.packet[1+40] ); // (padding 2) /* Check for video header (new format) */ if( !strncmp( st->streamtype, "video", 5 ) ) { + st->sh.video.width = GetDWLE( &oggpacket.packet[1+44] ); + st->sh.video.height = GetDWLE( &oggpacket.packet[1+48] ); + p_stream->fmt.i_cat = VIDEO_ES; /* We need to get rid of the header packet */ @@ -1026,16 +1181,13 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) (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 = - GetWLE(&st->bits_per_sample); - p_stream->fmt.video.i_width = - GetDWLE(&st->sh.video.width); - p_stream->fmt.video.i_height = - GetDWLE(&st->sh.video.height); + p_stream->fmt.video.i_frame_rate_base = st->time_unit; + if( st->time_unit <= 0 ) + st->time_unit = 400000; + p_stream->f_rate = 10000000.0 / st->time_unit; + p_stream->fmt.video.i_bits_per_pixel = st->bits_per_sample; + p_stream->fmt.video.i_width = st->sh.video.width; + p_stream->fmt.video.i_height = st->sh.video.height; msg_Dbg( p_demux, "fps: %f, width:%i; height:%i, bitcount:%i", @@ -1048,36 +1200,42 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) else if( !strncmp( st->streamtype, "audio", 5 ) ) { char p_buffer[5]; + unsigned int i_extra_size; int i_format_tag; + st->sh.audio.channels = GetWLE( &oggpacket.packet[1+44] ); + st->sh.audio.blockalign = GetWLE( &oggpacket.packet[1+48] ); + st->sh.audio.avgbytespersec = GetDWLE( &oggpacket.packet[1+52] ); + 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->fmt.i_extra = GetQWLE(&st->size) - - sizeof(stream_header); - if( p_stream->fmt.i_extra ) + i_extra_size = st->size - 56; + + if( i_extra_size > 0 && + i_extra_size < oggpacket.bytes - 1 - 56 ) { - p_stream->fmt.p_extra = - malloc( p_stream->fmt.i_extra ); - memcpy( p_stream->fmt.p_extra, st + 1, - p_stream->fmt.i_extra ); + p_stream->fmt.i_extra = i_extra_size; + p_stream->fmt.p_extra = malloc( p_stream->fmt.i_extra ); + if( p_stream->fmt.p_extra ) + memcpy( p_stream->fmt.p_extra, st + 1, + p_stream->fmt.i_extra ); + else + p_stream->fmt.i_extra = 0; } memcpy( p_buffer, st->subtype, 4 ); p_buffer[4] = '\0'; 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->fmt.audio.i_rate = - GetQWLE(&st->samples_per_unit); - p_stream->fmt.i_bitrate = - GetDWLE(&st->sh.audio.avgbytespersec) * 8; - p_stream->fmt.audio.i_blockalign = - GetWLE(&st->sh.audio.blockalign); - p_stream->fmt.audio.i_bitspersample = - GetWLE(&st->bits_per_sample); + p_stream->fmt.audio.i_channels = st->sh.audio.channels; + if( st->time_unit <= 0 ) + st->time_unit = 10000000; + p_stream->f_rate = p_stream->fmt.audio.i_rate = st->samples_per_unit * 10000000 / st->time_unit; + p_stream->fmt.i_bitrate = st->sh.audio.avgbytespersec * 8; + p_stream->fmt.audio.i_blockalign = st->sh.audio.blockalign; + p_stream->fmt.audio.i_bitspersample = st->bits_per_sample; wf_tag_to_fourcc( i_format_tag, &p_stream->fmt.i_codec, 0 ); @@ -1109,7 +1267,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) 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 */ + p_stream->f_rate = 1000; /* granulepos is in millisec */ } else { @@ -1140,6 +1298,16 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) return VLC_EGENERIC; } + /* we'll need to get all headers for all of those streams + that we have to backup headers for */ + p_ogg->i_bos = 0; + for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ ) + { + if( p_ogg->pp_stream[i_stream]->b_force_backup ) + p_ogg->i_bos++; + } + + /* This is the first data page, which means we are now finished * with the initial pages. We just need to store it in the relevant * bitstream. */ @@ -1148,6 +1316,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os, &oggpage ) == 0 ) { + p_ogg->b_page_waiting = true; break; } } @@ -1155,7 +1324,6 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) return VLC_SUCCESS; } } -#undef p_stream return VLC_EGENERIC; } @@ -1167,6 +1335,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) static int Ogg_BeginningOfStream( demux_t *p_demux ) { demux_sys_t *p_ogg = p_demux->p_sys ; + logical_stream_t *p_old_stream = p_ogg->p_old_stream; int i_stream; /* Find the logical streams embedded in the physical stream and @@ -1181,8 +1350,33 @@ static int Ogg_BeginningOfStream( demux_t *p_demux ) for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ ) { -#define p_stream p_ogg->pp_stream[i_stream] - p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt ); + logical_stream_t *p_stream = p_ogg->pp_stream[i_stream]; + + p_stream->p_es = NULL; + + /* Try first to reuse an old ES */ + if( p_old_stream && + p_old_stream->fmt.i_cat == p_stream->fmt.i_cat && + p_old_stream->fmt.i_codec == p_stream->fmt.i_codec ) + { + msg_Dbg( p_demux, "will reuse old stream to avoid glitch" ); + + p_stream->p_es = p_old_stream->p_es; + es_format_Copy( &p_stream->fmt_old, &p_old_stream->fmt ); + + p_old_stream->p_es = NULL; + p_old_stream = NULL; + } + + if( !p_stream->p_es ) + { + /* Better be safe than sorry when possible with ogm */ + if( p_stream->fmt.i_codec == VLC_FOURCC( 'm', 'p', 'g', 'a' ) || + p_stream->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', ' ' ) ) + p_stream->fmt.b_packetized = false; + + p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt ); + } // TODO: something to do here ? if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') ) @@ -1195,10 +1389,16 @@ static int Ogg_BeginningOfStream( demux_t *p_demux ) p_stream->i_pcr = p_stream->i_previous_pcr = p_stream->i_interpolated_pcr = -1; - p_stream->b_reinit = 0; -#undef p_stream + p_stream->b_reinit = false; } + if( p_ogg->p_old_stream ) + { + if( p_ogg->p_old_stream->p_es ) + msg_Dbg( p_demux, "old stream not reused" ); + Ogg_LogicalStreamDelete( p_demux, p_ogg->p_old_stream ); + p_ogg->p_old_stream = NULL; + } return VLC_SUCCESS; } @@ -1210,27 +1410,145 @@ static void Ogg_EndOfStream( demux_t *p_demux ) demux_sys_t *p_ogg = p_demux->p_sys ; int i_stream; -#define p_stream p_ogg->pp_stream[i_stream] for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ ) + Ogg_LogicalStreamDelete( p_demux, p_ogg->pp_stream[i_stream] ); + free( p_ogg->pp_stream ); + + /* Reinit p_ogg */ + p_ogg->i_bitrate = 0; + p_ogg->i_streams = 0; + p_ogg->pp_stream = NULL; + + /* */ + if( p_ogg->p_meta ) + vlc_meta_Delete( p_ogg->p_meta ); + p_ogg->p_meta = NULL; +} + +/** + * This function delete and release all data associated to a logical_stream_t + */ +static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream ) +{ + if( p_stream->p_es ) + es_out_Del( p_demux->out, p_stream->p_es ); + + ogg_stream_clear( &p_stream->os ); + free( p_stream->p_headers ); + + es_format_Clean( &p_stream->fmt_old ); + es_format_Clean( &p_stream->fmt ); + + free( p_stream ); +} +/** + * This function check if a we need to reset a decoder in case we are + * reusing an old ES + */ +static bool Ogg_IsVorbisFormatCompatible( const es_format_t *p_new, const es_format_t *p_old ) +{ + int i_new = 0; + int i_old = 0; + int i; + + for( i = 0; i < 3; i++ ) { - if( p_stream->p_es ) - es_out_Del( p_demux->out, p_stream->p_es ); + const uint8_t *p_new_extra = ( const uint8_t*)p_new->p_extra + i_new; + const uint8_t *p_old_extra = ( const uint8_t*)p_old->p_extra + i_old; - p_ogg->i_bitrate -= p_stream->fmt.i_bitrate; + if( p_new->i_extra < i_new+2 || p_old->i_extra < i_old+2 ) + return false; - ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os ); - free( p_ogg->pp_stream[i_stream]->p_headers ); + const int i_new_size = GetWBE( &p_new_extra[0] ); + const int i_old_size = GetWBE( &p_old_extra[0] ); - es_format_Clean( &p_stream->fmt ); + if( i != 1 ) /* Ignore vorbis comment */ + { + if( i_new_size != i_old_size ) + return false; + if( memcmp( &p_new_extra[2], &p_old_extra[2], i_new_size ) ) + return false; + } - free( p_ogg->pp_stream[i_stream] ); + i_new += 2 + i_new_size; + i_old += 2 + i_old_size; } -#undef p_stream + return true; +} +static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream ) +{ + bool b_compatible = false; + if( !p_stream->fmt_old.i_cat || !p_stream->fmt_old.i_codec ) + return true; - /* Reinit p_ogg */ - free( p_ogg->pp_stream ); - p_ogg->pp_stream = NULL; - p_ogg->i_streams = 0; + /* Only vorbis is supported */ + if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ) + b_compatible = Ogg_IsVorbisFormatCompatible( &p_stream->fmt, &p_stream->fmt_old ); + + if( !b_compatible ) + msg_Warn( p_demux, "cannot reuse old stream, resetting the decoder" ); + + return !b_compatible; +} +static void Ogg_ExtractXiphMeta( demux_t *p_demux, const uint8_t *p_headers, int i_headers, int i_skip ) +{ + demux_sys_t *p_ogg = p_demux->p_sys; + + if( i_headers <= 2 ) + return; + + /* Skip first packet */ + const int i_tmp = GetWBE( &p_headers[0] ); + if( i_tmp > i_headers-2 ) + return; + p_headers += 2 + i_tmp; + i_headers -= 2 + i_tmp; + + if( i_headers <= 2 ) + return; + + /* */ + int i_comment = GetWBE( &p_headers[0] ); + const uint8_t *p_comment = &p_headers[2]; + if( i_comment > i_headers - 2 ) + return; + + if( i_comment <= i_skip ) + return; + + /* TODO how to handle multiple comments properly ? */ + vorbis_ParseComment( &p_ogg->p_meta, &p_comment[i_skip], i_comment - i_skip ); +} +static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers ) +{ + demux_sys_t *p_ogg = p_demux->p_sys; + + switch( i_codec ) + { + /* 3 headers with the 2° one being the comments */ + case VLC_FOURCC( 'v','o','r','b' ): + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 ); + break; + case VLC_FOURCC( 't','h','e','o' ): + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 ); + break; + case VLC_FOURCC( 's','p','x',' ' ): + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0 ); + break; + + /* TODO */ + case VLC_FOURCC( 'k','a','t','e' ): + case VLC_FOURCC( 'f','l','a','c' ): + case VLC_FOURCC( 'c','m','m','l' ): + msg_Warn( p_demux, "Ogg_ExtractMeta does not support %4.4s", (const char*)&i_codec ); + break; + /* No meta data */ + case VLC_FOURCC( 'd','r','a','c' ): + default: + break; + } + if( p_ogg->p_meta ) + p_demux->info.i_update |= INPUT_UPDATE_META; } static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream, @@ -1356,7 +1674,10 @@ static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream, 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" ); + else + { + msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" ); + } /* Fake this as the last metadata block */ *((uint8_t*)p_oggpacket->packet) |= 0x80; @@ -1396,27 +1717,27 @@ static void Ogg_ReadKateHeader( logical_stream_t *p_stream, p_stream->f_rate = (double)gnum/gden; p_stream->fmt.psz_language = malloc(16); - if (p_stream->fmt.psz_language) + if( p_stream->fmt.psz_language ) { - for (n=0;n<16;++n) + for( n = 0; n < 16; ++n ) p_stream->fmt.psz_language[n] = oggpack_read(&opb,8); p_stream->fmt.psz_language[15] = 0; /* just in case */ } else { - for (n=0;n<16;++n) + for( n = 0; n < 16; ++n ) oggpack_read(&opb,8); } p_stream->fmt.psz_description = malloc(16); - if (p_stream->fmt.psz_description) + if( p_stream->fmt.psz_description ) { - for (n=0;n<16;++n) + for( n = 0; n < 16; ++n ) p_stream->fmt.psz_description[n] = oggpack_read(&opb,8); p_stream->fmt.psz_description[15] = 0; /* just in case */ } else { - for (n=0;n<16;++n) + for( n = 0; n < 16; ++n ) oggpack_read(&opb,8); } } @@ -1455,7 +1776,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] ); granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] ); - p_stream->secondary_header_packets = + p_stream->i_secondary_header_packets = GetDWLE( &p_oggpacket->packet[24] ); /* we are guaranteed that the first header field will be @@ -1472,7 +1793,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, msg_Dbg( p_this, "AnxData packet info: %"PRId64" / %"PRId64", %d, ``%s''", granule_rate_numerator, granule_rate_denominator, - p_stream->secondary_header_packets, content_type_string ); + p_stream->i_secondary_header_packets, content_type_string ); p_stream->f_rate = (float) granule_rate_numerator / (float) granule_rate_denominator; @@ -1527,3 +1848,105 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, } } } + +static uint32_t dirac_uint( bs_t *p_bs ) +{ + uint32_t u_count = 0, u_value = 0; + + while( !bs_eof( p_bs ) && !bs_read( p_bs, 1 ) ) + { + u_count++; + u_value <<= 1; + u_value |= bs_read( p_bs, 1 ); + } + + return (1<i_granule_shift = 22; /* not 32 */ + + /* Backing up stream headers is not required -- seqhdrs are repeated + * thoughout the stream at suitable decoding start points */ + p_stream->b_force_backup = 0; + + /* read in useful bits from sequence header */ + bs_init( &bs, p_oggpacket->packet, p_oggpacket->bytes ); + bs_skip( &bs, 13*8); /* parse_info_header */ + dirac_uint( &bs ); /* major_version */ + dirac_uint( &bs ); /* minor_version */ + dirac_uint( &bs ); /* profile */ + dirac_uint( &bs ); /* level */ + + uint32_t u_video_format = dirac_uint( &bs ); /* index */ + if( u_video_format >= u_dirac_vidfmt_frate ) + { + /* don't know how to parse this ogg dirac stream */ + return false; + } + + if( dirac_bool( &bs ) ) + { + dirac_uint( &bs ); /* frame_width */ + dirac_uint( &bs ); /* frame_height */ + } + + if( dirac_bool( &bs ) ) + { + dirac_uint( &bs ); /* chroma_format */ + } + + if( dirac_bool( &bs ) ) + { + dirac_uint( &bs ); /* scan_format */ + } + + uint32_t u_n = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_n; + uint32_t u_d = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_d; + if( dirac_bool( &bs ) ) + { + uint32_t u_frame_rate_index = dirac_uint( &bs ); + if( u_frame_rate_index >= u_dirac_frate_tbl ) + { + /* something is wrong with this stream */ + return false; + } + u_n = p_dirac_frate_tbl[u_frame_rate_index].u_n; + u_d = p_dirac_frate_tbl[u_frame_rate_index].u_d; + if( u_frame_rate_index == 0 ) + { + u_n = dirac_uint( &bs ); /* frame_rate_numerator */ + u_d = dirac_uint( &bs ); /* frame_rate_denominator */ + } + } + p_stream->f_rate = (float) u_n / u_d; + + /* probably is an ogg dirac es */ + p_stream->fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'd','r','a','c' ); + + return true; +}