[libav-devel] [PATCH 1/2] avcodec: rename the AV1 profiles

Janne Grunau janne-libav at jannau.net
Thu Mar 29 19:11:09 CEST 2018


On 2018-03-29 13:10:49 -0300, James Almer wrote:
> Use the proper names instead of numbers
> 
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  libavcodec/avcodec.h   | 6 +++---
>  libavcodec/libaomenc.c | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index ac0915328..eb234a40d 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -2551,9 +2551,9 @@ typedef struct AVCodecContext {
>  #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE          3
>  #define FF_PROFILE_HEVC_REXT                        4
>  
> -#define FF_PROFILE_AV1_0                            0
> -#define FF_PROFILE_AV1_1                            1
> -#define FF_PROFILE_AV1_2                            2
> +#define FF_PROFILE_AV1_MAIN                         0
> +#define FF_PROFILE_AV1_HIGH                         1
> +#define FF_PROFILE_AV1_PROFESSIONAL                 2
>  
>      /**
>       * level
> diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
> index 94b3ddd32..a2a2c3994 100644
> --- a/libavcodec/libaomenc.c
> +++ b/libavcodec/libaomenc.c
> @@ -302,13 +302,13 @@ static av_cold int aom_init(AVCodecContext *avctx)
>      if (avctx->profile != FF_PROFILE_UNKNOWN)
>          enccfg.g_profile = avctx->profile;
>      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 {
>          const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
>          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
> -            avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_2;
> +            avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_PROFESSIONAL;
>      }

both patched look good to j-b in irc and I agree

Janne


More information about the libav-devel mailing list