* vpar_synchro.c : frame dropping routines
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_synchro.c,v 1.65 2000/12/27 18:09:02 massiot Exp $
+ * $Id: vpar_synchro.c,v 1.78 2001/01/18 05:13:23 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
* Please bear in mind that B's and IP's will be inverted when displaying
* (decoding order != presentation order). Thus, t1 < t0.
*
+ * FIXME: write a few words about stream structure changes.
+ *
* 2. Definitions
* ===========
* t[0..12] : Presentation timestamps of pictures 0..12.
*
* 3. General considerations
* ======================
- * We define to types of machines :
- * 2T > tauP : machines capable of decoding all P pictures
+ * We define three types of machines :
* 14T > tauI : machines capable of decoding all I pictures
+ * 2T > tauP : machines capable of decoding all P pictures
+ * T > tauB : machines capable of decoding all B pictures
*
* 4. Decoding of an I picture
* ========================
* before displaying :
* t0 - t > tau´I + DELTA
*
- * 4. Decoding of a P picture
+ * 5. Decoding of a P picture
* =======================
* On fast machines, we decode all P's.
* Otherwise :
* I picture, which is more important.
* t12 - t > tau´P + tau´I + DELTA
*
- * 5. Decoding of a B picture
+ * 6. Decoding of a B picture
* =======================
- * First criterion : have time to decode it.
+ * On fast machines, we decode all B's. Otherwise :
* t1 - t > tau´B + DELTA
- *
- * Second criterion : it shouldn't prevent us from displaying the forthcoming
- * P picture, which is more important.
- * t4 - t > tau´B + tau´P + DELTA
+ * Since the next displayed I or P is already decoded, we don't have to
+ * worry about it.
*
* I hope you will have a pleasant flight and do not forget your life
* jacket.
- * --Meuuh (2000-11-09)
+ * --Meuuh (2000-12-29)
*/
/*****************************************************************************
#include "video.h"
#include "video_output.h"
+#include "video_decoder.h"
+#include "vdec_motion.h"
#include "../video_decoder/vdec_idct.h"
-#include "../video_decoder/video_decoder.h"
-#include "../video_decoder/vdec_motion.h"
-#include "../video_decoder/vpar_blocks.h"
+#include "vpar_blocks.h"
#include "../video_decoder/vpar_headers.h"
#include "../video_decoder/vpar_synchro.h"
#include "../video_decoder/video_parser.h"
p_vpar->synchro.b_dropped_last = 0;
p_vpar->synchro.current_pts = mdate() + DEFAULT_PTS_DELAY;
p_vpar->synchro.backward_pts = 0;
+ p_vpar->synchro.i_current_period = p_vpar->synchro.i_backward_period = 0;
+#ifdef STATS
+ p_vpar->synchro.i_trashed_pic = p_vpar->synchro.i_not_chosen_pic =
+ p_vpar->synchro.i_pic = 0;
+#endif
}
/*****************************************************************************
#endif
now = mdate();
- period = 1000000 / (p_vpar->sequence.i_frame_rate) * 1001;
+ period = 1000000 * 1001 / p_vpar->sequence.i_frame_rate;
vlc_mutex_lock( &p_vpar->p_vout->change_lock );
tau_yuv = p_vpar->p_vout->render_time;
if( (S.i_n_b + 1) * period > S.p_tau[P_CODING_TYPE] )
{
- if( period > S.p_tau[B_CODING_TYPE] )
- {
- /* Security in case we're _really_ late */
- b_decode = (pts - now > 0);
- }
- else
- {
- b_decode = (pts - now) > (TAU_PRIME(B_CODING_TYPE) + DELTA);
-
- /* next P or I */
- b_decode &= (pts - now
- + period
- * ( 2 * S.i_n_b - S.i_eta_b + 3))
- > (TAU_PRIME(B_CODING_TYPE)
- + TAU_PRIME(P_CODING_TYPE) + DELTA);
- }
+ b_decode = (pts - now) > (TAU_PRIME(B_CODING_TYPE) + DELTA);
}
else
{
/*****************************************************************************
* vpar_SynchroNewPicture: Update stream structure and PTS
*****************************************************************************/
-void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type )
+void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
+ int i_repeat_field )
{
- /* FIXME: use decoder_fifo callback */
- pes_packet_t * p_pes;
+ mtime_t period = 1000000 * 1001 / p_vpar->sequence.i_frame_rate;
switch( i_coding_type )
{
case I_CODING_TYPE:
- p_vpar->synchro.i_eta_p = p_vpar->synchro.i_eta_b = 0;
if( p_vpar->synchro.i_eta_p
&& p_vpar->synchro.i_eta_p != p_vpar->synchro.i_n_p )
{
p_vpar->synchro.i_n_p, p_vpar->synchro.i_eta_p );
p_vpar->synchro.i_n_p = p_vpar->synchro.i_eta_p;
}
+ p_vpar->synchro.i_eta_p = p_vpar->synchro.i_eta_b = 0;
#ifdef STATS
if( p_vpar->synchro.i_type == VPAR_SYNCHRO_DEFAULT )
{
break;
}
- p_pes = DECODER_FIFO_START( *p_vpar->bit_stream.p_decoder_fifo );
+ p_vpar->synchro.current_pts += p_vpar->synchro.i_current_period
+ * (period >> 1);
+#define PTS_THRESHOLD (period >> 2)
if( i_coding_type == B_CODING_TYPE )
{
- if( p_pes->b_has_pts )
+ /* A video frame can be displayed 1, 2 or 3 times, according to
+ * repeat_first_field, top_field_first, progressive_sequence and
+ * progressive_frame. */
+ p_vpar->synchro.i_current_period = i_repeat_field;
+
+ if( p_vpar->sequence.next_pts )
{
- if( p_pes->i_pts < p_vpar->synchro.current_pts )
+ if( p_vpar->sequence.next_pts - p_vpar->synchro.current_pts
+ > PTS_THRESHOLD
+ || p_vpar->synchro.current_pts - p_vpar->sequence.next_pts
+ > PTS_THRESHOLD )
{
intf_WarnMsg( 2,
- "vpar synchro warning: pts_date < current_date" );
+ "vpar synchro warning: pts != current_date (%lld)",
+ p_vpar->synchro.current_pts
+ - p_vpar->sequence.next_pts );
}
- p_vpar->synchro.current_pts = p_pes->i_pts;
- p_pes->b_has_pts = 0;
- }
- else
- {
- p_vpar->synchro.current_pts += 1000000
- / (p_vpar->sequence.i_frame_rate) * 1001;
+ p_vpar->synchro.current_pts = p_vpar->sequence.next_pts;
+ p_vpar->sequence.next_pts = 0;
}
}
else
{
- if( p_vpar->synchro.backward_pts == 0 )
- {
- p_vpar->synchro.current_pts += 1000000
- / (p_vpar->sequence.i_frame_rate) * 1001;
- }
- else
+ p_vpar->synchro.i_current_period = p_vpar->synchro.i_backward_period;
+ p_vpar->synchro.i_backward_period = i_repeat_field;
+
+ if( p_vpar->synchro.backward_pts )
{
- if( p_vpar->synchro.backward_pts < p_vpar->synchro.current_pts )
+ if( p_vpar->sequence.next_dts &&
+ (p_vpar->sequence.next_dts - p_vpar->synchro.backward_pts
+ > PTS_THRESHOLD
+ || p_vpar->synchro.backward_pts - p_vpar->sequence.next_dts
+ > PTS_THRESHOLD) )
{
intf_WarnMsg( 2,
- "vpar warning: backward_date < current_date" );
+ "vpar synchro warning: backward_pts != dts (%lld)",
+ p_vpar->sequence.next_dts
+ - p_vpar->synchro.backward_pts );
+ }
+ if( p_vpar->synchro.backward_pts - p_vpar->synchro.current_pts
+ > PTS_THRESHOLD
+ || p_vpar->synchro.current_pts - p_vpar->synchro.backward_pts
+ > PTS_THRESHOLD )
+ {
+ intf_WarnMsg( 2,
+ "vpar synchro warning: backward_pts != current_pts (%lld)",
+ p_vpar->synchro.current_pts - p_vpar->synchro.backward_pts );
}
p_vpar->synchro.current_pts = p_vpar->synchro.backward_pts;
p_vpar->synchro.backward_pts = 0;
}
+ else if( p_vpar->sequence.next_dts )
+ {
+ if( p_vpar->sequence.next_dts - p_vpar->synchro.current_pts
+ > PTS_THRESHOLD
+ || p_vpar->synchro.current_pts - p_vpar->sequence.next_dts
+ > PTS_THRESHOLD )
+ {
+ intf_WarnMsg( 2,
+ "vpar synchro warning: dts != current_pts (%lld)",
+ p_vpar->synchro.current_pts
+ - p_vpar->sequence.next_dts );
+ }
+ /* By definition of a DTS. */
+ p_vpar->synchro.current_pts = p_vpar->sequence.next_dts;
+ p_vpar->sequence.next_dts = 0;
+ }
- if( p_pes->b_has_pts )
+ if( p_vpar->sequence.next_pts )
{
/* Store the PTS for the next time we have to date an I picture. */
- p_vpar->synchro.backward_pts = p_pes->i_pts;
- p_pes->b_has_pts = 0;
+ p_vpar->synchro.backward_pts = p_vpar->sequence.next_pts;
+ p_vpar->sequence.next_pts = 0;
}
}
+#undef PTS_THRESHOLD
#ifdef STATS
p_vpar->synchro.i_pic++;
projects / vlc / blobdiff