diff options
| author | wm4 <wm4@nowhere> | 2015-07-01 19:24:28 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-07-01 22:38:02 +0200 |
| commit | 0739cfc20934ac7772ab71dbae7ecba4ba10fda4 (patch) | |
| tree | 939c829441af634577d71fbdf99a60314aa3ab42 /video/out/gl_video.h | |
| parent | f166d1298545154618ee2d046bb3c433469469c2 (diff) | |
| download | mpv-0739cfc20934ac7772ab71dbae7ecba4ba10fda4.tar.bz2 mpv-0739cfc20934ac7772ab71dbae7ecba4ba10fda4.tar.xz | |
vo: change internal API for drawing frames
draw_image_timed is renamed to draw_frame. struct frame_timing is
renamed to vo_frame. flip_page_timed is merged into draw_frame (the
additional parameters are part of struct vo_frame). draw_frame also
deprecates VOCTRL_REDRAW_FRAME, and replaces it with a method that
works for both VOs which can cache the current frame, and VOs which
need to redraw it anyway.
This is preparation to making the interpolation and (work in progress)
display sync code saner.
Lots of other refactoring, and also some simplifications.
Diffstat (limited to 'video/out/gl_video.h')
| -rw-r--r-- | video/out/gl_video.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/gl_video.h b/video/out/gl_video.h index e3ce40b606..4e82215268 100644 --- a/video/out/gl_video.h +++ b/video/out/gl_video.h @@ -77,6 +77,7 @@ extern const struct gl_video_opts gl_video_opts_hq_def; extern const struct gl_video_opts gl_video_opts_def; struct gl_video; +struct vo_frame; struct gl_video *gl_video_init(GL *gl, struct mp_log *log, struct mpv_global *g); void gl_video_uninit(struct gl_video *p); @@ -87,9 +88,7 @@ bool gl_video_check_format(struct gl_video *p, int mp_format); void gl_video_config(struct gl_video *p, struct mp_image_params *params); void gl_video_set_output_depth(struct gl_video *p, int r, int g, int b); void gl_video_set_lut3d(struct gl_video *p, struct lut3d *lut3d); -void gl_video_set_image(struct gl_video *p, struct mp_image *img); -void gl_video_render_frame(struct gl_video *p, struct mp_image *img, int fbo, - struct frame_timing *t); +void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo); void gl_video_resize(struct gl_video *p, int vp_w, int vp_h, struct mp_rect *src, struct mp_rect *dst, struct mp_osd_res *osd); |