/*****************************************************************************
* vout_synchro.c : frame dropping routines
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: vout_synchro.c,v 1.3 2003/06/09 00:33:34 massiot Exp $
+ * Copyright (C) 1999-2005 the VideoLAN team
+ * $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
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*
* T : Picture period, T = 1/frame_rate.
* tau[I,P,B] : Mean time to decode an [I,P,B] picture.
* tauYUV : Mean time to render a picture (given by the video_output).
- * tau´[I,P,B] = 2 * tau[I,P,B] + tauYUV
+ * tau´[I,P,B] = 2 * tau[I,P,B] + tauYUV
* : Mean time + typical difference (estimated to tau/2, that
* needs to be confirmed) + render time.
* DELTA : A given error margin.
* ========================
* 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
+ * t0 - t > tau´I + DELTA
*
* 5. Decoding of a P picture
* =======================
* On fast machines, we decode all P's.
* Otherwise :
* First criterion : have time to decode it.
- * t2 - t > tau´P + DELTA
+ * t2 - t > tau´P + DELTA
*
* Second criterion : it shouldn't prevent us from displaying the forthcoming
* I picture, which is more important.
- * t12 - t > tau´P + tau´I + DELTA
+ * t12 - t > tau´P + tau´I + DELTA
*
* 6. Decoding of a B picture
* =======================
* On fast machines, we decode all B's. Otherwise :
- * t1 - t > tau´B + DELTA
+ * t1 - t > tau´B + DELTA
* Since the next displayed I or P is already decoded, we don't have to
* worry about it.
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <string.h> /* memcpy(), memset() */
-
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-
-#include "vout_synchro.h"
-#include "stream_control.h"
+#include <vlc_vout.h>
+#include <vlc_input.h>
+#include <vlc_vout_synchro.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) );
}
vlc_object_attach( p_synchro, p_object );
+ p_synchro->b_no_skip = !config_GetInt( p_object, "skip-frames" );
+ p_synchro->b_quiet = config_GetInt( p_object, "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_n_b = p_synchro->i_eta_b = DEFAULT_NB_B;
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;
}
/*****************************************************************************
* 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, vlc_bool_t b_low_delay )
{
#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;
+ if ( p_synchro->b_no_skip )
+ return 1;
+
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 )
{
case I_CODING_TYPE:
- if( S.backward_pts )
+ if( b_low_delay )
+ {
+ pts = S.current_pts;
+ }
+ else if( S.backward_pts )
{
pts = S.backward_pts;
}
{
b_decode = (pts - now) > (TAU_PRIME(I_CODING_TYPE) + DELTA);
}
- if( !b_decode )
+ if( !b_decode && !p_synchro->b_quiet )
{
msg_Warn( p_synchro,
"synchro trashing I ("I64Fd")", pts - now );
break;
case P_CODING_TYPE:
- if( S.backward_pts )
+ if( b_low_delay )
+ {
+ pts = S.current_pts;
+ }
+ else if( S.backward_pts )
{
pts = S.backward_pts;
}
/* 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] =
*****************************************************************************/
void vout_SynchroNewPicture( vout_synchro_t * p_synchro, int i_coding_type,
int i_repeat_field, mtime_t next_pts,
- mtime_t next_dts, int i_current_rate )
+ mtime_t next_dts, int i_current_rate,
+ vlc_bool_t b_low_delay )
{
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 )
{
- msg_Dbg( p_synchro,
- "stream periodicity changed from P[%d] to P[%d]",
- p_synchro->i_n_p, p_synchro->i_eta_p );
+#if 0
+ if( !p_synchro->b_quiet )
+ 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_dec_nb_ref = p_synchro->i_nb_ref;
#if 0
- msg_Dbg( p_synchro, "I("I64Fd") P("I64Fd")[%d] B("I64Fd")"
- "[%d] YUV("I64Fd") : trashed %d:%d/%d",
- p_synchro->p_tau[I_CODING_TYPE],
- p_synchro->p_tau[P_CODING_TYPE],
- 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_not_chosen_pic,
- p_synchro->i_trashed_pic -
- p_synchro->i_not_chosen_pic,
- p_synchro->i_pic );
+ if( !p_synchro->b_quiet )
+ msg_Dbg( p_synchro, "I("I64Fd") P("I64Fd")[%d] B("I64Fd")"
+ "[%d] YUV("I64Fd") : trashed %d:%d/%d",
+ p_synchro->p_tau[I_CODING_TYPE],
+ p_synchro->p_tau[P_CODING_TYPE],
+ p_synchro->i_n_p,
+ p_synchro->p_tau[B_CODING_TYPE],
+ p_synchro->i_n_b,
+ p_synchro->i_render_time,
+ p_synchro->i_not_chosen_pic,
+ p_synchro->i_trashed_pic -
+ p_synchro->i_not_chosen_pic,
+ p_synchro->i_pic );
p_synchro->i_trashed_pic = p_synchro->i_not_chosen_pic
= p_synchro->i_pic = 0;
#else
- if ( p_synchro->i_pic >= 100 )
+ if( p_synchro->i_pic >= 100 )
{
- msg_Dbg( p_synchro, "decoded %d/%d pictures",
- p_synchro->i_pic
- - p_synchro->i_trashed_pic,
- p_synchro->i_pic );
+ if( !p_synchro->b_quiet && p_synchro->i_trashed_pic != 0 )
+ msg_Dbg( p_synchro, "decoded %d/%d pictures",
+ p_synchro->i_pic
+ - p_synchro->i_trashed_pic,
+ p_synchro->i_pic );
p_synchro->i_trashed_pic = p_synchro->i_not_chosen_pic
= p_synchro->i_pic = 0;
}
if( p_synchro->i_eta_b
&& p_synchro->i_eta_b != p_synchro->i_n_b )
{
- msg_Dbg( p_synchro,
- "stream periodicity changed from B[%d] to B[%d]",
- p_synchro->i_n_b, p_synchro->i_eta_b );
+#if 0
+ if( !p_synchro->b_quiet )
+ msg_Dbg( p_synchro,
+ "stream periodicity changed from B[%d] to B[%d]",
+ p_synchro->i_n_b, p_synchro->i_eta_b );
+#endif
p_synchro->i_n_b = p_synchro->i_eta_b;
}
p_synchro->i_eta_b = 0;
p_synchro->current_pts += p_synchro->i_current_period
* (period >> 1);
-
+
#define PTS_THRESHOLD (period >> 2)
- if( i_coding_type == B_CODING_TYPE )
+ if( i_coding_type == B_CODING_TYPE || b_low_delay )
{
/* A video frame can be displayed 1, 2 or 3 times, according to
* repeat_first_field, top_field_first, progressive_sequence and
if( next_pts )
{
- if( next_pts - p_synchro->current_pts
+ if( (next_pts - p_synchro->current_pts
> PTS_THRESHOLD
- || p_synchro->current_pts - next_pts
- > PTS_THRESHOLD )
+ || p_synchro->current_pts - next_pts
+ > PTS_THRESHOLD) && !p_synchro->b_quiet )
{
msg_Warn( p_synchro, "vout synchro warning: pts != "
"current_date ("I64Fd")",
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
- > PTS_THRESHOLD) )
+ || p_synchro->backward_pts - next_dts
+ > PTS_THRESHOLD) && !p_synchro->b_quiet )
{
msg_Warn( p_synchro, "backward_pts != dts ("I64Fd")",
next_dts
- p_synchro->backward_pts );
}
- if( p_synchro->backward_pts - p_synchro->current_pts
+ if( (p_synchro->backward_pts - p_synchro->current_pts
> PTS_THRESHOLD
- || p_synchro->current_pts - p_synchro->backward_pts
- > PTS_THRESHOLD )
+ || p_synchro->current_pts - p_synchro->backward_pts
+ > PTS_THRESHOLD) && !p_synchro->b_quiet )
{
msg_Warn( p_synchro,
"backward_pts != current_pts ("I64Fd")",
}
else if( next_dts )
{
- if( next_dts - p_synchro->current_pts
+ if( (next_dts - p_synchro->current_pts
> PTS_THRESHOLD
- || p_synchro->current_pts - next_dts
- > PTS_THRESHOLD )
+ || p_synchro->current_pts - next_dts
+ > PTS_THRESHOLD) && !p_synchro->b_quiet )
{
msg_Warn( p_synchro, "dts != current_pts ("I64Fd")",
p_synchro->current_pts
{
/* We cannot be _that_ late, something must have happened, reinit
* the dates. */
- msg_Warn( p_synchro, "PTS << now ("I64Fd"), resetting",
- now - p_synchro->current_pts - DEFAULT_PTS_DELAY );
+ if( !p_synchro->b_quiet )
+ msg_Warn( p_synchro, "PTS << now ("I64Fd"), resetting",
+ now - p_synchro->current_pts - DEFAULT_PTS_DELAY );
p_synchro->current_pts = now + DEFAULT_PTS_DELAY;
}
if( p_synchro->backward_pts
projects / vlc / blobdiff