* src/video_output/video_output.c: another fix for on-the-fly deinterlacing switch.

[vlc] / src / video_output / vout_synchro.c

diff --git a/src/video_output/vout_synchro.c b/src/video_output/vout_synchro.c
index 02be0eab5b97ff4f310b95a4abdd1b75cb6079dc..94d396b6fdfb6a8d42d3855e8584e7edde1087aa 100644 (file)
--- a/src/video_output/vout_synchro.c
+++ b/src/video_output/vout_synchro.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * vout_synchro.c : frame dropping routines
  *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: vout_synchro.c,v 1.4 2003/10/17 18:38:47 gbazin Exp $
+ * Copyright (C) 1999-2004 VideoLAN
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -12,7 +12,7 @@
  * 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
@@ -64,7 +64,7 @@
  *    ========================
  * 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
  *
@@ -99,9 +99,9 @@
 
 #include <vlc/vlc.h>
 #include <vlc/vout.h>
+#include <vlc/input.h>
 
 #include "vout_synchro.h"
-#include "stream_control.h"
 
 /*
  * Local prototypes
@@ -118,7 +118,7 @@
  * 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) );
@@ -139,11 +139,10 @@ vout_synchro_t * __vout_SynchroInit( vlc_object_t * p_object,
     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;
 }
@@ -169,24 +168,23 @@ void vout_SynchroReset( vout_synchro_t * 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 )
 {
 #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 )
     {
@@ -352,9 +350,9 @@ void vout_SynchroNewPicture( vout_synchro_t * p_synchro, int 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;
 
@@ -384,7 +382,7 @@ void vout_SynchroNewPicture( vout_synchro_t * p_synchro, int i_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_render_time,
               p_synchro->i_not_chosen_pic,
               p_synchro->i_trashed_pic -
               p_synchro->i_not_chosen_pic,
@@ -428,7 +426,7 @@ void vout_SynchroNewPicture( vout_synchro_t * p_synchro, int i_coding_type,
 
     p_synchro->current_pts += p_synchro->i_current_period
                                         * (period >> 1);
- 
+
 #define PTS_THRESHOLD   (period >> 2)
     if( i_coding_type == B_CODING_TYPE )
     {
@@ -459,7 +457,7 @@ void vout_SynchroNewPicture( vout_synchro_t * p_synchro, int i_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