*****************************************************************************
* These tables are used by conversion and scaling functions.
*****************************************************************************/
+typedef int (yuv_init_t) ( p_vout_thread_t p_vout );
+typedef int (yuv_reset_t) ( p_vout_thread_t p_vout );
+typedef void (yuv_end_t) ( p_vout_thread_t p_vout );
+
typedef struct vout_yuv_s
{
/* conversion functions */
- vout_yuv_convert_t * p_Convert420; /* YUV 4:2:0 converter */
- vout_yuv_convert_t * p_Convert422; /* YUV 4:2:2 converter */
- vout_yuv_convert_t * p_Convert444; /* YUV 4:4:4 converter */
+ vout_yuv_convert_t *pf_yuv420; /* YUV 4:2:0 converter */
+ vout_yuv_convert_t *pf_yuv422; /* YUV 4:2:2 converter */
+ vout_yuv_convert_t *pf_yuv444; /* YUV 4:4:4 converter */
/* Pre-calculated conversion tables */
void * p_base; /* base for all conversion tables */
/* Temporary conversion buffer and offset array */
void * p_buffer; /* conversion buffer */
int * p_offset; /* offset array */
+
+ /* Plugin used and shortcuts to access its capabilities */
+ struct module_s * p_module;
+ yuv_init_t * pf_init; /* initialize YUV tables */
+ yuv_reset_t * pf_reset; /* reset YUV tables */
+ yuv_end_t * pf_end; /* free YUV tables */
+
} vout_yuv_t;
/*****************************************************************************
* is represented by a video output thread, and described using the following
* structure.
*****************************************************************************/
-typedef int (vout_sys_create_t) ( p_vout_thread_t p_vout,
- char *psz_display,
- int i_root_window, void *p_data );
-typedef int (vout_sys_init_t) ( p_vout_thread_t p_vout );
-typedef void (vout_sys_end_t) ( p_vout_thread_t p_vout );
-typedef void (vout_sys_destroy_t) ( p_vout_thread_t p_vout );
-typedef int (vout_sys_manage_t) ( p_vout_thread_t p_vout );
-typedef void (vout_sys_display_t) ( p_vout_thread_t p_vout );
-
-typedef void (vout_set_palette_t) ( p_vout_thread_t p_vout, u16 *red,
- u16 *green, u16 *blue, u16 *transp );
-
-typedef int (yuv_sys_init_t) ( p_vout_thread_t p_vout );
-typedef int (yuv_sys_reset_t) ( p_vout_thread_t p_vout );
-typedef void (yuv_sys_end_t) ( p_vout_thread_t p_vout );
-
typedef struct vout_thread_s
{
/* Thread properties and lock */
u32 i_gray_pixel; /* gray */
u32 i_blue_pixel; /* blue */
- /* Plugins */
- vout_sys_create_t * p_sys_create; /* allocate output method */
- vout_sys_init_t * p_sys_init; /* initialize output method */
- vout_sys_end_t * p_sys_end; /* terminate output method */
- vout_sys_destroy_t * p_sys_destroy; /* destroy output method */
- vout_sys_manage_t * p_sys_manage; /* handle events */
- vout_sys_display_t * p_sys_display; /* display rendered image */
-
- vout_set_palette_t * p_set_palette; /* set 8bpp palette */
-
- yuv_sys_init_t * p_yuv_init; /* initialize YUV tables */
- yuv_sys_reset_t * p_yuv_reset; /* reset YUV tables */
- yuv_sys_end_t * p_yuv_end; /* free YUV tables */
+ /* Plugin used and shortcuts to access its capabilities */
+ struct module_s * p_module;
+ int ( *pf_create ) ( struct vout_thread_s * );
+ int ( *pf_init ) ( struct vout_thread_s * );
+ void ( *pf_end ) ( struct vout_thread_s * );
+ void ( *pf_destroy ) ( struct vout_thread_s * );
+ int ( *pf_manage ) ( struct vout_thread_s * );
+ void ( *pf_display ) ( struct vout_thread_s * );
+ void ( *pf_setpalette ) ( struct vout_thread_s *, u16 *red,
+ u16 *green, u16 *blue, u16 *transp );
/* Pictures and rendering properties */
boolean_t b_grayscale; /* color or grayscale display */
+ boolean_t b_YCbr; /* use YUV to YCbr instead of RGB */
boolean_t b_info; /* print additional information */
boolean_t b_interface; /* render interface */
boolean_t b_scale; /* allow picture scaling */
#define VOUT_GRAYSCALE_CHANGE 0x0002 /* b_grayscale changed */
#define VOUT_INTF_CHANGE 0x0004 /* b_interface changed */
#define VOUT_SCALE_CHANGE 0x0008 /* b_scale changed */
+#define VOUT_GAMMA_CHANGE 0x0010 /* gamma changed */
+#define VOUT_CURSOR_CHANGE 0x0020 /* b_cursor changed */
+#define VOUT_FULLSCREEN_CHANGE 0x0040 /* b_fullscreen changed */
#define VOUT_SIZE_CHANGE 0x0200 /* size changed */
#define VOUT_DEPTH_CHANGE 0x0400 /* depth changed */
-#define VOUT_GAMMA_CHANGE 0x0010 /* gamma changed */
#define VOUT_YUV_CHANGE 0x0800 /* change yuv tables */
/* Disabled for thread deadlocks issues --Meuuh */
/*****************************************************************************
* Prototypes
*****************************************************************************/
-vout_thread_t * vout_CreateThread ( char *psz_display, int i_root_window,
- int i_width, int i_height, int *pi_status,
- int i_method, void *p_data );
-void vout_DestroyThread ( vout_thread_t *p_vout, int *pi_status );
-picture_t * vout_CreatePicture ( vout_thread_t *p_vout, int i_type,
- int i_width, int i_height );
-void vout_DestroyPicture ( vout_thread_t *p_vout, picture_t *p_pic );
-void vout_DisplayPicture ( vout_thread_t *p_vout, picture_t *p_pic );
-void vout_DatePicture ( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date );
-void vout_LinkPicture ( vout_thread_t *p_vout, picture_t *p_pic );
-void vout_UnlinkPicture ( vout_thread_t *p_vout, picture_t *p_pic );
+vout_thread_t * vout_CreateThread ( int *pi_status );
+void vout_DestroyThread ( vout_thread_t *p_vout, int *pi_status );
+picture_t * vout_CreatePicture ( vout_thread_t *p_vout, int i_type,
+ int i_width, int i_height );
+void vout_DestroyPicture ( vout_thread_t *p_vout, picture_t *p_pic );
+void vout_DisplayPicture ( vout_thread_t *p_vout, picture_t *p_pic );
+void vout_DatePicture ( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date );
+void vout_LinkPicture ( vout_thread_t *p_vout, picture_t *p_pic );
+void vout_UnlinkPicture ( vout_thread_t *p_vout, picture_t *p_pic );
+
subpicture_t * vout_CreateSubPicture ( vout_thread_t *p_vout, int i_type, int i_size );
void vout_DestroySubPicture ( vout_thread_t *p_vout, subpicture_t *p_subpic );
void vout_DisplaySubPicture ( vout_thread_t *p_vout, subpicture_t *p_subpic );
projects / vlc / blobdiff