Commit 3d7b2498 authored by Jean-Paul Saman's avatar Jean-Paul Saman

modules/mux/mpeg/ts.c: add fourcc 'aac'

parent 4d7052eb
...@@ -1046,25 +1046,26 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -1046,25 +1046,26 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
case AUDIO_ES: case AUDIO_ES:
switch( p_input->p_fmt->i_codec ) switch( p_input->p_fmt->i_codec )
{ {
case VLC_FOURCC( 'm', 'p','g', 'a' ): case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'm', 'p', '3', ' ' ): case VLC_FOURCC( 'm', 'p', '3', ' ' ):
p_stream->i_stream_type = p_stream->i_stream_type =
p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04; p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04;
p_stream->i_stream_id = 0xc0; p_stream->i_stream_id = 0xc0;
break; break;
case VLC_FOURCC( 'a', '5','2', ' ' ): case VLC_FOURCC( 'a', '5', '2', ' ' ):
p_stream->i_stream_type = 0x81; p_stream->i_stream_type = 0x81;
p_stream->i_stream_id = 0xbd; p_stream->i_stream_id = 0xbd;
break; break;
case VLC_FOURCC( 'l', 'p','c', 'm' ): case VLC_FOURCC( 'l', 'p', 'c', 'm' ):
p_stream->i_stream_type = 0x83; p_stream->i_stream_type = 0x83;
p_stream->i_stream_id = 0xbd; p_stream->i_stream_id = 0xbd;
break; break;
case VLC_FOURCC( 'd', 't','s', ' ' ): case VLC_FOURCC( 'd', 't', 's', ' ' ):
p_stream->i_stream_type = 0x06; p_stream->i_stream_type = 0x06;
p_stream->i_stream_id = 0xbd; p_stream->i_stream_id = 0xbd;
break; break;
case VLC_FOURCC( 'm', 'p','4', 'a' ): case VLC_FOURCC( 'a', 'a', 'c', ' ' ):
case VLC_FOURCC( 'm', 'p', '4', 'a' ):
/* XXX: make that configurable in some way when LOAS /* XXX: make that configurable in some way when LOAS
* is implemented for AAC in TS */ * is implemented for AAC in TS */
//p_stream->i_stream_type = 0x11; /* LOAS/LATM */ //p_stream->i_stream_type = 0x11; /* LOAS/LATM */
......
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