diff options
author | wm4 <wm4@nowhere> | 2017-08-09 20:57:37 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-08-09 20:57:37 +0200 |
commit | 9c5dcf93989bdfccd4779c2f19282a23703ee4f7 (patch) | |
tree | 6702e0220639837a2d4749da60a2a304e5ef52b2 /video/out/opengl/hwdec.h | |
parent | de6d3f8ca10f22901d1cdfb44d117e7ef3eabcc1 (diff) | |
download | mpv-9c5dcf93989bdfccd4779c2f19282a23703ee4f7.tar.bz2 mpv-9c5dcf93989bdfccd4779c2f19282a23703ee4f7.tar.xz |
vo_opengl: shrink the hwdec overlay API
Just remove one callback, and fold the functionality into the other one.
RPI will still not compile, so the hwdec_rpi.c changes are untested.
Diffstat (limited to 'video/out/opengl/hwdec.h')
-rw-r--r-- | video/out/opengl/hwdec.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/video/out/opengl/hwdec.h b/video/out/opengl/hwdec.h index 95cbdadcf1..6d4dc5d591 100644 --- a/video/out/opengl/hwdec.h +++ b/video/out/opengl/hwdec.h @@ -71,13 +71,11 @@ struct gl_hwdec_driver { // layer below it. // Non-overlay mode is strictly preferred, so try not to use overlay mode. - // Set the given frame as overlay, replacing the previous one. - // hw_image==NULL is passed to clear the overlay. - int (*overlay_frame)(struct gl_hwdec *hw, struct mp_image *hw_image); - - // Move overlay position within the "window". - void (*overlay_adjust)(struct gl_hwdec *hw, - struct mp_rect *src, struct mp_rect *dst); + // Set the given frame as overlay, replacing the previous one. This can also + // just change the position of the overlay. + // hw_image==src==dst==NULL is passed to clear the overlay. + int (*overlay_frame)(struct gl_hwdec *hw, struct mp_image *hw_image, + struct mp_rect *src, struct mp_rect *dst, bool newframe); }; struct gl_hwdec *gl_hwdec_load_api(struct mp_log *log, GL *gl, |