X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_internal.h;h=c5d99039758d47f9674eda83a0cbb0f712e6a708;hb=35eeabbfb577be2b0de06d06bb7bf2a190fdebbe;hp=d466ac1026044817260cec354060430721305ffc;hpb=958ae35d1498512821ebcdb2d98d4ce7fce4871b;p=vlc diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index d466ac1026..c5d9903975 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -32,146 +32,148 @@ #include #include +#include +#include #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 - -/* */ -typedef struct vout_sys_t vout_sys_t; +/* 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 { - /* module */ - char *psz_module_name; + /* Splitter module if used */ + char *splitter_name; + + /* Input thread for dvd menu interactions */ + vlc_object_t *input; + + /* */ + video_format_t original; /* Original format ie coming from the decoder */ + unsigned dpb_size; + + /* Snapshot interface */ + vout_snapshot_t snapshot; + + /* Statistics */ + vout_statistic_t statistic; + + /* Subpicture unit */ + vlc_mutex_t spu_lock; + 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; - /* Place holder for the vout_wrapper code */ - vout_sys_t *p_sys; + /* 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; /* */ - 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; + picture_t *current; + picture_t *next; } 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 */ - unsigned int i_par_den; /**< monitor pixel aspect-ratio */ bool is_late_dropped; - /* 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 */ - 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; + struct { + vlc_mutex_t lock; + filter_chain_t *chain_static; + filter_chain_t *chain_interactive; + } filter; /* */ 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_ControlChangeSubMargin(vout_thread_t *, int); /* */ 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 *); +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 *); +void spu_Attach( spu_t *, vlc_object_t *input, bool ); +void spu_ChangeMargin(spu_t *, int); + #endif