# HG changeset patch
# User alex
# Date 1022522212 0
# Node ID 2001affedb75a1b946f0e504ac375710b34f6cba
# Parent  a59795bd14d08cc3b32acdfe9b7cd272d1724e96
query_format revised

diff -r a59795bd14d0 -r 2001affedb75 libvo/vo_dxr3.c
--- a/libvo/vo_dxr3.c	Mon May 27 17:44:32 2002 +0000
+++ b/libvo/vo_dxr3.c	Mon May 27 17:56:52 2002 +0000
@@ -216,7 +216,7 @@
 		switch (*((uint32_t*)data)) {	
 		case IMGFMT_MPEGPES:
 			/* Hardware accelerated | Hardware supports subpics */
-			flag = 0x2 | 0x8;
+			flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_SPU;
 			break;
 #if defined(USE_LIBFAME) || defined(USE_LIBAVCODEC)
 		case IMGFMT_YV12:
@@ -224,7 +224,7 @@
 		case IMGFMT_RGB24:
 		case IMGFMT_BGR24:
 			/* Conversion needed | OSD Supported */
-			flag = 0x1 | 0x4;
+			flag = VFCAP_CSP_SUPPORTED | VFCAP_OSD;
 			break;
 #else
 		default:
@@ -234,7 +234,7 @@
 		if (noprebuf) {
 			return flag;
 		} else {
-			return (flag | 0x100);
+			return (flag | VFCAP_TIMER);
 		}
 	}
 	return VO_NOTIMPL;
diff -r a59795bd14d0 -r 2001affedb75 libvo/vo_fbdev.c
--- a/libvo/vo_fbdev.c	Mon May 27 17:44:32 2002 +0000
+++ b/libvo/vo_fbdev.c	Mon May 27 17:56:52 2002 +0000
@@ -1168,7 +1168,7 @@
 
 static uint32_t query_format(uint32_t format)
 {
-	int ret = 0x4; /* osd/sub is supported on every bpp */
+	int ret = VFCAP_OSD|VFCAP_CSP_SUPPORTED; /* osd/sub is supported on every bpp */
 
 	if (!fb_preinit())
 		return 0;
@@ -1176,14 +1176,14 @@
 		int bpp = format & 0xff;
 
 		if (bpp == fb_bpp)
-			return ret|0x2;
+			return ret|VFCAP_CSP_SUPPORTED_BY_HW;
 		else if (bpp == 15 && fb_bpp == 16)
-			return ret|0x1;
+			return ret;
 		else if (bpp == 24 && fb_bpp == 32)
-			return ret|0x1;
+			return ret;
 	}
 	if (format == IMGFMT_YV12)
-		return ret|0x1;
+		return ret;
 	return 0;
 }
 
diff -r a59795bd14d0 -r 2001affedb75 libvo/vo_fsdga.c
--- a/libvo/vo_fsdga.c	Mon May 27 17:44:32 2002 +0000
+++ b/libvo/vo_fsdga.c	Mon May 27 17:56:52 2002 +0000
@@ -1,4 +1,3 @@
-#define DISP
 
 /*
  * video_out_dga.c, X11 interface
@@ -281,9 +280,9 @@
  if( !vo_init() ) return 0; // Can't open X11
  printf("Format: %lx\n", (unsigned long) format);
 
- if( format==IMGFMT_YV12 ) return 1;
+ if( format==IMGFMT_YV12 ) return VFCAP_CSP_SUPPORTED;
  if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR && 
-     ( format&0xFF )==vo_depthonscreen ) return 1;
+     ( format&0xFF )==vo_depthonscreen ) return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW;
  return 0;
 }
 
diff -r a59795bd14d0 -r 2001affedb75 libvo/vo_gl.c
--- a/libvo/vo_gl.c	Mon May 27 17:44:32 2002 +0000
+++ b/libvo/vo_gl.c	Mon May 27 17:56:52 2002 +0000
@@ -454,9 +454,10 @@
 {
     switch(format){
     case IMGFMT_YV12:
+	return VFCAP_CSP_SUPPORTED;
     case IMGFMT_RGB|24:
     case IMGFMT_BGR|24:
-        return 1;
+        return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
     }
     return 0;
 }
diff -r a59795bd14d0 -r 2001affedb75 libvo/vo_gl2.c
--- a/libvo/vo_gl2.c	Mon May 27 17:44:32 2002 +0000
+++ b/libvo/vo_gl2.c	Mon May 27 17:56:52 2002 +0000
@@ -1081,9 +1081,10 @@
 {
     switch(format){
     case IMGFMT_YV12:
+	return VFCAP_CSP_SUPPORTED;
     case IMGFMT_RGB|24:
     case IMGFMT_BGR|24:
-        return 1;
+        return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD;
     }
     return 0;
 }