[FFmpeg-devel] [PATCH] fix nvenc potential profile error when encoding yuv444p

[Philip Langdale]

On Wed, 28 Oct 2015 14:53:42 +0800
Agatha Hu <ahu at nvidia.com> wrote:

> ---
>   libavcodec/nvenc.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
> index 0e6ef43..083e494 100644
> --- a/libavcodec/nvenc.c
> +++ b/libavcodec/nvenc.c
> @@ -912,6 +912,11 @@ static av_cold int
> nvenc_encode_init(AVCodecContext *avctx)
>                   goto error;
>               }
>           }
> +        // 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;
> 
> @@ -1452,7 +1457,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 },

Seems reasonable to me.


--phil