vo: add VO_CAP_NOREDRAW for upcoming vo_mediacodec_embed

MediaCodec uses a fixed number of output buffers to hold frames, and
expects that output buffers will be released as soon as possible. Once
rendered, the underlying frame is automatically released and cannot be
reused or rerendered.

The new VO_CAP_NOREDRAW forces mpv to release frames immediately after
they are rendered or dropped, to ensure that MediaCodec decoder does not
run out of buffers and stall out.
This commit is contained in:
Aman Gupta 2017-07-06 10:49:54 -07:00 committed by wm4
parent d08e407c9e
commit 6f0fdac6f1
2 changed files with 8 additions and 1 deletions

View File

@ -882,6 +882,11 @@ static bool render_frame(struct vo *vo)
update_vsync_timing_after_swap(vo);
}
if (vo->driver->caps & VO_CAP_NOREDRAW) {
talloc_free(in->current_frame);
in->current_frame = NULL;
}
if (in->dropped_frame) {
MP_STATS(vo, "drop-vo");
} else {
@ -903,7 +908,7 @@ static void do_redraw(struct vo *vo)
{
struct vo_internal *in = vo->in;
if (!vo->config_ok)
if (!vo->config_ok || (vo->driver->caps & VO_CAP_NOREDRAW))
return;
pthread_mutex_lock(&in->lock);

View File

@ -172,6 +172,8 @@ enum {
VO_CAP_ROTATE90 = 1 << 0,
// VO does framedrop itself (vo_vdpau). Untimed/encoding VOs never drop.
VO_CAP_FRAMEDROP = 1 << 1,
// VO does not support redraws (vo_mediacodec_embed).
VO_CAP_NOREDRAW = 1 << 2,
};
#define VO_MAX_REQ_FRAMES 10