X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=57d0c0265e807be94c5131b26ef24e8b08b75c93;hb=3ebe37d27e97cafa647292eca25ee77c4c207501;hp=5e50b7a55297a0b22759b5335d9d941525a1c237;hpb=78d87996ccb92d1dc91c9987685f976ed3be08a6;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index 5e50b7a552..57d0c0265e 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -39,7 +39,7 @@ #include #include -#include +#include "xiph.h" #include "vorbis.h" #include "kate_categories.h" @@ -79,7 +79,7 @@ typedef struct logical_stream_s * them to the decoder. */ int b_force_backup; int i_packets_backup; - uint8_t *p_headers; + void *p_headers; int i_headers; /* program clock reference (in units of 90kHz) derived from the previous @@ -408,7 +408,7 @@ static int Demux( demux_t * p_demux ) else { es_out_Control( p_demux->out, ES_OUT_SET_PCR, - p_stream->i_pcr ); + VLC_TS_0 + p_stream->i_pcr ); } continue; } @@ -439,7 +439,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 ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr ); return 1; } @@ -625,10 +625,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, if( p_stream->b_force_backup ) { - uint8_t *p_sav; - bool b_store_size = true; - bool b_store_num_headers = false; - + bool b_xiph; p_stream->i_packets_backup++; switch( p_stream->fmt.i_codec ) { @@ -636,6 +633,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, case VLC_CODEC_SPEEX: case VLC_CODEC_THEORA: if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0; + b_xiph = true; break; case VLC_CODEC_FLAC: @@ -653,42 +651,46 @@ static void Ogg_DecodePacket( demux_t *p_demux, p_oggpacket->bytes -= 9; } } - b_store_size = false; + b_xiph = false; break; case VLC_CODEC_KATE: - 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; + b_xiph = true; break; default: p_stream->b_force_backup = 0; + b_xiph = false; break; } /* Backup the ogg packet (likely an header packet) */ - p_stream->p_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) ); - if( p_stream->p_headers ) + if( !b_xiph ) { - uint8_t *p_extra = p_stream->p_headers + p_stream->i_headers; - - if( b_store_num_headers ) + void *p_org = p_stream->p_headers; + p_stream->i_headers += p_oggpacket->bytes; + p_stream->p_headers = realloc( p_stream->p_headers, p_stream->i_headers ); + if( p_stream->p_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; + memcpy( p_stream->p_headers + p_stream->i_headers - p_oggpacket->bytes, + p_oggpacket->packet, p_stream->i_headers ); } - if( b_store_size ) + else { - *(p_extra++) = p_oggpacket->bytes >> 8; - *(p_extra++) = p_oggpacket->bytes & 0xFF; + p_stream->i_headers = 0; + p_stream->p_headers = NULL; + free( p_org ); } - 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); - + } + else if( xiph_AppendHeaders( &p_stream->i_headers, &p_stream->p_headers, + p_oggpacket->bytes, p_oggpacket->packet ) ) + { + p_stream->i_headers = 0; + p_stream->p_headers = NULL; + } + if( p_stream->i_headers > 0 ) + { if( !p_stream->b_force_backup ) { /* Last header received, commit changes */ @@ -714,10 +716,6 @@ static void Ogg_DecodePacket( demux_t *p_demux, p_ogg->i_bos--; } } - else - { - p_stream->p_headers = p_sav; - } b_selected = false; /* Discard the header packet */ } @@ -738,7 +736,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, /* Call the pace control */ es_out_Control( p_demux->out, ES_OUT_SET_PCR, - p_stream->i_pcr ); + VLC_TS_0 + p_stream->i_pcr ); } p_stream->i_previous_pcr = p_stream->i_pcr; @@ -765,7 +763,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, 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 ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr ); } } } @@ -794,9 +792,9 @@ static void Ogg_DecodePacket( demux_t *p_demux, 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( i_pts == 0 ) i_pts = VLC_TS_0; + else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = VLC_TS_0; + else if( i_pts == -1 ) i_pts = VLC_TS_INVALID; if( p_stream->fmt.i_cat == AUDIO_ES ) p_block->i_dts = p_block->i_pts = i_pts; @@ -806,7 +804,13 @@ static void Ogg_DecodePacket( demux_t *p_demux, p_block->i_length = 0; } else if( p_stream->fmt.i_codec == VLC_CODEC_THEORA ) + { p_block->i_dts = p_block->i_pts = i_pts; + if( (p_oggpacket->granulepos & ((1<i_granule_shift)-1)) == 0 ) + { + p_block->i_flags |= BLOCK_FLAG_TYPE_I; + } + } else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC ) { ogg_int64_t dts = p_oggpacket->granulepos >> 31; @@ -815,7 +819,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, uint64_t u_pnum = dts + delay; p_block->i_dts = p_stream->i_pcr; - p_block->i_pts = 0; + p_block->i_pts = VLC_TS_INVALID; /* 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; @@ -823,7 +827,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, else { p_block->i_dts = i_pts; - p_block->i_pts = 0; + p_block->i_pts = VLC_TS_INVALID; } if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS && @@ -1103,7 +1107,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) /* Check for audio header (old format) */ else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 ) { - unsigned int i_extra_size; + int i_extra_size; unsigned int i_format_tag; p_stream->fmt.i_cat = AUDIO_ES; @@ -1214,7 +1218,7 @@ 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_extra_size; int i_format_tag; st->sh.audio.channels = GetWLE( &oggpacket.packet[1+44] ); @@ -1461,33 +1465,34 @@ static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_strea */ 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++ ) + unsigned pi_new_size[XIPH_MAX_HEADER_COUNT]; + void *pp_new_data[XIPH_MAX_HEADER_COUNT]; + unsigned i_new_count; + if( xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) ) + i_new_count = 0; + + unsigned pi_old_size[XIPH_MAX_HEADER_COUNT]; + void *pp_old_data[XIPH_MAX_HEADER_COUNT]; + unsigned i_old_count; + if( xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra ) ) + i_old_count = 0; + + bool b_match = i_new_count == i_old_count; + for( unsigned i = 0; i < i_new_count && b_match; i++ ) { - 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; - - if( p_new->i_extra < i_new+2 || p_old->i_extra < i_old+2 ) - return false; - - const int i_new_size = GetWBE( &p_new_extra[0] ); - const int i_old_size = GetWBE( &p_old_extra[0] ); - - 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; - } - - i_new += 2 + i_new_size; - i_old += 2 + i_old_size; + /* Ignore vorbis comment */ + if( i == 1 ) + continue; + if( pi_new_size[i] != pi_old_size[i] || + memcmp( pp_new_data[i], pp_old_data[i], pi_new_size[i] ) ) + b_match = false; } - return true; + + for( unsigned i = 0; i < i_new_count; i++ ) + free( pp_new_data[i] ); + for( unsigned i = 0; i < i_old_count; i++ ) + free( pp_old_data[i] ); + return b_match; } static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream ) { @@ -1504,44 +1509,22 @@ static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t * return !b_compatible; } -static void Ogg_ExtractXiphMeta( demux_t *p_demux, const uint8_t *p_headers, int i_headers, int i_skip, bool b_has_num_headers ) +static void Ogg_ExtractXiphMeta( demux_t *p_demux, const void *p_headers, unsigned i_headers, unsigned i_skip ) { demux_sys_t *p_ogg = p_demux->p_sys; - if (b_has_num_headers) - { - if (i_headers <= 0) - return; - /* number of headers on a byte, we're interested in the second header, so should be at least 2 to go on */ - if (*p_headers++ < 2) - return; - --i_headers; - } - - 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 ) + unsigned pi_size[XIPH_MAX_HEADER_COUNT]; + void *pp_data[XIPH_MAX_HEADER_COUNT]; + unsigned i_count; + if( xiph_SplitHeaders( pi_size, pp_data, &i_count, i_headers, p_headers ) ) return; /* TODO how to handle multiple comments properly ? */ - vorbis_ParseComment( &p_ogg->p_meta, &p_comment[i_skip], i_comment - i_skip ); + if( i_count >= 2 && pi_size[1] > i_skip ) + vorbis_ParseComment( &p_ogg->p_meta, (uint8_t*)pp_data[1] + i_skip, pi_size[1] - i_skip ); + + for( unsigned i = 0; i < i_count; i++ ) + free( pp_data[i] ); } static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers ) { @@ -1549,21 +1532,21 @@ static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8 switch( i_codec ) { - /* 3 headers with the 2° one being the comments */ + /* 3 headers with the 2° one being the comments */ case VLC_CODEC_VORBIS: - Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6, false ); + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 ); break; case VLC_CODEC_THEORA: - Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6, false ); + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 ); break; case VLC_CODEC_SPEEX: - Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0, false ); + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0 ); break; - /* N headers with the 2° one being the comments */ + /* N headers with the 2° one being the comments */ case VLC_CODEC_KATE: - /* 1 byte for header type, 7 bit for magic, 1 reserved zero byte */ - Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+7+1, true ); + /* 1 byte for header type, 7 bytes for magic, 1 reserved zero byte */ + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+7+1 ); break; /* TODO */ @@ -1826,7 +1809,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, 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", + sscanf( (char*)(&p_oggpacket->packet[42]), "%1023s\r\n", content_type_string ); }