[Mplayer-cvslog] CVS: main mplayer.c,1.384,1.385 dec_video.c,1.97,1.98 dec_video.h,1.3,1.4

[Nick Kurshev]

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

Modified Files:
	mplayer.c dec_video.c dec_video.h 
Log Message:
optimization

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- mplayer.c	3 Feb 2002 14:41:22 -0000	1.384
+++ mplayer.c	3 Feb 2002 15:16:46 -0000	1.385
@@ -1380,6 +1380,7 @@
 	    */
 	}
    }
+   init_video_vaa();
    fflush(stdout);
    
 //================== MAIN: ==========================

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- dec_video.c	3 Feb 2002 09:28:57 -0000	1.97
+++ dec_video.c	3 Feb 2002 15:16:46 -0000	1.98
@@ -748,6 +748,17 @@
 }
 
 extern int vaa_use_dr;
+
+static int use_dr=0;
+static bes_da_t bda;
+void init_video_vaa( void )
+{
+  memset(&bda,0,sizeof(bes_da_t));
+  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_LIBVO2
 int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){
 #else
@@ -758,9 +769,7 @@
 unsigned int out_fmt=mpi->imgfmt; //sh_video->codec->outfmt[sh_video->outfmtidx];
 int planar=(mpi->flags&MP_IMGFLAG_PLANAR)!=0; //(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420);
 int blit_frame=0;
-bes_da_t bda;
 void *vmem;
-int use_dr;
 int painted;
 static int double_buff_num = 0;
 
@@ -772,12 +781,7 @@
 unsigned int t=GetTimer();
 unsigned int t2;
 
-memset(&bda,0,sizeof(bes_da_t));
-painted = 0;
-  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;
+  painted = 0;
 #ifdef USE_MP_IMAGE
 if(mpi->type!=MP_IMGTYPE_EXPORT)
 if( !(mpi->flags&MP_IMGFLAG_ALLOCATED) && !(mpi->flags&MP_IMGFLAG_DIRECT) ){

Index: dec_video.h
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dec_video.h	1 Feb 2002 08:50:45 -0000	1.3
+++ dec_video.h	3 Feb 2002 15:16:46 -0000	1.4
@@ -3,6 +3,7 @@
 extern int video_read_properties(sh_video_t *sh_video);
 
 extern int init_video(sh_video_t *sh_video, int *pitches);
+extern void init_video_vaa( void );
 void uninit_video(sh_video_t *sh_video);
 
 #ifdef USE_LIBVO2