diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2018-03-16 11:34:25 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2018-04-09 16:50:03 +0200 |
| commit | cc06f7bd10c236539b4f6f87b795c459dd873770 (patch) | |
| tree | 1a87cccad4c3b9cbdff5bc9b355b632cbd04b54a /libavcodec/libx265.c | |
| parent | 54307b35311e9a871b3d8ecb2b2eecfc16de0163 (diff) | |
| download | ffmpeg-cc06f7bd10c236539b4f6f87b795c459dd873770.tar.gz | |
libx265: Support tiny video sizes
Where tiny is less than the default CTU size.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/libx265.c')
| -rw-r--r-- | libavcodec/libx265.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index fd5452193b..8f1d60b4e5 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -122,6 +122,17 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ctx->params->sourceHeight = avctx->height; ctx->params->bEnablePsnr = !!(avctx->flags & AV_CODEC_FLAG_PSNR); + /* Tune the CTU size based on input resolution. */ + if (ctx->params->sourceWidth < 64 || ctx->params->sourceHeight < 64) + ctx->params->maxCUSize = 32; + if (ctx->params->sourceWidth < 32 || ctx->params->sourceHeight < 32) + ctx->params->maxCUSize = 16; + if (ctx->params->sourceWidth < 16 || ctx->params->sourceHeight < 16) { + av_log(avctx, AV_LOG_ERROR, "Image size is too small (%dx%d).\n", + ctx->params->sourceWidth, ctx->params->sourceHeight); + return AVERROR(EINVAL); + } + if ((avctx->color_primaries <= AVCOL_PRI_BT2020 && avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) || (avctx->color_trc <= AVCOL_TRC_BT2020_12 && |