From 1440d075607ad3f1a6a535f7132719af3ab86cef Mon Sep 17 00:00:00 2001
From: Miroslav Slugen <thunder.m@email.cz>
Date: Fri, 30 Dec 2016 22:04:31 +0100
Subject: [PATCH 2/2] NVENC: Add bluray_compat basic implementation
---
libavcodec/nvenc.c | 15 +++++++++++++++
libavcodec/nvenc.h | 1 +
libavcodec/nvenc_h264.c | 1 +
libavcodec/nvenc_hevc.c | 1 +
4 files changed, 18 insertions(+)
@@ -958,6 +958,21 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx)
ctx->init_encode_params.enableEncodeAsync = 0;
ctx->init_encode_params.enablePTD = 1;
+ if (ctx->bluray_compat) {
+ ctx->aud = 1;
+ avctx->refs = FFMIN(FFMAX(avctx->refs, 0), 6);
+ avctx->max_b_frames = FFMIN(avctx->max_b_frames, 3);
+ switch (avctx->codec->id) {
+ case AV_CODEC_ID_H264:
+ /* maximum level depends on used resolution */
+ break;
+ case AV_CODEC_ID_HEVC:
+ ctx->level = NV_ENC_LEVEL_HEVC_51;
+ ctx->tier = NV_ENC_TIER_HEVC_HIGH;
+ break;
+ }
+ }
+
if (avctx->gop_size > 0) {
if (avctx->max_b_frames >= 0) {
/* 0 is intra-only, 1 is I/P only, 2 is one B-Frame, 3 two B-frames, and so on. */
@@ -154,6 +154,7 @@ typedef struct NvencContext
int aq_strength;
int quality;
int aud;
+ int bluray_compat;
} NvencContext;
int ff_nvenc_encode_init(AVCodecContext *avctx);
@@ -108,6 +108,7 @@ static const AVOption options[] = {
{ "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control",
OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE },
{ "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
+ { "bluray-compat", "Bluray compatibility workarounds", OFFSET(bluray_compat),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ NULL }
};
@@ -105,6 +105,7 @@ static const AVOption options[] = {
{ "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control",
OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE },
{ "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
+ { "bluray-compat", "Bluray compatibility workarounds", OFFSET(bluray_compat),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ NULL }
};
--
2.1.4