#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"
-/* Number of pictures required to computes the FPS rate */
-#define VOUT_FPS_SAMPLES 20
-
/* */
struct vout_thread_sys_t
{
- /* module */
- char *psz_module_name;
+ /* 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;
- /* Video output configuration */
- config_chain_t *p_cfg;
+ /* 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;
- vlc_cond_t change_wait;
- bool b_ready;
- bool b_done;
- bool b_error;
+ bool dead;
+ vout_control_t control;
/* */
struct {
picture_t *filtered;
} display;
- bool b_picture_empty;
- vlc_cond_t picture_wait;
struct {
mtime_t date;
mtime_t timestamp;
} displayed;
struct {
- bool is_requested;
mtime_t last;
mtime_t timestamp;
} step;
mtime_t date;
} pause;
+ /* OSD title configuration */
struct {
bool show;
mtime_t timeout;
int position;
- char *value;
} title;
/* */
- vlc_mutex_t vfilter_lock; /**< video filter2 lock */
-
- /* */
- unsigned int i_par_num; /**< monitor pixel aspect-ratio */
- unsigned int i_par_den; /**< monitor pixel aspect-ratio */
bool is_late_dropped;
- /* Statistics */
- vout_statistic_t statistic;
-
- /* Filter chain */
- char *psz_filter_chain;
- bool b_filter_change;
-
/* Video filter2 chain */
- filter_chain_t *p_vf2_chain;
- char *psz_vf2;
-
- /* Snapshot interface */
- vout_snapshot_t snapshot;
-
- /* Subpicture unit */
- spu_t *p_spu;
+ 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 */
-
- vlc_mutex_t change_lock; /**< thread change lock */
-
- 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 */
+ 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 */
};
-/** \defgroup vout_changes Flags for changes
- * These flags are set in the vout_thread_t::i_changes field when another
- * 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_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 *);
-void vout_CloseWrapper(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 *);
-int vout_ManageWrapper(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
projects / vlc / blobdiff