diff options
| author | Miroslav Slugen <thunder.m@email.cz> | 2016-12-30 22:04:31 +0100 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2017-01-01 14:47:25 +0100 |
| commit | 9b425bd24c48085b0d96bc0698af82bd46e57d03 (patch) | |
| tree | c03ca63492ce63cda7418179073b1c6ac869768a /libavcodec | |
| parent | 1841eda6796671cc761e446bbca0f73d629ade4e (diff) | |
| download | ffmpeg-9b425bd24c48085b0d96bc0698af82bd46e57d03.tar.gz | |
avcodec/nvenc: Add bluray_compat basic implementation
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/nvenc.c | 15 | ||||
| -rw-r--r-- | libavcodec/nvenc.h | 1 | ||||
| -rw-r--r-- | libavcodec/nvenc_h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/nvenc_hevc.c | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
5 files changed, 19 insertions, 1 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 93979f3dd9..4ee99a9f30 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -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. */ diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index c435e057b9..ab48cf759a 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -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); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index cae27aaf58..76dc48bfdf 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -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 } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index e44ca7e8ea..cd1dcb9e11 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -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 } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index fce4add003..8f37ebde60 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 70 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |