diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-27 17:56:52 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-27 17:56:52 +0000 |
commit | bb314fce939272cb9bdaba59d23ef74bbb408a62 (patch) | |
tree | 8894a3543c4ed207191511dc81792b1ae031c4cb /libvo | |
parent | e290b551980c39cbe4358b996c97cbff582174d7 (diff) |
query_format revised
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6213 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_dxr3.c | 6 | ||||
-rw-r--r-- | libvo/vo_fbdev.c | 10 | ||||
-rw-r--r-- | libvo/vo_fsdga.c | 5 | ||||
-rw-r--r-- | libvo/vo_gl.c | 3 | ||||
-rw-r--r-- | libvo/vo_gl2.c | 3 |
5 files changed, 14 insertions, 13 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index f87becafea..d2b7709cf4 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -216,7 +216,7 @@ uint32_t control(uint32_t request, void *data, ...) 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 @@ uint32_t control(uint32_t request, void *data, ...) 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 @@ uint32_t control(uint32_t request, void *data, ...) if (noprebuf) { return flag; } else { - return (flag | 0x100); + return (flag | VFCAP_TIMER); } } return VO_NOTIMPL; diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index a4b3646837..aafe42ff41 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -1168,7 +1168,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, 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 @@ static uint32_t query_format(uint32_t format) 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 --git a/libvo/vo_fsdga.c b/libvo/vo_fsdga.c index 2e18bd1f73..f720c34aca 100644 --- a/libvo/vo_fsdga.c +++ b/libvo/vo_fsdga.c @@ -1,4 +1,3 @@ -#define DISP /* * video_out_dga.c, X11 interface @@ -281,9 +280,9 @@ static uint32_t query_format( uint32_t format ) 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 --git a/libvo/vo_gl.c b/libvo/vo_gl.c index fa3378fa7e..f5c704b594 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -454,9 +454,10 @@ query_format(uint32_t format) { 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 --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index ecfe46e514..eb1cb65dba 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -1081,9 +1081,10 @@ query_format(uint32_t format) { 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; } |