[FFmpeg-cvslog] Revert "vaapi_h265: Reduce the amount of padding in the stream"

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Tue Sep 12 22:11:52 2017 +0100| [f940c859c23ae201b0170cf541ea8f6b7a52dd49] | committer: Mark Thompson

Revert "vaapi_h265: Reduce the amount of padding in the stream"

This reverts commit a14a12ca137bf1526452b97bedfc9f7b301d4e04.

The CTU size is always 32x32; the surface size is what actually sets
the desired property, and it is already correct.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f940c859c23ae201b0170cf541ea8f6b7a52dd49
---

 libavcodec/vaapi_encode_h265.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index 165b6ffde4..477065e2ce 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -815,11 +815,8 @@ static av_cold int vaapi_encode_h265_configure(AVCodecContext *avctx)
     if (err < 0)
         return err;
 
-    // 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;
+    priv->ctu_width     = FFALIGN(ctx->surface_width,  32) / 32;
+    priv->ctu_height    = FFALIGN(ctx->surface_height, 32) / 32;
 
     av_log(avctx, AV_LOG_VERBOSE, "Input %ux%u -> Surface %ux%u -> CTU %ux%u.\n",
            avctx->width, avctx->height, ctx->surface_width,