Commit 6e8a6d28 authored by Rafaël Carré's avatar Rafaël Carré

DecoderFixTs: deindent, cosmetics

parent 6eeeda91
...@@ -1082,35 +1082,35 @@ static void DecoderFixTs( decoder_t *p_dec, mtime_t *pi_ts0, mtime_t *pi_ts1, ...@@ -1082,35 +1082,35 @@ static void DecoderFixTs( decoder_t *p_dec, mtime_t *pi_ts0, mtime_t *pi_ts1,
const mtime_t i_es_delay = p_owner->i_ts_delay; const mtime_t i_es_delay = p_owner->i_ts_delay;
if( p_clock ) if( !p_clock )
{ return;
const bool b_ephemere = pi_ts1 && *pi_ts0 == *pi_ts1;
int i_rate;
if( *pi_ts0 > VLC_TS_INVALID ) const bool b_ephemere = pi_ts1 && *pi_ts0 == *pi_ts1;
{ int i_rate;
*pi_ts0 += i_es_delay;
if( pi_ts1 && *pi_ts1 > VLC_TS_INVALID )
*pi_ts1 += i_es_delay;
if( input_clock_ConvertTS( p_clock, &i_rate, pi_ts0, pi_ts1, i_ts_bound ) )
*pi_ts0 = VLC_TS_INVALID;
}
else
{
i_rate = input_clock_GetRate( p_clock );
}
/* Do not create ephemere data because of rounding errors */ if( *pi_ts0 > VLC_TS_INVALID )
if( !b_ephemere && pi_ts1 && *pi_ts0 == *pi_ts1 ) {
*pi_ts1 += 1; *pi_ts0 += i_es_delay;
if( pi_ts1 && *pi_ts1 > VLC_TS_INVALID )
*pi_ts1 += i_es_delay;
if( input_clock_ConvertTS( p_clock, &i_rate, pi_ts0, pi_ts1, i_ts_bound ) )
*pi_ts0 = VLC_TS_INVALID;
}
else
{
i_rate = input_clock_GetRate( p_clock );
}
if( pi_duration ) /* Do not create ephemere data because of rounding errors */
*pi_duration = ( *pi_duration * i_rate + if( !b_ephemere && pi_ts1 && *pi_ts0 == *pi_ts1 )
INPUT_RATE_DEFAULT-1 ) / INPUT_RATE_DEFAULT; *pi_ts1 += 1;
if( pi_rate ) if( pi_duration )
*pi_rate = i_rate; *pi_duration = ( *pi_duration * i_rate + INPUT_RATE_DEFAULT-1 )
} / INPUT_RATE_DEFAULT;
if( pi_rate )
*pi_rate = i_rate;
} }
static bool DecoderIsExitRequested( decoder_t *p_dec ) static bool DecoderIsExitRequested( decoder_t *p_dec )
......
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