X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_internal.h;h=0caa9156664ffb604fd6e7f6e76cd5fb72b3de61;hb=4b9c63a36eded246ad9ef1ea0de0cf7b38d29ad9;hp=466f2ccd6ff2650b4295e339d8b49692cb92d36f;hpb=447d0c8fad511536e86bad5141bd9dd9721ed95a;p=vlc diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index 466f2ccd6f..0caa915666 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -30,98 +30,133 @@ #ifndef _VOUT_INTERNAL_H #define _VOUT_INTERNAL_H 1 +#include +#include +#include +#include #include "vout_control.h" +#include "control.h" #include "snapshot.h" #include "statistic.h" - -/* Number of pictures required to computes the FPS rate */ -#define VOUT_FPS_SAMPLES 20 +#include "chrono.h" /* */ struct vout_thread_sys_t { - /* module */ - char *psz_module_name; - - /* Thread & synchronization */ - vlc_thread_t thread; - vlc_cond_t change_wait; - bool b_ready; - bool b_done; + /* Splitter module if used */ + char *splitter_name; - /* */ - bool b_picture_displayed; - bool b_picture_empty; - mtime_t i_picture_displayed_date; - picture_t *p_picture_displayed; - int i_picture_qtype; - bool b_picture_interlaced; - vlc_cond_t picture_wait; - - /* */ - vlc_mutex_t vfilter_lock; /**< video filter2 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 */ - /** - * 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 */ vout_statistic_t statistic; - /* Pause */ - bool b_paused; - mtime_t i_pause_date; + /* Subpicture unit */ + spu_t *p_spu; - /* 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; + /* Monitor Pixel Aspect Ratio */ + unsigned int i_par_num; + unsigned int i_par_den; - /* Video filter2 chain */ - filter_chain_t *p_vf2_chain; - char *psz_vf2; + /* Video output window */ + struct { + bool is_unused; + vout_window_cfg_t cfg; + vout_window_t *object; + } window; - /* Snapshot interface */ - vout_snapshot_t snapshot; + /* Thread & synchronization */ + vlc_thread_t thread; + bool dead; + vout_control_t control; - /* Show media title on videoutput */ - bool b_title_show; - mtime_t i_title_timeout; - int i_title_position; + /* */ + 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; - char *psz_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 */ }; -/* DO NOT use vout_RenderPicture/vout_IntfInit unless you are in src/video_ouput */ -picture_t *vout_RenderPicture( vout_thread_t *, picture_t *, - subpicture_t *, - mtime_t render_date ); -void vout_IntfInit( vout_thread_t * ); +/* 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 *); -/* 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 ); +/* */ +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 *); +void spu_Attach( spu_t *, vlc_object_t *input, bool ); + #endif