/*****************************************************************************
* decoder_synchro.c : frame dropping routines
*****************************************************************************
- * Copyright (C) 1999-2005 the VideoLAN team
+ * Copyright (C) 1999-2005 VLC authors and VideoLAN
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
* Jean-Marc Dressler <polux@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*
/* */
int i_frame_rate;
- bool b_no_skip;
- bool b_quiet;
+ bool b_no_skip;
+ bool b_quiet;
/* date of the beginning of the decoding of the current picture */
mtime_t decoding_start;
unsigned int pi_meaningful[4]; /* number of durations read */
/* render_time filled by SynchroChoose() */
- int i_render_time;
+ int i_render_time;
/* stream context */
int i_nb_ref; /* Number of reference pictures */
*****************************************************************************/
decoder_synchro_t * decoder_SynchroInit( decoder_t *p_dec, int i_frame_rate )
{
- decoder_synchro_t * p_synchro = malloc( sizeof(*p_synchro) );
- if ( p_synchro == NULL )
+ decoder_synchro_t * p_synchro = calloc( 1, sizeof(*p_synchro) );
+ if( !p_synchro )
return NULL;
- memset( p_synchro, 0, sizeof(*p_synchro) );
p_synchro->p_dec = p_dec;
- p_synchro->b_no_skip = !config_GetInt( p_dec, "skip-frames" );
- p_synchro->b_quiet = config_GetInt( p_dec, "quiet-synchro" );
+ p_synchro->b_no_skip = !var_InheritBool( p_dec, "skip-frames" );
+ p_synchro->b_quiet = var_InheritBool( p_dec, "quiet-synchro" );
/* We use a fake stream pattern, which is often right. */
p_synchro->i_n_p = p_synchro->i_eta_p = DEFAULT_NB_P;
+ p_synchro->i_render_time)
#define S (*p_synchro)
mtime_t now, period;
- mtime_t pts = 0;
+ mtime_t pts;
bool b_decode = 0;
int i_current_rate;
pts = decoder_GetDisplayDate( p_synchro->p_dec, S.current_pts ) + period * (S.i_n_b + 2);
}
- if( (1 + S.i_n_p * (S.i_n_b + 1)) * period >
- S.p_tau[I_CODING_TYPE] )
+ if( (1 + S.i_n_p * (S.i_n_b + 1)) * period > S.p_tau[I_CODING_TYPE] )
{
b_decode = 1;
}
{
b_decode = (pts - now) > (TAU_PRIME(I_CODING_TYPE) + DELTA);
}
+ if( pts <= VLC_TS_INVALID )
+ b_decode = 1;
+
if( !b_decode && !p_synchro->b_quiet )
{
msg_Warn( p_synchro->p_dec,
{
b_decode = 0;
}
+ if( p_synchro->i_nb_ref >= 1 && pts <= VLC_TS_INVALID )
+ b_decode = 1;
break;
case B_CODING_TYPE:
{
b_decode = 0;
}
+ if( p_synchro->i_nb_ref >= 2 && pts <= VLC_TS_INVALID )
+ b_decode = 1;
+ break;
}
if( !b_decode )
{
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]++;
}
}
}
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 )
projects / vlc / blobdiff