RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49' 

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-11 14:07:09 -03:00
parent e493ede4ae f940c859c2
commit f1fdd17d39
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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