diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-09-26 14:26:23 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-10-01 14:48:38 +0000 |
| commit | 0b705983584691c6d7b1ee19c4b6950fa5334326 (patch) | |
| tree | ff51915e63cb312aaeaab5f7c79ba7dd533d7db8 /video/out/vo_vaapi.c | |
| parent | 043189c2298ea6ee9d1d88143946e6b95e907db8 (diff) | |
| download | mpv-0b705983584691c6d7b1ee19c4b6950fa5334326.tar.bz2 mpv-0b705983584691c6d7b1ee19c4b6950fa5334326.tar.xz | |
vo: fully replace draw_image with draw_frame
0739cfc20934ac7772ab71dbae7ecba4ba10fda4 added the draw_frame API
deprecated draw_image internally. VOs that still used draw_image were
around, but really there's no reason to not just "upgrade" them anyway.
draw_frame is what the "real" VOs that people care about (gpu/gpu-next)
use. So we can just simplfy the code a bit now. VOCTRL_REDRAW_FRAME is
also no longer needed so that can be completely deleted as well. Note
that several of these VOs are legacy crap anyway (e.g. vaapi) and maybe
should just be deleted but whatever. vo_direct3d was also completely
untested (not that anyone should ever use it).
Diffstat (limited to 'video/out/vo_vaapi.c')
| -rw-r--r-- | video/out/vo_vaapi.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c index 4cc6ded00f..12888fefe9 100644 --- a/video/out/vo_vaapi.c +++ b/video/out/vo_vaapi.c @@ -563,11 +563,12 @@ static void get_vsync(struct vo *vo, struct vo_vsync_info *info) present_sync_get_info(x11->present, info); } -static void draw_image(struct vo *vo, struct mp_image *mpi) +static void draw_frame(struct vo *vo, struct vo_frame *frame) { struct priv *p = vo->priv; + struct mp_image *mpi = frame->current; - if (mpi->imgfmt != IMGFMT_VAAPI) { + if (mpi && mpi->imgfmt != IMGFMT_VAAPI) { struct mp_image *dst = p->swdec_surfaces[p->output_surface]; if (!dst || va_surface_upload(p, dst, mpi) < 0) { MP_WARN(vo, "Could not upload surface.\n"); @@ -575,7 +576,6 @@ static void draw_image(struct vo *vo, struct mp_image *mpi) return; } mp_image_copy_attributes(dst, mpi); - talloc_free(mpi); mpi = mp_image_new_ref(dst); } @@ -715,10 +715,6 @@ static int control(struct vo *vo, uint32_t request, void *data) struct priv *p = vo->priv; switch (request) { - case VOCTRL_REDRAW_FRAME: - p->output_surface = p->visible_surface; - draw_osd(vo); - return true; case VOCTRL_SET_PANSCAN: resize(p); return VO_TRUE; @@ -858,7 +854,7 @@ const struct vo_driver video_out_vaapi = { .query_format = query_format, .reconfig = reconfig, .control = control, - .draw_image = draw_image, + .draw_frame = draw_frame, .flip_page = flip_page, .get_vsync = get_vsync, .wakeup = vo_x11_wakeup, |