RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl_cb: make mpv_opengl_cb_render() return left frames 

Instead of error code which was not helpful because it's always 0,
mpv_opengl_cb_render() returns the number of left frames in the
frame queue now.
This commit is contained in:
xylosper 2015-01-09 05:24:57 +09:00 committed by wm4
parent e66acd52af
commit a4c0e254a3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpv/opengl_cb.h
View File

@ -191,7 +191,7 @@ int mpv_opengl_cb_init_gl(mpv_opengl_cb_context *ctx, const char *exts,
* image - the renderer will flip it before setting the viewport * image - the renderer will flip it before setting the viewport
* (typically you want to flip the image if you are rendering * (typically you want to flip the image if you are rendering
* directly to the main framebuffer). * directly to the main framebuffer).
* @return error code * @return the number of left frames in the internal queue to be rendered
*/ */
int mpv_opengl_cb_render(mpv_opengl_cb_context *ctx, int fbo, int vp[4]); int mpv_opengl_cb_render(mpv_opengl_cb_context *ctx, int fbo, int vp[4]);

5
video/out/vo_opengl_cb.c
View File

@ -343,11 +343,12 @@ int mpv_opengl_cb_render(struct mpv_opengl_cb_context *ctx, int fbo, int vp[4])
gl_video_unset_gl_state(ctx->renderer); gl_video_unset_gl_state(ctx->renderer);
pthread_mutex_lock(&ctx->lock); pthread_mutex_lock(&ctx->lock);
if (vo && ctx->queued_frames > 0) const int left = ctx->queued_frames;
if (vo && left > 0)
update(vo->priv); update(vo->priv);
pthread_mutex_unlock(&ctx->lock); pthread_mutex_unlock(&ctx->lock);
return 0; return left;
} }
static void draw_image(struct vo *vo, mp_image_t *mpi) static void draw_image(struct vo *vo, mp_image_t *mpi)