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_corevideo.m | |
| 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_corevideo.m')
| -rw-r--r-- | video/out/vo_corevideo.m | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/video/out/vo_corevideo.m b/video/out/vo_corevideo.m index 9dcd27355e..c5b5399adc 100644 --- a/video/out/vo_corevideo.m +++ b/video/out/vo_corevideo.m @@ -219,7 +219,7 @@ static void flip_page(struct vo *vo) p->mpglctx->gl->Clear(GL_COLOR_BUFFER_BIT); } -static uint32_t draw_image(struct vo *vo, mp_image_t *mpi) +static void draw_image(struct vo *vo, mp_image_t *mpi) { struct priv *p = vo->priv; CVReturn error; @@ -240,7 +240,6 @@ static uint32_t draw_image(struct vo *vo, mp_image_t *mpi) } do_render(vo); - return VO_TRUE; } static int query_format(struct vo *vo, uint32_t format) @@ -386,8 +385,6 @@ static int control(struct vo *vo, uint32_t request, void *data) { struct priv *p = vo->priv; switch (request) { - case VOCTRL_DRAW_IMAGE: - return draw_image(vo, data); case VOCTRL_QUERY_FORMAT: return query_format(vo, *(uint32_t*)data); case VOCTRL_ONTOP: @@ -438,7 +435,6 @@ static int control(struct vo *vo, uint32_t request, void *data) } const struct vo_driver video_out_corevideo = { - .is_new = true, .info = &(const vo_info_t) { "Mac OS X Core Video", "corevideo", @@ -448,6 +444,7 @@ const struct vo_driver video_out_corevideo = { .preinit = preinit, .config = config, .control = control, + .draw_image = draw_image, .draw_osd = draw_osd, .flip_page = flip_page, .check_events = check_events, |