ffmpeg | branch: master | James Almer <[email protected]> | Sat Nov 11 00:49:43 2017 -0300| [e6d70494ce03760c6700c50380f4455c41919661] | committer: James Almer
Merge commit 'a14a12ca137bf1526452b97bedfc9f7b301d4e04' * commit 'a14a12ca137bf1526452b97bedfc9f7b301d4e04': vaapi_h265: Reduce the amount of padding in the stream Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6d70494ce03760c6700c50380f4455c41919661 --- libavcodec/vaapi_encode_h265.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 3ae92a7a09..58b30b087f 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -815,8 +815,11 @@ static av_cold int vaapi_encode_h265_configure(AVCodecContext *avctx) if (err < 0) return err; - priv->ctu_width = FFALIGN(ctx->surface_width, 32) / 32; - priv->ctu_height = FFALIGN(ctx->surface_height, 32) / 32; + // This is an Intel driver constraint. Despite MinCbSizeY being 8, + // we are still required to encode at 16-pixel alignment and then + // crop back (so 1080 lines is still encoded as 1088 + cropping). + priv->ctu_width = FFALIGN(ctx->surface_width, 16) / 16; + priv->ctu_height = FFALIGN(ctx->surface_height, 16) / 16; av_log(avctx, AV_LOG_VERBOSE, "Input %ux%u -> Surface %ux%u -> CTU %ux%u.\n", avctx->width, avctx->height, ctx->surface_width, ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
