[Mplayer-cvslog] CVS: main/libvo video_out.c,1.34,1.35 vosub_vidix.c,1.9,1.10

[Nick Kurshev]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv25359/main/libvo

Modified Files:
	video_out.c vosub_vidix.c 
Log Message:
gamma correction support

Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- video_out.c	17 Jan 2002 01:32:29 -0000	1.34
+++ video_out.c	18 Jan 2002 09:11:09 -0000	1.35
@@ -47,7 +47,16 @@
 float vo_fps=0; // for mp1e rte
 
 char *vo_subdevice = NULL;
-
+/****************************************
+*	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_red_intense=0;
+int vo_gamma_green_intense=0;
+int vo_gamma_blue_intense=0;
 //
 // Externally visible list of all vo drivers
 //

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vosub_vidix.c	16 Jan 2002 15:22:45 -0000	1.9
+++ vosub_vidix.c	18 Jan 2002 09:11:09 -0000	1.10
@@ -154,15 +154,51 @@
 	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_intense;
+extern int vo_gamma_green_intense;
+extern int vo_gamma_blue_intense;
+
+vidix_video_eq_t vid_eq;
+
 void vidix_start(void)
 {
     int err;
 
+    if(verbose > 1)
+    {
+	printf("vosub_vidix: vo_gamma_brightness=%i\n"
+	       "vosub_vidix: vo_gamma_saturation=%i\n"
+	       "vosub_vidix: vo_gamma_contrast=%i\n"
+	       "vosub_vidix: vo_gamma_hue=%i\n"
+	       "vosub_vidix: vo_gamma_red_intense=%i\n"
+	       "vosub_vidix: vo_gamma_green_intense=%i\n"
+	       "vosub_vidix: vo_gamma_blue_intense=%i\n"
+	       ,vo_gamma_brightness
+	       ,vo_gamma_saturation
+	       ,vo_gamma_contrast
+	       ,vo_gamma_hue
+	       ,vo_gamma_red_intense
+	       ,vo_gamma_green_intense
+	       ,vo_gamma_blue_intense);
+    }
     if((err=vdlPlaybackOn(vidix_handler))!=0)
     {
 	printf("vosub_vidix: Can't start playback: %s\n",strerror(err));
 	return -1;
     }
+    vid_eq.brightness = vo_gamma_brightness;
+    vid_eq.saturation = vo_gamma_saturation;
+    vid_eq.contrast = vo_gamma_contrast;
+    vid_eq.hue = vo_gamma_hue;
+    vid_eq.red_intense = vo_gamma_red_intense;
+    vid_eq.green_intense = vo_gamma_green_intense;
+    vid_eq.blue_intense = vo_gamma_blue_intense;
+    vid_eq.flags = VEQ_FLG_ITU_R_BT_601;
+    vdlPlaybackSetEq(vidix_handler,&vid_eq);
     return 0;
 }