highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vaapi_encode: Sync to input surface rather than output

Browse Source 
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.
This commit is contained in:
Mark Thompson 2016-09-18 16:06:55 +01:00
parent 892bbbcdc1
commit 086e4b58b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vaapi_encode.c
View File

@ -109,10 +109,10 @@ static int vaapi_encode_wait(AVCodecContext *avctx,
} }
av_log(avctx, AV_LOG_DEBUG, "Sync to pic %"PRId64"/%"PRId64" " av_log(avctx, AV_LOG_DEBUG, "Sync to pic %"PRId64"/%"PRId64" "
"(recon surface %#x).\n", pic->display_order, "(input surface %#x).\n", pic->display_order,
pic->encode_order, pic->recon_surface); 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) { if (vas != VA_STATUS_SUCCESS) {
av_log(avctx, AV_LOG_ERROR, "Failed to sync to picture completion: " av_log(avctx, AV_LOG_ERROR, "Failed to sync to picture completion: "
"%d (%s).\n", vas, vaErrorStr(vas)); "%d (%s).\n", vas, vaErrorStr(vas));