[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.29,1.30 video_out_internal.h,1.9,1.10 vo_mpegpes.c,1.27,1.28 vo_vesa.c,1.71,1.72 vo_x11.c,1.89,1.90 vo_xv.c,1.68,1.69 vosub_vidix.c,1.41,1.42

[Arpi of Ize]

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

Modified Files:
	mga_common.c video_out_internal.h vo_mpegpes.c vo_vesa.c 
	vo_x11.c vo_xv.c vosub_vidix.c 
Log Message:
VFCAP added

Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mga_common.c	31 Mar 2002 20:45:31 -0000	1.29
+++ mga_common.c	11 Apr 2002 21:07:00 -0000	1.30
@@ -223,7 +223,7 @@
     case IMGFMT_UYVY:
 //    case IMGFMT_RGB|24:
 //    case IMGFMT_BGR|24:
-        return 1;
+        return 3 | VFCAP_OSD|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN;
     }
     return 0;
 }

Index: video_out_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- video_out_internal.h	9 Feb 2002 00:47:26 -0000	1.9
+++ video_out_internal.h	11 Apr 2002 21:07:00 -0000	1.10
@@ -21,6 +21,8 @@
  *
  */
 
+#include "../libmpcodecs/vfcap.h"
+
 static uint32_t control(uint32_t request, void *data, ...);
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 		     uint32_t d_height, uint32_t fullscreen, char *title,

Index: vo_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mpegpes.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vo_mpegpes.c	11 Apr 2002 11:18:02 -0000	1.27
+++ vo_mpegpes.c	11 Apr 2002 21:07:00 -0000	1.28
@@ -496,9 +496,9 @@
 static uint32_t
 query_format(uint32_t format)
 {
-    if(format==IMGFMT_MPEGPES) return 1|256;
+    if(format==IMGFMT_MPEGPES) return 3|VFCAP_TIMER;
 #ifdef USE_LIBFAME
-    if(format==IMGFMT_YV12) return 1|256;
+    if(format==IMGFMT_YV12) return 1|VFCAP_TIMER|VFCAP_OSD;
 #endif
     return 0;
 }

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- vo_vesa.c	17 Feb 2002 17:18:05 -0000	1.71
+++ vo_vesa.c	11 Apr 2002 21:07:00 -0000	1.72
@@ -445,7 +445,7 @@
 {
     if(verbose > 2)
         printf("vo_vesa: query_format was called: %x (%s)\n",format,vo_format_name(format));
-    return 1; /* due new SwScale code */
+    return 1 | VFCAP_OSD | VFCAP_SWSCALE; /* due new SwScale code */
 }
 
 static void paintBkGnd( void )

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- vo_x11.c	31 Mar 2002 09:28:17 -0000	1.89
+++ vo_x11.c	11 Apr 2002 21:07:00 -0000	1.90
@@ -569,9 +569,9 @@
     if (IMGFMT_IS_BGR(format))
     {
 	if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen)
-	    return 0x1|0x2|0x4;
+	    return 3|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP;
 	else
-	    return 0x1|0x4;
+	    return 1|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP;
     }
 
  switch( format )
@@ -585,7 +585,7 @@
    case IMGFMT_I420:
    case IMGFMT_IYUV:
    case IMGFMT_YV12:
-    return 0x1|0x4;
+    return 1|VFCAP_OSD|VFCAP_SWSCALE;
   }
  return 0;
 }

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vo_xv.c	7 Apr 2002 02:10:39 -0000	1.68
+++ vo_xv.c	11 Apr 2002 21:07:00 -0000	1.69
@@ -706,13 +706,11 @@
     return VO_FALSE;
 }
 
-
 static uint32_t query_format(uint32_t format)
 {
-    int flag=1;
+    int flag=3|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD; // FIXME! check for DOWN
    /* check image formats */
-     fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);
-     if(format==IMGFMT_BGR24){ format=IMGFMT_YV12;flag|=2;} // conversion!
+     if(format==IMGFMT_BGR24){ format=IMGFMT_YV12;flag&=~2;flag|=VFCAP_FLIP;} // conversion!
      for(i = 0; i < formats; i++){
 //       printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
        if (fo[i].id == format) return flag; //xv_format = fo[i].id;
@@ -790,6 +788,8 @@
 	printf("Couldn't find free Xvideo port - maybe other applications keep open it\n");
 	return -1;
     }
+
+    fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);
 
     return 0;
 }

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- vosub_vidix.c	27 Mar 2002 21:49:19 -0000	1.41
+++ vosub_vidix.c	11 Apr 2002 21:07:00 -0000	1.42
@@ -31,6 +31,7 @@
 #include "video_out.h"
 #include "../mp_image.h"
 
+#include "../libmpcodecs/vfcap.h"
 
 #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
 #define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
@@ -361,12 +362,12 @@
 	    vo_server->draw_slice = vidix_draw_slice_swYV12;
 	    forced_fourcc=IMGFMT_YUY2;
 	    printf("vosub_vidix: WARNING!!! Using YV12 to YUY2 SW convertion\n");
-	    return 0x02;
+	    return VFCAP_CSP_SUPPORTED|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN;
 	}
     }
-    return 0 ;
+    return 0;
   }
-  return 0x2; /* hw support without conversion */
+  return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN;
 }
 
 int vidix_grkey_support(void)