diff options
| author | Agatha Hu <ahu@nvidia.com> | 2015-10-31 16:00:39 +0100 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2015-10-31 16:00:39 +0100 |
| commit | 20abda6b626c0efe1df298eab697d61ba52669c3 (patch) | |
| tree | ddfc6dfb9fb1d0f6ffae241c7a212ffc46526efb /libavcodec/nvenc.c | |
| parent | 8a5b60a6b1d841b74c2670f5165c8b05321f395a (diff) | |
| download | ffmpeg-20abda6b626c0efe1df298eab697d61ba52669c3.tar.gz | |
avcodec/nvenc: fix potential profile error when encoding yuv444p
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'libavcodec/nvenc.c')
| -rw-r--r-- | libavcodec/nvenc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 0e6ef435a1..812b0b4881 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -913,6 +913,12 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) } } + // force setting profile as high444p if input is AV_PIX_FMT_YUV444P + if (avctx->pix_fmt == AV_PIX_FMT_YUV444P) { + ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID; + avctx->profile = FF_PROFILE_H264_HIGH_444_PREDICTIVE; + } + ctx->encode_config.encodeCodecConfig.h264Config.chromaFormatIDC = avctx->profile == FF_PROFILE_H264_HIGH_444_PREDICTIVE ? 3 : 1; if (ctx->level) { @@ -1452,7 +1458,7 @@ static const enum AVPixelFormat pix_fmts_nvenc[] = { #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { { "preset", "Set the encoding preset (one of slow = hq 2pass, medium = hq, fast = hp, hq, hp, bd, ll, llhq, llhp, default)", OFFSET(preset), AV_OPT_TYPE_STRING, { .str = "hq" }, 0, 0, VE }, - { "profile", "Set the encoding profile (high, main or baseline)", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, + { "profile", "Set the encoding profile (high, main, baseline or high444p)", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "level", "Set the encoding level restriction (auto, 1.0, 1.0b, 1.1, 1.2, ..., 4.2, 5.0, 5.1)", OFFSET(level), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "tier", "Set the encoding tier (main or high)", OFFSET(tier), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "cbr", "Use cbr encoding mode", OFFSET(cbr), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, |