diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-09 00:47:26 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-09 00:47:26 +0000 |
| commit | 7c51652a1ba60b6a102eae0c76562234e30d83be (patch) | |
| tree | dd6402878602d5b9703fc573564d689e300ef2f6 /libvo/vo_dxr3.c | |
| parent | 73fb8576e423b1c555cf1fcf8898168cff6f9294 (diff) | |
| download | mpv-7c51652a1ba60b6a102eae0c76562234e30d83be.tar.bz2 mpv-7c51652a1ba60b6a102eae0c76562234e30d83be.tar.xz | |
query_ stuff replaced by new control() - patch by David Holm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4593 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_dxr3.c')
| -rw-r--r-- | libvo/vo_dxr3.c | 75 |
1 files changed, 33 insertions, 42 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 3dc56b32ca..ba171ade86 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -92,6 +92,39 @@ static vo_info_t vo_info = "" }; +uint32_t control(uint32_t request, void *data, ...) +{ + uint32_t flag = 0; + switch (request) { + case VOCTRL_RESET: + fsync(fd_video); + return VO_TRUE; + case VOCTRL_QUERY_FORMAT: + switch (*((uint32_t*)data)) { + case IMGFMT_MPEGPES: + /* Hardware accelerated | Hardware supports subpics */ + flag = 0x2 | 0x8; + break; +#ifdef USE_LIBAVCODEC + case IMGFMT_YV12: + case IMGFMT_YUY2: + case IMGFMT_RGB24: + case IMGFMT_BGR24: + /* Conversion needed | OSD Supported */ + flag = 0x1 | 0x4; + break; + default: + printf("VO: [dxr3] Format unsupported, mail dholm@iname.com\n"); +#else + default: + printf("VO: [dxr3] You have enable libavcodec support (Read DOCS/codecs.html)!\n"); +#endif + } + return flag; + } + return VO_NOTIMPL; +} + static uint32_t config(uint32_t scr_width, uint32_t scr_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info) { int tmp1, tmp2; @@ -288,13 +321,6 @@ static uint32_t draw_frame(uint8_t * src[]) static void flip_page(void) { /* Flush the device if a seek occured */ - if (!vo_pts) { - /* Flush video */ - /*ioval = EM8300_SUBDEVICE_VIDEO; - ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval); - */ - fsync(fd_video); - } #ifdef USE_LIBAVCODEC if (img_format == IMGFMT_YV12) { int out_size = avcodec_encode_video(avc_context, avc_outbuf, avc_outbuf_size, &avc_picture); @@ -352,36 +378,6 @@ static uint32_t draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0 return -1; } -static uint32_t query_format(uint32_t format) -{ - uint32_t flag = 0; - - if (format == IMGFMT_MPEGPES) { - /* Hardware accelerated | Hardware supports subpics */ - flag = 0x2 | 0x8; -#ifdef USE_LIBAVCODEC - } else if (format == IMGFMT_YV12) { - /* Conversion needed | OSD Supported */ - flag = 0x1 | 0x4; - } else if (format == IMGFMT_YUY2) { - /* Conversion needed | OSD Supported */ - flag = 0x1 | 0x4; - } else if (format == IMGFMT_RGB24) { - /* Conversion needed | OSD Supported */ - flag = 0x1 | 0x4; - } else if (format == IMGFMT_BGR24) { - /* Conversion needed | OSD Supported */ - flag = 0x1 | 0x4; - } else { - printf("VO: [dxr3] Format unsupported, mail dholm@iname.com\n"); -#else - } else { - printf("VO: [dxr3] You have enable libavcodec support (Read DOCS/codecs.html)!\n"); -#endif - } - return flag; -} - static void uninit(void) { printf("VO: [dxr3] Uninitializing\n"); @@ -484,8 +480,3 @@ static uint32_t preinit(const char *arg) return 0; } - -static void query_vaa(vo_vaa_t *vaa) -{ - memset(vaa, 0, sizeof(vo_vaa_t)); -} |