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_sdl.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_sdl.c')
-rw-r--r-- | video/out/vo_sdl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index b32af3ec3d..5d27962250 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -825,7 +825,7 @@ static int query_format(struct vo *vo, uint32_t format) return 0; } -static void draw_image(struct vo *vo, mp_image_t *mpi, double pts) +static void draw_image(struct vo *vo, mp_image_t *mpi) { struct priv *vc = vo->priv; void *pixels; @@ -997,8 +997,6 @@ static int control(struct vo *vo, uint32_t request, void *data) switch (request) { case VOCTRL_QUERY_FORMAT: return query_format(vo, *((uint32_t *)data)); - case VOCTRL_DRAW_IMAGE: - draw_image(vo, (mp_image_t *)data, vo->next_pts); return 0; case VOCTRL_FULLSCREEN: set_fullscreen(vo, !vo_fs); @@ -1008,7 +1006,7 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_RESUME: return vc->int_pause = 0; case VOCTRL_REDRAW_FRAME: - draw_image(vo, NULL, MP_NOPTS_VALUE); + draw_image(vo, NULL); return 1; case VOCTRL_UPDATE_SCREENINFO: update_screeninfo(vo); @@ -1042,7 +1040,6 @@ static int control(struct vo *vo, uint32_t request, void *data) #define OPT_BASE_STRUCT struct priv const struct vo_driver video_out_sdl = { - .is_new = true, .info = &(const vo_info_t) { "SDL 2.0 Renderer", "sdl", @@ -1060,6 +1057,7 @@ const struct vo_driver video_out_sdl = { .preinit = preinit, .config = config, .control = control, + .draw_image = draw_image, .uninit = uninit, .check_events = check_events, .draw_osd = draw_osd, |