Skip to content

V
vlc-1.1
Commit d06ef508 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* ts: correct use of descriptor 0x5 (for ac3 and lpcm too).

parent e3a434cf
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 7 deletions
modules/demux/ts.c
View file @ d06ef508
...@@ -2183,17 +2183,49 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -2183,17 +2183,49 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x", msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x",
p_es->i_pid, p_es->i_type, p_dr->i_tag ); p_es->i_pid, p_es->i_type, p_dr->i_tag );
if( p_dr->i_tag == 0x6a ) if( p_dr->i_tag == 0x05 )
{ {
/* Registration Descriptor */
if( p_dr->i_length != 4 )
{
msg_Warn( p_demux, "invalid Registration Descriptor" );
}
else
{
if( !memcmp( p_dr->p_data, "AC-3", 4 ) )
{
/* ATSC with stream_type 0x81 (but this descriptor
* is then not mandatory */
pid->es->fmt.i_cat = AUDIO_ES; pid->es->fmt.i_cat = AUDIO_ES;
pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); pid->es->fmt.i_codec = VLC_FOURCC('a','5','2',' ');
} }
else if( p_dr->i_tag == 0x05 ) else if( !memcmp( p_dr->p_data, "DTS1", 4 ) ||
!memcmp( p_dr->p_data, "DTS2", 4 ) ||
!memcmp( p_dr->p_data, "DTS3", 4 ) )
{ {
/*registration descriptor(ETSI TS 101 154 Annex F)*/
pid->es->fmt.i_cat = AUDIO_ES;
pid->es->fmt.i_codec = VLC_FOURCC('d','t','s',' ');
}
else if( !memcmp( p_dr->p_data, "BSSD", 4 ) )
{
pid->es->fmt.i_cat = AUDIO_ES;
pid->es->fmt.i_codec = VLC_FOURCC('l','p','c','m');
}
else
{
msg_Warn( p_demux,
"unknown Registration Descriptor (%4.4s)",
p_dr->p_data );
}
}
/* DTS registration descriptor (ETSI TS 101 154 Annex F) */ }
else if( p_dr->i_tag == 0x6a )
{
/* DVB with stream_type 0x06 */
pid->es->fmt.i_cat = AUDIO_ES; pid->es->fmt.i_cat = AUDIO_ES;
pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
} }
else if( p_dr->i_tag == 0x73 ) else if( p_dr->i_tag == 0x73 )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment