Reused vout window in vout_Request().

[vlc] / src / video_output / vout_internal.h

diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index fad85fcec4da94beed11da87cbfc7344e43b918f..afdeec5d294fb0477ac3cd42639fb7f30926e6de 100644 (file)
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -30,12 +30,129 @@
 #ifndef _VOUT_INTERNAL_H
 #define _VOUT_INTERNAL_H 1
 
-/* 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 );
+#include <vlc_picture_fifo.h>
+#include <vlc_picture_pool.h>
+#include <vlc_vout_display.h>
+#include <vlc_vout_wrapper.h>
+#include "vout_control.h"
+#include "control.h"
+#include "snapshot.h"
+#include "statistic.h"
+#include "chrono.h"
 
-/* DO NOT use vout_CountPictureAvailable unless your are in src/input/decoder.c (no exception) */
-int vout_CountPictureAvailable( vout_thread_t * );
+/* */
+struct vout_thread_sys_t
+{
+    /* Splitter module if used */
+    char            *splitter_name;
+
+    /* */
+    video_format_t  original; /* Original format ie coming from the decoder */
+
+    /* Snapshot interface */
+    vout_snapshot_t snapshot;
+
+    /* Statistics */
+    vout_statistic_t statistic;
+
+    /* Subpicture unit */
+    spu_t           *p_spu;
+
+    /* Monitor Pixel Aspect Ratio */
+    unsigned int    i_par_num;
+    unsigned int    i_par_den;
+
+    /* Video output window */
+    struct {
+        bool              is_unused;
+        vout_window_cfg_t cfg;
+        vout_window_t     *object;
+    } window;
+
+    /* Thread & synchronization */
+    vlc_thread_t    thread;
+    bool            dead;
+    vout_control_t  control;
+
+    /* */
+    struct {
+        char           *title;
+        vout_display_t *vd;
+        bool           use_dr;
+        picture_t      *filtered;
+    } display;
+
+    struct {
+        mtime_t     date;
+        mtime_t     timestamp;
+        int         qtype;
+        bool        is_interlaced;
+        picture_t   *decoded;
+    } displayed;
+
+    struct {
+        mtime_t     last;
+        mtime_t     timestamp;
+    } step;
+
+    struct {
+        bool        is_on;
+        mtime_t     date;
+    } pause;
+
+    /* OSD title configuration */
+    struct {
+        bool        show;
+        mtime_t     timeout;
+        int         position;
+    } title;
+
+    /* */
+    bool            is_late_dropped;
+
+    /* Video filter2 chain */
+    vlc_mutex_t     vfilter_lock;
+    filter_chain_t *vfilter_chain;
+
+    /* */
+    vlc_mouse_t     mouse;
+
+    /* */
+    vlc_mutex_t     picture_lock;                 /**< picture heap lock */
+    picture_pool_t  *private_pool;
+    picture_pool_t  *display_pool;
+    picture_pool_t  *decoder_pool;
+    picture_fifo_t  *decoder_fifo;
+    bool            is_decoder_pool_slow;
+    vout_chrono_t   render;           /**< picture render time estimator */
+};
+
+/* TODO to move them to vlc_vout.h */
+void vout_ControlChangeFullscreen(vout_thread_t *, bool fullscreen);
+void vout_ControlChangeOnTop(vout_thread_t *, bool is_on_top);
+void vout_ControlChangeDisplayFilled(vout_thread_t *, bool is_filled);
+void vout_ControlChangeZoom(vout_thread_t *, int num, int den);
+void vout_ControlChangeSampleAspectRatio(vout_thread_t *, unsigned num, unsigned den);
+void vout_ControlChangeCropRatio(vout_thread_t *, unsigned num, unsigned den);
+void vout_ControlChangeCropWindow(vout_thread_t *, int x, int y, int width, int height);
+void vout_ControlChangeCropBorder(vout_thread_t *, int left, int top, int right, int bottom);
+void vout_ControlChangeFilters(vout_thread_t *, const char *);
+void vout_ControlChangeSubFilters(vout_thread_t *, const char *);
+
+/* */
+void vout_IntfInit( vout_thread_t * );
+
+/* */
+int  vout_OpenWrapper (vout_thread_t *, const char *, const vout_display_state_t *);
+void vout_CloseWrapper(vout_thread_t *, vout_display_state_t *);
+int  vout_InitWrapper(vout_thread_t *);
+void vout_EndWrapper(vout_thread_t *);
+void vout_ManageWrapper(vout_thread_t *);
+void vout_RenderWrapper(vout_thread_t *, picture_t *);
+void vout_DisplayWrapper(vout_thread_t *, picture_t *);
+
+/* */
+int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *);
 
 #endif