[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.37,1.38 video_out.c,1.52,1.53 video_out.h,1.36,1.37 vo_xmga.c,1.73,1.74 vo_xv.c,1.104,1.105 vo_xvidix.c,1.46,1.47 vosub_vidix.c,1.48,1.49
Zoltan Ponekker
pontscho at mplayerhq.hu
Fri Jul 19 22:51:50 CEST 2002
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv27481/libvo
Modified Files:
mga_common.c video_out.c video_out.h vo_xmga.c vo_xv.c
vo_xvidix.c vosub_vidix.c
Log Message:
- fix audio equalizer
- rewrite video equalizer handling (i teszted with mga g400 [x]mga,xv,xvidix and radeon xv,xvidix )
- fix some small gtk bug
- i dunno, i don't remember ... :)
Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mga_common.c 10 Jun 2002 18:40:19 -0000 1.37
+++ mga_common.c 19 Jul 2002 20:51:47 -0000 1.38
@@ -37,9 +37,21 @@
uint32_t luma;
float factor = 256.0 / 2000;
+ static int prev_br = 0;
+ static int prev_c = 0;
- luma = ((int)(info->brightness * factor) << 16) +
- ((int)(info->contrast * factor) & 0xFFFF);
+ if ( info->cap & VEQ_CAP_BRIGHTNESS )
+ {
+ prev_br=info->brightness;
+ if ( prev_br == 1000 ) prev_br=999; // i dunno why needed this line -- Pontscho
+ }
+ if ( info->cap & VEQ_CAP_CONTRAST )
+ {
+ prev_c=info->contrast;
+ if ( prev_c == 1000 ) prev_c=999; // i dunno why needed this line -- Pontscho
+ }
+
+ luma = ((int)(prev_br * factor) << 16) + ((int)(prev_c * factor) & 0xFFFF);
if (ioctl(f,MGA_VID_SET_LUMA,luma)) {
perror("Error in mga_vid_config ioctl()");
printf("Could not set luma values in the kernel module!\n");
Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- video_out.c 4 Jun 2002 20:17:07 -0000 1.52
+++ video_out.c 19 Jul 2002 20:51:47 -0000 1.53
@@ -66,10 +66,10 @@
/****************************************
* GAMMA CORRECTION *
****************************************/
-int vo_gamma_brightness=0;
-int vo_gamma_saturation=0;
-int vo_gamma_contrast=0;
-int vo_gamma_hue=0;
+int vo_gamma_brightness=-101;
+int vo_gamma_saturation=-101;
+int vo_gamma_contrast=-101;
+int vo_gamma_hue=-101;
int vo_gamma_red_intensity=0;
int vo_gamma_green_intensity=0;
int vo_gamma_blue_intensity=0;
Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- video_out.h 5 Jun 2002 22:47:15 -0000 1.36
+++ video_out.h 19 Jul 2002 20:51:47 -0000 1.37
@@ -220,6 +220,14 @@
extern int vo_fsmode;
extern float vo_panscan;
+extern int vo_gamma_brightness;
+extern int vo_gamma_saturation;
+extern int vo_gamma_contrast;
+extern int vo_gamma_hue;
+extern int vo_gamma_red_intensity;
+extern int vo_gamma_green_intensity;
+extern int vo_gamma_blue_intensity;
+
extern int vo_mouse_timer_const;
extern int vo_pts;
Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- vo_xmga.c 10 Jun 2002 18:40:19 -0000 1.73
+++ vo_xmga.c 19 Jul 2002 20:51:47 -0000 1.74
@@ -328,6 +328,11 @@
set_window();
+ saver_off(mDisplay);
+
+ XFlush( mDisplay );
+ XSync( mDisplay,False );
+
mga_vid_config.src_width=width;
mga_vid_config.src_height=height;
@@ -335,15 +340,10 @@
mga_vid_config.colkey_red=255;
mga_vid_config.colkey_green=0;
mga_vid_config.colkey_blue=255;
-
- if(mga_init()) return -1;
- XFlush( mDisplay );
- XSync( mDisplay,False );
+ mga_vid_config.version=MGA_VID_VERSION;
- saver_off(mDisplay);
-
- return 0;
+ return mga_init();
}
static const vo_info_t* get_info( void )
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- vo_xv.c 17 Jul 2002 21:20:11 -0000 1.104
+++ vo_xv.c 19 Jul 2002 20:51:47 -0000 1.105
@@ -138,8 +138,7 @@
{
for (i = 0; i < howmany && attributes; i++)
{
- if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS"
-))
+ if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS"))
{
was_reset = 1;
mp_msg(MSGT_VO,MSGL_V,"vo_xv: reset gamma correction\n");
@@ -289,14 +288,6 @@
}
return 0;
}
-
-extern int vo_gamma_brightness;
-extern int vo_gamma_saturation;
-extern int vo_gamma_contrast;
-extern int vo_gamma_hue;
-extern int vo_gamma_red_intensity;
-extern int vo_gamma_green_intensity;
-extern int vo_gamma_blue_intensity;
static void set_gamma_correction( void )
{
Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- vo_xvidix.c 5 Jul 2002 15:34:17 -0000 1.46
+++ vo_xvidix.c 19 Jul 2002 20:51:47 -0000 1.47
@@ -73,6 +73,8 @@
static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
drwDepth, drwcX, drwcY, dwidth, dheight;
+extern void set_video_eq( int cap );
+
static void set_window(int force_update,const vo_tune_info_t *info)
{
Window mRoot;
@@ -172,6 +174,13 @@
mp_msg(MSGT_VO, MSGL_V, "[xvidix] window properties: pos: %dx%d, size: %dx%d\n",
vo_dx, vo_dy, window_width, window_height);
+
+ { // á.c.s. technologies (C) Pontscho
+ vidix_video_eq_t eq;
+ vo_vaa_t vo_vaa;
+ if ( vidix_control( VOCTRL_QUERY_VAA,&vo_vaa) != VO_NOTIMPL )
+ if ( vo_vaa.get_video_eq && vo_vaa.get_video_eq( &eq ) == 0 ) set_video_eq( eq.cap );
+ }
/* mDrawColorKey: */
@@ -332,6 +341,7 @@
}
set_window(1,info);
+
if(info) memcpy(&vtune,info,sizeof(vo_tune_info_t));
else memset(&vtune,0,sizeof(vo_tune_info_t));
XFlush(mDisplay);
Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- vosub_vidix.c 24 Jun 2002 11:51:55 -0000 1.48
+++ vosub_vidix.c 19 Jul 2002 20:51:47 -0000 1.49
@@ -71,14 +71,6 @@
vaa->set_deint=vidix_set_deint;
}
-extern int vo_gamma_brightness;
-extern int vo_gamma_saturation;
-extern int vo_gamma_contrast;
-extern int vo_gamma_hue;
-extern int vo_gamma_red_intensity;
-extern int vo_gamma_green_intensity;
-extern int vo_gamma_blue_intensity;
-
static vidix_video_eq_t vid_eq;
int vidix_start(void)
More information about the MPlayer-cvslog
mailing list