[FFmpeg-cvslog] avcodec: add AV1 profiles to profile.h

James Almer git at videolan.org
Fri Jun 26 05:38:22 EEST 2020


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Jun 25 23:28:57 2020 -0300| [82b64e9bf671e37c078a4aae26b6f5c68723d7f9] | committer: James Almer

avcodec: add AV1 profiles to profile.h

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82b64e9bf671e37c078a4aae26b6f5c68723d7f9
---

 libavcodec/libaomenc.c | 1 +
 libavcodec/profiles.h  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index 1c78da719a..fe98449fa1 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -1107,6 +1107,7 @@ static const AVOption options[] = {
     { "tune",            "The metric that the encoder tunes for. Automatically chosen by the encoder by default", OFFSET(tune), AV_OPT_TYPE_INT, {.i64 = -1}, -1, AOM_TUNE_SSIM, VE, "tune"},
     { "psnr",            NULL,         0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_PSNR}, 0, 0, VE, "tune"},
     { "ssim",            NULL,         0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_SSIM}, 0, 0, VE, "tune"},
+    FF_AV1_PROFILE_OPTS
     { NULL },
 };
 
diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h
index d2419257dc..6baaba5701 100644
--- a/libavcodec/profiles.h
+++ b/libavcodec/profiles.h
@@ -51,6 +51,11 @@
     FF_AVCTX_PROFILE_OPTION("main",          NULL, VIDEO, FF_PROFILE_MPEG2_MAIN)\
     FF_AVCTX_PROFILE_OPTION("simple",        NULL, VIDEO, FF_PROFILE_MPEG2_SIMPLE)\
 
+#define FF_AV1_PROFILE_OPTS \
+    FF_AVCTX_PROFILE_OPTION("main",          NULL, VIDEO, FF_PROFILE_AV1_MAIN)\
+    FF_AVCTX_PROFILE_OPTION("high",          NULL, VIDEO, FF_PROFILE_AV1_HIGH)\
+    FF_AVCTX_PROFILE_OPTION("professional",  NULL, VIDEO, FF_PROFILE_AV1_PROFESSIONAL)\
+
 extern const AVProfile ff_aac_profiles[];
 extern const AVProfile ff_dca_profiles[];
 extern const AVProfile ff_dnxhd_profiles[];



More information about the ffmpeg-cvslog mailing list