RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-19 21:31:52 +00:00
Code Issues Releases Wiki Activity

query_format revised

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6213 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2002-05-27 17:56:52 +00:00
parent e290b55198
commit bb314fce93
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvo/vo_dxr3.c
View File

@ -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;

10
libvo/vo_fbdev.c
View File

@ -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;
}

5
libvo/vo_fsdga.c
View File

@ -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;
}

3
libvo/vo_gl.c
View File

@ -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;
}

3
libvo/vo_gl2.c
View File

@ -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;
}