Skip to content

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

TS mux: cosmetics, reduce indentation

parent 1e8a2b5c
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 104 deletions
modules/mux/mpeg/ts.c
View file @ 9fcc258c
......@@ -1271,8 +1271,6 @@ static bool MuxStreams(sout_mux_t *p_mux )
i = -1;
}
sout_input_t *p_input;
ts_stream_t *p_stream;
int64_t i_spu_delay = 0;
if( i == -1 )
p_input = p_sys->p_pcr_input;
......@@ -1280,7 +1278,7 @@ static bool MuxStreams(sout_mux_t *p_mux )
continue;
else
p_input = p_mux->pp_inputs[i];
p_stream = (ts_stream_t*)p_input->p_sys;
ts_stream_t *p_stream = (ts_stream_t*)p_input->p_sys;
if( ( p_stream != p_pcr_stream ||
p_stream->i_pes_length >= i_shaping_delay ) &&
......@@ -1307,9 +1305,7 @@ static bool MuxStreams(sout_mux_t *p_mux )
/* Don't mux the SPU yet if it is too early */
block_t *p_spu = block_FifoShow( p_input->p_fifo );
i_spu_delay =
p_spu->i_dts - p_pcr_stream->i_pes_dts;
int64_t i_spu_delay = p_spu->i_dts - p_pcr_stream->i_pes_dts;
if( ( i_spu_delay > i_shaping_delay ) &&
( i_spu_delay < INT64_C(100000000) ) )
continue;
......@@ -1378,16 +1374,16 @@ static bool MuxStreams(sout_mux_t *p_mux )
p_pcr_stream->i_pes_used = 0;
p_pcr_stream->i_pes_length = 0;
}
continue;
}
else
{
int i_header_size = 0;
int i_max_pes_size = 0;
int b_data_alignment = 0;
if( p_input->p_fmt->i_cat == SPU_ES )
{
if( p_input->p_fmt->i_codec ==
VLC_CODEC_SUBT )
if( p_input->p_fmt->i_codec == VLC_CODEC_SUBT )
{
/* Prepend header */
p_data = block_Realloc( p_data, 2,
......@@ -1405,13 +1401,12 @@ static bool MuxStreams(sout_mux_t *p_mux )
/* Append a empty sub (sub text only) */
if( p_data->i_length > 0 &&
!( p_data->i_buffer == 1 &&
*p_data->p_buffer == ' ' ) )
( p_data->i_buffer != 1 || *p_data->p_buffer != ' ' ) )
{
block_t *p_spu = block_New( p_mux, 3 );
p_spu->i_dts = p_spu->i_pts =
p_data->i_dts + p_data->i_length;
p_spu->i_dts = p_data->i_dts + p_data->i_length;
p_spu->i_pts = p_spu->i_dts;
p_spu->i_length = 1000;
p_spu->p_buffer[0] = 0;
......@@ -1425,22 +1420,19 @@ static bool MuxStreams(sout_mux_t *p_mux )
p_data->p_next = p_spu;
}
}
else if( p_input->p_fmt->i_codec ==
VLC_CODEC_TELETEXT )
else if( p_input->p_fmt->i_codec == VLC_CODEC_TELETEXT )
{
/* EN 300 472 */
i_header_size = 0x24;
b_data_alignment = 1;
}
else if( p_input->p_fmt->i_codec ==
VLC_CODEC_DVBS )
else if( p_input->p_fmt->i_codec == VLC_CODEC_DVBS )
{
/* EN 300 743 */
b_data_alignment = 1;
}
}
else if( p_data->i_length < 0 ||
p_data->i_length > 2000000 )
else if( p_data->i_length < 0 || p_data->i_length > 2000000 )
{
/* FIXME choose a better value, but anyway we
* should never have to do that */
......@@ -1454,16 +1446,14 @@ static bool MuxStreams(sout_mux_t *p_mux )
}
/* Convert to pes */
if( p_stream->i_stream_id == 0xa0 &&
p_data->i_pts <= 0 )
if( p_stream->i_stream_id == 0xa0 && p_data->i_pts <= 0 )
{
/* XXX yes I know, it's awful, but it's needed,
* so don't remove it ... */
p_data->i_pts = p_data->i_dts;
}
if( p_input->p_fmt->i_codec ==
VLC_CODEC_DIRAC )
if( p_input->p_fmt->i_codec == VLC_CODEC_DIRAC )
{
b_data_alignment = 1;
/* dirac pes packets should be unbounded in
......@@ -1487,10 +1477,8 @@ static bool MuxStreams(sout_mux_t *p_mux )
p_stream->b_key_frame = 1;
}
}
}
/* save */
const mtime_t i_pcr_dts = p_pcr_stream->i_pes_dts;
const mtime_t i_pcr_length = p_pcr_stream->i_pes_length;
p_pcr_stream->b_key_frame = 0;
......@@ -1533,14 +1521,12 @@ static bool MuxStreams(sout_mux_t *p_mux )
i_packet_count += chain_ts.i_depth;
/* msg_Dbg( p_mux, "estimated pck=%d", i_packet_count ); */
for (;; )
const mtime_t i_pcr_dts = p_pcr_stream->i_pes_dts;
for (;;)
{
int i_stream = -1;
mtime_t i_dts = 0;
ts_stream_t *p_stream;
sout_input_t *p_input;
block_t *p_ts;
bool b_pcr;
/* Select stream (lowest dts) */
for (int i = 0; i < p_mux->i_nb_inputs; i++ )
......@@ -1564,10 +1550,10 @@ static bool MuxStreams(sout_mux_t *p_mux )
break;
}
p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
p_input = p_mux->pp_inputs[i_stream];
sout_input_t *p_input = p_mux->pp_inputs[i_stream];
/* do we need to issue pcr */
b_pcr = false;
bool b_pcr = false;
if( p_stream == p_pcr_stream &&
i_pcr_dts + i_packet_pos * i_pcr_length / i_packet_count >=
p_sys->i_pcr + p_sys->i_pcr_delay )
......@@ -1578,7 +1564,7 @@ static bool MuxStreams(sout_mux_t *p_mux )
}
/* Build the TS packet */
p_ts = TSNew( p_mux, p_stream, b_pcr );
block_t *p_ts = TSNew( p_mux, p_stream, b_pcr );
if( p_sys->csa != NULL &&
(p_input->p_fmt->i_cat != AUDIO_ES || p_sys->b_crypt_audio) &&
(p_input->p_fmt->i_cat != VIDEO_ES || p_sys->b_crypt_video) )
......
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