/*****************************************************************************
* vout_synchro.c : frame dropping routines
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: vout_synchro.c,v 1.2 2003/05/04 22:33:35 massiot Exp $
+ * Copyright (C) 1999-2004 VideoLAN
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 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
* ========================
* On fast machines, we decode all I's.
* Otherwise :
- * We can decode an I picture if we simply have enough time to decode it
+ * We can decode an I picture if we simply have enough time to decode it
* before displaying :
* t0 - t > tau´I + DELTA
*
#include <vlc/vlc.h>
#include <vlc/vout.h>
+#include <vlc/input.h>
#include "vout_synchro.h"
-#include "stream_control.h"
/*
* Local prototypes
/* Error margins */
#define DELTA (int)(0.075*CLOCK_FREQ)
+#define MAX_VALID_TAU (int)(0.3*CLOCK_FREQ)
#define DEFAULT_NB_P 5
#define DEFAULT_NB_B 1
* vout_SynchroInit : You know what ?
*****************************************************************************/
vout_synchro_t * __vout_SynchroInit( vlc_object_t * p_object,
- vout_thread_t * p_vout, int i_frame_rate )
+ int i_frame_rate )
{
vout_synchro_t * p_synchro = vlc_object_create( p_object,
sizeof(vout_synchro_t) );
memset( p_synchro->p_tau, 0, 4 * sizeof(mtime_t) );
memset( p_synchro->pi_meaningful, 0, 4 * sizeof(unsigned int) );
p_synchro->i_nb_ref = 0;
+ p_synchro->i_trash_nb_ref = p_synchro->i_dec_nb_ref = 0;
p_synchro->current_pts = mdate() + DEFAULT_PTS_DELAY;
p_synchro->backward_pts = 0;
p_synchro->i_current_period = p_synchro->i_backward_period = 0;
- p_synchro->i_trashed_pic = p_synchro->i_not_chosen_pic =
+ p_synchro->i_trashed_pic = p_synchro->i_not_chosen_pic =
p_synchro->i_pic = 0;
p_synchro->i_frame_rate = i_frame_rate;
- p_synchro->p_vout = p_vout;
return p_synchro;
}
void vout_SynchroReset( vout_synchro_t * p_synchro )
{
p_synchro->i_nb_ref = 0;
+ p_synchro->i_trash_nb_ref = p_synchro->i_dec_nb_ref = 0;
}
/*****************************************************************************
* vout_SynchroChoose : Decide whether we will decode a picture or not
*****************************************************************************/
-vlc_bool_t vout_SynchroChoose( vout_synchro_t * p_synchro, int i_coding_type )
+vlc_bool_t vout_SynchroChoose( vout_synchro_t * p_synchro, int i_coding_type,
+ int i_render_time )
{
#define TAU_PRIME( coding_type ) (p_synchro->p_tau[(coding_type)] \
+ (p_synchro->p_tau[(coding_type)] >> 1) \
- + tau_yuv)
+ + p_synchro->i_render_time)
#define S (*p_synchro)
/* VPAR_SYNCHRO_DEFAULT */
- mtime_t now, period, tau_yuv;
+ mtime_t now, period;
mtime_t pts = 0;
vlc_bool_t b_decode = 0;
now = mdate();
period = 1000000 * 1001 / p_synchro->i_frame_rate
- * p_synchro->i_current_rate / DEFAULT_RATE;
+ * p_synchro->i_current_rate / INPUT_RATE_DEFAULT;
- vlc_mutex_lock( &p_synchro->p_vout->change_lock );
- tau_yuv = p_synchro->p_vout->render_time;
- vlc_mutex_unlock( &p_synchro->p_vout->change_lock );
+ p_synchro->i_render_time = i_render_time;
switch( i_coding_type )
{
{
msg_Warn( p_synchro,
"synchro trashing I ("I64Fd")", pts - now );
- p_synchro->i_nb_ref = 0;
}
- else if( p_synchro->i_nb_ref < 2 )
- p_synchro->i_nb_ref++;
break;
case P_CODING_TYPE:
{
b_decode = 0;
}
- if( b_decode )
- p_synchro->i_nb_ref = 2;
- else
- p_synchro->i_nb_ref = 0;
break;
case B_CODING_TYPE:
void vout_SynchroTrash( vout_synchro_t * p_synchro )
{
p_synchro->i_trashed_pic++;
+ p_synchro->i_nb_ref = p_synchro->i_trash_nb_ref;
}
/*****************************************************************************
void vout_SynchroDecode( vout_synchro_t * p_synchro )
{
p_synchro->decoding_start = mdate();
+ p_synchro->i_nb_ref = p_synchro->i_dec_nb_ref;
}
/*****************************************************************************
/* 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] )
+ || ( !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] =
mtime_t next_dts, int i_current_rate )
{
mtime_t period = 1000000 * 1001 / p_synchro->i_frame_rate
- * i_current_rate / DEFAULT_RATE;
+ * i_current_rate / INPUT_RATE_DEFAULT;
#if 0
- mtime_t now = mdate();
+ mtime_t now = mdate();
#endif
p_synchro->i_current_rate = i_current_rate;
if( p_synchro->i_eta_p
&& p_synchro->i_eta_p != p_synchro->i_n_p )
{
-#if 0
msg_Dbg( p_synchro,
"stream periodicity changed from P[%d] to P[%d]",
p_synchro->i_n_p, p_synchro->i_eta_p );
-#endif
p_synchro->i_n_p = p_synchro->i_eta_p;
}
p_synchro->i_eta_p = p_synchro->i_eta_b = 0;
+ p_synchro->i_trash_nb_ref = 0;
+ if( p_synchro->i_nb_ref < 2 )
+ p_synchro->i_dec_nb_ref = p_synchro->i_nb_ref + 1;
+ else
+ p_synchro->i_dec_nb_ref = p_synchro->i_nb_ref;
#if 0
msg_Dbg( p_synchro, "I("I64Fd") P("I64Fd")[%d] B("I64Fd")"
p_synchro->i_n_p,
p_synchro->p_tau[B_CODING_TYPE],
p_synchro->i_n_b,
- p_synchro->p_vout->render_time,
+ p_synchro->i_render_time,
p_synchro->i_not_chosen_pic,
p_synchro->i_trashed_pic -
p_synchro->i_not_chosen_pic,
if( p_synchro->i_eta_b
&& p_synchro->i_eta_b != p_synchro->i_n_b )
{
- msg_Warn( p_synchro,
- "stream periodicity changed from B[%d] to B[%d]",
- p_synchro->i_n_b, p_synchro->i_eta_b );
+ msg_Dbg( p_synchro,
+ "stream periodicity changed from B[%d] to B[%d]",
+ p_synchro->i_n_b, p_synchro->i_eta_b );
p_synchro->i_n_b = p_synchro->i_eta_b;
}
p_synchro->i_eta_b = 0;
+ p_synchro->i_dec_nb_ref = 2;
+ p_synchro->i_trash_nb_ref = 0;
break;
+
case B_CODING_TYPE:
p_synchro->i_eta_b++;
+ p_synchro->i_dec_nb_ref = p_synchro->i_trash_nb_ref
+ = p_synchro->i_nb_ref;
break;
}
p_synchro->current_pts += p_synchro->i_current_period
* (period >> 1);
-
+
#define PTS_THRESHOLD (period >> 2)
if( i_coding_type == B_CODING_TYPE )
{
if( p_synchro->backward_pts )
{
- if( next_dts &&
+ if( next_dts &&
(next_dts - p_synchro->backward_pts
> PTS_THRESHOLD
|| p_synchro->backward_pts - next_dts
projects / vlc / blobdiff