Ajout des fichiers de la synchro un peu partout.

diff --git a/include/video_parser.h b/include/video_parser.h
index ff629c7941b5fdee8db6abbb5ae814caed3d3dfc..621197e1fa849e60558231b7f4ce11f0d033f0ac 100644 (file)
--- a/include/video_parser.h
+++ b/include/video_parser.h
@@ -56,6 +56,7 @@ typedef struct vpar_thread_s
     picture_parsing_t       picture;
     slice_parsing_t         slice;
     macroblock_parsing_t    mb;
+    video_synchro_t         synchro;
 
 #ifdef STATS
     /* Statistics */

diff --git a/include/vpar_synchro.h b/include/vpar_synchro.h
new file mode 100644 (file)
index 0000000..eeb28c3
--- /dev/null
+++ b/include/vpar_synchro.h
@@ -0,0 +1,35 @@
+/*****************************************************************************
+ * vpar_synchro.h : video parser blocks management
+ * (c)1999 VideoLAN
+ *****************************************************************************
+ *****************************************************************************
+ * Requires:
+ *  "config.h"
+ *  "common.h"
+ *  "mtime.h"
+ *  "vlc_thread.h"
+ *  "input.h"
+ *  "video.h"
+ *  "video_output.h"
+ *  "decoder_fifo.h"
+ *  "video_fifo.h"
+ *****************************************************************************/
+
+/*****************************************************************************
+ * video_synchro_t : timers for the video synchro
+ *****************************************************************************/
+typedef struct video_synchro_s
+{
+
+} video_synchro_t;
+
+/*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
+void 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 );
+mtime_t vpar_SynchroDecode( struct vpar_thread_s * p_vpar, int i_coding_type,
+                            int i_structure );
+

diff --git a/src/video_decoder/vdec_idct.c b/src/video_decoder/vdec_idct.c
index 5dbdd9ac062fd13ca88969c4635c07464893a64e..fae4b2710f02399afe39bfc7a736834fcb8c700c 100644 (file)
--- a/src/video_decoder/vdec_idct.c
+++ b/src/video_decoder/vdec_idct.c
@@ -36,6 +36,7 @@
 #include "vpar_blocks.h"
 #include "vpar_headers.h"
 #include "video_fifo.h"
+#include "vpar_synchro.h"
 #include "video_parser.h"
 
 /*

diff --git a/src/video_decoder/vdec_motion.c b/src/video_decoder/vdec_motion.c
index b549169cbb1def7bce8a28bbb63a4956fc3c91ea..ff07cb460e10d0a8caf02692118e9dd59edd3545 100644 (file)
--- a/src/video_decoder/vdec_motion.c
+++ b/src/video_decoder/vdec_motion.c
@@ -36,6 +36,7 @@
 #include "vpar_blocks.h"
 #include "vpar_headers.h"
 #include "video_fifo.h"
+#include "vpar_synchro.h"
 #include "video_parser.h"
 
 /*

diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c
index 7babd0948470fc854f05eef91fd6f33e57e3f4c9..d6cc79c32b3b1427f7c863d3bba4deedb6745781 100644 (file)
--- a/src/video_decoder/video_decoder.c
+++ b/src/video_decoder/video_decoder.c
@@ -38,6 +38,7 @@
 #include "vpar_blocks.h"
 #include "vpar_headers.h"
 #include "video_fifo.h"
+#include "vpar_synchro.h"
 #include "video_parser.h"
 
 /*

diff --git a/src/video_parser/video_fifo.c b/src/video_parser/video_fifo.c
index 5f680dbcb0e45e9585726432cb43239e0c74f7a9..681a3410e8b3bd8bdff4c277ed79e602ea71cacc 100644 (file)
--- a/src/video_parser/video_fifo.c
+++ b/src/video_parser/video_fifo.c
@@ -36,6 +36,7 @@
 #include "vpar_blocks.h"
 #include "vpar_headers.h"
 #include "video_fifo.h"
+#include "vpar_synchro.h"
 #include "video_parser.h"
 
 /*****************************************************************************

diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c
index b6bd33f66b327360f33f19d1e37e7de73df66ec6..f16c3697c737d8f6d865fba9d888978a372e026a 100644 (file)
--- a/src/video_parser/video_parser.c
+++ b/src/video_parser/video_parser.c
@@ -38,6 +38,7 @@
 #include "vpar_blocks.h"
 #include "vpar_headers.h"
 #include "video_fifo.h"
+#include "vpar_synchro.h"
 #include "video_parser.h"
 
 /*

diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c
index f1b89d7488cee1149a8f3dbf4d8ccb142a29f8c0..3fc7ae6b2e6f3b621df5ff53dd212b9ad3a69f7c 100644 (file)
--- a/src/video_parser/vpar_blocks.c
+++ b/src/video_parser/vpar_blocks.c
@@ -36,6 +36,7 @@
 #include "vpar_blocks.h"
 #include "vpar_headers.h"
 #include "video_fifo.h"
+#include "vpar_synchro.h"
 #include "video_parser.h"
 
 /*

diff --git a/src/video_parser/vpar_headers.c b/src/video_parser/vpar_headers.c
index 21afebbfd2e8877bf3487b6b728dae9f94314c53..5104f27fb0ff584620c624ef16f926cb6a65722b 100644 (file)
--- a/src/video_parser/vpar_headers.c
+++ b/src/video_parser/vpar_headers.c
@@ -36,6 +36,7 @@
 #include "vpar_blocks.h"
 #include "vpar_headers.h"
 #include "video_fifo.h"
+#include "vpar_synchro.h"
 #include "video_parser.h"
 
 /*

diff --git a/src/video_parser/vpar_motion.c b/src/video_parser/vpar_motion.c
index 8e9277c3dbdeb6252268ebaa71c8d6e8605bb30a..e4b740412fedd2f9887494c87e4747c5d542e992 100644 (file)
--- a/src/video_parser/vpar_motion.c
+++ b/src/video_parser/vpar_motion.c
@@ -36,6 +36,7 @@
 #include "vpar_blocks.h"
 #include "vpar_headers.h"
 #include "video_fifo.h"
+#include "vpar_synchro.h"
 #include "video_parser.h"
 
 /*

diff --git a/src/video_parser/vpar_synchro.c b/src/video_parser/vpar_synchro.c
new file mode 100644 (file)
index 0000000..e3d2954
--- /dev/null
+++ b/src/video_parser/vpar_synchro.c
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * vpar_motion.c : motion vectors parsing
+ * (c)1999 VideoLAN
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/uio.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XShm.h>
+
+#include "config.h"
+#include "common.h"
+#include "mtime.h"
+#include "vlc_thread.h"
+
+#include "intf_msg.h"
+#include "debug.h"                    /* ?? temporaire, requis par netlist.h */
+
+#include "input.h"
+#include "input_netlist.h"
+#include "decoder_fifo.h"
+#include "video.h"
+#include "video_output.h"
+
+#include "vdec_idct.h"
+#include "video_decoder.h"
+#include "vdec_motion.h"
+
+#include "vpar_blocks.h"
+#include "vpar_headers.h"
+#include "video_fifo.h"
+#include "vpar_synchro.h"
+#include "video_parser.h"
+
+/*
+ * Local prototypes
+ */
+
+/*****************************************************************************
+ * vpar_SynchroChoose : Decide whether we will decode a picture or not
+ *****************************************************************************/
+void vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
+                         int i_structure )
+{
+
+}
+
+/*****************************************************************************
+ * vpar_SynchroTrash : Update timers when we trash a picture
+ *****************************************************************************/
+void vpar_SynchroTrash( vpar_thread_t * p_vpar, int i_coding_type,
+                        int i_structure )
+{
+
+}
+
+/*****************************************************************************
+ * vpar_SynchroDecode : Update timers when we decide to decode a picture
+ *****************************************************************************/
+mtime_t vpar_SynchroDecode( vpar_thread_t * p_vpar, int i_coding_type,
+                            int i_structure )
+{
+
+}