WinCE: fix vlc_GetCPUCount()

[vlc] / src / video_output / vout_internal.h

diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index d466ac1026044817260cec354060430721305ffc..a182e72f2ff891e8a81fe606e0dcb9fbf645a65e 100644 (file)
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -32,7 +32,9 @@
 
 #include <vlc_picture_fifo.h>
 #include <vlc_picture_pool.h>
+#include <vlc_vout_display.h>
 #include "vout_control.h"
+#include "control.h"
 #include "snapshot.h"
 #include "statistic.h"
 #include "chrono.h"
@@ -40,9 +42,6 @@
 /* Number of pictures required to computes the FPS rate */
 #define VOUT_FPS_SAMPLES                20
 
-/* */
-typedef struct vout_sys_t vout_sys_t;
-
 /* */
 struct vout_thread_sys_t
 {
@@ -52,8 +51,10 @@ struct vout_thread_sys_t
     /* Video output configuration */
     config_chain_t *p_cfg;
 
-    /* Place holder for the vout_wrapper code */
-    vout_sys_t      *p_sys;
+    /* */
+    video_format_t  fmt_render;      /* render format (from the decoder) */
+    video_format_t  fmt_in;            /* input (modified render) format */
+    video_format_t  fmt_out;     /* output format (for the video output) */
 
     /* Thread & synchronization */
     vlc_thread_t    thread;
@@ -61,25 +62,40 @@ struct vout_thread_sys_t
     bool            b_ready;
     bool            b_done;
     bool            b_error;
+    vout_control_t  control;
 
     /* */
-    bool            b_picture_empty;
-    vlc_cond_t      picture_wait;
     struct {
-        mtime_t     clock;
-        mtime_t     timestampX;
+        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 {
-        bool        is_requested;
         mtime_t     last;
         mtime_t     timestamp;
     } step;
 
-    /* */
-    vlc_mutex_t     vfilter_lock;         /**< video filter2 lock */
+    struct {
+        bool        is_on;
+        mtime_t     date;
+    } pause;
+
+    /* OSD title configuration */
+    struct {
+        bool        show;
+        mtime_t     timeout;
+        int         position;
+    } title;
 
     /* */
     unsigned int    i_par_num;           /**< monitor pixel aspect-ratio */
@@ -89,29 +105,17 @@ struct vout_thread_sys_t
     /* Statistics */
     vout_statistic_t statistic;
 
-    /* Pause */
-    bool            b_paused;
-    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;
 
     /* Video filter2 chain */
+    vlc_mutex_t     vfilter_lock;
     filter_chain_t *p_vf2_chain;
-    char           *psz_vf2;
 
     /* Snapshot interface */
     vout_snapshot_t snapshot;
 
-    /* Show media title on videoutput */
-    bool            b_title_show;
-    mtime_t         i_title_timeout;
-    int             i_title_position;
-
-    char            *psz_title;
-
     /* Subpicture unit */
     spu_t          *p_spu;
 
@@ -131,8 +135,6 @@ struct vout_thread_sys_t
 
     uint16_t            i_changes;          /**< changes made to the thread.
                                                       \see \ref vout_changes */
-    unsigned            b_fullscreen:1;       /**< toogle fullscreen display */
-    unsigned            b_on_top:1; /**< stay always on top of other windows */
 };
 
 /** \defgroup vout_changes Flags for changes
@@ -140,30 +142,21 @@ struct vout_thread_sys_t
  * thread changed a variable
  * @{
  */
-/** b_autoscale changed */
-#define VOUT_SCALE_CHANGE       0x0008
-/** b_on_top changed */
-#define VOUT_ON_TOP_CHANGE      0x0010
-/** b_fullscreen changed */
-#define VOUT_FULLSCREEN_CHANGE  0x0040
-/** i_zoom changed */
-#define VOUT_ZOOM_CHANGE        0x0080
 /** cropping parameters changed */
 #define VOUT_CROP_CHANGE        0x1000
 /** aspect ratio changed */
 #define VOUT_ASPECT_CHANGE      0x2000
 /**@}*/
 
+/* 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_IntfInit( vout_thread_t * );
 
-/* 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  );
-
 /* */
 int  vout_OpenWrapper (vout_thread_t *, const char *);
 void vout_CloseWrapper(vout_thread_t *);
@@ -173,5 +166,8 @@ int  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