diff options
| author | Mark Thompson <sw@jkqxz.net> | 2016-09-18 16:06:55 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2016-09-28 22:54:11 +0100 |
| commit | 086e4b58b59ea3993107aa24d92bb962ec69667c (patch) | |
| tree | 76d1b345fbc0e178b0a4f2f23f1fed848e2c6d40 /libavcodec | |
| parent | 892bbbcdc171ff0d08d69636a240ffb95f54243c (diff) | |
| download | ffmpeg-086e4b58b59ea3993107aa24d92bb962ec69667c.tar.gz | |
vaapi_encode: Sync to input surface rather than output
While outwardly bizarre, this change makes the behaviour consistent
with other VAAPI encoders which sync to the encode /input/ picture in
order to wait for /output/ from the encoder. It is not harmful on
i965 (because synchronisation already happens in vaRenderPicture(),
so it has no effect there), and it allows the encoder to work on
mesa/gallium which assumes this behaviour.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vaapi_encode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 7ec5340717..dc6cdfef60 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -109,10 +109,10 @@ static int vaapi_encode_wait(AVCodecContext *avctx, } av_log(avctx, AV_LOG_DEBUG, "Sync to pic %"PRId64"/%"PRId64" " - "(recon surface %#x).\n", pic->display_order, - pic->encode_order, pic->recon_surface); + "(input surface %#x).\n", pic->display_order, + pic->encode_order, pic->input_surface); - vas = vaSyncSurface(ctx->hwctx->display, pic->recon_surface); + vas = vaSyncSurface(ctx->hwctx->display, pic->input_surface); if (vas != VA_STATUS_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to sync to picture completion: " "%d (%s).\n", vas, vaErrorStr(vas)); |