X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvideo_output.h;h=7759ce890de4e7bb6c83beed42eb1180461019a6;hb=976dfc3eb46069ea3b920dec899e0c13ccf17c96;hp=fb0fdb9969fd2b858f6ba823e9ec2cc6bc4088da;hpb=cc0f0bb6fd28d5ed3463be4a227990cbae8a849f;p=vlc diff --git a/include/video_output.h b/include/video_output.h index fb0fdb9969..7759ce890d 100644 --- a/include/video_output.h +++ b/include/video_output.h @@ -2,12 +2,13 @@ * video_output.h : video output thread * This module describes the programming interface for video output threads. * It includes functions allowing to open a new thread, send pictures to a - * thread, and destroy a previously oppenned video output thread. + * thread, and destroy a previously opened video output thread. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: video_output.h,v 1.68 2001/12/30 07:09:54 sam Exp $ + * $Id: video_output.h,v 1.82 2002/07/31 20:56:50 sam Exp $ * * Authors: Vincent Seguin + * Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,27 +25,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -/***************************************************************************** - * vout_bank_t, p_vout_bank (global variable) - ***************************************************************************** - * This global variable is accessed by any function using the video output. - *****************************************************************************/ -typedef struct vout_bank_s -{ - /* Array to all the video outputs */ - struct vout_thread_s *pp_vout[ VOUT_MAX_THREADS ]; - - int i_count; - vlc_mutex_t lock; /* Global lock */ - -} vout_bank_t; - -#ifndef PLUGIN -extern vout_bank_t *p_vout_bank; -#else -# define p_vout_bank (p_symbols->p_vout_bank) -#endif - /***************************************************************************** * vout_chroma_t: Chroma conversion function ***************************************************************************** @@ -54,32 +34,30 @@ extern vout_bank_t *p_vout_bank; * p_dest destination picture * Picture width and source dimensions must be multiples of 16. *****************************************************************************/ -typedef void (vout_chroma_convert_t)( struct vout_thread_s *, +typedef void (vout_chroma_convert_t)( vout_thread_t *, picture_t *, picture_t * ); -typedef struct vout_chroma_s +typedef struct vout_chroma_t { /* conversion functions */ vout_chroma_convert_t *pf_convert; /* Private module-dependant data */ - p_chroma_sys_t p_sys; /* private data */ + chroma_sys_t * p_sys; /* private data */ /* Plugin used and shortcuts to access its capabilities */ - struct module_s * p_module; - int ( * pf_init ) ( struct vout_thread_s * ); - void ( * pf_end ) ( struct vout_thread_s * ); + module_t * p_module; } vout_chroma_t; /***************************************************************************** * vout_fifo_t *****************************************************************************/ -typedef struct vout_fifo_s +typedef struct vout_fifo_t { /* See the fifo types below */ int i_type; - boolean_t b_die; + vlc_bool_t b_die; int i_fifo; /* Just to keep track of the fifo index */ vlc_mutex_t data_lock; @@ -98,40 +76,35 @@ typedef struct vout_fifo_s * is represented by a video output thread, and described using the following * structure. *****************************************************************************/ -typedef struct vout_thread_s +struct vout_thread_t { + VLC_COMMON_MEMBERS + /* Thread properties and lock */ - boolean_t b_die; /* `die' flag */ - boolean_t b_error; /* `error' flag */ - boolean_t b_active; /* `active' flag */ - vlc_thread_t thread_id; /* id for pthread functions */ vlc_mutex_t picture_lock; /* picture heap lock */ vlc_mutex_t subpicture_lock; /* subpicture heap lock */ vlc_mutex_t change_lock; /* thread change lock */ - int * pi_status; /* temporary status flag */ - p_vout_sys_t p_sys; /* system output method */ - + vout_sys_t * p_sys; /* system output method */ + /* Current display properties */ u16 i_changes; /* changes made to the thread */ float f_gamma; /* gamma */ - boolean_t b_grayscale; /* color or grayscale display */ - boolean_t b_info; /* print additional information */ - boolean_t b_interface; /* render interface */ - boolean_t b_scale; /* allow picture scaling */ - boolean_t b_fullscreen; /* toogle fullscreen display */ + vlc_bool_t b_grayscale; /* color or grayscale display */ + vlc_bool_t b_info; /* print additional information */ + vlc_bool_t b_interface; /* render interface */ + vlc_bool_t b_scale; /* allow picture scaling */ + vlc_bool_t b_fullscreen; /* toogle fullscreen display */ mtime_t render_time; /* last picture render time */ + int i_window_width; /* video window width */ + int i_window_height; /* video window height */ /* 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 *, - struct picture_s * ); - void ( *pf_setpalette ) ( struct vout_thread_s *, - u16 *, u16 *, u16 * ); + module_t * p_module; + int ( *pf_init ) ( vout_thread_t * ); + void ( *pf_end ) ( vout_thread_t * ); + int ( *pf_manage ) ( vout_thread_t * ); + void ( *pf_render ) ( vout_thread_t *, picture_t * ); + void ( *pf_display ) ( vout_thread_t *, picture_t * ); /* Statistics - these numbers are not supposed to be accurate, but are a * good indication of the thread status */ @@ -142,16 +115,16 @@ typedef struct vout_thread_s int i_heap_size; /* heap size */ picture_heap_t render; /* rendered pictures */ picture_heap_t output; /* direct buffers */ - boolean_t b_direct; /* rendered are like direct ? */ + vlc_bool_t b_direct; /* rendered are like direct ? */ vout_chroma_t chroma; /* translation tables */ /* Picture and subpicture heaps */ - picture_t p_picture[VOUT_MAX_PICTURES]; /* pictures */ + picture_t p_picture[2*VOUT_MAX_PICTURES]; /* pictures */ subpicture_t p_subpicture[VOUT_MAX_PICTURES]; /* subpictures */ /* Bitmap fonts */ - p_vout_font_t p_default_font; /* default font */ - p_vout_font_t p_large_font; /* large font */ + vout_font_t * p_default_font; /* default font */ + vout_font_t * p_large_font; /* large font */ /* Statistics */ count_t c_loops; @@ -159,7 +132,13 @@ typedef struct vout_thread_s mtime_t display_jitter; /* average deviation from the PTS */ count_t c_jitter_samples; /* number of samples used for the * * calculation of the jitter */ -} vout_thread_t; + + /* Mouse */ + int i_mouse_x, i_mouse_y, i_mouse_button; + + /* Filter chain */ + char *psz_filter_chain; +}; #define I_OUTPUTPICTURES p_vout->output.i_pictures #define PP_OUTPUTPICTURE p_vout->output.pp_picture @@ -187,49 +166,31 @@ typedef struct vout_thread_s /***************************************************************************** * Prototypes *****************************************************************************/ -#ifndef PLUGIN -void vout_InitBank ( void ); -void vout_EndBank ( void ); - -vout_thread_t * vout_CreateThread ( int *pi_status, int, int, int, int ); -void vout_DestroyThread ( vout_thread_t *, int *pi_status ); +#define vout_CreateThread(a,b,c,d,e) __vout_CreateThread(VLC_OBJECT(a),b,c,d,e) +VLC_EXPORT( vout_thread_t *, __vout_CreateThread, ( vlc_object_t *, int, int, u32, int ) ); +VLC_EXPORT( void, vout_DestroyThread, ( vout_thread_t * ) ); vout_fifo_t * vout_CreateFifo ( void ); void vout_DestroyFifo ( vout_fifo_t * ); void vout_FreeFifo ( vout_fifo_t * ); -picture_t * vout_CreatePicture ( vout_thread_t *, - boolean_t, boolean_t, boolean_t ); -void vout_AllocatePicture( picture_t *, int, int, int ); -void vout_DestroyPicture ( vout_thread_t *, picture_t * ); -void vout_DisplayPicture ( vout_thread_t *, picture_t * ); -void vout_DatePicture ( vout_thread_t *, picture_t *, mtime_t ); -void vout_LinkPicture ( vout_thread_t *, picture_t * ); -void vout_UnlinkPicture ( vout_thread_t *, picture_t * ); +VLC_EXPORT( int, vout_ChromaCmp, ( u32, u32 ) ); + +VLC_EXPORT( picture_t *, vout_CreatePicture, ( vout_thread_t *, vlc_bool_t, vlc_bool_t, vlc_bool_t ) ); +VLC_EXPORT( void, vout_AllocatePicture,( vout_thread_t *, picture_t *, int, int, u32 ) ); +VLC_EXPORT( void, vout_DestroyPicture, ( vout_thread_t *, picture_t * ) ); +VLC_EXPORT( void, vout_DisplayPicture, ( vout_thread_t *, picture_t * ) ); +VLC_EXPORT( void, vout_DatePicture, ( vout_thread_t *, picture_t *, mtime_t ) ); +VLC_EXPORT( void, vout_LinkPicture, ( vout_thread_t *, picture_t * ) ); +VLC_EXPORT( void, vout_UnlinkPicture, ( vout_thread_t *, picture_t * ) ); +VLC_EXPORT( void, vout_PlacePicture, ( vout_thread_t *, int, int, int *, int *, int *, int * ) ); picture_t * vout_RenderPicture ( vout_thread_t *, picture_t *, subpicture_t * ); -void vout_PlacePicture ( vout_thread_t *, int, int, - int *, int *, int *, int * ); -subpicture_t * vout_CreateSubPicture ( vout_thread_t *, int, int ); -void vout_DestroySubPicture ( vout_thread_t *, subpicture_t * ); -void vout_DisplaySubPicture ( vout_thread_t *, subpicture_t * ); +VLC_EXPORT( subpicture_t *, vout_CreateSubPicture, ( vout_thread_t *, int, int ) ); +VLC_EXPORT( void, vout_DestroySubPicture, ( vout_thread_t *, subpicture_t * ) ); +VLC_EXPORT( void, vout_DisplaySubPicture, ( vout_thread_t *, subpicture_t * ) ); + subpicture_t * vout_SortSubPictures ( vout_thread_t *, mtime_t ); void vout_RenderSubPictures ( vout_thread_t *, picture_t *, subpicture_t * ); -#else -# define vout_CreateThread p_symbols->vout_CreateThread -# define vout_DestroyThread p_symbols->vout_DestroyThread -# define vout_CreateSubPicture p_symbols->vout_CreateSubPicture -# define vout_DestroySubPicture p_symbols->vout_DestroySubPicture -# define vout_DisplaySubPicture p_symbols->vout_DisplaySubPicture -# define vout_CreatePicture p_symbols->vout_CreatePicture -# define vout_AllocatePicture p_symbols->vout_AllocatePicture -# define vout_DisplayPicture p_symbols->vout_DisplayPicture -# define vout_DestroyPicture p_symbols->vout_DestroyPicture -# define vout_DatePicture p_symbols->vout_DatePicture -# define vout_LinkPicture p_symbols->vout_LinkPicture -# define vout_UnlinkPicture p_symbols->vout_UnlinkPicture -# define vout_PlacePicture p_symbols->vout_PlacePicture -#endif -