diff options
| author | wm4 <wm4@nowhere> | 2012-11-04 15:56:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-13 17:39:31 +0100 |
| commit | 191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30 (patch) | |
| tree | 5051c40e3342b47369953605ea0a7edf3d1599eb /video/out/vo_x11.c | |
| parent | 97032f1b58cc4c5c17002939703ee16904691675 (diff) | |
| download | mpv-191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30.tar.bz2 mpv-191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30.tar.xz | |
video/out: make draw_image mandatory, remove VOCTRL_DRAW_IMAGE
Remove VOCTRL_DRAW_IMAGE and always set vo_driver.draw_image in VOs.
Make draw_image mandatory: change some VOs (like vo_x11) to support it,
and remove the image-to-slices fallback in vf_vo.
Remove vo_driver.is_new. This member indicated whether draw_image is
supported unconditionally, which is now always the case.
draw_image_pts is a hack until the video filter chain is changed to
include the PTS as field in mp_image. Then vo_vdpau and vo_lavc will
be changed to use draw_image.
Diffstat (limited to 'video/out/vo_x11.c')
| -rw-r--r-- | video/out/vo_x11.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index f8d906f1e7..f787017e90 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -523,6 +523,11 @@ static int draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, return 0; } +static void draw_image(struct vo *vo, mp_image_t *mpi) +{ + draw_slice(vo, mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0); +} + static int query_format(struct vo *vo, uint32_t format) { mp_msg(MSGT_VO, MSGL_DBG2, @@ -627,7 +632,6 @@ static int control(struct vo *vo, uint32_t request, void *data) } const struct vo_driver video_out_x11 = { - .is_new = false, .info = &(const vo_info_t) { "X11 ( XImage/Shm )", "x11", @@ -647,6 +651,7 @@ const struct vo_driver video_out_x11 = { .preinit = preinit, .config = config, .control = control, + .draw_image = draw_image, .draw_slice = draw_slice, .draw_osd = draw_osd, .flip_page = flip_page, |