X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_internal.h;h=951a9d1643cedb0a8ffdb1deea4395269ab9bb79;hb=4079a71f3a52c94290bbc992388769a25d9a36e6;hp=574ea003b63f56dc2138a1618442c22a0b799f7a;hpb=75f55c2781e8883d1832b57c75762e93e38ee247;p=vlc

diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 574ea003b6..951a9d1643 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -30,59 +30,143 @@
 #ifndef _VOUT_INTERNAL_H
 #define _VOUT_INTERNAL_H 1
 
+#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"
 
+/* It should be high enough to absorbe jitter due to difficult picture(s)
+ * to decode but not too high as memory is not that cheap.
+ *
+ * It can be made lower at compilation time if needed, but performance
+ * may be degraded.
+ */
+#define VOUT_MAX_PICTURES (20)
+
+/* */
 struct vout_thread_sys_t
 {
-    /* */
-    picture_t       *p_picture_displayed;
+    /* Splitter module if used */
+    char            *splitter_name;
 
-    /* */
-    vlc_mutex_t     vfilter_lock;         /**< video filter2 change lock */
+    /* Input thread for dvd menu interactions */
+    vlc_object_t    *input;
 
     /* */
-    uint32_t        render_time;           /**< last picture render time */
-    unsigned int    i_par_num;           /**< monitor pixel aspect-ratio */
-    unsigned int    i_par_den;           /**< monitor pixel aspect-ratio */
+    video_format_t  original;   /* Original format ie coming from the decoder */
+    unsigned        dpb_size;
 
-    /* */
-    bool            b_direct;            /**< rendered are like direct ? */
-    filter_t        *p_chroma;
-
-    /**
-     * These numbers are not supposed to be accurate, but are a
-     * good indication of the thread status */
-    count_t         c_fps_samples;                         /**< picture counts */
-    mtime_t         p_fps_sample[VOUT_FPS_SAMPLES];     /**< FPS samples dates */
+    /* Snapshot interface */
+    vout_snapshot_t snapshot;
 
     /* Statistics */
-    int             i_picture_lost;
-    int             i_picture_displayed;
+    vout_statistic_t statistic;
+
+    /* Subpicture unit */
+    vlc_mutex_t     spu_lock;
+    spu_t           *p_spu;
 
-    /* Pause */
-    bool            b_paused;
-    mtime_t         i_pause_date;
+    /* Monitor Pixel Aspect Ratio */
+    unsigned int    i_par_num;
+    unsigned int    i_par_den;
 
-    /* Filter chain */
-    char           *psz_filter_chain;
-    bool            b_filter_change;
+    /* 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 */
-    filter_chain_t *p_vf2_chain;
-    char           *psz_vf2;
+    vlc_mutex_t     vfilter_lock;
+    filter_chain_t *vfilter_chain;
 
-    /* Misc */
-    bool            b_snapshot;     /**< take one snapshot on the next loop */
+    /* */
+    vlc_mouse_t     mouse;
 
-    /* Show media title on videoutput */
-    bool            b_title_show;
-    mtime_t         i_title_timeout;
-    int             i_title_position;
+    /* */
+    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 */
 };
 
-/* 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 );
+/* 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 *);
+void spu_Attach( spu_t *, vlc_object_t *input, bool );
 
 #endif