diff options
| -rw-r--r-- | xine/vo_props.h | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/xine/vo_props.h b/xine/vo_props.h index 73f48917..dc377dfc 100644 --- a/xine/vo_props.h +++ b/xine/vo_props.h @@ -4,33 +4,57 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: vo_props.h,v 1.3 2009-03-15 17:49:33 phintuka Exp $ + * $Id: vo_props.h,v 1.4 2009-03-17 12:20:33 phintuka Exp $ * */ #ifndef XINELIBOUTPUT_VO_PROPS_H_ #define XINELIBOUTPUT_VO_PROPS_H_ +/* + * Extended vo capabilities + */ /* output can scale OSD */ -#define VO_CAP_OSDSCALING 0x01000000 +#ifdef VO_CAP_CUSTOM_EXTENT_OVERLAY + /* xine-lib 1.2 */ +# define VO_CAP_OSDSCALING VO_CAP_CUSTOM_EXTENT_OVERLAY +#else +# define VO_CAP_OSDSCALING 0x01000000 +#endif + +/* Output can blend ARGB surfaces */ +#ifdef VO_CAP_ARGB_LAYER_OVERLAY +# define VO_CAP_ARGB VO_CAP_ARGB_LAYER_OVERLAY +#else +# define VO_CAP_ARGB 0x02000000 +#endif + + +/* + * Extended vo properties + */ /* enable/disable OSD scaling */ #define VO_PROP_OSD_SCALING 0x1001 -/* OSD width */ -#define VO_PROP_OSD_WIDTH 0x1002 -/* OSD height */ -#define VO_PROP_OSD_HEIGHT 0x1003 -/* VDR OSD , hili_rgb_clut */ + +/* + * VDR OSD tagging and extra data + */ + +/* VDR OSD , stored in overlay hili_rgb_clut member */ #define VDR_OSD_MAGIC -9999 +/* VDR OSD extra data, stored in overlay hili clut data */ typedef struct { /* extent of reference coordinate system */ uint16_t extent_width; uint16_t extent_height; /* overlay layer */ uint32_t layer; + /* scaling: 0 - disable , 1...N - quality */ + uint8_t scaling; } vdr_osd_extradata_t; #endif /* XINELIBOUTPUT_VO_PROPS_H_ */ |