Browse Source

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

This reverts commit a14a12ca13.

The CTU size is always 32x32; the surface size is what actually sets
the desired property, and it is already correct.
tags/n4.0
Mark Thompson 8 years ago
parent
commit
f940c859c2
1 changed files with 2 additions and 5 deletions
  1. +2
    -5
      libavcodec/vaapi_encode_h265.c

+ 2
- 5
libavcodec/vaapi_encode_h265.c View File

@@ -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,


Loading…
Cancel
Save