Commit 3414682c authored by Rafaël Carré's avatar Rafaël Carré

decoder synchro: cosmetics

parent 245b9e9e
......@@ -369,25 +369,24 @@ void decoder_SynchroEnd( decoder_synchro_t * p_synchro, int i_coding_type,
{
mtime_t tau;
if( !b_garbage )
{
tau = mdate() - p_synchro->decoding_start;
if( b_garbage )
return;
tau = mdate() - p_synchro->decoding_start;
/* If duration too high, something happened (pause ?), so don't
* take it into account. */
if( tau < 3 * p_synchro->p_tau[i_coding_type]
|| ( !p_synchro->pi_meaningful[i_coding_type]
&& tau < MAX_VALID_TAU ) )
/* If duration too high, something happened (pause ?), so don't
* take it into account. */
if( tau < 3 * p_synchro->p_tau[i_coding_type] ||
( !p_synchro->pi_meaningful[i_coding_type] && tau < MAX_VALID_TAU ) )
{
/* Mean with average tau, to ensure stability. */
p_synchro->p_tau[i_coding_type] =
(p_synchro->pi_meaningful[i_coding_type]
* p_synchro->p_tau[i_coding_type] + tau)
/ (p_synchro->pi_meaningful[i_coding_type] + 1);
if( p_synchro->pi_meaningful[i_coding_type] < MAX_PIC_AVERAGE )
{
/* Mean with average tau, to ensure stability. */
p_synchro->p_tau[i_coding_type] =
(p_synchro->pi_meaningful[i_coding_type]
* p_synchro->p_tau[i_coding_type] + tau)
/ (p_synchro->pi_meaningful[i_coding_type] + 1);
if( p_synchro->pi_meaningful[i_coding_type] < MAX_PIC_AVERAGE )
{
p_synchro->pi_meaningful[i_coding_type]++;
}
p_synchro->pi_meaningful[i_coding_type]++;
}
}
}
......@@ -416,8 +415,7 @@ void decoder_SynchroNewPicture( decoder_synchro_t * p_synchro, int i_coding_type
switch( i_coding_type )
{
case I_CODING_TYPE:
if( p_synchro->i_eta_p
&& p_synchro->i_eta_p != p_synchro->i_n_p )
if( p_synchro->i_eta_p && p_synchro->i_eta_p != p_synchro->i_n_p )
{
#if 0
if( !p_synchro->b_quiet )
......
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