Support AV1 encoding using libaom

FFmpeg · Mar 12, 2018 · 43778a5 · 43778a5
1 parent c438899
commit 43778a5
Show file tree

Hide file tree

Showing 5 changed files with 590 additions and 1 deletion.
diff --git a/configure b/configure
@@ -2366,6 +2366,7 @@ avxsynth_deps="libdl"
 avisynth_demuxer_deps_any="avisynth avxsynth"
 avisynth_demuxer_select="riffdec"
 libaom_av1_decoder_deps="libaom"
+libaom_av1_encoder_deps="libaom"
 libdcadec_decoder_deps="libdcadec"
 libfaac_encoder_deps="libfaac"
 libfaac_encoder_select="audio_frame_queue"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
@@ -688,6 +688,7 @@ OBJS-$(CONFIG_WEBM_MUXER)              += mpeg4audio.o
 
 # external codec libraries
 OBJS-$(CONFIG_LIBAOM_AV1_DECODER)         += libaomdec.o libaom.o
+OBJS-$(CONFIG_LIBAOM_AV1_ENCODER)         += libaomenc.o libaom.o
 OBJS-$(CONFIG_LIBDCADEC_DECODER)          += libdcadec.o dca.o
 OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
 OBJS-$(CONFIG_LIBFDK_AAC_DECODER)         += libfdk-aacdec.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
@@ -421,7 +421,7 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (XSUB,              xsub);
 
     /* external libraries */
-    REGISTER_DECODER(LIBAOM_AV1,        libaom_av1);
+    REGISTER_ENCDEC (LIBAOM_AV1,        libaom_av1);
     REGISTER_DECODER(LIBDCADEC,         libdcadec)
     REGISTER_ENCODER(LIBFAAC,           libfaac);
     REGISTER_ENCDEC (LIBFDK_AAC,        libfdk_aac);

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
@@ -2551,6 +2551,10 @@ 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
+
     /**
      * level
      * - encoding: Set by user.