[FFmpeg-cvslog] Merge commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49'

James Almer git at videolan.org
Sat Nov 11 19:08:00 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 14:07:09 2017 -0300| [f1fdd17d39598a01dd19bf7202de5ef8f06ddcb0] | committer: James Almer

Merge commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49'

* commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49':
  Revert "vaapi_h265: Reduce the amount of padding in the stream"

Merged-by: James Almer <jamrial at gmail.com>

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

 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 58b30b087f..3ae92a7a09 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,


======================================================================




More information about the ffmpeg-cvslog mailing list