X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=2eb3433f84c29b0598150bd5f6f09453c4963491;hb=f259d0a2ac6d4162fdb5b78ac3fdac5acdac1363;hp=4b8e6149c80b58205112784a13427183f3a6b141;hpb=626e56bfc8c041fcf1db5873a7a2824d6f4f688a;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index 4b8e6149c8..2eb3433f84 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -25,7 +25,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include @@ -43,10 +48,10 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_shortname ( "OGG" ); - set_description( _("OGG demuxer" ) ); + set_description( N_("OGG demuxer" ) ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux2", 50 ); + set_capability( "demux", 50 ); set_callbacks( Open, Close ); add_shortcut( "ogg" ); vlc_module_end(); @@ -60,6 +65,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; @@ -81,7 +87,10 @@ typedef struct logical_stream_s /* Misc */ int b_reinit; - int i_theora_keyframe_granule_shift; + 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; @@ -95,6 +104,8 @@ 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; @@ -104,30 +115,24 @@ struct demux_sys_t /* bitrate */ int i_bitrate; - - /* meta data */ - vlc_meta_t *meta; - - /* attachments */ - int i_attachments; - input_attachment_t **attachments; }; /* 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]; @@ -140,15 +145,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 @@ -174,12 +180,18 @@ 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 ); + /* 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_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 void Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * ); /***************************************************************************** * Open: initializes ogg demux structures @@ -202,31 +214,17 @@ 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_eos = 0; - if( !var_CreateGetBool( p_demux, "meta-preparsed" ) ) - { - p_demux->p_private = malloc( sizeof( demux_meta_t ) ); - if( !p_demux->p_private ) - return VLC_ENOMEM; - module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 ); - if( p_meta ) - { - module_Unneed( p_demux, p_meta ); - demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private; - p_sys->meta = p_demux_meta->p_meta; - p_sys->i_attachments = p_demux_meta->i_attachments; - p_sys->attachments = p_demux_meta->attachments; - } - free( p_demux->p_private ); - } - /* Initialize the Ogg physical bitstream parser */ ogg_sync_init( &p_sys->oy ); @@ -246,13 +244,8 @@ static void Close( vlc_object_t *p_this ) Ogg_EndOfStream( p_demux ); - var_Destroy( p_demux, "meta-preparsed" ); - if( p_sys->meta ) vlc_meta_Delete( p_sys->meta ); - - int i; - for( i = 0; i < p_sys->i_attachments; i++ ) - free( p_sys->attachments[i] ); - TAB_CLEAN( p_sys->i_attachments, p_sys->attachments); + if( p_sys->p_old_stream ) + Ogg_LogicalStreamDelete( p_demux, p_sys->p_old_stream ); free( p_sys ); } @@ -275,11 +268,19 @@ 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 ); @@ -311,14 +312,14 @@ static int Demux( demux_t * p_demux ) { if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') && oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[1], "theora", 6 ) ) + ! memcmp( oggpacket.packet, "\x80theora", 7 ) ) { 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 && - ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) ) + ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) ) { Ogg_ReadVorbisHeader( p_stream, &oggpacket ); p_stream->secondary_header_packets = 0; @@ -387,7 +388,6 @@ static int Demux( demux_t * p_demux ) es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr ); } - return 1; } @@ -398,16 +398,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; int64_t *pi64; + bool *pb_bool; int i; - input_attachment_t ***ppp_attach; - int *pi_int; - vlc_meta_t *p_meta; switch( i_query ) { - case DEMUX_GET_META: - p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* ); - vlc_meta_Merge( p_meta, p_sys->meta ); + case DEMUX_HAS_UNSUPPORTED_META: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; return VLC_SUCCESS; case DEMUX_GET_TIME: @@ -431,22 +429,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } ogg_sync_reset( &p_sys->oy ); - case DEMUX_GET_ATTACHMENTS: - ppp_attach = - (input_attachment_t***)va_arg( args, input_attachment_t*** ); - pi_int = (int*)va_arg( args, int * ); - - if( p_sys->i_attachments <= 0 ) - return VLC_EGENERIC; - - *pi_int = p_sys->i_attachments; - *ppp_attach = malloc( sizeof(input_attachment_t**) * p_sys->i_attachments ); - for( i = 0; i < p_sys->i_attachments; i++ ) - (*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] ); - return VLC_SUCCESS; - default: - return demux2_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate, + return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate, 1, i_query, args ); } } @@ -487,19 +471,26 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, /* Convert the granulepos into a pcr */ if( p_oggpacket->granulepos >= 0 ) { - if( p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) ) + if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) || + p_stream->fmt.i_codec == VLC_FOURCC( 'k','a','t','e' ) ) { - p_stream->i_pcr = p_oggpacket->granulepos * I64C(1000000) + ogg_int64_t iframe = p_oggpacket->granulepos >> + p_stream->i_granule_shift; + ogg_int64_t pframe = p_oggpacket->granulepos - + ( iframe << p_stream->i_granule_shift ); + + 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 { - ogg_int64_t iframe = p_oggpacket->granulepos >> - p_stream->i_theora_keyframe_granule_shift; - ogg_int64_t pframe = p_oggpacket->granulepos - - ( iframe << p_stream->i_theora_keyframe_granule_shift ); - - p_stream->i_pcr = ( iframe + pframe ) * I64C(1000000) + p_stream->i_pcr = p_oggpacket->granulepos * INT64_C(1000000) / p_stream->f_rate; } @@ -513,10 +504,10 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, * If we can't then don't touch the old value. */ if( p_stream->fmt.i_cat == VIDEO_ES ) /* 1 frame per packet */ - p_stream->i_interpolated_pcr += (I64C(1000000) / p_stream->f_rate); + p_stream->i_interpolated_pcr += (INT64_C(1000000) / p_stream->f_rate); else if( p_stream->fmt.i_bitrate ) p_stream->i_interpolated_pcr += - ( p_oggpacket->bytes * I64C(1000000) / + ( p_oggpacket->bytes * INT64_C(1000000) / p_stream->fmt.i_bitrate / 8 ); } } @@ -529,7 +520,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, ogg_packet *p_oggpacket ) { block_t *p_block; - vlc_bool_t b_selected; + bool b_selected; int i_header_len = 0; mtime_t i_pts = -1, i_interpolated_pts; @@ -541,13 +532,13 @@ static void Ogg_DecodePacket( demux_t *p_demux, } if( p_oggpacket->bytes >= 7 && - ! memcmp ( &p_oggpacket->packet[0], "Annodex", 7 ) ) + ! memcmp ( p_oggpacket->packet, "Annodex", 7 ) ) { /* it's an Annodex packet -- skip it (do nothing) */ return; } else if( p_oggpacket->bytes >= 7 && - ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) ) + ! memcmp ( p_oggpacket->packet, "AnxData", 7 ) ) { /* it's an AnxData packet -- skip it (do nothing) */ return; @@ -562,8 +553,9 @@ static void Ogg_DecodePacket( demux_t *p_demux, if( p_stream->b_force_backup ) { - uint8_t *p_extra; - vlc_bool_t b_store_size = VLC_TRUE; + uint8_t *p_sav; + bool b_store_size = true; + bool b_store_num_headers = false; p_stream->i_packets_backup++; switch( p_stream->fmt.i_codec ) @@ -589,7 +581,13 @@ static void Ogg_DecodePacket( demux_t *p_demux, p_oggpacket->bytes -= 9; } } - b_store_size = VLC_FALSE; + b_store_size = false; + break; + + case VLC_FOURCC( 'k','a','t','e' ): + if( p_stream->i_packets_backup == 1) + b_store_num_headers = true; + if( p_stream->i_packets_backup == p_stream->i_kate_num_headers ) p_stream->b_force_backup = 0; break; default: @@ -599,30 +597,51 @@ 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 + - p_oggpacket->bytes + (b_store_size ? 2 : 0) ); - p_extra = p_stream->p_headers + p_stream->i_headers; - if( b_store_size ) + 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) ); + 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); + uint8_t *p_extra = p_stream->p_headers + p_stream->i_headers; - if( !p_stream->b_force_backup ) + 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 ) + { + /* 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 = + realloc( p_stream->fmt.p_extra, 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_FMT, + p_stream->p_es, &p_stream->fmt ); + } + } + 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 = VLC_FALSE; /* Discard the header packet */ + b_selected = false; /* Discard the header packet */ } /* Convert the pcr into a pts */ @@ -706,6 +725,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; @@ -717,7 +749,9 @@ static void Ogg_DecodePacket( demux_t *p_demux, 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' ) ) + 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 */ i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6; @@ -747,7 +781,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, } i_header_len++; - if( p_block->i_buffer >= i_header_len ) + if( p_block->i_buffer >= (unsigned int)i_header_len ) p_block->i_buffer -= i_header_len; else p_block->i_buffer = 0; @@ -756,7 +790,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) ) { /* FIXME: the biggest hack I've ever done */ - msg_Warn( p_demux, "tarkin pts: "I64Fd", granule: "I64Fd, + msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64, p_block->i_pts, p_block->i_dts ); msleep(10000); } @@ -784,8 +818,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 ) ) @@ -795,17 +827,21 @@ 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 **pp_sav = p_ogg->pp_stream; + 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; 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 ); @@ -826,14 +862,14 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) /* Check for Vorbis header */ if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) ) + ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) ) { Ogg_ReadVorbisHeader( p_stream, &oggpacket ); msg_Dbg( p_demux, "found vorbis header" ); } /* Check for Speex header */ - else if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[0], "Speex", 5 ) ) + else if( oggpacket.bytes >= 5 && + ! memcmp( oggpacket.packet, "Speex", 5 ) ) { Ogg_ReadSpeexHeader( p_stream, &oggpacket ); msg_Dbg( p_demux, "found speex header, channels: %i, " @@ -843,7 +879,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) } /* Check for Flac header (< version 1.1.1) */ else if( oggpacket.bytes >= 4 && - ! memcmp( &oggpacket.packet[0], "fLaC", 4 ) ) + ! memcmp( oggpacket.packet, "fLaC", 4 ) ) { msg_Dbg( p_demux, "found FLAC header" ); @@ -876,7 +912,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) } /* Check for Theora header */ else if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[1], "theora", 6 ) ) + ! memcmp( oggpacket.packet, "\x80theora", 7 ) ) { Ogg_ReadTheoraHeader( p_stream, &oggpacket ); @@ -884,6 +920,13 @@ 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 ) ) + { + Ogg_ReadDiracHeader( p_stream, &oggpacket ); + msg_Dbg( p_demux, "found dirac header" ); + } /* Check for Tarkin header */ else if( oggpacket.bytes >= 7 && ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) ) @@ -906,7 +949,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) } /* Check for Annodex header */ else if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[0], "Annodex", 7 ) ) + ! memcmp( oggpacket.packet, "Annodex", 7 ) ) { Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, &oggpacket ); @@ -916,11 +959,18 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) } /* Check for Annodex header */ else if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[0], "AnxData", 7 ) ) + ! memcmp( oggpacket.packet, "AnxData", 7 ) ) { Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, &oggpacket ); } + /* Check for Kate header */ + 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" ); + } else if( oggpacket.bytes >= 142 && !memcmp( &oggpacket.packet[1], "Direct Show Samples embedded in Ogg", 35 )) @@ -972,12 +1022,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)); @@ -1022,15 +1075,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 */ @@ -1043,16 +1108,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", @@ -1065,36 +1127,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 ); @@ -1136,6 +1204,15 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) p_ogg->i_streams--; } } + else if( oggpacket.bytes >= 7 && + ! memcmp( oggpacket.packet, "fishead", 7 ) ) + + { + /* Skeleton */ + msg_Dbg( p_demux, "stream %d is a skeleton", + p_ogg->i_streams-1 ); + /* FIXME: https://trac.videolan.org/vlc/ticket/1412 */ + } else { msg_Dbg( p_demux, "stream %d is of unknown type", @@ -1163,7 +1240,6 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) return VLC_SUCCESS; } } -#undef p_stream return VLC_EGENERIC; } @@ -1175,6 +1251,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 @@ -1189,9 +1266,28 @@ 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 ) + 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') ) { /* Set the CMML stream active */ @@ -1203,9 +1299,15 @@ 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 } + 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; } @@ -1217,28 +1319,80 @@ 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; +} + +/** + * 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 ); - if( p_ogg->pp_stream[i_stream]->p_headers) - 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; + if( !p_stream->fmt_old.i_cat || !p_stream->fmt_old.i_codec ) + return true; - /* Reinit p_ogg */ - if( p_ogg->pp_stream ) 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_ReadTheoraHeader( logical_stream_t *p_stream, @@ -1285,11 +1439,11 @@ static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream, i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 ); /* granule_shift = i_log( frequency_force -1 ) */ - p_stream->i_theora_keyframe_granule_shift = 0; + p_stream->i_granule_shift = 0; i_keyframe_frequency_force--; while( i_keyframe_frequency_force ) { - p_stream->i_theora_keyframe_granule_shift++; + p_stream->i_granule_shift++; i_keyframe_frequency_force >>= 1; } @@ -1376,12 +1530,65 @@ static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream, } } +static void Ogg_ReadKateHeader( logical_stream_t *p_stream, + ogg_packet *p_oggpacket ) +{ + oggpack_buffer opb; + int32_t gnum; + int32_t gden; + int n; + + p_stream->fmt.i_cat = SPU_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'k','a','t','e' ); + + /* Signal that we want to keep a backup of the kate + * stream headers. They will be used when switching between + * kate streams. */ + p_stream->b_force_backup = 1; + + /* Cheat and get additionnal info ;) */ + oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes); + oggpack_adv( &opb, 11*8 ); /* packet type, kate magic, version */ + p_stream->i_kate_num_headers = oggpack_read( &opb, 8 ); + oggpack_adv( &opb, 3*8 ); + p_stream->i_granule_shift = oggpack_read( &opb, 8 ); + oggpack_adv( &opb, 8*8 ); /* reserved */ + gnum = oggpack_read( &opb, 32 ); + gden = oggpack_read( &opb, 32 ); + p_stream->f_rate = (double)gnum/gden; + + p_stream->fmt.psz_language = malloc(16); + if (p_stream->fmt.psz_language) + { + 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) + oggpack_read(&opb,8); + } + p_stream->fmt.psz_description = malloc(16); + if (p_stream->fmt.psz_description) + { + 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) + oggpack_read(&opb,8); + } +} + static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, logical_stream_t *p_stream, ogg_packet *p_oggpacket ) { if( p_oggpacket->bytes >= 28 && - !memcmp( &p_oggpacket->packet[0], "Annodex", 7 ) ) + !memcmp( p_oggpacket->packet, "Annodex", 7 ) ) { oggpack_buffer opb; @@ -1400,7 +1607,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, timebase_denominator = GetQWLE( &p_oggpacket->packet[24] ); } else if( p_oggpacket->bytes >= 42 && - !memcmp( &p_oggpacket->packet[0], "AnxData", 7 ) ) + !memcmp( p_oggpacket->packet, "AnxData", 7 ) ) { uint64_t granule_rate_numerator; uint64_t granule_rate_denominator; @@ -1425,7 +1632,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, content_type_string ); } - msg_Dbg( p_this, "AnxData packet info: "I64Fd" / "I64Fd", %d, ``%s''", + 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 ); @@ -1482,3 +1689,83 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, } } } + +static uint32_t dirac_uint( bs_t *p_bs ) +{ + uint32_t count = 0, value = 0; + while( !bs_read ( p_bs, 1 ) ) { + count++; + value <<= 1; + value |= bs_read ( p_bs, 1 ); + } + + return (1<fmt.i_cat = VIDEO_ES; + p_stream->fmt.i_codec = VLC_FOURCC( 'd','r','a','c' ); + p_stream->i_granule_shift = 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 (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 )) { + if (dirac_bool( &bs )) { /* interlaced */ + dirac_bool( &bs ); /* top_field_first */ + } + } + + static const struct { + uint32_t u_n /* numerator */, u_d /* denominator */; + } dirac_frate_tbl[] = { /* table 10.3 */ + {1,1}, /* this first value is never used */ + {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1}, + {50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2}, + }; + + static const uint32_t dirac_vidfmt_frate[] = { /* table C.1 */ + 1, 9, 10, 9, 10, 9, 10, 4, 3, 7, 6, 4, 3, 7, 6, 2, 2, 7, 6, 7, 6, + }; + + uint32_t u_n = dirac_frate_tbl[dirac_vidfmt_frate[u_video_format]].u_n; + uint32_t u_d = dirac_frate_tbl[dirac_vidfmt_frate[u_video_format]].u_d; + if (dirac_bool( &bs )) { + uint32_t frame_rate_index = dirac_uint( &bs ); + u_n = dirac_frate_tbl[frame_rate_index].u_n; + u_d = dirac_frate_tbl[frame_rate_index].u_d; + if (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; +}