X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=7f5b240c2d0cebb35a544c2308e9a9c0c382d793;hb=6224f35b42e886e20cb40af3d95a0a72c6addc24;hp=9070accf1abcc359d5fe56429edc2d7207d8b192;hpb=a60c74bf2d3d56705a103d24dd8133a2995ae41f;p=vlc diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index 9070accf1a..7f5b240c2d 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -39,6 +39,9 @@ #include #include +#include +#include "vorbis.h" +#include "kate_categories.h" /***************************************************************************** * Module descriptor @@ -119,6 +122,9 @@ struct demux_sys_t /* 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) */ @@ -188,6 +194,9 @@ 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 * ); @@ -195,7 +204,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 void Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * ); +static bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * ); /***************************************************************************** * Open: initializes ogg demux structures @@ -234,6 +243,9 @@ static int Open( vlc_object_t * p_this ) ogg_sync_init( &p_sys->oy ); p_sys->b_page_waiting = false; + /* */ + p_sys->p_meta = NULL; + return VLC_SUCCESS; } @@ -327,6 +339,18 @@ static int Demux( demux_t * p_demux ) /* if we've just pulled page, look for the right logical stream */ if( !p_sys->b_page_waiting ) { + if( p_sys->i_streams == 1 && + ogg_page_serialno( &oggpage ) != p_stream->os.serialno ) + { + msg_Err( p_demux, "Broken Ogg stream (serialno) mismatch" ); + ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &oggpage ) ); + + p_stream->b_reinit = true; + p_stream->i_pcr = -1; + p_stream->i_interpolated_pcr = -1; + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + } + if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 ) continue; } @@ -336,21 +360,21 @@ static int Demux( demux_t * p_demux ) /* Read info from any secondary header packets, if there are any */ if( p_stream->i_secondary_header_packets > 0 ) { - if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') && + if( p_stream->fmt.i_codec == VLC_CODEC_THEORA && oggpacket.bytes >= 7 && ! memcmp( oggpacket.packet, "\x80theora", 7 ) ) { Ogg_ReadTheoraHeader( p_stream, &oggpacket ); p_stream->i_secondary_header_packets = 0; } - else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') && + else if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS && oggpacket.bytes >= 7 && ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) ) { Ogg_ReadVorbisHeader( p_stream, &oggpacket ); 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_CODEC_CMML ) { p_stream->i_secondary_header_packets = 0; } @@ -373,9 +397,9 @@ static int Demux( demux_t * p_demux ) } /* An Ogg/vorbis packet contains an end date granulepos */ - if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) || - p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) || - p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) ) + if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS || + p_stream->fmt.i_codec == VLC_CODEC_SPEEX || + p_stream->fmt.i_codec == VLC_CODEC_FLAC ) { if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 ) { @@ -384,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; } @@ -415,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; } @@ -426,12 +450,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; @@ -510,8 +541,8 @@ 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' ) || - p_stream->fmt.i_codec == VLC_FOURCC( 'k','a','t','e' ) ) + if( p_stream->fmt.i_codec == VLC_CODEC_THEORA || + p_stream->fmt.i_codec == VLC_CODEC_KATE ) { ogg_int64_t iframe = p_oggpacket->granulepos >> p_stream->i_granule_shift; @@ -521,7 +552,7 @@ 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' ) ) + else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC ) { ogg_int64_t i_dts = p_oggpacket->granulepos >> 31; /* NB, OggDirac granulepos values are in units of 2*picturerate */ @@ -533,6 +564,7 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, / p_stream->f_rate; } + p_stream->i_pcr += 1; p_stream->i_interpolated_pcr = p_stream->i_pcr; } else @@ -584,7 +616,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, return; } - if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) && + if( p_stream->fmt.i_codec == VLC_CODEC_SUBT && p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return; /* Check the ES is selected */ @@ -600,13 +632,13 @@ static void Ogg_DecodePacket( demux_t *p_demux, p_stream->i_packets_backup++; switch( p_stream->fmt.i_codec ) { - case VLC_FOURCC( 'v','o','r','b' ): - case VLC_FOURCC( 's','p','x',' ' ): - case VLC_FOURCC( 't','h','e','o' ): + case VLC_CODEC_VORBIS: + case VLC_CODEC_SPEEX: + case VLC_CODEC_THEORA: if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0; break; - case VLC_FOURCC( 'f','l','a','c' ): + case VLC_CODEC_FLAC: if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 ) { Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket ); @@ -624,7 +656,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, b_store_size = false; break; - case VLC_FOURCC( 'k','a','t','e' ): + 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; @@ -639,7 +671,9 @@ static void Ogg_DecodePacket( demux_t *p_demux, 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( !p_stream->p_headers ) + p_stream->p_headers = p_sav; + else { uint8_t *p_extra = p_stream->p_headers + p_stream->i_headers; @@ -674,22 +708,22 @@ static void Ogg_DecodePacket( demux_t *p_demux, 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 - { - p_stream->p_headers = p_sav; - } b_selected = false; /* Discard the header packet */ } /* Convert the pcr into a pts */ - if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) || - p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) || - p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) ) + if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS || + p_stream->fmt.i_codec == VLC_CODEC_SPEEX || + p_stream->fmt.i_codec == VLC_CODEC_FLAC ) { if( p_stream->i_pcr >= 0 ) { @@ -702,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; @@ -729,14 +763,14 @@ 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 ); } } } - if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) && + if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS && + p_stream->fmt.i_codec != VLC_CODEC_SPEEX && + p_stream->fmt.i_codec != VLC_CODEC_FLAC && p_stream->i_pcr >= 0 ) { p_stream->i_previous_pcr = p_stream->i_pcr; @@ -758,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; @@ -769,9 +803,15 @@ static void Ogg_DecodePacket( demux_t *p_demux, p_block->i_dts = p_block->i_pts = i_pts; p_block->i_length = 0; } - else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) ) + else if( p_stream->fmt.i_codec == VLC_CODEC_THEORA ) + { p_block->i_dts = p_block->i_pts = i_pts; - else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) ) + 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; ogg_int64_t delay = (p_oggpacket->granulepos >> 9) & 0x1fff; @@ -779,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; @@ -787,23 +827,23 @@ 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_FOURCC( 'v','o','r','b' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 't','a','r','k' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 'c','m','m','l' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 'd','r','a','c' ) && - p_stream->fmt.i_codec != VLC_FOURCC( 'k','a','t','e' ) ) + if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS && + p_stream->fmt.i_codec != VLC_CODEC_SPEEX && + p_stream->fmt.i_codec != VLC_CODEC_FLAC && + p_stream->fmt.i_codec != VLC_CODEC_TARKIN && + p_stream->fmt.i_codec != VLC_CODEC_THEORA && + p_stream->fmt.i_codec != VLC_CODEC_CMML && + p_stream->fmt.i_codec != VLC_CODEC_DIRAC && + p_stream->fmt.i_codec != VLC_CODEC_KATE ) { /* 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' )) + if( p_stream->fmt.i_codec == VLC_CODEC_SUBT) { /* But with subtitles we need to retrieve the duration first */ int i, lenbytes = 0; @@ -833,7 +873,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, p_block->i_buffer = 0; } - if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) ) + if( p_stream->fmt.i_codec == VLC_CODEC_TARKIN ) { /* FIXME: the biggest hack I've ever done */ msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64, @@ -934,7 +974,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) p_stream->b_force_backup = 1; p_stream->fmt.i_cat = AUDIO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' ); + p_stream->fmt.i_codec = VLC_CODEC_FLAC; } /* Check for Flac header (>= version 1.1.1) */ else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F && @@ -951,7 +991,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) p_stream->b_force_backup = 1; p_stream->fmt.i_cat = AUDIO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' ); + p_stream->fmt.i_codec = VLC_CODEC_FLAC; oggpacket.packet += 13; oggpacket.bytes -= 13; Ogg_ReadFlacHeader( p_demux, p_stream, &oggpacket ); } @@ -969,8 +1009,14 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) else if( oggpacket.bytes >= 5 && ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) { - Ogg_ReadDiracHeader( p_stream, &oggpacket ); - msg_Dbg( p_demux, "found dirac header" ); + 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 && @@ -980,7 +1026,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) msg_Dbg( p_demux, "found tarkin header" ); p_stream->fmt.i_cat = VIDEO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 't','a','r','k' ); + p_stream->fmt.i_codec = VLC_CODEC_TARKIN; /* Cheat and get additionnal info ;) */ oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes); @@ -1061,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; @@ -1172,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] ); @@ -1238,7 +1284,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->fmt.i_codec = VLC_CODEC_SUBT; p_stream->f_rate = 1000; /* granulepos is in millisec */ } else @@ -1343,15 +1389,15 @@ static int Ogg_BeginningOfStream( demux_t *p_demux ) 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', ' ' ) ) + if( p_stream->fmt.i_codec == VLC_CODEC_MPGA || + p_stream->fmt.i_codec == VLC_CODEC_A52 ) 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') ) + if( p_stream->fmt.i_codec == VLC_CODEC_CMML ) { /* Set the CMML stream active */ es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es ); @@ -1390,6 +1436,11 @@ static void Ogg_EndOfStream( demux_t *p_demux ) 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; } /** @@ -1449,7 +1500,7 @@ static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t * return true; /* Only vorbis is supported */ - if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ) + if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ) b_compatible = Ogg_IsVorbisFormatCompatible( &p_stream->fmt, &p_stream->fmt_old ); if( !b_compatible ) @@ -1457,6 +1508,82 @@ 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 ) +{ + 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 ) + 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_CODEC_VORBIS: + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6, false ); + break; + case VLC_CODEC_THEORA: + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6, false ); + break; + case VLC_CODEC_SPEEX: + Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0, false ); + break; + + /* 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 ); + break; + + /* TODO */ + case VLC_CODEC_FLAC: + msg_Warn( p_demux, "Ogg_ExtractMeta does not support %4.4s", (const char*)&i_codec ); + break; + + /* No meta data */ + case VLC_CODEC_CMML: /* CMML is XML text, doesn't have Vorbis comments */ + case VLC_CODEC_DIRAC: + default: + break; + } + if( p_ogg->p_meta ) + p_demux->info.i_update |= INPUT_UPDATE_META; +} static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream, ogg_packet *p_oggpacket ) @@ -1467,7 +1594,7 @@ static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream, int i_keyframe_frequency_force; p_stream->fmt.i_cat = VIDEO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' ); + p_stream->fmt.i_codec = VLC_CODEC_THEORA; /* Signal that we want to keep a backup of the theora * stream headers. They will be used when switching between @@ -1519,7 +1646,7 @@ static void Ogg_ReadVorbisHeader( logical_stream_t *p_stream, oggpack_buffer opb; p_stream->fmt.i_cat = AUDIO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' ); + p_stream->fmt.i_codec = VLC_CODEC_VORBIS; /* Signal that we want to keep a backup of the vorbis * stream headers. They will be used when switching between @@ -1542,7 +1669,7 @@ static void Ogg_ReadSpeexHeader( logical_stream_t *p_stream, oggpack_buffer opb; p_stream->fmt.i_cat = AUDIO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' ); + p_stream->fmt.i_codec = VLC_CODEC_SPEEX; /* Signal that we want to keep a backup of the speex * stream headers. They will be used when switching between @@ -1603,9 +1730,10 @@ static void Ogg_ReadKateHeader( logical_stream_t *p_stream, int32_t gnum; int32_t gden; int n; + char *psz_desc; p_stream->fmt.i_cat = SPU_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'k','a','t','e' ); + p_stream->fmt.i_codec = VLC_CODEC_KATE; /* Signal that we want to keep a backup of the kate * stream headers. They will be used when switching between @@ -1626,25 +1754,33 @@ static void Ogg_ReadKateHeader( logical_stream_t *p_stream, p_stream->fmt.psz_language = malloc(16); 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 ) { - 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 */ + + /* Now find a localized user readable description for this category */ + psz_desc = strdup(FindKateCategoryName(p_stream->fmt.psz_description)); + if( psz_desc ) + { + free( p_stream->fmt.psz_description ); + p_stream->fmt.psz_description = psz_desc; + } } else { - for( n = 0; n < 16; ++n ) + for( n = 0; n < 16; n++ ) oggpack_read(&opb,8); } } @@ -1694,7 +1830,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 ); } @@ -1716,21 +1852,21 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, else if( !strncmp(content_type_string, "audio/x-vorbis", 14) ) { p_stream->fmt.i_cat = AUDIO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' ); + p_stream->fmt.i_codec = VLC_CODEC_VORBIS; 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->fmt.i_codec = VLC_CODEC_SPEEX; p_stream->b_force_backup = 1; } else if( !strncmp(content_type_string, "video/x-theora", 14) ) { p_stream->fmt.i_cat = VIDEO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' ); + p_stream->fmt.i_codec = VLC_CODEC_THEORA; p_stream->b_force_backup = 1; } @@ -1745,13 +1881,13 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, { /* n.b. MPEG streams are unsupported right now */ p_stream->fmt.i_cat = VIDEO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' ); + p_stream->fmt.i_codec = VLC_CODEC_MPGV; } else if( !strncmp(content_type_string, "text/x-cmml", 11) ) { ogg_stream_packetout( &p_stream->os, p_oggpacket ); p_stream->fmt.i_cat = SPU_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'c','m','m','l' ); + p_stream->fmt.i_codec = VLC_CODEC_CMML; } } } @@ -1775,13 +1911,25 @@ static int dirac_bool( bs_t *p_bs ) return bs_read( p_bs, 1 ); } -static void Ogg_ReadDiracHeader( logical_stream_t *p_stream, +static bool Ogg_ReadDiracHeader( logical_stream_t *p_stream, ogg_packet *p_oggpacket ) { + static const struct { + uint32_t u_n /* numerator */, u_d /* denominator */; + } p_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 size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl); + + static const uint32_t pu_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, + }; + static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate); + bs_t bs; - p_stream->fmt.i_cat = VIDEO_ES; - p_stream->fmt.i_codec = VLC_FOURCC( 'd','r','a','c' ); p_stream->i_granule_shift = 22; /* not 32 */ /* Backing up stream headers is not required -- seqhdrs are repeated @@ -1797,6 +1945,11 @@ static void Ogg_ReadDiracHeader( logical_stream_t *p_stream, 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 ) ) { @@ -1814,31 +1967,16 @@ static void Ogg_ReadDiracHeader( logical_stream_t *p_stream, dirac_uint( &bs ); /* scan_format */ } - static const struct { - uint32_t u_n /* numerator */, u_d /* denominator */; - } p_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 size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl); - - static const uint32_t pu_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, - }; - static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate); - - /* */ - if( u_video_format >= u_dirac_vidfmt_frate ) - u_video_format = 0; - 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 ) - u_frame_rate_index = 0; + { + /* 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 ) @@ -1848,4 +1986,10 @@ static void Ogg_ReadDiracHeader( logical_stream_t *p_stream, } } 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_CODEC_DIRAC; + + return true; }