Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/video_out video_out_aa.c,1.38,1.39 video_out_directfb.c,1.22,1.23 video_out_directx.c,1.7,1.8 video_out_fb.c,1.29,1.30 video_out_opengl.c,1.29,1.30 video_out_pgx64.c,1.41,1.42 video_out_sdl.c,1.28,1.29 video_out_stk.c,1.6,1.7 video_out_syncfb.c,1.90,1.91 video_out_vidix.c,1.48,1.49 video_out_xshm.c,1.116,1.117 video_out_xv.c,1.177,1.178 video_out_xvmc.c,1.3,1.4
|
From: Michael R. <mr...@us...> - 2003-10-23 16:51:25
|
Update of /cvsroot/xine/xine-lib/src/video_out
In directory sc8-pr-cvs1:/tmp/cvs-serv11425/src/video_out
Modified Files:
video_out_aa.c video_out_directfb.c video_out_directx.c
video_out_fb.c video_out_opengl.c video_out_pgx64.c
video_out_sdl.c video_out_stk.c video_out_syncfb.c
video_out_vidix.c video_out_xshm.c video_out_xv.c
video_out_xvmc.c
Log Message:
cleanup in video_out.h
* some obsolete VO_CAP_* constants removed
* VO_ZOOM_* constants replaced by their XINE_VO_ZOOM_* equivalents from xine.h
* moved some bits around
* proc_frame() needs only one parameter: the frame
* renamed copy_called to proc_called
* changed logic in video_out.c to call proc_* functions a bit
(call proc_frame() first, then call proc_slice() if proc_frame() has not set
proc_called, this allows video out plugins to have both hooks called)
Index: video_out_aa.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_aa.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- video_out_aa.c 22 Oct 2003 20:38:10 -0000 1.38
+++ video_out_aa.c 23 Oct 2003 15:17:07 -0000 1.39
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2001 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
Index: video_out_directfb.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_directfb.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- video_out_directfb.c 22 Oct 2003 20:38:10 -0000 1.22
+++ video_out_directfb.c 23 Oct 2003 15:17:07 -0000 1.23
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
Index: video_out_directx.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_directx.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- video_out_directx.c 22 Oct 2003 20:38:10 -0000 1.7
+++ video_out_directx.c 23 Oct 2003 15:17:07 -0000 1.8
@@ -19,6 +19,8 @@
*
* video_out_directx.c, direct draw video output plugin for xine
* by Matthew Grooms <el...@al...>
+ *
+ * $Id$
*/
typedef unsigned char boolean;
Index: video_out_fb.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_fb.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- video_out_fb.c 22 Oct 2003 20:38:10 -0000 1.29
+++ video_out_fb.c 23 Oct 2003 15:17:07 -0000 1.30
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project and Fredrik Noring
+ * Copyright (C) 2000-2003 the xine project and Fredrik Noring
*
* This file is part of xine, a free video player.
*
@@ -149,16 +149,14 @@
static uint32_t fb_get_capabilities(vo_driver_t *this_gen)
{
- return VO_CAP_YV12 |
- VO_CAP_YUY2 |
- VO_CAP_BRIGHTNESS;
+ return VO_CAP_YV12 | VO_CAP_YUY2;
}
static void fb_frame_proc_slice(vo_frame_t *vo_img, uint8_t **src)
{
fb_frame_t *frame = (fb_frame_t *)vo_img ;
- vo_img->copy_called = 1;
+ vo_img->proc_called = 1;
if(frame->format == XINE_IMGFMT_YV12)
frame->yuv2rgb->yuv2rgb_fun(frame->yuv2rgb, frame->rgb_dst,
src[0], src[1], src[2]);
Index: video_out_opengl.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_opengl.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- video_out_opengl.c 22 Oct 2003 20:38:10 -0000 1.29
+++ video_out_opengl.c 23 Oct 2003 15:17:07 -0000 1.30
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
@@ -189,14 +189,14 @@
static uint32_t opengl_get_capabilities (vo_driver_t *this_gen) {
- return VO_CAP_YV12 | VO_CAP_YUY2 | VO_CAP_BRIGHTNESS;
+ return VO_CAP_YV12 | VO_CAP_YUY2;
}
static void opengl_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
opengl_frame_t *frame = (opengl_frame_t *) vo_img ;
- vo_img->copy_called = 1;
+ vo_img->proc_called = 1;
/* DEBUGF ((stderr, "*** %p: frame_copy src %p/%p/%p to %p\n", frame, src[0], src[1], src[2], frame->rgb_dst)); */
@@ -286,7 +286,7 @@
* supply required functions/fields
*/
frame->vo_frame.proc_slice = opengl_frame_proc_slice;
- frame->vo_frame.proc_frame = opengl_frame_proc_frame;
+ frame->vo_frame.proc_frame = NULL;
frame->vo_frame.field = opengl_frame_field;
frame->vo_frame.dispose = opengl_frame_dispose;
frame->vo_frame.driver = this_gen;
Index: video_out_pgx64.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_pgx64.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- video_out_pgx64.c 22 Oct 2003 20:38:10 -0000 1.41
+++ video_out_pgx64.c 23 Oct 2003 15:17:07 -0000 1.42
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
@@ -267,14 +267,14 @@
* XINE VIDEO DRIVER FUNCTIONS
*/
-static void pgx64_frame_proc_frame(pgx64_frame_t *frame, uint8_t **src)
+static void pgx64_frame_proc_frame(pgx64_frame_t *frame)
{
int i;
- frame->vo_frame.copy_called = 1;
+ frame->vo_frame.proc_called = 1;
for (i=0; i<frame->planes; i++) {
- memcpy(frame->buffer_ptrs[i], src[i], frame->lengths[i]);
+ memcpy(frame->buffer_ptrs[i], frame->vo_frame.base[i], frame->lengths[i]);
}
}
@@ -282,7 +282,7 @@
{
int i, len;
- frame->vo_frame.copy_called = 1;
+ frame->vo_frame.proc_called = 1;
for (i=0; i<frame->planes; i++) {
len = (frame->lengths[i] - frame->stripe_offsets[i] < frame->stripe_lengths[i]) ? frame->lengths[i] - frame->stripe_offsets[i] : frame->stripe_lengths[i];
@@ -306,10 +306,7 @@
static uint32_t pgx64_get_capabilities(pgx64_driver_t *this)
{
return VO_CAP_YV12 |
- VO_CAP_YUY2 |
- VO_CAP_COLORKEY |
- VO_CAP_SATURATION |
- VO_CAP_BRIGHTNESS;
+ VO_CAP_YUY2;
}
static pgx64_frame_t* pgx64_alloc_frame(pgx64_driver_t *this)
Index: video_out_sdl.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_sdl.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- video_out_sdl.c 22 Oct 2003 20:38:10 -0000 1.28
+++ video_out_sdl.c 23 Oct 2003 15:17:07 -0000 1.29
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
Index: video_out_stk.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_stk.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- video_out_stk.c 22 Oct 2003 20:38:10 -0000 1.6
+++ video_out_stk.c 23 Oct 2003 15:17:07 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
Index: video_out_syncfb.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_syncfb.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- video_out_syncfb.c 22 Oct 2003 20:38:10 -0000 1.90
+++ video_out_syncfb.c 23 Oct 2003 15:17:07 -0000 1.91
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
@@ -683,9 +683,9 @@
break;
case VO_PROP_ZOOM_X:
- if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
+ if ((value >= XINE_VO_ZOOM_MIN) && (value <= XINE_VO_ZOOM_MAX)) {
this->props[property].value = value;
- this->sc.zoom_factor_x = (double)value / (double)VO_ZOOM_STEP;
+ this->sc.zoom_factor_x = (double)value / (double)XINE_VO_ZOOM_STEP;
syncfb_compute_ideal_size (this);
@@ -697,9 +697,9 @@
break;
case VO_PROP_ZOOM_Y:
- if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
+ if ((value >= XINE_VO_ZOOM_MIN) && (value <= XINE_VO_ZOOM_MAX)) {
this->props[property].value = value;
- this->sc.zoom_factor_y = (double)value / (double)VO_ZOOM_STEP;
+ this->sc.zoom_factor_y = (double)value / (double)XINE_VO_ZOOM_STEP;
syncfb_compute_ideal_size (this);
@@ -933,8 +933,6 @@
this->props[VO_PROP_BRIGHTNESS].value = this->params.brightness;
this->props[VO_PROP_BRIGHTNESS].min = -128;
this->props[VO_PROP_BRIGHTNESS].max = 127;
-
- this->supported_capabilities |= (VO_CAP_CONTRAST | VO_CAP_BRIGHTNESS);
} else {
printf("video_out_syncfb: info. (brightness/contrast control won\'t be available because your SyncFB kernel module seems to be outdated. Please refer to README.syncfb for informations on how to update it.)\n");
}
Index: video_out_vidix.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_vidix.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- video_out_vidix.c 22 Oct 2003 20:38:10 -0000 1.48
+++ video_out_vidix.c 23 Oct 2003 15:17:07 -0000 1.49
@@ -692,14 +692,14 @@
}
if ( property == VO_PROP_ZOOM_X ) {
- this->sc.zoom_factor_x = (double)value / (double)VO_ZOOM_STEP;
+ this->sc.zoom_factor_x = (double)value / (double)XINE_VO_ZOOM_STEP;
vidix_compute_ideal_size (this);
this->sc.force_redraw = 1;
}
if ( property == VO_PROP_ZOOM_Y ) {
- this->sc.zoom_factor_y = (double)value / (double)VO_ZOOM_STEP;
+ this->sc.zoom_factor_y = (double)value / (double)XINE_VO_ZOOM_STEP;
vidix_compute_ideal_size (this);
this->sc.force_redraw = 1;
@@ -906,32 +906,24 @@
printf("video_out_vidix: couldn't get equalizer capabilities: %s\n", strerror(err));
} else {
if(this->vidix_eq.cap & VEQ_CAP_BRIGHTNESS) {
- this->capabilities |= VO_CAP_BRIGHTNESS;
-
this->props[VO_PROP_BRIGHTNESS].value = 0;
this->props[VO_PROP_BRIGHTNESS].min = -1000;
this->props[VO_PROP_BRIGHTNESS].max = 1000;
}
if(this->vidix_eq.cap & VEQ_CAP_CONTRAST) {
- this->capabilities |= VO_CAP_CONTRAST;
-
this->props[VO_PROP_CONTRAST].value = 0;
this->props[VO_PROP_CONTRAST].min = -1000;
this->props[VO_PROP_CONTRAST].max = 1000;
}
if(this->vidix_eq.cap & VEQ_CAP_SATURATION) {
- this->capabilities |= VO_CAP_SATURATION;
-
this->props[VO_PROP_SATURATION].value = 0;
this->props[VO_PROP_SATURATION].min = -1000;
this->props[VO_PROP_SATURATION].max = 1000;
}
if(this->vidix_eq.cap & VEQ_CAP_HUE) {
- this->capabilities |= VO_CAP_HUE;
-
this->props[VO_PROP_HUE].value = 0;
this->props[VO_PROP_HUE].min = -1000;
this->props[VO_PROP_HUE].max = 1000;
@@ -972,12 +964,12 @@
this->props[VO_PROP_ASPECT_RATIO].max = XINE_VO_ASPECT_NUM_RATIOS;
this->props[VO_PROP_ZOOM_X].value = 100;
- this->props[VO_PROP_ZOOM_X].min = VO_ZOOM_MIN;
- this->props[VO_PROP_ZOOM_X].max = VO_ZOOM_MAX;
+ this->props[VO_PROP_ZOOM_X].min = XINE_VO_ZOOM_MIN;
+ this->props[VO_PROP_ZOOM_X].max = XINE_VO_ZOOM_MAX;
this->props[VO_PROP_ZOOM_Y].value = 100;
- this->props[VO_PROP_ZOOM_Y].min = VO_ZOOM_MIN;
- this->props[VO_PROP_ZOOM_Y].max = VO_ZOOM_MAX;
+ this->props[VO_PROP_ZOOM_Y].min = XINE_VO_ZOOM_MIN;
+ this->props[VO_PROP_ZOOM_Y].max = XINE_VO_ZOOM_MAX;
this->vo_driver.get_capabilities = vidix_get_capabilities;
this->vo_driver.alloc_frame = vidix_alloc_frame;
@@ -1097,7 +1089,6 @@
/* We'll assume all drivers support colour keying (which they do
at the moment) */
- this->capabilities |= VO_CAP_COLORKEY;
this->vidix_grkey.ckey.op = CKEY_TRUE;
/* Colour key components */
Index: video_out_xshm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_xshm.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- video_out_xshm.c 22 Oct 2003 20:38:10 -0000 1.116
+++ video_out_xshm.c 23 Oct 2003 15:17:07 -0000 1.117
@@ -307,15 +307,14 @@
*/
static uint32_t xshm_get_capabilities (vo_driver_t *this_gen) {
- return VO_CAP_YV12 | VO_CAP_YUY2 |
- VO_CAP_BRIGHTNESS | VO_CAP_CONTRAST | VO_CAP_SATURATION;
+ return VO_CAP_YV12 | VO_CAP_YUY2;
}
static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
/*xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
- vo_img->copy_called = 1;
+ vo_img->proc_called = 1;
#ifdef LOG
printf ("video_out_xshm: copy... (format %d)\n", frame->format);
Index: video_out_xv.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_xv.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- video_out_xv.c 22 Oct 2003 20:38:10 -0000 1.177
+++ video_out_xv.c 23 Oct 2003 15:17:07 -0000 1.178
@@ -833,13 +833,13 @@
break;
case VO_PROP_ZOOM_X:
- if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
+ if ((value >= XINE_VO_ZOOM_MIN) && (value <= XINE_VO_ZOOM_MAX)) {
this->props[property].value = value;
if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
printf ("video_out_xv: VO_PROP_ZOOM_X = %d\n",
this->props[property].value);
- this->sc.zoom_factor_x = (double)value / (double)VO_ZOOM_STEP;
+ this->sc.zoom_factor_x = (double)value / (double)XINE_VO_ZOOM_STEP;
xv_compute_ideal_size (this);
@@ -848,13 +848,13 @@
break;
case VO_PROP_ZOOM_Y:
- if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
+ if ((value >= XINE_VO_ZOOM_MIN) && (value <= XINE_VO_ZOOM_MAX)) {
this->props[property].value = value;
if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
printf ("video_out_xv: VO_PROP_ZOOM_Y = %d\n",
this->props[property].value);
- this->sc.zoom_factor_y = (double)value / (double)VO_ZOOM_STEP;
+ this->sc.zoom_factor_y = (double)value / (double)XINE_VO_ZOOM_STEP;
xv_compute_ideal_size (this);
@@ -1015,7 +1015,6 @@
/* called xlocked */
static void xv_check_capability (xv_driver_t *this,
- uint32_t capability,
int property, XvAttribute attr,
int base_id, char *str_prop,
char *config_name,
@@ -1023,8 +1022,6 @@
int int_default;
cfg_entry_t *entry;
- this->capabilities |= capability;
-
/*
* some Xv drivers (Gatos ATI) report some ~0 as max values, this is confusing.
*/
@@ -1071,7 +1068,7 @@
xv_set_property (&this->vo_driver, property, entry->num_value);
- if (capability == VO_CAP_COLORKEY) {
+ if (strcmp(str_prop, "XV_COLORKEY") == 0) {
this->use_colorkey = 1;
this->colorkey = entry->num_value;
}
@@ -1222,39 +1219,33 @@
for(k = 0; k < nattr; k++) {
if((attr[k].flags & XvSettable) && (attr[k].flags & XvGettable)) {
if(!strcmp(attr[k].name, "XV_HUE")) {
- xv_check_capability (this, VO_CAP_HUE,
- VO_PROP_HUE, attr[k],
+ xv_check_capability (this, VO_PROP_HUE, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_HUE",
NULL, NULL);
} else if(!strcmp(attr[k].name, "XV_SATURATION")) {
- xv_check_capability (this, VO_CAP_SATURATION,
- VO_PROP_SATURATION, attr[k],
+ xv_check_capability (this, VO_PROP_SATURATION, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_SATURATION",
NULL, NULL);
} else if(!strcmp(attr[k].name, "XV_BRIGHTNESS")) {
- xv_check_capability (this, VO_CAP_BRIGHTNESS,
- VO_PROP_BRIGHTNESS, attr[k],
+ xv_check_capability (this, VO_PROP_BRIGHTNESS, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_BRIGHTNESS",
NULL, NULL);
} else if(!strcmp(attr[k].name, "XV_CONTRAST")) {
- xv_check_capability (this, VO_CAP_CONTRAST,
- VO_PROP_CONTRAST, attr[k],
+ xv_check_capability (this, VO_PROP_CONTRAST, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_CONTRAST",
NULL, NULL);
} else if(!strcmp(attr[k].name, "XV_COLORKEY")) {
- xv_check_capability (this, VO_CAP_COLORKEY,
- VO_PROP_COLORKEY, attr[k],
+ xv_check_capability (this, VO_PROP_COLORKEY, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_COLORKEY",
"video.xv_colorkey",
_("Colorkey used for Xv video overlay"));
} else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) {
- xv_check_capability (this, VO_CAP_AUTOPAINT_COLORKEY,
- VO_PROP_AUTOPAINT_COLORKEY, attr[k],
+ xv_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
"video.xv_autopaint_colorkey",
_("Make Xv autopaint its colorkey"));
Index: video_out_xvmc.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_xvmc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- video_out_xvmc.c 22 Oct 2003 20:38:10 -0000 1.3
+++ video_out_xvmc.c 23 Oct 2003 15:17:07 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2002 the xine project
+ * Copyright (C) 2000-2003 the xine project
*
* This file is part of xine, a free video player.
*
@@ -1211,12 +1211,12 @@
break;
case VO_PROP_ZOOM_X:
- if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
+ if ((value >= XINE_VO_ZOOM_MIN) && (value <= XINE_VO_ZOOM_MAX)) {
this->props[property].value = value;
printf ("video_out_xv: VO_PROP_ZOOM_X = %d\n",
this->props[property].value);
- this->sc.zoom_factor_x = (double)value / (double)VO_ZOOM_STEP;
+ this->sc.zoom_factor_x = (double)value / (double)XINE_VO_ZOOM_STEP;
xvmc_compute_ideal_size (this);
@@ -1225,12 +1225,12 @@
break;
case VO_PROP_ZOOM_Y:
- if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
+ if ((value >= XINE_VO_ZOOM_MIN) && (value <= XINE_VO_ZOOM_MAX)) {
this->props[property].value = value;
printf ("video_out_xv: VO_PROP_ZOOM_Y = %d\n",
this->props[property].value);
- this->sc.zoom_factor_y = (double)value / (double)VO_ZOOM_STEP;
+ this->sc.zoom_factor_y = (double)value / (double)XINE_VO_ZOOM_STEP;
xvmc_compute_ideal_size (this);
@@ -1407,7 +1407,6 @@
}
static void xvmc_check_capability (xvmc_driver_t *this,
- uint32_t capability,
int property, XvAttribute attr,
int base_id, char *str_prop,
char *config_name,
@@ -1416,12 +1415,10 @@
int int_default;
cfg_entry_t *entry;
- this->capabilities |= capability;
-
/*
* some Xv drivers (Gatos ATI) report some ~0 as max values, this is confusing.
*/
- if (VO_CAP_COLORKEY && (attr.max_value == ~0))
+ if (attr.max_value == ~0)
attr.max_value = 2147483615;
this->props[property].min = attr.min_value;
@@ -1454,7 +1451,7 @@
xvmc_set_property (&this->vo_driver, property, entry->num_value);
- if (capability == VO_CAP_COLORKEY) {
+ if (strcmp(str_prop, "XV_COLORKEY") == 0) {
this->use_colorkey = 1;
this->colorkey = entry->num_value;
}
@@ -1598,39 +1595,33 @@
for(k = 0; k < nattr; k++) {
if((attr[k].flags & XvSettable) && (attr[k].flags & XvGettable)) {
if(!strcmp(attr[k].name, "XV_HUE")) {
- xvmc_check_capability (this, VO_CAP_HUE,
- VO_PROP_HUE, attr[k],
+ xvmc_check_capability (this, VO_PROP_HUE, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_HUE",
NULL, NULL);
} else if(!strcmp(attr[k].name, "XV_SATURATION")) {
- xvmc_check_capability (this, VO_CAP_SATURATION,
- VO_PROP_SATURATION, attr[k],
+ xvmc_check_capability (this, VO_PROP_SATURATION, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_SATURATION",
NULL, NULL);
} else if(!strcmp(attr[k].name, "XV_BRIGHTNESS")) {
- xvmc_check_capability (this, VO_CAP_BRIGHTNESS,
- VO_PROP_BRIGHTNESS, attr[k],
+ xvmc_check_capability (this, VO_PROP_BRIGHTNESS, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_BRIGHTNESS",
NULL, NULL);
} else if(!strcmp(attr[k].name, "XV_CONTRAST")) {
- xvmc_check_capability (this, VO_CAP_CONTRAST,
- VO_PROP_CONTRAST, attr[k],
+ xvmc_check_capability (this, VO_PROP_CONTRAST, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_CONTRAST",
NULL, NULL);
} else if(!strcmp(attr[k].name, "XV_COLORKEY")) {
- xvmc_check_capability (this, VO_CAP_COLORKEY,
- VO_PROP_COLORKEY, attr[k],
+ xvmc_check_capability (this, VO_PROP_COLORKEY, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_COLORKEY",
"video.xv_colorkey",
_("Colorkey used for Xv video overlay"));
} else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) {
- xvmc_check_capability (this, VO_CAP_AUTOPAINT_COLORKEY,
- VO_PROP_AUTOPAINT_COLORKEY, attr[k],
+ xvmc_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
NULL, NULL);
|