win32 vout: factorize code

[vlc] / src / video_output / vout_internal.h

diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 574ea003b63f56dc2138a1618442c22a0b799f7a..eb9fd1729e85413cee40f5d3a507318c8f071966 100644 (file)
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -32,10 +32,25 @@
 
 #include "vout_control.h"
 
+/* Number of pictures required to computes the FPS rate */
+#define VOUT_FPS_SAMPLES                20
+
+/* */
 struct vout_thread_sys_t
 {
+    /* Thread & synchronization */
+    vlc_thread_t    thread;
+    vlc_cond_t      change_wait;
+    bool            b_ready;
+    bool            b_done;
+
     /* */
+    bool            b_picture_displayed;
+    bool            b_picture_empty;
+    mtime_t         i_picture_displayed_date;
     picture_t       *p_picture_displayed;
+    int             i_picture_qtype;
+    vlc_cond_t      picture_wait;
 
     /* */
     vlc_mutex_t     vfilter_lock;         /**< video filter2 change lock */
@@ -64,6 +79,7 @@ struct vout_thread_sys_t
     mtime_t         i_pause_date;
 
     /* Filter chain */
+    bool           b_first_vout;  /* True if it is the first vout of the filter chain */
     char           *psz_filter_chain;
     bool            b_filter_change;
 
@@ -71,18 +87,33 @@ struct vout_thread_sys_t
     filter_chain_t *p_vf2_chain;
     char           *psz_vf2;
 
-    /* Misc */
-    bool            b_snapshot;     /**< take one snapshot on the next loop */
+    /* Snapshot interface */
+    struct
+    {
+        bool        b_available;
+        int         i_request;
+        picture_t   *p_picture;
+        vlc_mutex_t lock;
+        vlc_cond_t  wait;
+    } snapshot;
 
     /* Show media title on videoutput */
     bool            b_title_show;
     mtime_t         i_title_timeout;
     int             i_title_position;
+
+    char            *psz_title;
 };
 
 /* DO NOT use vout_RenderPicture unless you are in src/video_ouput */
 picture_t *vout_RenderPicture( vout_thread_t *, picture_t *,
                                subpicture_t *, bool b_paused );
 
+/* DO NOT use vout_UsePictureLocked unless you are in src/video_ouput
+ *
+ * This function supposes that you call it with picture_lock taken.
+ */
+void vout_UsePictureLocked( vout_thread_t *p_vout, picture_t *p_pic  );
+
 #endif