Skip to content

V
vlc-2-2
Commit 9229335a authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

TS mux: simplify unsupported codec path

parent 13b4e116
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 107 deletions
modules/mux/mpeg/ts.c
View file @ 9229335a
...@@ -925,11 +925,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -925,11 +925,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
msg_Dbg( p_mux, "adding input codec=%4.4s pid=%d", msg_Dbg( p_mux, "adding input codec=%4.4s pid=%d",
(char*)&p_stream->i_codec, p_stream->i_pid ); (char*)&p_stream->i_codec, p_stream->i_pid );
switch( p_input->p_fmt->i_cat ) p_stream->i_stream_type = -1;
{
case VIDEO_ES:
switch( p_input->p_fmt->i_codec ) switch( p_input->p_fmt->i_codec )
{ {
/* VIDEO */
case VLC_CODEC_MPGV: case VLC_CODEC_MPGV:
/* TODO: do we need to check MPEG-I/II ? */ /* TODO: do we need to check MPEG-I/II ? */
p_stream->i_stream_type = 0x02; p_stream->i_stream_type = 0x02;
...@@ -965,15 +965,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -965,15 +965,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_stream->i_stream_id = (PES_EXTENDED_STREAM_ID << 8) | 0x60; p_stream->i_stream_id = (PES_EXTENDED_STREAM_ID << 8) | 0x60;
p_stream->i_stream_type = 0xd1; p_stream->i_stream_type = 0xd1;
break; break;
default:
free( p_stream );
return VLC_EGENERIC;
}
break;
case AUDIO_ES: /* AUDIO */
switch( p_input->p_fmt->i_codec )
{
case VLC_CODEC_MPGA: case VLC_CODEC_MPGA:
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;
...@@ -1004,15 +998,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -1004,15 +998,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_sys->i_mpeg4_streams++; p_sys->i_mpeg4_streams++;
p_stream->i_es_id = p_stream->i_pid; p_stream->i_es_id = p_stream->i_pid;
break; break;
default:
free( p_stream );
return VLC_EGENERIC;
}
break;
case SPU_ES: /* TEXT */
switch( p_input->p_fmt->i_codec )
{
case VLC_CODEC_SPU: case VLC_CODEC_SPU:
p_stream->i_stream_type = 0x82; p_stream->i_stream_type = 0x82;
p_stream->i_stream_id = 0xbd; p_stream->i_stream_id = 0xbd;
...@@ -1032,13 +1020,10 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -1032,13 +1020,10 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_stream->i_stream_type = 0x06; p_stream->i_stream_type = 0x06;
p_stream->i_stream_id = 0xbd; /* FIXME */ p_stream->i_stream_id = 0xbd; /* FIXME */
break; break;
default:
free( p_stream );
return VLC_EGENERIC;
} }
break;
default: if (p_stream->i_stream_type == -1)
{
free( p_stream ); free( p_stream );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
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