/*****************************************************************************
* vpar_synchro.h : video parser blocks management
- * (c)1999 VideoLAN
- *****************************************************************************
*****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Author: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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"
* "video_fifo.h"
*****************************************************************************/
-#define POLUX_SYNCHRO
-
/*****************************************************************************
* video_synchro_t and video_synchro_tab_s : timers for the video synchro
*****************************************************************************/
-#ifdef SAM_SYNCHRO
-typedef struct video_synchro_tab_s
-{
- double mean;
- double deviation;
-
-} video_synchro_tab_t;
-
-typedef struct video_synchro_fifo_s
-{
- /* type of image to be decoded, and decoding date */
- int i_image_type;
- mtime_t i_decode_date;
- mtime_t i_pts;
-
-} video_synchro_fifo_t;
+#define MAX_DECODING_PIC 16
+#define MAX_PIC_AVERAGE 8
+/* Read the discussion on top of vpar_synchro.c for more information. */
typedef struct video_synchro_s
{
- /* fifo containing decoding dates */
- video_synchro_fifo_t fifo[16];
- unsigned int i_fifo_start;
- unsigned int i_fifo_stop;
-
- /* 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 */
- unsigned int i_images_since_pts;
-
- /* il manquait un compteur */
- unsigned int modulo;
-
- /* P images since the last I */
- unsigned int current_p_count;
- unsigned int nondropped_p_count;
- double p_count_predict;
- /* B images since the last I */
- unsigned int current_b_count;
- unsigned int nondropped_b_count;
- double b_count_predict;
-
- /* can we display pictures ? */
- unsigned int can_display_i;
- unsigned int can_display_p;
- double displayable_p;
- unsigned int can_display_b;
- double displayable_b;
-
- /* 1 for linear count, 2 for binary count, 3 for ternary count */
- video_synchro_tab_t tab_p[6];
- video_synchro_tab_t tab_b[6];
-
- double theorical_fps;
- double actual_fps;
+ /* synchro algorithm */
+ int i_type;
-} video_synchro_t;
+ /* fifo containing decoding dates */
+ mtime_t p_date_fifo[MAX_DECODING_PIC];
+ int pi_coding_types[MAX_DECODING_PIC];
+ unsigned int i_start, i_end;
+ vlc_mutex_t fifo_lock;
+
+ /* stream properties */
+ unsigned int i_n_p, i_n_b;
+
+ /* decoding values */
+ mtime_t p_tau[4]; /* average decoding durations */
+ unsigned int pi_meaningful[4]; /* number of durations read */
+ /* and p_vout->render_time (read with p_vout->change_lock) */
+
+ /* stream context */
+ unsigned int i_eta_p, i_eta_b;
+ boolean_t b_dropped_last; /* for special synchros below */
+ mtime_t backward_pts, current_pts;
+
+#ifdef STATS
+ unsigned int i_B_self, i_B_next, i_B_last, i_B_I;
#endif
-
-#ifdef MEUUH_SYNCHRO
-typedef struct video_synchro_s
-{
- int kludge_level, kludge_p, kludge_b, kludge_nbp, kludge_nbb;
- int kludge_nbframes;
- mtime_t kludge_date, kludge_prevdate;
- int i_coding_type;
} video_synchro_t;
-#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
+#define FIFO_INCREMENT( i_counter ) \
+ p_vpar->synchro.i_counter = \
+ (p_vpar->synchro.i_counter + 1) % MAX_DECODING_PIC;
-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
+/* Synchro algorithms */
+#define VPAR_SYNCHRO_DEFAULT 0
+#define VPAR_SYNCHRO_I 1
+#define VPAR_SYNCHRO_Iplus 2
+#define VPAR_SYNCHRO_IP 3
+#define VPAR_SYNCHRO_IPplus 4
+#define VPAR_SYNCHRO_IPB 5
/*****************************************************************************
* Prototypes
*****************************************************************************/
-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 );
-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
+void vpar_SynchroInit ( struct vpar_thread_s * p_vpar );
+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 );
+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 );
projects / vlc / blobdiff