Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/video_out alphablend.c,1.31,1.32 video_out_aa.c,1.30,1.31 video_out_none.c,1.3,1.4 video_out_opengl.c,1.19,1.20 video_out_pgx64.c,1.14,1.15 video_out_syncfb.c,1.79,1.80 video_out_vidix.c,1.14,1.15 video_out_xshm.c,1.95,1.96 video_out_xv.c,1.150,1.151
|
From: Michael R. <mr...@us...> - 2002-11-22 18:06:34
|
Update of /cvsroot/xine/xine-lib/src/video_out
In directory sc8-pr-cvs1:/tmp/cvs-serv6627/src/video_out
Modified Files:
alphablend.c video_out_aa.c video_out_none.c
video_out_opengl.c video_out_pgx64.c video_out_syncfb.c
video_out_vidix.c video_out_xshm.c video_out_xv.c
Log Message:
when the image does not fit the viewport and black bars need to be added, their
size ratio and therefore the position of the image is now configurable
(I remembered my arts lessons at school where the teacher told us that images
look more pleasing when the lower border is twice the size of the upper and set
the default accordingly. ;)
Index: alphablend.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/alphablend.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- alphablend.c 20 Nov 2002 14:20:39 -0000 1.31
+++ alphablend.c 22 Nov 2002 18:06:14 -0000 1.32
@@ -30,8 +30,8 @@
/*
#define LOG_BLEND_YUV
-*/
#define LOG_BLEND_RGB16
+*/
#include <string.h>
#include <stdlib.h>
Index: video_out_aa.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_aa.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- video_out_aa.c 20 Nov 2002 11:57:48 -0000 1.30
+++ video_out_aa.c 22 Nov 2002 18:06:17 -0000 1.31
@@ -328,6 +328,6 @@
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_VIDEO_OUT, 11, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class },
+ { PLUGIN_VIDEO_OUT, 12, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
Index: video_out_none.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_none.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- video_out_none.c 20 Nov 2002 11:57:48 -0000 1.3
+++ video_out_none.c 22 Nov 2002 18:06:18 -0000 1.4
@@ -297,6 +297,6 @@
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_VIDEO_OUT, 11, "none", XINE_VERSION_CODE, &vo_info_none, init_class },
+ { PLUGIN_VIDEO_OUT, 12, "none", XINE_VERSION_CODE, &vo_info_none, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
Index: video_out_opengl.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_opengl.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- video_out_opengl.c 21 Nov 2002 23:24:50 -0000 1.19
+++ video_out_opengl.c 22 Nov 2002 18:06:19 -0000 1.20
@@ -913,7 +913,7 @@
this->display = visual->display;
this->screen = visual->screen;
- vo_scale_init (&this->sc, 0, 0);
+ vo_scale_init (&this->sc, 0, 0, class->config);
this->sc.frame_output_cb = visual->frame_output_cb;
this->sc.dest_size_cb = visual->dest_size_cb;
@@ -993,7 +993,7 @@
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_VIDEO_OUT, 11, "opengl", XINE_VERSION_CODE,
+ { PLUGIN_VIDEO_OUT, 12, "opengl", XINE_VERSION_CODE,
&vo_info_opengl, opengl_init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
Index: video_out_pgx64.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_pgx64.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- video_out_pgx64.c 20 Nov 2002 11:57:48 -0000 1.14
+++ video_out_pgx64.c 22 Nov 2002 18:06:20 -0000 1.15
@@ -689,7 +689,7 @@
this->fb_width = attr.fbtype.fb_width;
this->fb_height = attr.fbtype.fb_height;
- vo_scale_init(&this->vo_scale, 0, 0);
+ vo_scale_init(&this->vo_scale, 0, 0, this->class->config);
this->vo_scale.user_ratio = ASPECT_AUTO;
set_reg_bits(this, BUS_CNTL, BUS_EXT_REG_EN);
@@ -833,8 +833,8 @@
plugin_info_t xine_plugin_info[] = {
#ifdef HAVE_X11
- {PLUGIN_VIDEO_OUT, 11, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, (void*)pgx64_init_class},
+ {PLUGIN_VIDEO_OUT, 12, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, (void*)pgx64_init_class},
#endif
- {PLUGIN_VIDEO_OUT, 11, "pgx64fb", XINE_VERSION_CODE, &vo_info_pgx64fb, (void*)pgx64fb_init_class},
+ {PLUGIN_VIDEO_OUT, 12, "pgx64fb", XINE_VERSION_CODE, &vo_info_pgx64fb, (void*)pgx64fb_init_class},
{PLUGIN_NONE, 0, "", 0, NULL, NULL}
};
Index: video_out_syncfb.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_syncfb.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- video_out_syncfb.c 20 Nov 2002 11:57:48 -0000 1.79
+++ video_out_syncfb.c 22 Nov 2002 18:06:20 -0000 1.80
@@ -949,7 +949,7 @@
this->drawable = visual->d;
this->gc = XCreateGC (this->display, this->drawable, 0, NULL);
- vo_scale_init( &this->sc, visual->display_ratio, 1, 0 );
+ vo_scale_init( &this->sc, visual->display_ratio, 1, 0, config );
this->sc.frame_output_cb = visual->frame_output_cb;
this->sc.user_data = visual->user_data;
Index: video_out_vidix.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_vidix.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- video_out_vidix.c 20 Nov 2002 11:57:48 -0000 1.14
+++ video_out_vidix.c 22 Nov 2002 18:06:22 -0000 1.15
@@ -694,7 +694,7 @@
this->screen = visual->screen;
this->drawable = visual->d;
- vo_scale_init( &this->sc, 1, /*this->vidix_cap.flags & FLAG_UPSCALER,*/ 0 );
+ vo_scale_init( &this->sc, 1, /*this->vidix_cap.flags & FLAG_UPSCALER,*/ 0, config );
this->sc.frame_output_cb = visual->frame_output_cb;
this->sc.user_data = visual->user_data;
this->zoom_x = this->zoom_y = 100;
@@ -796,6 +796,6 @@
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_VIDEO_OUT, 11, "vidix", XINE_VERSION_CODE, &vo_info_vidix, init_class },
+ { PLUGIN_VIDEO_OUT, 12, "vidix", XINE_VERSION_CODE, &vo_info_vidix, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
Index: video_out_xshm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_xshm.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- video_out_xshm.c 20 Nov 2002 11:57:49 -0000 1.95
+++ video_out_xshm.c 22 Nov 2002 18:06:22 -0000 1.96
@@ -1054,7 +1054,7 @@
this->display = visual->display;
this->screen = visual->screen;
- vo_scale_init( &this->sc, 0, 0 );
+ vo_scale_init( &this->sc, 0, 0, config );
this->sc.frame_output_cb = visual->frame_output_cb;
this->sc.dest_size_cb = visual->dest_size_cb;
this->sc.user_data = visual->user_data;
@@ -1265,6 +1265,6 @@
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_VIDEO_OUT, 11, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class },
+ { PLUGIN_VIDEO_OUT, 12, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
Index: video_out_xv.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_xv.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- video_out_xv.c 20 Nov 2002 11:57:49 -0000 1.150
+++ video_out_xv.c 22 Nov 2002 18:06:26 -0000 1.151
@@ -1109,7 +1109,7 @@
this->xv_port = class->xv_port;
this->config = config;
- vo_scale_init (&this->sc, 1, 0 );
+ vo_scale_init (&this->sc, 1, 0, config );
this->sc.frame_output_cb = visual->frame_output_cb;
this->sc.user_data = visual->user_data;
@@ -1388,7 +1388,7 @@
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_VIDEO_OUT, 11, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class },
+ { PLUGIN_VIDEO_OUT, 12, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
|