. suppression d'un bug cosm�tique dans l'affichage des plugins qui en

[vlc] / include / vpar_synchro.h

diff --git a/include/vpar_synchro.h b/include/vpar_synchro.h
index 257478a998ed970e6f42eaec3d6f85d4fc78bf66..3f163a76da7a7e67acc55fb880818860252ce07d 100644 (file)
--- a/include/vpar_synchro.h
+++ b/include/vpar_synchro.h
@@ -1,13 +1,31 @@
 /*****************************************************************************
  * vpar_synchro.h : video parser blocks management
- * (c)1999 VideoLAN
- *****************************************************************************
  *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
  * Requires:
  *  "config.h"
  *  "common.h"
  *  "mtime.h"
- *  "vlc_thread.h"
+ *  "threads.h"
  *  "input.h"
  *  "video.h"
  *  "video_output.h"
@@ -15,6 +33,8 @@
  *  "video_fifo.h"
  *****************************************************************************/
 
+#define POLUX_SYNCHRO
+
 /*****************************************************************************
  * video_synchro_t and video_synchro_tab_s : timers for the video synchro
  *****************************************************************************/
@@ -23,7 +43,7 @@ typedef struct video_synchro_tab_s
 {
     double mean;
     double deviation;
-    
+
 } video_synchro_tab_t;
 
 typedef struct video_synchro_fifo_s
@@ -32,7 +52,7 @@ typedef struct video_synchro_fifo_s
     int i_image_type;
     mtime_t i_decode_date;
     mtime_t i_pts;
-    
+
 } video_synchro_fifo_t;
 
 typedef struct video_synchro_s
@@ -45,12 +65,12 @@ typedef struct video_synchro_s
     /* mean decoding time */
     mtime_t i_mean_decode_time;
     /* dates */
-    mtime_t i_last_display_pts;            /* pts of the last displayed image */
-    mtime_t i_last_decode_pts;               /* pts of the last decoded image */
-    mtime_t i_last_i_pts;                          /* pts of the last I image */
-    mtime_t i_last_nondropped_i_pts;       /* pts of last non-dropped I image */
+    mtime_t i_last_display_pts;           /* pts of the last displayed image */
+    mtime_t i_last_decode_pts;              /* pts of the last decoded image */
+    mtime_t i_last_i_pts;                         /* pts of the last I image */
+    mtime_t i_last_nondropped_i_pts;      /* pts of last non-dropped I image */
     unsigned int i_images_since_pts;
-    
+
     /* il manquait un compteur */
     unsigned int modulo;
 
@@ -78,7 +98,9 @@ typedef struct video_synchro_s
     double actual_fps;
 
 } video_synchro_t;
-#else
+#endif
+
+#ifdef MEUUH_SYNCHRO
 typedef struct video_synchro_s
 {
     int         kludge_level, kludge_p, kludge_b, kludge_nbp, kludge_nbb;
@@ -87,14 +109,38 @@ typedef struct video_synchro_s
     int         i_coding_type;
 } video_synchro_t;
 
-#define SYNC_TOLERATE   10000 /* 10 ms */
-#define SYNC_DELAY      500000
+#define SYNC_TOLERATE   ((int)(0.010*CLOCK_FREQ))                   /* 10 ms */
+#define SYNC_DELAY      ((int)(0.500*CLOCK_FREQ))                  /* 500 ms */
+#endif
+
+#ifdef POLUX_SYNCHRO
+
+#define SYNC_AVERAGE_COUNT 10
+
+typedef struct video_synchro_s
+{
+    /* Date Section */
+
+    /* Dates needed to compute the date of the current frame
+     * We also use the stream frame rate (sequence.r_frame_rate) */
+    mtime_t     i_current_frame_date;
+    mtime_t     i_backward_frame_date;
+
+    /* Frame Trashing Section */
+
+    int         i_b_nb, i_p_nb;   /* number of decoded P and B between two I */
+    float       r_b_average, r_p_average;
+    int         i_b_count, i_p_count, i_i_count;
+    int         i_b_trasher;                /* used for brensenham algorithm */
+
+} video_synchro_t;
+
 #endif
 
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-boolean_t vpar_SynchroChoose( struct vpar_thread_s * p_vpar, int i_coding_type, 
+boolean_t vpar_SynchroChoose( struct vpar_thread_s * p_vpar, int i_coding_type,
                          int i_structure );
 void vpar_SynchroTrash( struct vpar_thread_s * p_vpar, int i_coding_type,
                         int i_structure );
@@ -102,3 +148,7 @@ void vpar_SynchroDecode( struct vpar_thread_s * p_vpar, int i_coding_type,
                             int i_structure );
 void vpar_SynchroEnd( struct vpar_thread_s * p_vpar );
 mtime_t vpar_SynchroDate( struct vpar_thread_s * p_vpar );
+
+#ifndef SAM_SYNCHRO
+void vpar_SynchroKludge( struct vpar_thread_s *, mtime_t );
+#endif