Commit f6171471 authored by James Almer's avatar James Almer

avcodec: rename the AV1 profiles

Use the proper names instead of numbers
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent a2fc8dba
...@@ -2551,9 +2551,9 @@ typedef struct AVCodecContext { ...@@ -2551,9 +2551,9 @@ typedef struct AVCodecContext {
#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3
#define FF_PROFILE_HEVC_REXT 4 #define FF_PROFILE_HEVC_REXT 4
#define FF_PROFILE_AV1_0 0 #define FF_PROFILE_AV1_MAIN 0
#define FF_PROFILE_AV1_1 1 #define FF_PROFILE_AV1_HIGH 1
#define FF_PROFILE_AV1_2 2 #define FF_PROFILE_AV1_PROFESSIONAL 2
/** /**
* level * level
......
...@@ -302,13 +302,13 @@ static av_cold int aom_init(AVCodecContext *avctx) ...@@ -302,13 +302,13 @@ static av_cold int aom_init(AVCodecContext *avctx)
if (avctx->profile != FF_PROFILE_UNKNOWN) if (avctx->profile != FF_PROFILE_UNKNOWN)
enccfg.g_profile = avctx->profile; enccfg.g_profile = avctx->profile;
else if (avctx->pix_fmt == AV_PIX_FMT_YUV420P) else if (avctx->pix_fmt == AV_PIX_FMT_YUV420P)
avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_0; avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_MAIN;
else { else {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
if (desc->comp[0].depth < 12) if (desc->comp[0].depth < 12)
avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_1; avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_HIGH;
else else
avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_2; avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_PROFESSIONAL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment