[Mplayer-cvslog] CVS: main cfg-common.h,1.36,1.37 dec_video.h,1.6,1.7 mencoder.c,1.109,1.110 mplayer.c,1.459,1.460

[Arpi of Ize]

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

Modified Files:
	cfg-common.h dec_video.h mencoder.c mplayer.c 
Log Message:
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cfg-common.h	3 Apr 2002 18:15:15 -0000	1.36
+++ cfg-common.h	6 Apr 2002 22:05:00 -0000	1.37
@@ -96,6 +96,7 @@
 	{"tv", "MPlayer was compiled without TV Interface support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 #endif
 	{"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+    {"vop", &vo_plugin_args, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 
 #else
 
@@ -179,4 +180,6 @@
         {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 						
+extern char** vo_plugin_args;
+
 #endif

Index: dec_video.h
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dec_video.h	18 Mar 2002 01:48:40 -0000	1.6
+++ dec_video.h	6 Apr 2002 22:05:00 -0000	1.7
@@ -6,11 +6,7 @@
 extern int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status);
 extern void uninit_video(sh_video_t *sh_video);
 
-#ifdef USE_LIBVO2
-extern int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame);
-#else
-extern int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame);
-#endif
+extern int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame);
 
 extern int get_video_quality_max(sh_video_t *sh_video);
 extern void set_video_quality(sh_video_t *sh_video,int quality);

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mencoder.c	31 Mar 2002 22:12:39 -0000	1.109
+++ mencoder.c	6 Apr 2002 22:05:00 -0000	1.110
@@ -670,6 +670,8 @@
 sh_video->codec=NULL;
 if(out_video_codec>1){
 
+sh_video->vfilter=vf_open_filter(NULL,"vo",&video_out);
+sh_video->vfilter=append_filters(sh_video->vfilter);
 
 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
 
@@ -1566,7 +1568,7 @@
          raw_rgb_buffer2 = malloc(vo_w*vo_h*4);
      }
 	    
-     blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
+     blit_frame=decode_video(sh_video,start,in_size,0);
      if(skip_flag>0) break;
      if(!blit_frame){
          // empty.
@@ -1608,7 +1610,7 @@
  }
  break;
 case VCODEC_RAW:
-    blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
+    blit_frame=decode_video(sh_video,start,in_size,0);
     if(skip_flag>0) break;
     if(!blit_frame){
 	// empty.
@@ -1629,7 +1631,7 @@
 //		     long* keyframe, int quality);
     long flags=0;
     int ret;
-    blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
+    blit_frame=decode_video(sh_video,start,in_size,0);
     if(skip_flag>0) break;
     if(!blit_frame){
 	// empty.
@@ -1648,7 +1650,7 @@
     printf("No support for Divx4 encore compiled in\n");
     mencoder_exit(1,NULL);
 #else
-    blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
+    blit_frame=decode_video(sh_video,start,in_size,0);
     draw_sub();
     if(skip_flag>0) break;
     if(!blit_frame){
@@ -1692,7 +1694,7 @@
 #else
 	int out_size;
 
-	blit_frame=decode_video(&video_out,sh_video,start,in_size,0);
+	blit_frame=decode_video(sh_video,start,in_size,0);
 	if(skip_flag>0) break;
 	if(!blit_frame){
 	    // empty.

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- mplayer.c	4 Apr 2002 14:44:47 -0000	1.459
+++ mplayer.c	6 Apr 2002 22:05:00 -0000	1.460
@@ -1163,7 +1163,7 @@
 
 }
 //================== Init AUDIO (codec) ==========================
-current_module="init_audio_codec";
+current_module="find_audio_codec";
 
 if(sh_audio){
   // Go through the codec.conf and find the best codec...
@@ -1191,6 +1191,8 @@
   }
 }
 
+current_module="init_audio_codec";
+
 if(sh_audio){
   mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n");
   if(!init_audio(sh_audio)){
@@ -1215,6 +1217,11 @@
 sh_video->video_out=video_out;
 inited_flags|=INITED_VO;
 
+current_module="init_video_filters";
+
+sh_video->vfilter=vf_open_filter(NULL,"vo",video_out);
+sh_video->vfilter=append_filters(sh_video->vfilter);
+
 current_module="init_video_codec";
 
 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
@@ -1524,7 +1531,7 @@
 	// decode:
 	current_module="decode_video";
 //	printf("Decode! %p  %d  \n",start,in_size);
-	blit_frame=decode_video(video_out,sh_video,start,in_size,drop_frame);
+	blit_frame=decode_video(sh_video,start,in_size,drop_frame);
     }
     vdecode_time=video_time_usage-vdecode_time;
     //------------------------ frame decoded. --------------------