[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.130,1.131 dec_video.c,1.96,1.97 mencoder.c,1.80,1.81

[Nick Kurshev]

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

Modified Files:
	cfg-mplayer.h dec_video.c mencoder.c 
Log Message:
Allows to users control direct rendering

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- cfg-mplayer.h	1 Feb 2002 01:54:38 -0000	1.130
+++ cfg-mplayer.h	3 Feb 2002 09:28:57 -0000	1.131
@@ -47,6 +47,7 @@
 extern int vo_gamma_red_intensity;
 extern int vo_gamma_green_intensity;
 extern int vo_gamma_blue_intensity;
+extern int vaa_use_dr;
 #endif
 
 #ifdef USE_SUB
@@ -254,6 +255,8 @@
 	{"red_intensity",&vo_gamma_red_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
 	{"green_intensity",&vo_gamma_green_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
 	{"blue_intensity",&vo_gamma_blue_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
+        {"vaa_dr", &vaa_use_dr, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+        {"vaa_nodr", &vaa_use_dr, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 #endif
 
 #ifdef HAVE_AA

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- dec_video.c	3 Feb 2002 00:52:51 -0000	1.96
+++ dec_video.c	3 Feb 2002 09:28:57 -0000	1.97
@@ -747,6 +747,7 @@
   return 1;
 }
 
+extern int vaa_use_dr;
 #ifdef USE_LIBVO2
 int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){
 #else
@@ -776,6 +777,7 @@
   use_dr = 0;
   if(vo_vaa.query_bes_da)
     use_dr = vo_vaa.query_bes_da(&bda) ? 0 : 1;
+  if(!vaa_use_dr) use_dr = 0;
 #ifdef USE_MP_IMAGE
 if(mpi->type!=MP_IMGTYPE_EXPORT)
 if( !(mpi->flags&MP_IMGFLAG_ALLOCATED) && !(mpi->flags&MP_IMGFLAG_DIRECT) ){

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mencoder.c	2 Feb 2002 23:39:53 -0000	1.80
+++ mencoder.c	3 Feb 2002 09:28:57 -0000	1.81
@@ -93,6 +93,7 @@
 **************************************************************************/
 vo_vaa_t vo_vaa;
 int vo_doublebuffering;
+int vaa_use_dr;
 
 //--------------------------