summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/deinterlace.c2
-rw-r--r--src/video_out/deinterlace.h2
-rw-r--r--src/video_out/video_out_aa.c4
-rw-r--r--src/video_out/video_out_directfb.c4
-rw-r--r--src/video_out/video_out_pgx64.c4
-rw-r--r--src/video_out/video_out_xshm.c70
-rw-r--r--src/video_out/video_out_xv.c107
-rw-r--r--src/video_out/yuv2rgb.c17
-rw-r--r--src/video_out/yuv2rgb_mlib.c2
9 files changed, 133 insertions, 79 deletions
diff --git a/src/video_out/deinterlace.c b/src/video_out/deinterlace.c
index 28a054572..fac701b79 100644
--- a/src/video_out/deinterlace.c
+++ b/src/video_out/deinterlace.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2001 the xine project
*
- * This file is part of xine, a unix video player.
+ * This file is part of xine, a free video player.
*
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/video_out/deinterlace.h b/src/video_out/deinterlace.h
index 4381701f5..9cdbab1dd 100644
--- a/src/video_out/deinterlace.h
+++ b/src/video_out/deinterlace.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2001 the xine project
*
- * This file is part of xine, a unix video player.
+ * This file is part of xine, a free video player.
*
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 17cb93280..a164fcecd 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2000-2001 the xine project
*
- * This file is part of xine, a unix video player.
+ * This file is part of xine, a free video player.
*
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_aa.c,v 1.33 2002/12/21 12:56:49 miguelfreitas Exp $
+ * $Id: video_out_aa.c,v 1.34 2003/03/06 16:49:31 guenter Exp $
*
* video_out_aa.c, ascii-art output plugin for xine
*
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 4ddda3eb0..e64cb667b 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2000, 2001 the xine project
*
- * This file is part of xine, a unix video player.
+ * This file is part of xine, a free video player.
*
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_directfb.c,v 1.15 2003/02/28 02:51:51 storri Exp $
+ * $Id: video_out_directfb.c,v 1.16 2003/03/06 16:49:31 guenter Exp $
*
* DirectFB based output plugin.
* Rich Wareham <richwareham@users.sourceforge.net>
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 44bc0029c..cec39f13e 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2000-2002 the xine project
*
- * This file is part of xine, a unix video player.
+ * This file is part of xine, a free video player.
*
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_pgx64.c,v 1.23 2002/12/22 00:35:05 komadori Exp $
+ * $Id: video_out_pgx64.c,v 1.24 2003/03/06 16:49:31 guenter Exp $
*
* video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine
*
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index fc95264e0..c3c7dff07 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -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.
*
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_xshm.c,v 1.107 2003/02/22 16:56:01 hadess Exp $
+ * $Id: video_out_xshm.c,v 1.108 2003/03/06 16:49:32 guenter Exp $
*
* video_out_xshm.c, X11 shared memory extension interface for xine
*
@@ -123,12 +123,14 @@ typedef struct xshm_driver_s {
int (*x11_old_error_handler) (Display *, XErrorEvent *);
+ xine_t *xine;
} xshm_driver_t;
typedef struct {
video_driver_class_t driver_class;
config_values_t *config;
+ xine_t *xine;
} xshm_class_t;
@@ -143,7 +145,7 @@ static int HandleXError (Display *display, XErrorEvent *xevent) {
XGetErrorText (display, xevent->error_code, str, 1024);
- printf ("received X error event: %s\n", str);
+ printf ("video_out_xshm: received X error event: %s\n", str);
gX11Fail = 1;
return 0;
@@ -191,8 +193,10 @@ static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo,
height);
if (myimage == NULL ) {
- printf ("video_out_xshm: shared memory error when allocating image\n");
- printf ("video_out_xshm: => not using MIT Shared Memory extension.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf ("video_out_xshm: shared memory error when allocating image\n");
+ printf ("video_out_xshm: => not using MIT Shared Memory extension.\n");
+ }
this->use_shm = 0;
goto finishShmTesting;
}
@@ -206,8 +210,10 @@ static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo,
IPC_CREAT | 0777);
if (shminfo->shmid < 0 ) {
- printf ("video_out_xshm: %s: allocating image\n",strerror(errno));
- printf ("video_out_xshm: => not using MIT Shared Memory extension.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf ("video_out_xshm: %s: allocating image\n",strerror(errno));
+ printf ("video_out_xshm: => not using MIT Shared Memory extension.\n");
+ }
this->use_shm = 0;
goto finishShmTesting;
}
@@ -215,8 +221,10 @@ static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo,
shminfo->shmaddr = (char *) shmat(shminfo->shmid, 0, 0);
if (shminfo->shmaddr == ((char *) -1)) {
- printf ("video_out_xshm: shared memory error (address error) when allocating image \n");
- printf ("video_out_xshm: => not using MIT Shared Memory extension.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf ("video_out_xshm: shared memory error (address error) when allocating image \n");
+ printf ("video_out_xshm: => not using MIT Shared Memory extension.\n");
+ }
shmctl (shminfo->shmid, IPC_RMID, 0);
shminfo->shmid = -1;
this->use_shm = 0;
@@ -231,8 +239,10 @@ static XImage *create_ximage (xshm_driver_t *this, XShmSegmentInfo *shminfo,
XSync(this->display, False);
if (gX11Fail) {
- printf ("video_out_xshm: x11 error during shared memory XImage creation\n");
- printf ("video_out_xshm: => not using MIT Shared Memory extension.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf ("video_out_xshm: x11 error during shared memory XImage creation\n");
+ printf ("video_out_xshm: => not using MIT Shared Memory extension.\n");
+ }
shmdt (shminfo->shmaddr);
shmctl (shminfo->shmid, IPC_RMID, 0);
shminfo->shmid = -1;
@@ -836,8 +846,10 @@ static int xshm_set_property (vo_driver_t *this_gen,
if (value>=NUM_ASPECT_RATIOS)
value = ASPECT_AUTO;
this->sc.user_ratio = value;
- printf ("video_out_xshm: aspect ratio changed to %s\n",
- vo_scale_aspect_ratio_name(value));
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf ("video_out_xshm: aspect ratio changed to %s\n",
+ vo_scale_aspect_ratio_name(value));
+ }
} else if (property == VO_PROP_BRIGHTNESS) {
@@ -1126,6 +1138,7 @@ static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const voi
0, NULL);
this->x11_old_error_handler = NULL;
+ this->xine = class->xine;
this->vo_driver.get_capabilities = xshm_get_capabilities;
this->vo_driver.alloc_frame = xshm_alloc_frame;
@@ -1162,12 +1175,13 @@ static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const voi
this->visual = attribs.visual;
this->depth = attribs.depth;
- if (this->depth>16)
- printf ("\n\n"
- "WARNING: current display depth is %d. For better performance\n"
- "a depth of 16 bpp is recommended!\n\n",
- this->depth);
-
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ if (this->depth>16)
+ printf ("\n\n"
+ "WARNING: current display depth is %d. For better performance\n"
+ "a depth of 16 bpp is recommended!\n\n",
+ this->depth);
+ }
/*
* check for X shared memory support
@@ -1176,7 +1190,8 @@ static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const voi
if (XShmQueryExtension(display)) {
this->use_shm = 1;
} else {
- printf ("video_out_xshm: MIT shared memory extension not present on display.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf ("video_out_xshm: MIT shared memory extension not present on display.\n");
this->use_shm = 0;
}
@@ -1200,12 +1215,14 @@ static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const voi
cpu_byte_order = htonl(1) == 1 ? MSBFirst : LSBFirst;
swapped = cpu_byte_order != this->image_byte_order;
- printf ("video_out_xshm: video mode depth is %d (%d bpp), %s, %sswapped,\n"
- "\tred: %08lx, green: %08lx, blue: %08lx\n",
- this->depth, this->bpp,
- visual_class_name(this->visual),
- swapped ? "" : "not ",
- this->visual->red_mask, this->visual->green_mask, this->visual->blue_mask);
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf ("video_out_xshm: video mode depth is %d (%d bpp), %s, %sswapped,\n"
+ "\tred: %08lx, green: %08lx, blue: %08lx\n",
+ this->depth, this->bpp,
+ visual_class_name(this->visual),
+ swapped ? "" : "not ",
+ this->visual->red_mask, this->visual->green_mask, this->visual->blue_mask);
+ }
mode = 0;
@@ -1312,6 +1329,7 @@ static void *xshm_init_class (xine_t *xine, void *visual_gen) {
this->driver_class.dispose = xshm_dispose_class;
this->config = xine->config;
+ this->xine = xine;
return this;
}
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 477e032c8..647c348e5 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -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.
*
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_xv.c,v 1.160 2003/03/05 22:12:48 esnel Exp $
+ * $Id: video_out_xv.c,v 1.161 2003/03/06 16:49:32 guenter Exp $
*
* video_out_xv.c, X11 video extension interface for xine
*
@@ -137,6 +137,8 @@ struct xv_driver_s {
uint32_t colorkey;
int (*x11_old_error_handler) (Display *, XErrorEvent *);
+
+ xine_t *xine;
};
typedef struct {
@@ -146,6 +148,7 @@ typedef struct {
XvPortID xv_port;
XvAdaptorInfo *adaptor_info;
unsigned int adaptor_num;
+ xine_t *xine;
} xv_class_t;
int gX11Fail;
@@ -274,8 +277,10 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
width, height, shminfo);
if (image == NULL ) {
- printf("video_out_xv: XvShmCreateImage failed\n");
- printf("video_out_xv: => not using MIT Shared Memory extension.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf("video_out_xv: XvShmCreateImage failed\n");
+ printf("video_out_xv: => not using MIT Shared Memory extension.\n");
+ }
this->use_shm = 0;
goto finishShmTesting;
}
@@ -285,15 +290,19 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
IPC_CREAT | 0777);
if (image->data_size==0) {
- printf("video_out_xv: XvShmCreateImage returned a zero size\n");
- printf("video_out_xv: => not using MIT Shared Memory extension.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf("video_out_xv: XvShmCreateImage returned a zero size\n");
+ printf("video_out_xv: => not using MIT Shared Memory extension.\n");
+ }
this->use_shm = 0;
goto finishShmTesting;
}
if (shminfo->shmid < 0 ) {
- perror("video_out_xv: shared memory error in shmget: ");
- printf("video_out_xv: => not using MIT Shared Memory extension.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ perror("video_out_xv: shared memory error in shmget: ");
+ printf("video_out_xv: => not using MIT Shared Memory extension.\n");
+ }
this->use_shm = 0;
goto finishShmTesting;
}
@@ -301,13 +310,15 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
shminfo->shmaddr = (char *) shmat(shminfo->shmid, 0, 0);
if (shminfo->shmaddr == NULL) {
- printf("video_out_xv: shared memory error (address error NULL)\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf("video_out_xv: shared memory error (address error NULL)\n");
this->use_shm = 0;
goto finishShmTesting;
}
if (shminfo->shmaddr == ((char *) -1)) {
- printf("video_out_xv: shared memory error (address error)\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf("video_out_xv: shared memory error (address error)\n");
this->use_shm = 0;
goto finishShmTesting;
}
@@ -321,8 +332,10 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
shmctl(shminfo->shmid, IPC_RMID, 0);
if (gX11Fail) {
- printf ("video_out_xv: x11 error during shared memory XImage creation\n");
- printf ("video_out_xv: => not using MIT Shared Memory extension.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf ("video_out_xv: x11 error during shared memory XImage creation\n");
+ printf ("video_out_xv: => not using MIT Shared Memory extension.\n");
+ }
shmdt (shminfo->shmaddr);
shmctl (shminfo->shmid, IPC_RMID, 0);
shminfo->shmid = -1;
@@ -775,8 +788,9 @@ static int xv_get_property (vo_driver_t *this_gen, int property) {
xv_driver_t *this = (xv_driver_t *) this_gen;
- printf ("video_out_xv: property #%d = %d\n", property,
- this->props[property].value);
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf ("video_out_xv: property #%d = %d\n", property,
+ this->props[property].value);
return this->props[property].value;
}
@@ -818,8 +832,10 @@ static int xv_set_property (vo_driver_t *this_gen,
case VO_PROP_INTERLACED:
this->props[property].value = value;
- printf("video_out_xv: VO_PROP_INTERLACED(%d)\n",
- this->props[property].value);
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf("video_out_xv: VO_PROP_INTERLACED(%d)\n",
+ this->props[property].value);
+ }
this->deinterlace_enabled = value;
if (this->deinterlace_method == DEINTERLACE_ONEFIELDXV) {
xv_compute_ideal_size (this);
@@ -832,8 +848,10 @@ static int xv_set_property (vo_driver_t *this_gen,
value = ASPECT_AUTO;
this->props[property].value = value;
- printf("video_out_xv: VO_PROP_ASPECT_RATIO(%d)\n",
- this->props[property].value);
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
+ printf("video_out_xv: VO_PROP_ASPECT_RATIO(%d)\n",
+ this->props[property].value);
+ }
this->sc.user_ratio = value;
xv_compute_ideal_size (this);
@@ -844,8 +862,9 @@ static int xv_set_property (vo_driver_t *this_gen,
if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
this->props[property].value = value;
- printf ("video_out_xv: VO_PROP_ZOOM_X = %d\n",
- this->props[property].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;
@@ -858,8 +877,9 @@ static int xv_set_property (vo_driver_t *this_gen,
if ((value >= VO_ZOOM_MIN) && (value <= VO_ZOOM_MAX)) {
this->props[property].value = value;
- printf ("video_out_xv: VO_PROP_ZOOM_Y = %d\n",
- this->props[property].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;
@@ -1054,8 +1074,9 @@ static void xv_check_capability (xv_driver_t *this,
XvGetPortAttribute (this->display, this->xv_port,
this->props[property].atom, &int_default);
- printf ("video_out_xv: port attribute %s (%d) value is %d\n",
- str_prop, property, int_default);
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf ("video_out_xv: port attribute %s (%d) value is %d\n",
+ str_prop, property, int_default);
if (config_name) {
/* is this a boolean property ? */
@@ -1111,7 +1132,8 @@ static void xv_update_XV_FILTER(void *this_gen, xine_cfg_entry_t *entry) {
atom = XInternAtom (this->display, "XV_FILTER", False);
XvSetPortAttribute (this->display, this->xv_port, atom, xv_filter);
- printf("video_out_xv: bilinear scaling mode (XV_FILTER) = %d\n",xv_filter);
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf("video_out_xv: bilinear scaling mode (XV_FILTER) = %d\n",xv_filter);
}
static void xv_update_XV_DOUBLE_BUFFER(void *this_gen, xine_cfg_entry_t *entry) {
@@ -1124,7 +1146,8 @@ static void xv_update_XV_DOUBLE_BUFFER(void *this_gen, xine_cfg_entry_t *entry)
atom = XInternAtom (this->display, "XV_DOUBLE_BUFFER", False);
XvSetPortAttribute (this->display, this->xv_port, atom, xv_double_buffer);
- printf("video_out_xv: double buffering mode = %d\n",xv_double_buffer);
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf("video_out_xv: double buffering mode = %d\n",xv_double_buffer);
}
static void xv_update_xv_pitch_alignment(void *this_gen, xine_cfg_entry_t *entry) {
@@ -1152,8 +1175,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
display = visual->display;
- printf ("video_out_xv: open_plugin\n");
-
this = malloc (sizeof (xv_driver_t));
if (!this) {
@@ -1173,16 +1194,17 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
this->sc.frame_output_cb = visual->frame_output_cb;
this->sc.user_data = visual->user_data;
- this->drawable = visual->d;
- this->gc = XCreateGC (this->display, this->drawable, 0, NULL);
- this->capabilities = 0;
- this->expecting_event = 0;
- this->use_shm = 1;
- this->deinterlace_method = 0;
+ this->drawable = visual->d;
+ this->gc = XCreateGC (this->display, this->drawable, 0, NULL);
+ this->capabilities = 0;
+ this->expecting_event = 0;
+ this->use_shm = 1;
+ this->deinterlace_method = 0;
this->deinterlace_frame.image = NULL;
- this->use_colorkey = 0;
- this->colorkey = 0;
- this->x11_old_error_handler = NULL;
+ this->use_colorkey = 0;
+ this->colorkey = 0;
+ this->x11_old_error_handler = NULL;
+ this->xine = class->xine;
XAllocNamedColor (this->display,
DefaultColormap(this->display, this->screen),
@@ -1286,7 +1308,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
}
}
XFree(attr);
- } else {
+ } else if (this->xine->verbosity >= XINE_VERBOSITY_DEBUG) {
printf("video_out_xv: no port attributes defined.\n");
}
@@ -1308,11 +1330,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
if (fo[i].id == XINE_IMGFMT_YV12) {
this->xv_format_yv12 = fo[i].id;
this->capabilities |= VO_CAP_YV12;
- printf("video_out_xv: this adaptor supports the yv12 format.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf("video_out_xv: this adaptor supports the yv12 format.\n");
} else if (fo[i].id == XINE_IMGFMT_YUY2) {
this->xv_format_yuy2 = fo[i].id;
this->capabilities |= VO_CAP_YUY2;
- printf("video_out_xv: this adaptor supports the yuy2 format.\n");
+ if (this->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf("video_out_xv: this adaptor supports the yuy2 format.\n");
}
}
@@ -1427,7 +1451,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
"driver doesn't support Xv?!\n");
/* XvFreeAdaptorInfo (adaptor_info); this crashed on me (gb)*/
return NULL;
- } else
+ } else if (xine->verbosity >= XINE_VERBOSITY_LOG)
printf ("video_out_xv: using Xv port %ld from adaptor %s for hardware "
"colorspace conversion and scaling.\n", xv_port,
adaptor_info[adaptor_num].name);
@@ -1447,6 +1471,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
this->xv_port = xv_port;
this->adaptor_info = adaptor_info;
this->adaptor_num = adaptor_num;
+ this->xine = xine;
return this;
}
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index 63674e675..a34541030 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -1,7 +1,8 @@
/*
* yuv2rgb.c
*
- * This file is part of xine, a unix video player.
+ * Copyright (C) 2003 the xine project
+ * This file is part of xine, a free video player.
*
* based on work from mpeg2dec:
* Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
@@ -22,7 +23,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: yuv2rgb.c,v 1.40 2003/02/02 17:27:45 esnel Exp $
+ * $Id: yuv2rgb.c,v 1.41 2003/03/06 16:49:32 guenter Exp $
*/
#include "config.h"
@@ -35,7 +36,9 @@
#include "yuv2rgb.h"
#include "xineutils.h"
+/*
#define LOG
+*/
static int prof_scale_line = -1;
@@ -2391,7 +2394,7 @@ static void yuv2rgb_set_csc_levels (yuv2rgb_factory_t *this,
default:
- fprintf (stderr, "mode %d not supported by yuv2rgb\n", mode);
+ printf ("yuv2rgb: mode %d not supported by yuv2rgb\n", mode);
abort();
}
@@ -3184,16 +3187,20 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
yuv2rgb_init_mmxext (this);
+#ifdef LOG
if (this->yuv2rgb_fun != NULL)
printf ("yuv2rgb: using MMXEXT for colorspace transform\n");
+#endif
}
if ((this->yuv2rgb_fun == NULL) && (mm & MM_ACCEL_X86_MMX)) {
yuv2rgb_init_mmx (this);
+#ifdef LOG
if (this->yuv2rgb_fun != NULL)
printf ("yuv2rgb: using MMX for colorspace transform\n");
+#endif
}
#endif
#if HAVE_MLIB
@@ -3201,12 +3208,16 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
yuv2rgb_init_mlib (this);
+#ifdef LOG
if (this->yuv2rgb_fun != NULL)
printf ("yuv2rgb: using medialib for colorspace transform\n");
+#endif
}
#endif
if (this->yuv2rgb_fun == NULL) {
+#ifdef LOG
printf ("yuv2rgb: no accelerated colorspace conversion found\n");
+#endif
yuv2rgb_c_init (this);
}
diff --git a/src/video_out/yuv2rgb_mlib.c b/src/video_out/yuv2rgb_mlib.c
index 5cac646dd..e1a7cba7d 100644
--- a/src/video_out/yuv2rgb_mlib.c
+++ b/src/video_out/yuv2rgb_mlib.c
@@ -5,7 +5,7 @@
*
* Author: Juergen Keil <jk@tools.de>
*
- * This file is part of xine, a free unix video player.
+ * This file is part of xine, a free video player.
*
* xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-09 15:27:05 +0000