[FFmpeg-cvslog] Merge commit '43778a501f1bfbceeddc8eaeea2ea2b3506beeda'

James Almer git at videolan.org
Thu Mar 29 06:24:37 EEST 2018


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 28 23:15:18 2018 -0300| [99cc3cf7a26cd4113e5047034577027d8c6f07a2] | committer: James Almer

Merge commit '43778a501f1bfbceeddc8eaeea2ea2b3506beeda'

* commit '43778a501f1bfbceeddc8eaeea2ea2b3506beeda':
  Support AV1 encoding using libaom

This contains some extra changes taken from the libvpx encoder
wrapper, most of them contained in the set_pix_fmt() function.

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

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

 configure              |   1 +
 libavcodec/Makefile    |   1 +
 libavcodec/allcodecs.c |   1 +
 libavcodec/avcodec.h   |   4 +
 libavcodec/libaomenc.c | 742 +++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 749 insertions(+)

diff --git a/configure b/configure
index f8820aec09..9974bc1f55 100755
--- a/configure
+++ b/configure
@@ -3007,6 +3007,7 @@ h264_videotoolbox_encoder_select="videotoolbox_encoder"
 hevc_videotoolbox_encoder_deps="pthreads"
 hevc_videotoolbox_encoder_select="videotoolbox_encoder"
 libaom_av1_decoder_deps="libaom"
+libaom_av1_encoder_deps="libaom"
 libcelt_decoder_deps="libcelt"
 libcodec2_decoder_deps="libcodec2"
 libcodec2_encoder_deps="libcodec2"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 127f53596a..404047d335 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -940,6 +940,7 @@ OBJS-$(CONFIG_ILBC_AT_ENCODER)            += audiotoolboxenc.o
 OBJS-$(CONFIG_PCM_ALAW_AT_ENCODER)        += audiotoolboxenc.o
 OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER)       += audiotoolboxenc.o
 OBJS-$(CONFIG_LIBAOM_AV1_DECODER)         += libaomdec.o
+OBJS-$(CONFIG_LIBAOM_AV1_ENCODER)         += libaomenc.o
 OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
 OBJS-$(CONFIG_LIBCODEC2_DECODER)          += libcodec2.o codec2utils.o
 OBJS-$(CONFIG_LIBCODEC2_ENCODER)          += libcodec2.o codec2utils.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index be7f24725b..059445000d 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -664,6 +664,7 @@ extern AVCodec ff_pcm_mulaw_at_decoder;
 extern AVCodec ff_qdmc_at_decoder;
 extern AVCodec ff_qdm2_at_decoder;
 extern AVCodec ff_libaom_av1_decoder;
+extern AVCodec ff_libaom_av1_encoder;
 extern AVCodec ff_libcelt_decoder;
 extern AVCodec ff_libcodec2_encoder;
 extern AVCodec ff_libcodec2_decoder;
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 50c34dbff9..3306910dd2 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2933,6 +2933,10 @@ typedef struct AVCodecContext {
 #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE          3
 #define FF_PROFILE_HEVC_REXT                        4
 
+#define FF_PROFILE_AV1_MAIN                         0
+#define FF_PROFILE_AV1_HIGH                         1
+#define FF_PROFILE_AV1_PROFESSIONAL                 2
+
 #define FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT            0xc0
 #define FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT 0xc1
 #define FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT         0xc2
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
new file mode 100644
index 0000000000..a80bcbf522
--- /dev/null
+++ b/libavcodec/libaomenc.c
@@ -0,0 +1,742 @@
+/*
+ * Copyright (c) 2010, Google, Inc.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * AV1 encoder support via libaom
+ */
+
+#define AOM_DISABLE_CTRL_TYPECHECKS 1
+#include <aom/aom_encoder.h>
+#include <aom/aomcx.h>
+
+#include "libavutil/base64.h"
+#include "libavutil/common.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+
+#include "avcodec.h"
+#include "internal.h"
+
+/*
+ * Portion of struct aom_codec_cx_pkt from aom_encoder.h.
+ * One encoded frame returned from the library.
+ */
+struct FrameListData {
+    void *buf;                       /**< compressed data buffer */
+    size_t sz;                       /**< length of compressed data */
+    int64_t pts;                     /**< time stamp to show frame
+                                          (in timebase units) */
+    unsigned long duration;          /**< duration to show frame
+                                          (in timebase units) */
+    uint32_t flags;                  /**< flags for this frame */
+    struct FrameListData *next;
+};
+
+typedef struct AOMEncoderContext {
+    AVClass *class;
+    struct aom_codec_ctx encoder;
+    struct aom_image rawimg;
+    struct aom_fixed_buf twopass_stats;
+    struct FrameListData *coded_frame_list;
+    int cpu_used;
+    int auto_alt_ref;
+    int lag_in_frames;
+    int error_resilient;
+    int crf;
+    int static_thresh;
+    int drop_threshold;
+    int noise_sensitivity;
+} AOMContext;
+
+static const char *const ctlidstr[] = {
+    [AOME_SET_CPUUSED]          = "AOME_SET_CPUUSED",
+    [AOME_SET_CQ_LEVEL]         = "AOME_SET_CQ_LEVEL",
+    [AOME_SET_ENABLEAUTOALTREF] = "AOME_SET_ENABLEAUTOALTREF",
+    [AOME_SET_STATIC_THRESHOLD] = "AOME_SET_STATIC_THRESHOLD",
+    [AV1E_SET_COLOR_RANGE]      = "AV1E_SET_COLOR_RANGE",
+};
+
+static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
+{
+    AOMContext *ctx    = avctx->priv_data;
+    const char *error  = aom_codec_error(&ctx->encoder);
+    const char *detail = aom_codec_error_detail(&ctx->encoder);
+
+    av_log(avctx, AV_LOG_ERROR, "%s: %s\n", desc, error);
+    if (detail)
+        av_log(avctx, AV_LOG_ERROR, "  Additional information: %s\n", detail);
+}
+
+static av_cold void dump_enc_cfg(AVCodecContext *avctx,
+                                 const struct aom_codec_enc_cfg *cfg)
+{
+    int width = -30;
+    int level = AV_LOG_DEBUG;
+
+    av_log(avctx, level, "aom_codec_enc_cfg\n");
+    av_log(avctx, level, "generic settings\n"
+                         "  %*s%u\n  %*s%u\n  %*s%u\n  %*s%u\n  %*s%u\n"
+                         "  %*s%u\n  %*s%u\n"
+                         "  %*s{%u/%u}\n  %*s%u\n  %*s%d\n  %*s%u\n",
+           width, "g_usage:",           cfg->g_usage,
+           width, "g_threads:",         cfg->g_threads,
+           width, "g_profile:",         cfg->g_profile,
+           width, "g_w:",               cfg->g_w,
+           width, "g_h:",               cfg->g_h,
+           width, "g_bit_depth:",       cfg->g_bit_depth,
+           width, "g_input_bit_depth:", cfg->g_input_bit_depth,
+           width, "g_timebase:",        cfg->g_timebase.num, cfg->g_timebase.den,
+           width, "g_error_resilient:", cfg->g_error_resilient,
+           width, "g_pass:",            cfg->g_pass,
+           width, "g_lag_in_frames:",   cfg->g_lag_in_frames);
+    av_log(avctx, level, "rate control settings\n"
+                         "  %*s%u\n  %*s%d\n  %*s%p("SIZE_SPECIFIER")\n  %*s%u\n",
+           width, "rc_dropframe_thresh:", cfg->rc_dropframe_thresh,
+           width, "rc_end_usage:",        cfg->rc_end_usage,
+           width, "rc_twopass_stats_in:", cfg->rc_twopass_stats_in.buf, cfg->rc_twopass_stats_in.sz,
+           width, "rc_target_bitrate:",   cfg->rc_target_bitrate);
+    av_log(avctx, level, "quantizer settings\n"
+                         "  %*s%u\n  %*s%u\n",
+           width, "rc_min_quantizer:", cfg->rc_min_quantizer,
+           width, "rc_max_quantizer:", cfg->rc_max_quantizer);
+    av_log(avctx, level, "bitrate tolerance\n"
+                         "  %*s%u\n  %*s%u\n",
+           width, "rc_undershoot_pct:", cfg->rc_undershoot_pct,
+           width, "rc_overshoot_pct:",  cfg->rc_overshoot_pct);
+    av_log(avctx, level, "decoder buffer model\n"
+                         "  %*s%u\n  %*s%u\n  %*s%u\n",
+           width, "rc_buf_sz:",         cfg->rc_buf_sz,
+           width, "rc_buf_initial_sz:", cfg->rc_buf_initial_sz,
+           width, "rc_buf_optimal_sz:", cfg->rc_buf_optimal_sz);
+    av_log(avctx, level, "2 pass rate control settings\n"
+                         "  %*s%u\n  %*s%u\n  %*s%u\n",
+           width, "rc_2pass_vbr_bias_pct:",       cfg->rc_2pass_vbr_bias_pct,
+           width, "rc_2pass_vbr_minsection_pct:", cfg->rc_2pass_vbr_minsection_pct,
+           width, "rc_2pass_vbr_maxsection_pct:", cfg->rc_2pass_vbr_maxsection_pct);
+    av_log(avctx, level, "keyframing settings\n"
+                         "  %*s%d\n  %*s%u\n  %*s%u\n",
+           width, "kf_mode:",     cfg->kf_mode,
+           width, "kf_min_dist:", cfg->kf_min_dist,
+           width, "kf_max_dist:", cfg->kf_max_dist);
+    av_log(avctx, level, "\n");
+}
+
+static void coded_frame_add(void *list, struct FrameListData *cx_frame)
+{
+    struct FrameListData **p = list;
+
+    while (*p)
+        p = &(*p)->next;
+    *p = cx_frame;
+    cx_frame->next = NULL;
+}
+
+static av_cold void free_coded_frame(struct FrameListData *cx_frame)
+{
+    av_freep(&cx_frame->buf);
+    av_freep(&cx_frame);
+}
+
+static av_cold void free_frame_list(struct FrameListData *list)
+{
+    struct FrameListData *p = list;
+
+    while (p) {
+        list = list->next;
+        free_coded_frame(p);
+        p = list;
+    }
+}
+
+static av_cold int codecctl_int(AVCodecContext *avctx,
+                                enum aome_enc_control_id id, int val)
+{
+    AOMContext *ctx = avctx->priv_data;
+    char buf[80];
+    int width = -30;
+    int res;
+
+    snprintf(buf, sizeof(buf), "%s:", ctlidstr[id]);
+    av_log(avctx, AV_LOG_DEBUG, "  %*s%d\n", width, buf, val);
+
+    res = aom_codec_control(&ctx->encoder, id, val);
+    if (res != AOM_CODEC_OK) {
+        snprintf(buf, sizeof(buf), "Failed to set %s codec control",
+                 ctlidstr[id]);
+        log_encoder_error(avctx, buf);
+        return AVERROR(EINVAL);
+    }
+
+    return 0;
+}
+
+static av_cold int aom_free(AVCodecContext *avctx)
+{
+    AOMContext *ctx = avctx->priv_data;
+
+    aom_codec_destroy(&ctx->encoder);
+    av_freep(&ctx->twopass_stats.buf);
+    av_freep(&avctx->stats_out);
+    free_frame_list(ctx->coded_frame_list);
+    return 0;
+}
+
+static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps,
+                       struct aom_codec_enc_cfg *enccfg, aom_codec_flags_t *flags,
+                       aom_img_fmt_t *img_fmt)
+{
+    AOMContext av_unused *ctx = avctx->priv_data;
+    enccfg->g_bit_depth = enccfg->g_input_bit_depth = 8;
+    switch (avctx->pix_fmt) {
+    case AV_PIX_FMT_YUV420P:
+        enccfg->g_profile = FF_PROFILE_AV1_MAIN;
+        *img_fmt = AOM_IMG_FMT_I420;
+        return 0;
+    case AV_PIX_FMT_YUV422P:
+        enccfg->g_profile = FF_PROFILE_AV1_PROFESSIONAL;
+        *img_fmt = AOM_IMG_FMT_I422;
+        return 0;
+    case AV_PIX_FMT_GBRP:
+    case AV_PIX_FMT_YUV444P:
+        enccfg->g_profile = FF_PROFILE_AV1_HIGH;
+        *img_fmt = AOM_IMG_FMT_I444;
+        return 0;
+    case AV_PIX_FMT_YUV420P10:
+    case AV_PIX_FMT_YUV420P12:
+        if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) {
+            enccfg->g_bit_depth = enccfg->g_input_bit_depth =
+                avctx->pix_fmt == AV_PIX_FMT_YUV420P10 ? 10 : 12;
+            enccfg->g_profile =
+                enccfg->g_bit_depth == 10 ? FF_PROFILE_AV1_MAIN : FF_PROFILE_AV1_PROFESSIONAL;
+            *img_fmt = AOM_IMG_FMT_I42016;
+            *flags |= AOM_CODEC_USE_HIGHBITDEPTH;
+            return 0;
+        }
+        break;
+    case AV_PIX_FMT_YUV422P10:
+    case AV_PIX_FMT_YUV422P12:
+        if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) {
+            enccfg->g_bit_depth = enccfg->g_input_bit_depth =
+                avctx->pix_fmt == AV_PIX_FMT_YUV422P10 ? 10 : 12;
+            enccfg->g_profile = FF_PROFILE_AV1_PROFESSIONAL;
+            *img_fmt = AOM_IMG_FMT_I42216;
+            *flags |= AOM_CODEC_USE_HIGHBITDEPTH;
+            return 0;
+        }
+        break;
+    case AV_PIX_FMT_GBRP10:
+    case AV_PIX_FMT_GBRP12:
+    case AV_PIX_FMT_YUV444P10:
+    case AV_PIX_FMT_YUV444P12:
+        if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) {
+            enccfg->g_bit_depth = enccfg->g_input_bit_depth =
+                avctx->pix_fmt == AV_PIX_FMT_YUV444P10 ||
+                avctx->pix_fmt == AV_PIX_FMT_GBRP10 ? 10 : 12;
+            enccfg->g_profile =
+                enccfg->g_bit_depth == 10 ? FF_PROFILE_AV1_HIGH : FF_PROFILE_AV1_PROFESSIONAL;
+            *img_fmt = AOM_IMG_FMT_I44416;
+            *flags |= AOM_CODEC_USE_HIGHBITDEPTH;
+            return 0;
+        }
+        break;
+    default:
+        break;
+    }
+    av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format.\n");
+    return AVERROR_INVALIDDATA;
+}
+
+static void set_color_range(AVCodecContext *avctx)
+{
+    enum aom_color_range aom_cr;
+    switch (avctx->color_range) {
+    case AVCOL_RANGE_UNSPECIFIED:
+    case AVCOL_RANGE_MPEG:       aom_cr = AOM_CR_STUDIO_RANGE; break;
+    case AVCOL_RANGE_JPEG:       aom_cr = AOM_CR_FULL_RANGE;   break;
+    default:
+        av_log(avctx, AV_LOG_WARNING, "Unsupported color range (%d)\n",
+               avctx->color_range);
+        return;
+    }
+
+    codecctl_int(avctx, AV1E_SET_COLOR_RANGE, aom_cr);
+}
+
+static av_cold int aom_init(AVCodecContext *avctx,
+                            const struct aom_codec_iface *iface)
+{
+    AOMContext *ctx = avctx->priv_data;
+    struct aom_codec_enc_cfg enccfg = { 0 };
+    aom_codec_flags_t flags = 0;
+    AVCPBProperties *cpb_props;
+    int res;
+    aom_img_fmt_t img_fmt;
+    aom_codec_caps_t codec_caps = aom_codec_get_caps(iface);
+
+    av_log(avctx, AV_LOG_INFO, "%s\n", aom_codec_version_str());
+    av_log(avctx, AV_LOG_VERBOSE, "%s\n", aom_codec_build_config());
+
+    if ((res = aom_codec_enc_config_default(iface, &enccfg, 0)) != AOM_CODEC_OK) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to get config: %s\n",
+               aom_codec_err_to_string(res));
+        return AVERROR(EINVAL);
+    }
+
+    if (set_pix_fmt(avctx, codec_caps, &enccfg, &flags, &img_fmt))
+        return AVERROR(EINVAL);
+
+    if(!avctx->bit_rate)
+        if(avctx->rc_max_rate || avctx->rc_buffer_size || avctx->rc_initial_buffer_occupancy) {
+            av_log( avctx, AV_LOG_ERROR, "Rate control parameters set without a bitrate\n");
+            return AVERROR(EINVAL);
+        }
+
+    dump_enc_cfg(avctx, &enccfg);
+
+    enccfg.g_w            = avctx->width;
+    enccfg.g_h            = avctx->height;
+    enccfg.g_timebase.num = avctx->time_base.num;
+    enccfg.g_timebase.den = avctx->time_base.den;
+    enccfg.g_threads      = avctx->thread_count;
+
+    if (ctx->lag_in_frames >= 0)
+        enccfg.g_lag_in_frames = ctx->lag_in_frames;
+
+    if (avctx->flags & AV_CODEC_FLAG_PASS1)
+        enccfg.g_pass = AOM_RC_FIRST_PASS;
+    else if (avctx->flags & AV_CODEC_FLAG_PASS2)
+        enccfg.g_pass = AOM_RC_LAST_PASS;
+    else
+        enccfg.g_pass = AOM_RC_ONE_PASS;
+
+    if (avctx->rc_min_rate == avctx->rc_max_rate &&
+        avctx->rc_min_rate == avctx->bit_rate && avctx->bit_rate) {
+        enccfg.rc_end_usage = AOM_CBR;
+    } else if (ctx->crf >= 0) {
+        enccfg.rc_end_usage = AOM_CQ;
+        if (!avctx->bit_rate)
+            enccfg.rc_end_usage = AOM_Q;
+    }
+
+    if (avctx->bit_rate) {
+        enccfg.rc_target_bitrate = av_rescale_rnd(avctx->bit_rate, 1, 1000,
+                                                  AV_ROUND_NEAR_INF);
+    } else if (enccfg.rc_end_usage == AOM_Q) {
+    } else {
+        if (enccfg.rc_end_usage == AOM_CQ) {
+            enccfg.rc_target_bitrate = 1000000;
+        } else {
+            avctx->bit_rate = enccfg.rc_target_bitrate * 1000;
+            av_log(avctx, AV_LOG_WARNING,
+                   "Neither bitrate nor constrained quality specified, using default bitrate of %dkbit/sec\n",
+                   enccfg.rc_target_bitrate);
+        }
+    }
+
+    if (avctx->qmin >= 0)
+        enccfg.rc_min_quantizer = avctx->qmin;
+    if (avctx->qmax >= 0)
+        enccfg.rc_max_quantizer = avctx->qmax;
+
+    if (enccfg.rc_end_usage == AOM_CQ || enccfg.rc_end_usage == AOM_Q
+       ) {
+        if (ctx->crf < enccfg.rc_min_quantizer || ctx->crf > enccfg.rc_max_quantizer) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "CQ level %d must be between minimum and maximum quantizer value (%d-%d)\n",
+                   ctx->crf, enccfg.rc_min_quantizer, enccfg.rc_max_quantizer);
+            return AVERROR(EINVAL);
+        }
+    }
+
+    enccfg.rc_dropframe_thresh = ctx->drop_threshold;
+
+    // 0-100 (0 => CBR, 100 => VBR)
+    enccfg.rc_2pass_vbr_bias_pct       = round(avctx->qcompress * 100);
+    if (avctx->bit_rate)
+        enccfg.rc_2pass_vbr_minsection_pct =
+            avctx->rc_min_rate * 100LL / avctx->bit_rate;
+    if (avctx->rc_max_rate)
+        enccfg.rc_2pass_vbr_maxsection_pct =
+            avctx->rc_max_rate * 100LL / avctx->bit_rate;
+
+    if (avctx->rc_buffer_size)
+        enccfg.rc_buf_sz =
+            avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
+    if (avctx->rc_initial_buffer_occupancy)
+        enccfg.rc_buf_initial_sz =
+            avctx->rc_initial_buffer_occupancy * 1000LL / avctx->bit_rate;
+    enccfg.rc_buf_optimal_sz = enccfg.rc_buf_sz * 5 / 6;
+
+    // _enc_init() will balk if kf_min_dist differs from max w/AOM_KF_AUTO
+    if (avctx->keyint_min >= 0 && avctx->keyint_min == avctx->gop_size)
+        enccfg.kf_min_dist = avctx->keyint_min;
+    if (avctx->gop_size >= 0)
+        enccfg.kf_max_dist = avctx->gop_size;
+
+    if (enccfg.g_pass == AOM_RC_FIRST_PASS)
+        enccfg.g_lag_in_frames = 0;
+    else if (enccfg.g_pass == AOM_RC_LAST_PASS) {
+        int decode_size, ret;
+
+        if (!avctx->stats_in) {
+            av_log(avctx, AV_LOG_ERROR, "No stats file for second pass\n");
+            return AVERROR_INVALIDDATA;
+        }
+
+        ctx->twopass_stats.sz = strlen(avctx->stats_in) * 3 / 4;
+        ret                   = av_reallocp(&ctx->twopass_stats.buf, ctx->twopass_stats.sz);
+        if (ret < 0) {
+            av_log(avctx, AV_LOG_ERROR,
+                   "Stat buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
+                   ctx->twopass_stats.sz);
+            ctx->twopass_stats.sz = 0;
+            return ret;
+        }
+        decode_size = av_base64_decode(ctx->twopass_stats.buf, avctx->stats_in,
+                                       ctx->twopass_stats.sz);
+        if (decode_size < 0) {
+            av_log(avctx, AV_LOG_ERROR, "Stat buffer decode failed\n");
+            return AVERROR_INVALIDDATA;
+        }
+
+        ctx->twopass_stats.sz      = decode_size;
+        enccfg.rc_twopass_stats_in = ctx->twopass_stats;
+    }
+
+    /* 0-3: For non-zero values the encoder increasingly optimizes for reduced
+     * complexity playback on low powered devices at the expense of encode
+     * quality. */
+    if (avctx->profile != FF_PROFILE_UNKNOWN)
+        enccfg.g_profile = avctx->profile;
+
+    enccfg.g_error_resilient = ctx->error_resilient;
+
+    dump_enc_cfg(avctx, &enccfg);
+    /* Construct Encoder Context */
+    res = aom_codec_enc_init(&ctx->encoder, iface, &enccfg, flags);
+    if (res != AOM_CODEC_OK) {
+        log_encoder_error(avctx, "Failed to initialize encoder");
+        return AVERROR(EINVAL);
+    }
+
+    // codec control failures are currently treated only as warnings
+    av_log(avctx, AV_LOG_DEBUG, "aom_codec_control\n");
+    codecctl_int(avctx, AOME_SET_CPUUSED, ctx->cpu_used);
+    if (ctx->auto_alt_ref >= 0)
+        codecctl_int(avctx, AOME_SET_ENABLEAUTOALTREF, ctx->auto_alt_ref);
+
+    codecctl_int(avctx, AOME_SET_STATIC_THRESHOLD, ctx->static_thresh);
+    if (ctx->crf >= 0)
+        codecctl_int(avctx, AOME_SET_CQ_LEVEL,          ctx->crf);
+
+    set_color_range(avctx);
+
+    // provide dummy value to initialize wrapper, values will be updated each _encode()
+    aom_img_wrap(&ctx->rawimg, img_fmt, avctx->width, avctx->height, 1,
+                 (unsigned char*)1);
+
+    if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH)
+        ctx->rawimg.bit_depth = enccfg.g_bit_depth;
+
+    cpb_props = ff_add_cpb_side_data(avctx);
+    if (!cpb_props)
+        return AVERROR(ENOMEM);
+
+    if (enccfg.rc_end_usage == AOM_CBR ||
+        enccfg.g_pass != AOM_RC_ONE_PASS) {
+        cpb_props->max_bitrate = avctx->rc_max_rate;
+        cpb_props->min_bitrate = avctx->rc_min_rate;
+        cpb_props->avg_bitrate = avctx->bit_rate;
+    }
+    cpb_props->buffer_size = avctx->rc_buffer_size;
+
+    return 0;
+}
+
+static inline void cx_pktcpy(struct FrameListData *dst,
+                             const struct aom_codec_cx_pkt *src)
+{
+    dst->pts      = src->data.frame.pts;
+    dst->duration = src->data.frame.duration;
+    dst->flags    = src->data.frame.flags;
+    dst->sz       = src->data.frame.sz;
+    dst->buf      = src->data.frame.buf;
+}
+
+/**
+ * Store coded frame information in format suitable for return from encode2().
+ *
+ * Write information from @a cx_frame to @a pkt
+ * @return packet data size on success
+ * @return a negative AVERROR on error
+ */
+static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
+                      AVPacket *pkt)
+{
+    int ret = ff_alloc_packet2(avctx, pkt, cx_frame->sz, 0);
+    if (ret < 0) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Error getting output packet of size %"SIZE_SPECIFIER".\n", cx_frame->sz);
+        return ret;
+    }
+    memcpy(pkt->data, cx_frame->buf, pkt->size);
+    pkt->pts = pkt->dts = cx_frame->pts;
+
+    if (!!(cx_frame->flags & AOM_FRAME_IS_KEY))
+        pkt->flags |= AV_PKT_FLAG_KEY;
+    return pkt->size;
+}
+
+/**
+ * Queue multiple output frames from the encoder, returning the front-most.
+ * In cases where aom_codec_get_cx_data() returns more than 1 frame append
+ * the frame queue. Return the head frame if available.
+ * @return Stored frame size
+ * @return AVERROR(EINVAL) on output size error
+ * @return AVERROR(ENOMEM) on coded frame queue data allocation error
+ */
+static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out)
+{
+    AOMContext *ctx = avctx->priv_data;
+    const struct aom_codec_cx_pkt *pkt;
+    const void *iter = NULL;
+    int size = 0;
+
+    if (ctx->coded_frame_list) {
+        struct FrameListData *cx_frame = ctx->coded_frame_list;
+        /* return the leading frame if we've already begun queueing */
+        size = storeframe(avctx, cx_frame, pkt_out);
+        if (size < 0)
+            return size;
+        ctx->coded_frame_list = cx_frame->next;
+        free_coded_frame(cx_frame);
+    }
+
+    /* consume all available output from the encoder before returning. buffers
+     * are only good through the next aom_codec call */
+    while ((pkt = aom_codec_get_cx_data(&ctx->encoder, &iter))) {
+        switch (pkt->kind) {
+        case AOM_CODEC_CX_FRAME_PKT:
+            if (!size) {
+                struct FrameListData cx_frame;
+
+                /* avoid storing the frame when the list is empty and we haven't yet
+                 * provided a frame for output */
+                assert(!ctx->coded_frame_list);
+                cx_pktcpy(&cx_frame, pkt);
+                size = storeframe(avctx, &cx_frame, pkt_out);
+                if (size < 0)
+                    return size;
+            } else {
+                struct FrameListData *cx_frame =
+                    av_malloc(sizeof(struct FrameListData));
+
+                if (!cx_frame) {
+                    av_log(avctx, AV_LOG_ERROR,
+                           "Frame queue element alloc failed\n");
+                    return AVERROR(ENOMEM);
+                }
+                cx_pktcpy(cx_frame, pkt);
+                cx_frame->buf = av_malloc(cx_frame->sz);
+
+                if (!cx_frame->buf) {
+                    av_log(avctx, AV_LOG_ERROR,
+                           "Data buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
+                           cx_frame->sz);
+                    av_freep(&cx_frame);
+                    return AVERROR(ENOMEM);
+                }
+                memcpy(cx_frame->buf, pkt->data.frame.buf, pkt->data.frame.sz);
+                coded_frame_add(&ctx->coded_frame_list, cx_frame);
+            }
+            break;
+        case AOM_CODEC_STATS_PKT:
+        {
+            struct aom_fixed_buf *stats = &ctx->twopass_stats;
+            int err;
+            if ((err = av_reallocp(&stats->buf,
+                                   stats->sz +
+                                   pkt->data.twopass_stats.sz)) < 0) {
+                stats->sz = 0;
+                av_log(avctx, AV_LOG_ERROR, "Stat buffer realloc failed\n");
+                return err;
+            }
+            memcpy((uint8_t *)stats->buf + stats->sz,
+                   pkt->data.twopass_stats.buf, pkt->data.twopass_stats.sz);
+            stats->sz += pkt->data.twopass_stats.sz;
+            break;
+        }
+        case AOM_CODEC_PSNR_PKT: // FIXME add support for AV_CODEC_FLAG_PSNR
+        case AOM_CODEC_CUSTOM_PKT:
+            // ignore unsupported/unrecognized packet types
+            break;
+        }
+    }
+
+    return size;
+}
+
+static int aom_encode(AVCodecContext *avctx, AVPacket *pkt,
+                      const AVFrame *frame, int *got_packet)
+{
+    AOMContext *ctx = avctx->priv_data;
+    struct aom_image *rawimg = NULL;
+    int64_t timestamp = 0;
+    int res, coded_size;
+    aom_enc_frame_flags_t flags = 0;
+
+    if (frame) {
+        rawimg                      = &ctx->rawimg;
+        rawimg->planes[AOM_PLANE_Y] = frame->data[0];
+        rawimg->planes[AOM_PLANE_U] = frame->data[1];
+        rawimg->planes[AOM_PLANE_V] = frame->data[2];
+        rawimg->stride[AOM_PLANE_Y] = frame->linesize[0];
+        rawimg->stride[AOM_PLANE_U] = frame->linesize[1];
+        rawimg->stride[AOM_PLANE_V] = frame->linesize[2];
+        timestamp                   = frame->pts;
+        switch (frame->color_range) {
+        case AVCOL_RANGE_MPEG:
+            rawimg->range = AOM_CR_STUDIO_RANGE;
+            break;
+        case AVCOL_RANGE_JPEG:
+            rawimg->range = AOM_CR_FULL_RANGE;
+            break;
+        }
+
+        if (frame->pict_type == AV_PICTURE_TYPE_I)
+            flags |= AOM_EFLAG_FORCE_KF;
+    }
+
+    res = aom_codec_encode(&ctx->encoder, rawimg, timestamp,
+                           avctx->ticks_per_frame, flags);
+    if (res != AOM_CODEC_OK) {
+        log_encoder_error(avctx, "Error encoding frame");
+        return AVERROR_INVALIDDATA;
+    }
+    coded_size = queue_frames(avctx, pkt);
+
+    if (!frame && avctx->flags & AV_CODEC_FLAG_PASS1) {
+        size_t b64_size = AV_BASE64_SIZE(ctx->twopass_stats.sz);
+
+        avctx->stats_out = av_malloc(b64_size);
+        if (!avctx->stats_out) {
+            av_log(avctx, AV_LOG_ERROR, "Stat buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
+                   b64_size);
+            return AVERROR(ENOMEM);
+        }
+        av_base64_encode(avctx->stats_out, b64_size, ctx->twopass_stats.buf,
+                         ctx->twopass_stats.sz);
+    }
+
+    *got_packet = !!coded_size;
+    return 0;
+}
+
+static const enum AVPixelFormat av1_pix_fmts[] = {
+    AV_PIX_FMT_YUV420P,
+    AV_PIX_FMT_YUV422P,
+    AV_PIX_FMT_YUV444P,
+    AV_PIX_FMT_GBRP,
+    AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat av1_pix_fmts_highbd[] = {
+    AV_PIX_FMT_YUV420P,
+    AV_PIX_FMT_YUV422P,
+    AV_PIX_FMT_YUV444P,
+    AV_PIX_FMT_YUV420P10,
+    AV_PIX_FMT_YUV422P10,
+    AV_PIX_FMT_YUV444P10,
+    AV_PIX_FMT_YUV420P12,
+    AV_PIX_FMT_YUV422P12,
+    AV_PIX_FMT_YUV444P12,
+    AV_PIX_FMT_GBRP,
+    AV_PIX_FMT_GBRP10,
+    AV_PIX_FMT_GBRP12,
+    AV_PIX_FMT_NONE
+};
+
+static av_cold void av1_init_static(AVCodec *codec)
+{
+    aom_codec_caps_t codec_caps = aom_codec_get_caps(aom_codec_av1_cx());
+    if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH)
+        codec->pix_fmts = av1_pix_fmts_highbd;
+    else
+        codec->pix_fmts = av1_pix_fmts;
+}
+
+static av_cold int av1_init(AVCodecContext *avctx)
+{
+    return aom_init(avctx, aom_codec_av1_cx());
+}
+
+#define OFFSET(x) offsetof(AOMContext, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+    { "cpu-used",        "Quality/Speed ratio modifier",           OFFSET(cpu_used),        AV_OPT_TYPE_INT, {.i64 = 1}, -8, 8, VE},
+    { "auto-alt-ref",    "Enable use of alternate reference "
+                         "frames (2-pass only)",                   OFFSET(auto_alt_ref),    AV_OPT_TYPE_INT, {.i64 = -1},      -1,      2,       VE},
+    { "lag-in-frames",   "Number of frames to look ahead at for "
+                         "alternate reference frame selection",    OFFSET(lag_in_frames),   AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE},
+    { "error-resilience", "Error resilience configuration", OFFSET(error_resilient), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, VE, "er"},
+    { "default",         "Improve resiliency against losses of whole frames", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_ERROR_RESILIENT_DEFAULT}, 0, 0, VE, "er"},
+    { "partitions",      "The frame partitions are independently decodable "
+                         "by the bool decoder, meaning that partitions can be decoded even "
+                         "though earlier partitions have been lost. Note that intra predicition"
+                         " is still done over the partition boundary.",       0, AV_OPT_TYPE_CONST, {.i64 = AOM_ERROR_RESILIENT_PARTITIONS}, 0, 0, VE, "er"},
+    { "crf",              "Select the quality for constant quality mode", offsetof(AOMContext, crf), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 63, VE },
+    { "static-thresh",    "A change threshold on blocks below which they will be skipped by the encoder", OFFSET(static_thresh), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+    { "drop-threshold",   "Frame drop threshold", offsetof(AOMContext, drop_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, VE },
+    { "noise-sensitivity", "Noise sensitivity", OFFSET(noise_sensitivity), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 4, VE},
+    { NULL }
+};
+
+static const AVCodecDefault defaults[] = {
+    { "qmin",             "-1" },
+    { "qmax",             "-1" },
+    { "g",                "-1" },
+    { "keyint_min",       "-1" },
+    { NULL },
+};
+
+static const AVClass class_aom = {
+    .class_name = "libaom-av1 encoder",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_libaom_av1_encoder = {
+    .name           = "libaom-av1",
+    .long_name      = NULL_IF_CONFIG_SMALL("libaom AV1"),
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_AV1,
+    .priv_data_size = sizeof(AOMContext),
+    .init           = av1_init,
+    .encode2        = aom_encode,
+    .close          = aom_free,
+    .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_EXPERIMENTAL,
+    .priv_class     = &class_aom,
+    .defaults       = defaults,
+    .init_static_data = av1_init_static,
+    .wrapper_name   = "libaom",
+};


======================================================================

diff --cc configure
index f8820aec09,42465edf94..9974bc1f55
--- a/configure
+++ b/configure
@@@ -2964,52 -2358,18 +2964,53 @@@ h264_redundant_pps_bsf_select="cbs_h264
  hevc_metadata_bsf_select="cbs_h265"
  mjpeg2jpeg_bsf_select="jpegtables"
  mpeg2_metadata_bsf_select="cbs_mpeg2"
 -trace_headers_bsf_select="cbs_h264 cbs_h265 cbs_mpeg2"
 +trace_headers_bsf_select="cbs"
  
  # external libraries
 -avisynth_deps="LoadLibrary"
 -avxsynth_deps="libdl"
 -avisynth_demuxer_deps_any="avisynth avxsynth"
 +aac_at_decoder_deps="audiotoolbox"
 +aac_at_decoder_select="aac_adtstoasc_bsf"
 +ac3_at_decoder_deps="audiotoolbox"
 +ac3_at_decoder_select="ac3_parser"
 +adpcm_ima_qt_at_decoder_deps="audiotoolbox"
 +alac_at_decoder_deps="audiotoolbox"
 +amr_nb_at_decoder_deps="audiotoolbox"
 +avisynth_deps_any="libdl LoadLibrary"
 +avisynth_demuxer_deps="avisynth"
  avisynth_demuxer_select="riffdec"
 +eac3_at_decoder_deps="audiotoolbox"
 +eac3_at_decoder_select="ac3_parser"
 +gsm_ms_at_decoder_deps="audiotoolbox"
 +ilbc_at_decoder_deps="audiotoolbox"
 +mp1_at_decoder_deps="audiotoolbox"
 +mp2_at_decoder_deps="audiotoolbox"
 +mp3_at_decoder_deps="audiotoolbox"
 +mp1_at_decoder_select="mpegaudioheader"
 +mp2_at_decoder_select="mpegaudioheader"
 +mp3_at_decoder_select="mpegaudioheader"
 +pcm_alaw_at_decoder_deps="audiotoolbox"
 +pcm_mulaw_at_decoder_deps="audiotoolbox"
 +qdmc_at_decoder_deps="audiotoolbox"
 +qdm2_at_decoder_deps="audiotoolbox"
 +aac_at_encoder_deps="audiotoolbox"
 +aac_at_encoder_select="audio_frame_queue"
 +alac_at_encoder_deps="audiotoolbox"
 +alac_at_encoder_select="audio_frame_queue"
 +ilbc_at_encoder_deps="audiotoolbox"
 +ilbc_at_encoder_select="audio_frame_queue"
 +pcm_alaw_at_encoder_deps="audiotoolbox"
 +pcm_alaw_at_encoder_select="audio_frame_queue"
 +pcm_mulaw_at_encoder_deps="audiotoolbox"
 +pcm_mulaw_at_encoder_select="audio_frame_queue"
 +chromaprint_muxer_deps="chromaprint"
 +h264_videotoolbox_encoder_deps="pthreads"
 +h264_videotoolbox_encoder_select="videotoolbox_encoder"
 +hevc_videotoolbox_encoder_deps="pthreads"
 +hevc_videotoolbox_encoder_select="videotoolbox_encoder"
  libaom_av1_decoder_deps="libaom"
+ libaom_av1_encoder_deps="libaom"
 -libdcadec_decoder_deps="libdcadec"
 -libfaac_encoder_deps="libfaac"
 -libfaac_encoder_select="audio_frame_queue"
 +libcelt_decoder_deps="libcelt"
 +libcodec2_decoder_deps="libcodec2"
 +libcodec2_encoder_deps="libcodec2"
  libfdk_aac_decoder_deps="libfdk_aac"
  libfdk_aac_encoder_deps="libfdk_aac"
  libfdk_aac_encoder_select="audio_frame_queue"
diff --cc libavcodec/Makefile
index 127f53596a,ea0c9dceae..404047d335
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -915,34 -686,11 +915,35 @@@ OBJS-$(CONFIG_SPDIF_MUXER)             
  OBJS-$(CONFIG_TAK_DEMUXER)             += tak.o
  OBJS-$(CONFIG_WEBM_MUXER)              += mpeg4audio.o
  
 +# libavfilter dependencies
 +OBJS-$(CONFIG_ELBG_FILTER)             += elbg.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_AAC_AT_DECODER)             += audiotoolboxdec.o
 +OBJS-$(CONFIG_AC3_AT_DECODER)             += audiotoolboxdec.o
 +OBJS-$(CONFIG_ADPCM_IMA_QT_AT_DECODER)    += audiotoolboxdec.o
 +OBJS-$(CONFIG_ALAC_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_AMR_NB_AT_DECODER)          += audiotoolboxdec.o
 +OBJS-$(CONFIG_EAC3_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_GSM_MS_AT_DECODER)          += audiotoolboxdec.o
 +OBJS-$(CONFIG_ILBC_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_MP1_AT_DECODER)             += audiotoolboxdec.o
 +OBJS-$(CONFIG_MP2_AT_DECODER)             += audiotoolboxdec.o
 +OBJS-$(CONFIG_MP3_AT_DECODER)             += audiotoolboxdec.o
 +OBJS-$(CONFIG_PCM_MULAW_AT_DECODER)       += audiotoolboxdec.o
 +OBJS-$(CONFIG_PCM_ALAW_AT_DECODER)        += audiotoolboxdec.o
 +OBJS-$(CONFIG_QDMC_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_QDM2_AT_DECODER)            += audiotoolboxdec.o
 +OBJS-$(CONFIG_AAC_AT_ENCODER)             += audiotoolboxenc.o
 +OBJS-$(CONFIG_ALAC_AT_ENCODER)            += audiotoolboxenc.o
 +OBJS-$(CONFIG_ILBC_AT_ENCODER)            += audiotoolboxenc.o
 +OBJS-$(CONFIG_PCM_ALAW_AT_ENCODER)        += audiotoolboxenc.o
 +OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER)       += audiotoolboxenc.o
 +OBJS-$(CONFIG_LIBAOM_AV1_DECODER)         += libaomdec.o
++OBJS-$(CONFIG_LIBAOM_AV1_ENCODER)         += libaomenc.o
 +OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
 +OBJS-$(CONFIG_LIBCODEC2_DECODER)          += libcodec2.o codec2utils.o
 +OBJS-$(CONFIG_LIBCODEC2_ENCODER)          += libcodec2.o codec2utils.o
  OBJS-$(CONFIG_LIBFDK_AAC_DECODER)         += libfdk-aacdec.o
  OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o
  OBJS-$(CONFIG_LIBGSM_DECODER)             += libgsmdec.o
diff --cc libavcodec/allcodecs.c
index be7f24725b,4aee65762e..059445000d
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@@ -29,792 -28,28 +29,793 @@@
  #include "avcodec.h"
  #include "version.h"
  
 -#define REGISTER_ENCODER(X, x)                                          \
 -    {                                                                   \
 -        extern AVCodec ff_##x##_encoder;                                \
 -        if (CONFIG_##X##_ENCODER)                                       \
 -            avcodec_register(&ff_##x##_encoder);                        \
 -    }
 +extern AVCodec ff_a64multi_encoder;
 +extern AVCodec ff_a64multi5_encoder;
 +extern AVCodec ff_aasc_decoder;
 +extern AVCodec ff_aic_decoder;
 +extern AVCodec ff_alias_pix_encoder;
 +extern AVCodec ff_alias_pix_decoder;
 +extern AVCodec ff_amv_encoder;
 +extern AVCodec ff_amv_decoder;
 +extern AVCodec ff_anm_decoder;
 +extern AVCodec ff_ansi_decoder;
 +extern AVCodec ff_apng_encoder;
 +extern AVCodec ff_apng_decoder;
 +extern AVCodec ff_asv1_encoder;
 +extern AVCodec ff_asv1_decoder;
 +extern AVCodec ff_asv2_encoder;
 +extern AVCodec ff_asv2_decoder;
 +extern AVCodec ff_aura_decoder;
 +extern AVCodec ff_aura2_decoder;
 +extern AVCodec ff_avrp_encoder;
 +extern AVCodec ff_avrp_decoder;
 +extern AVCodec ff_avrn_decoder;
 +extern AVCodec ff_avs_decoder;
 +extern AVCodec ff_avui_encoder;
 +extern AVCodec ff_avui_decoder;
 +extern AVCodec ff_ayuv_encoder;
 +extern AVCodec ff_ayuv_decoder;
 +extern AVCodec ff_bethsoftvid_decoder;
 +extern AVCodec ff_bfi_decoder;
 +extern AVCodec ff_bink_decoder;
 +extern AVCodec ff_bmp_encoder;
 +extern AVCodec ff_bmp_decoder;
 +extern AVCodec ff_bmv_video_decoder;
 +extern AVCodec ff_brender_pix_decoder;
 +extern AVCodec ff_c93_decoder;
 +extern AVCodec ff_cavs_decoder;
 +extern AVCodec ff_cdgraphics_decoder;
 +extern AVCodec ff_cdxl_decoder;
 +extern AVCodec ff_cfhd_decoder;
 +extern AVCodec ff_cinepak_encoder;
 +extern AVCodec ff_cinepak_decoder;
 +extern AVCodec ff_clearvideo_decoder;
 +extern AVCodec ff_cljr_encoder;
 +extern AVCodec ff_cljr_decoder;
 +extern AVCodec ff_cllc_decoder;
 +extern AVCodec ff_comfortnoise_encoder;
 +extern AVCodec ff_comfortnoise_decoder;
 +extern AVCodec ff_cpia_decoder;
 +extern AVCodec ff_cscd_decoder;
 +extern AVCodec ff_cyuv_decoder;
 +extern AVCodec ff_dds_decoder;
 +extern AVCodec ff_dfa_decoder;
 +extern AVCodec ff_dirac_decoder;
 +extern AVCodec ff_dnxhd_encoder;
 +extern AVCodec ff_dnxhd_decoder;
 +extern AVCodec ff_dpx_encoder;
 +extern AVCodec ff_dpx_decoder;
 +extern AVCodec ff_dsicinvideo_decoder;
 +extern AVCodec ff_dvaudio_decoder;
 +extern AVCodec ff_dvvideo_encoder;
 +extern AVCodec ff_dvvideo_decoder;
 +extern AVCodec ff_dxa_decoder;
 +extern AVCodec ff_dxtory_decoder;
 +extern AVCodec ff_dxv_decoder;
 +extern AVCodec ff_eacmv_decoder;
 +extern AVCodec ff_eamad_decoder;
 +extern AVCodec ff_eatgq_decoder;
 +extern AVCodec ff_eatgv_decoder;
 +extern AVCodec ff_eatqi_decoder;
 +extern AVCodec ff_eightbps_decoder;
 +extern AVCodec ff_eightsvx_exp_decoder;
 +extern AVCodec ff_eightsvx_fib_decoder;
 +extern AVCodec ff_escape124_decoder;
 +extern AVCodec ff_escape130_decoder;
 +extern AVCodec ff_exr_decoder;
 +extern AVCodec ff_ffv1_encoder;
 +extern AVCodec ff_ffv1_decoder;
 +extern AVCodec ff_ffvhuff_encoder;
 +extern AVCodec ff_ffvhuff_decoder;
 +extern AVCodec ff_fic_decoder;
 +extern AVCodec ff_fits_encoder;
 +extern AVCodec ff_fits_decoder;
 +extern AVCodec ff_flashsv_encoder;
 +extern AVCodec ff_flashsv_decoder;
 +extern AVCodec ff_flashsv2_encoder;
 +extern AVCodec ff_flashsv2_decoder;
 +extern AVCodec ff_flic_decoder;
 +extern AVCodec ff_flv_encoder;
 +extern AVCodec ff_flv_decoder;
 +extern AVCodec ff_fmvc_decoder;
 +extern AVCodec ff_fourxm_decoder;
 +extern AVCodec ff_fraps_decoder;
 +extern AVCodec ff_frwu_decoder;
 +extern AVCodec ff_g2m_decoder;
 +extern AVCodec ff_gdv_decoder;
 +extern AVCodec ff_gif_encoder;
 +extern AVCodec ff_gif_decoder;
 +extern AVCodec ff_h261_encoder;
 +extern AVCodec ff_h261_decoder;
 +extern AVCodec ff_h263_encoder;
 +extern AVCodec ff_h263_decoder;
 +extern AVCodec ff_h263i_decoder;
 +extern AVCodec ff_h263p_encoder;
 +extern AVCodec ff_h263p_decoder;
 +extern AVCodec ff_h263_v4l2m2m_decoder;
 +extern AVCodec ff_h264_decoder;
 +extern AVCodec ff_h264_crystalhd_decoder;
 +extern AVCodec ff_h264_v4l2m2m_decoder;
 +extern AVCodec ff_h264_mediacodec_decoder;
 +extern AVCodec ff_h264_mmal_decoder;
 +extern AVCodec ff_h264_qsv_decoder;
 +extern AVCodec ff_h264_rkmpp_decoder;
 +extern AVCodec ff_hap_encoder;
 +extern AVCodec ff_hap_decoder;
 +extern AVCodec ff_hevc_decoder;
 +extern AVCodec ff_hevc_qsv_decoder;
 +extern AVCodec ff_hevc_rkmpp_decoder;
 +extern AVCodec ff_hevc_v4l2m2m_decoder;
 +extern AVCodec ff_hnm4_video_decoder;
 +extern AVCodec ff_hq_hqa_decoder;
 +extern AVCodec ff_hqx_decoder;
 +extern AVCodec ff_huffyuv_encoder;
 +extern AVCodec ff_huffyuv_decoder;
 +extern AVCodec ff_idcin_decoder;
 +extern AVCodec ff_iff_ilbm_decoder;
 +extern AVCodec ff_indeo2_decoder;
 +extern AVCodec ff_indeo3_decoder;
 +extern AVCodec ff_indeo4_decoder;
 +extern AVCodec ff_indeo5_decoder;
 +extern AVCodec ff_interplay_video_decoder;
 +extern AVCodec ff_jpeg2000_encoder;
 +extern AVCodec ff_jpeg2000_decoder;
 +extern AVCodec ff_jpegls_encoder;
 +extern AVCodec ff_jpegls_decoder;
 +extern AVCodec ff_jv_decoder;
 +extern AVCodec ff_kgv1_decoder;
 +extern AVCodec ff_kmvc_decoder;
 +extern AVCodec ff_lagarith_decoder;
 +extern AVCodec ff_ljpeg_encoder;
 +extern AVCodec ff_loco_decoder;
 +extern AVCodec ff_m101_decoder;
 +extern AVCodec ff_magicyuv_encoder;
 +extern AVCodec ff_magicyuv_decoder;
 +extern AVCodec ff_mdec_decoder;
 +extern AVCodec ff_mimic_decoder;
 +extern AVCodec ff_mjpeg_encoder;
 +extern AVCodec ff_mjpeg_decoder;
 +extern AVCodec ff_mjpegb_decoder;
 +extern AVCodec ff_mmvideo_decoder;
 +extern AVCodec ff_motionpixels_decoder;
 +extern AVCodec ff_mpeg1video_encoder;
 +extern AVCodec ff_mpeg1video_decoder;
 +extern AVCodec ff_mpeg2video_encoder;
 +extern AVCodec ff_mpeg2video_decoder;
 +extern AVCodec ff_mpeg4_encoder;
 +extern AVCodec ff_mpeg4_decoder;
 +extern AVCodec ff_mpeg4_crystalhd_decoder;
 +extern AVCodec ff_mpeg4_v4l2m2m_decoder;
 +extern AVCodec ff_mpeg4_mmal_decoder;
 +extern AVCodec ff_mpegvideo_decoder;
 +extern AVCodec ff_mpeg1_v4l2m2m_decoder;
 +extern AVCodec ff_mpeg2_mmal_decoder;
 +extern AVCodec ff_mpeg2_crystalhd_decoder;
 +extern AVCodec ff_mpeg2_v4l2m2m_decoder;
 +extern AVCodec ff_mpeg2_qsv_decoder;
 +extern AVCodec ff_mpeg2_mediacodec_decoder;
 +extern AVCodec ff_msa1_decoder;
 +extern AVCodec ff_mscc_decoder;
 +extern AVCodec ff_msmpeg4v1_decoder;
 +extern AVCodec ff_msmpeg4v2_encoder;
 +extern AVCodec ff_msmpeg4v2_decoder;
 +extern AVCodec ff_msmpeg4v3_encoder;
 +extern AVCodec ff_msmpeg4v3_decoder;
 +extern AVCodec ff_msmpeg4_crystalhd_decoder;
 +extern AVCodec ff_msrle_decoder;
 +extern AVCodec ff_mss1_decoder;
 +extern AVCodec ff_mss2_decoder;
 +extern AVCodec ff_msvideo1_encoder;
 +extern AVCodec ff_msvideo1_decoder;
 +extern AVCodec ff_mszh_decoder;
 +extern AVCodec ff_mts2_decoder;
 +extern AVCodec ff_mvc1_decoder;
 +extern AVCodec ff_mvc2_decoder;
 +extern AVCodec ff_mxpeg_decoder;
 +extern AVCodec ff_nuv_decoder;
 +extern AVCodec ff_paf_video_decoder;
 +extern AVCodec ff_pam_encoder;
 +extern AVCodec ff_pam_decoder;
 +extern AVCodec ff_pbm_encoder;
 +extern AVCodec ff_pbm_decoder;
 +extern AVCodec ff_pcx_encoder;
 +extern AVCodec ff_pcx_decoder;
 +extern AVCodec ff_pgm_encoder;
 +extern AVCodec ff_pgm_decoder;
 +extern AVCodec ff_pgmyuv_encoder;
 +extern AVCodec ff_pgmyuv_decoder;
 +extern AVCodec ff_pictor_decoder;
 +extern AVCodec ff_pixlet_decoder;
 +extern AVCodec ff_png_encoder;
 +extern AVCodec ff_png_decoder;
 +extern AVCodec ff_ppm_encoder;
 +extern AVCodec ff_ppm_decoder;
 +extern AVCodec ff_prores_encoder;
 +extern AVCodec ff_prores_decoder;
 +extern AVCodec ff_prores_aw_encoder;
 +extern AVCodec ff_prores_ks_encoder;
 +extern AVCodec ff_prores_lgpl_decoder;
 +extern AVCodec ff_psd_decoder;
 +extern AVCodec ff_ptx_decoder;
 +extern AVCodec ff_qdraw_decoder;
 +extern AVCodec ff_qpeg_decoder;
 +extern AVCodec ff_qtrle_encoder;
 +extern AVCodec ff_qtrle_decoder;
 +extern AVCodec ff_r10k_encoder;
 +extern AVCodec ff_r10k_decoder;
 +extern AVCodec ff_r210_encoder;
 +extern AVCodec ff_r210_decoder;
 +extern AVCodec ff_rawvideo_encoder;
 +extern AVCodec ff_rawvideo_decoder;
 +extern AVCodec ff_rl2_decoder;
 +extern AVCodec ff_roq_encoder;
 +extern AVCodec ff_roq_decoder;
 +extern AVCodec ff_rpza_decoder;
 +extern AVCodec ff_rscc_decoder;
 +extern AVCodec ff_rv10_encoder;
 +extern AVCodec ff_rv10_decoder;
 +extern AVCodec ff_rv20_encoder;
 +extern AVCodec ff_rv20_decoder;
 +extern AVCodec ff_rv30_decoder;
 +extern AVCodec ff_rv40_decoder;
 +extern AVCodec ff_s302m_encoder;
 +extern AVCodec ff_s302m_decoder;
 +extern AVCodec ff_sanm_decoder;
 +extern AVCodec ff_scpr_decoder;
 +extern AVCodec ff_screenpresso_decoder;
 +extern AVCodec ff_sdx2_dpcm_decoder;
 +extern AVCodec ff_sgi_encoder;
 +extern AVCodec ff_sgi_decoder;
 +extern AVCodec ff_sgirle_decoder;
 +extern AVCodec ff_sheervideo_decoder;
 +extern AVCodec ff_smacker_decoder;
 +extern AVCodec ff_smc_decoder;
 +extern AVCodec ff_smvjpeg_decoder;
 +extern AVCodec ff_snow_encoder;
 +extern AVCodec ff_snow_decoder;
 +extern AVCodec ff_sp5x_decoder;
 +extern AVCodec ff_speedhq_decoder;
 +extern AVCodec ff_srgc_decoder;
 +extern AVCodec ff_sunrast_encoder;
 +extern AVCodec ff_sunrast_decoder;
 +extern AVCodec ff_svq1_encoder;
 +extern AVCodec ff_svq1_decoder;
 +extern AVCodec ff_svq3_decoder;
 +extern AVCodec ff_targa_encoder;
 +extern AVCodec ff_targa_decoder;
 +extern AVCodec ff_targa_y216_decoder;
 +extern AVCodec ff_tdsc_decoder;
 +extern AVCodec ff_theora_decoder;
 +extern AVCodec ff_thp_decoder;
 +extern AVCodec ff_tiertexseqvideo_decoder;
 +extern AVCodec ff_tiff_encoder;
 +extern AVCodec ff_tiff_decoder;
 +extern AVCodec ff_tmv_decoder;
 +extern AVCodec ff_truemotion1_decoder;
 +extern AVCodec ff_truemotion2_decoder;
 +extern AVCodec ff_truemotion2rt_decoder;
 +extern AVCodec ff_tscc_decoder;
 +extern AVCodec ff_tscc2_decoder;
 +extern AVCodec ff_txd_decoder;
 +extern AVCodec ff_ulti_decoder;
 +extern AVCodec ff_utvideo_encoder;
 +extern AVCodec ff_utvideo_decoder;
 +extern AVCodec ff_v210_encoder;
 +extern AVCodec ff_v210_decoder;
 +extern AVCodec ff_v210x_decoder;
 +extern AVCodec ff_v308_encoder;
 +extern AVCodec ff_v308_decoder;
 +extern AVCodec ff_v408_encoder;
 +extern AVCodec ff_v408_decoder;
 +extern AVCodec ff_v410_encoder;
 +extern AVCodec ff_v410_decoder;
 +extern AVCodec ff_vb_decoder;
 +extern AVCodec ff_vble_decoder;
 +extern AVCodec ff_vc1_decoder;
 +extern AVCodec ff_vc1_crystalhd_decoder;
 +extern AVCodec ff_vc1image_decoder;
 +extern AVCodec ff_vc1_mmal_decoder;
 +extern AVCodec ff_vc1_qsv_decoder;
 +extern AVCodec ff_vc1_v4l2m2m_decoder;
 +extern AVCodec ff_vc2_encoder;
 +extern AVCodec ff_vcr1_decoder;
 +extern AVCodec ff_vmdvideo_decoder;
 +extern AVCodec ff_vmnc_decoder;
 +extern AVCodec ff_vp3_decoder;
 +extern AVCodec ff_vp5_decoder;
 +extern AVCodec ff_vp6_decoder;
 +extern AVCodec ff_vp6a_decoder;
 +extern AVCodec ff_vp6f_decoder;
 +extern AVCodec ff_vp7_decoder;
 +extern AVCodec ff_vp8_decoder;
 +extern AVCodec ff_vp8_rkmpp_decoder;
 +extern AVCodec ff_vp8_v4l2m2m_decoder;
 +extern AVCodec ff_vp9_decoder;
 +extern AVCodec ff_vp9_rkmpp_decoder;
 +extern AVCodec ff_vp9_v4l2m2m_decoder;
 +extern AVCodec ff_vqa_decoder;
 +extern AVCodec ff_bitpacked_decoder;
 +extern AVCodec ff_webp_decoder;
 +extern AVCodec ff_wrapped_avframe_encoder;
 +extern AVCodec ff_wrapped_avframe_decoder;
 +extern AVCodec ff_wmv1_encoder;
 +extern AVCodec ff_wmv1_decoder;
 +extern AVCodec ff_wmv2_encoder;
 +extern AVCodec ff_wmv2_decoder;
 +extern AVCodec ff_wmv3_decoder;
 +extern AVCodec ff_wmv3_crystalhd_decoder;
 +extern AVCodec ff_wmv3image_decoder;
 +extern AVCodec ff_wnv1_decoder;
 +extern AVCodec ff_xan_wc3_decoder;
 +extern AVCodec ff_xan_wc4_decoder;
 +extern AVCodec ff_xbm_encoder;
 +extern AVCodec ff_xbm_decoder;
 +extern AVCodec ff_xface_encoder;
 +extern AVCodec ff_xface_decoder;
 +extern AVCodec ff_xl_decoder;
 +extern AVCodec ff_xpm_decoder;
 +extern AVCodec ff_xwd_encoder;
 +extern AVCodec ff_xwd_decoder;
 +extern AVCodec ff_y41p_encoder;
 +extern AVCodec ff_y41p_decoder;
 +extern AVCodec ff_ylc_decoder;
 +extern AVCodec ff_yop_decoder;
 +extern AVCodec ff_yuv4_encoder;
 +extern AVCodec ff_yuv4_decoder;
 +extern AVCodec ff_zero12v_decoder;
 +extern AVCodec ff_zerocodec_decoder;
 +extern AVCodec ff_zlib_encoder;
 +extern AVCodec ff_zlib_decoder;
 +extern AVCodec ff_zmbv_encoder;
 +extern AVCodec ff_zmbv_decoder;
 +
 +/* audio codecs */
 +extern AVCodec ff_aac_encoder;
 +extern AVCodec ff_aac_decoder;
 +extern AVCodec ff_aac_fixed_decoder;
 +extern AVCodec ff_aac_latm_decoder;
 +extern AVCodec ff_ac3_encoder;
 +extern AVCodec ff_ac3_decoder;
 +extern AVCodec ff_ac3_fixed_encoder;
 +extern AVCodec ff_ac3_fixed_decoder;
 +extern AVCodec ff_alac_encoder;
 +extern AVCodec ff_alac_decoder;
 +extern AVCodec ff_als_decoder;
 +extern AVCodec ff_amrnb_decoder;
 +extern AVCodec ff_amrwb_decoder;
 +extern AVCodec ff_ape_decoder;
 +extern AVCodec ff_aptx_encoder;
 +extern AVCodec ff_aptx_decoder;
 +extern AVCodec ff_aptx_hd_encoder;
 +extern AVCodec ff_aptx_hd_decoder;
 +extern AVCodec ff_atrac1_decoder;
 +extern AVCodec ff_atrac3_decoder;
 +extern AVCodec ff_atrac3al_decoder;
 +extern AVCodec ff_atrac3p_decoder;
 +extern AVCodec ff_atrac3pal_decoder;
 +extern AVCodec ff_binkaudio_dct_decoder;
 +extern AVCodec ff_binkaudio_rdft_decoder;
 +extern AVCodec ff_bmv_audio_decoder;
 +extern AVCodec ff_cook_decoder;
 +extern AVCodec ff_dca_encoder;
 +extern AVCodec ff_dca_decoder;
 +extern AVCodec ff_dolby_e_decoder;
 +extern AVCodec ff_dsd_lsbf_decoder;
 +extern AVCodec ff_dsd_msbf_decoder;
 +extern AVCodec ff_dsd_lsbf_planar_decoder;
 +extern AVCodec ff_dsd_msbf_planar_decoder;
 +extern AVCodec ff_dsicinaudio_decoder;
 +extern AVCodec ff_dss_sp_decoder;
 +extern AVCodec ff_dst_decoder;
 +extern AVCodec ff_eac3_encoder;
 +extern AVCodec ff_eac3_decoder;
 +extern AVCodec ff_evrc_decoder;
 +extern AVCodec ff_ffwavesynth_decoder;
 +extern AVCodec ff_flac_encoder;
 +extern AVCodec ff_flac_decoder;
 +extern AVCodec ff_g723_1_encoder;
 +extern AVCodec ff_g723_1_decoder;
 +extern AVCodec ff_g729_decoder;
 +extern AVCodec ff_gsm_decoder;
 +extern AVCodec ff_gsm_ms_decoder;
 +extern AVCodec ff_iac_decoder;
 +extern AVCodec ff_imc_decoder;
 +extern AVCodec ff_interplay_acm_decoder;
 +extern AVCodec ff_mace3_decoder;
 +extern AVCodec ff_mace6_decoder;
 +extern AVCodec ff_metasound_decoder;
 +extern AVCodec ff_mlp_encoder;
 +extern AVCodec ff_mlp_decoder;
 +extern AVCodec ff_mp1_decoder;
 +extern AVCodec ff_mp1float_decoder;
 +extern AVCodec ff_mp2_encoder;
 +extern AVCodec ff_mp2_decoder;
 +extern AVCodec ff_mp2float_decoder;
 +extern AVCodec ff_mp2fixed_encoder;
 +extern AVCodec ff_mp3_decoder;
 +extern AVCodec ff_mp3float_decoder;
 +extern AVCodec ff_mp3adu_decoder;
 +extern AVCodec ff_mp3adufloat_decoder;
 +extern AVCodec ff_mp3on4_decoder;
 +extern AVCodec ff_mp3on4float_decoder;
 +extern AVCodec ff_mpc7_decoder;
 +extern AVCodec ff_mpc8_decoder;
 +extern AVCodec ff_nellymoser_encoder;
 +extern AVCodec ff_nellymoser_decoder;
 +extern AVCodec ff_on2avc_decoder;
 +extern AVCodec ff_opus_encoder;
 +extern AVCodec ff_opus_decoder;
 +extern AVCodec ff_paf_audio_decoder;
 +extern AVCodec ff_qcelp_decoder;
 +extern AVCodec ff_qdm2_decoder;
 +extern AVCodec ff_qdmc_decoder;
 +extern AVCodec ff_ra_144_encoder;
 +extern AVCodec ff_ra_144_decoder;
 +extern AVCodec ff_ra_288_decoder;
 +extern AVCodec ff_ralf_decoder;
 +extern AVCodec ff_sbc_encoder;
 +extern AVCodec ff_sbc_decoder;
 +extern AVCodec ff_shorten_decoder;
 +extern AVCodec ff_sipr_decoder;
 +extern AVCodec ff_smackaud_decoder;
 +extern AVCodec ff_sonic_encoder;
 +extern AVCodec ff_sonic_decoder;
 +extern AVCodec ff_sonic_ls_encoder;
 +extern AVCodec ff_tak_decoder;
 +extern AVCodec ff_truehd_encoder;
 +extern AVCodec ff_truehd_decoder;
 +extern AVCodec ff_truespeech_decoder;
 +extern AVCodec ff_tta_encoder;
 +extern AVCodec ff_tta_decoder;
 +extern AVCodec ff_twinvq_decoder;
 +extern AVCodec ff_vmdaudio_decoder;
 +extern AVCodec ff_vorbis_encoder;
 +extern AVCodec ff_vorbis_decoder;
 +extern AVCodec ff_wavpack_encoder;
 +extern AVCodec ff_wavpack_decoder;
 +extern AVCodec ff_wmalossless_decoder;
 +extern AVCodec ff_wmapro_decoder;
 +extern AVCodec ff_wmav1_encoder;
 +extern AVCodec ff_wmav1_decoder;
 +extern AVCodec ff_wmav2_encoder;
 +extern AVCodec ff_wmav2_decoder;
 +extern AVCodec ff_wmavoice_decoder;
 +extern AVCodec ff_ws_snd1_decoder;
 +extern AVCodec ff_xma1_decoder;
 +extern AVCodec ff_xma2_decoder;
 +
 +/* PCM codecs */
 +extern AVCodec ff_pcm_alaw_encoder;
 +extern AVCodec ff_pcm_alaw_decoder;
 +extern AVCodec ff_pcm_bluray_decoder;
 +extern AVCodec ff_pcm_dvd_decoder;
 +extern AVCodec ff_pcm_f16le_decoder;
 +extern AVCodec ff_pcm_f24le_decoder;
 +extern AVCodec ff_pcm_f32be_encoder;
 +extern AVCodec ff_pcm_f32be_decoder;
 +extern AVCodec ff_pcm_f32le_encoder;
 +extern AVCodec ff_pcm_f32le_decoder;
 +extern AVCodec ff_pcm_f64be_encoder;
 +extern AVCodec ff_pcm_f64be_decoder;
 +extern AVCodec ff_pcm_f64le_encoder;
 +extern AVCodec ff_pcm_f64le_decoder;
 +extern AVCodec ff_pcm_lxf_decoder;
 +extern AVCodec ff_pcm_mulaw_encoder;
 +extern AVCodec ff_pcm_mulaw_decoder;
 +extern AVCodec ff_pcm_s8_encoder;
 +extern AVCodec ff_pcm_s8_decoder;
 +extern AVCodec ff_pcm_s8_planar_encoder;
 +extern AVCodec ff_pcm_s8_planar_decoder;
 +extern AVCodec ff_pcm_s16be_encoder;
 +extern AVCodec ff_pcm_s16be_decoder;
 +extern AVCodec ff_pcm_s16be_planar_encoder;
 +extern AVCodec ff_pcm_s16be_planar_decoder;
 +extern AVCodec ff_pcm_s16le_encoder;
 +extern AVCodec ff_pcm_s16le_decoder;
 +extern AVCodec ff_pcm_s16le_planar_encoder;
 +extern AVCodec ff_pcm_s16le_planar_decoder;
 +extern AVCodec ff_pcm_s24be_encoder;
 +extern AVCodec ff_pcm_s24be_decoder;
 +extern AVCodec ff_pcm_s24daud_encoder;
 +extern AVCodec ff_pcm_s24daud_decoder;
 +extern AVCodec ff_pcm_s24le_encoder;
 +extern AVCodec ff_pcm_s24le_decoder;
 +extern AVCodec ff_pcm_s24le_planar_encoder;
 +extern AVCodec ff_pcm_s24le_planar_decoder;
 +extern AVCodec ff_pcm_s32be_encoder;
 +extern AVCodec ff_pcm_s32be_decoder;
 +extern AVCodec ff_pcm_s32le_encoder;
 +extern AVCodec ff_pcm_s32le_decoder;
 +extern AVCodec ff_pcm_s32le_planar_encoder;
 +extern AVCodec ff_pcm_s32le_planar_decoder;
 +extern AVCodec ff_pcm_s64be_encoder;
 +extern AVCodec ff_pcm_s64be_decoder;
 +extern AVCodec ff_pcm_s64le_encoder;
 +extern AVCodec ff_pcm_s64le_decoder;
 +extern AVCodec ff_pcm_u8_encoder;
 +extern AVCodec ff_pcm_u8_decoder;
 +extern AVCodec ff_pcm_u16be_encoder;
 +extern AVCodec ff_pcm_u16be_decoder;
 +extern AVCodec ff_pcm_u16le_encoder;
 +extern AVCodec ff_pcm_u16le_decoder;
 +extern AVCodec ff_pcm_u24be_encoder;
 +extern AVCodec ff_pcm_u24be_decoder;
 +extern AVCodec ff_pcm_u24le_encoder;
 +extern AVCodec ff_pcm_u24le_decoder;
 +extern AVCodec ff_pcm_u32be_encoder;
 +extern AVCodec ff_pcm_u32be_decoder;
 +extern AVCodec ff_pcm_u32le_encoder;
 +extern AVCodec ff_pcm_u32le_decoder;
 +extern AVCodec ff_pcm_zork_decoder;
 +
 +/* DPCM codecs */
 +extern AVCodec ff_gremlin_dpcm_decoder;
 +extern AVCodec ff_interplay_dpcm_decoder;
 +extern AVCodec ff_roq_dpcm_encoder;
 +extern AVCodec ff_roq_dpcm_decoder;
 +extern AVCodec ff_sol_dpcm_decoder;
 +extern AVCodec ff_xan_dpcm_decoder;
 +
 +/* ADPCM codecs */
 +extern AVCodec ff_adpcm_4xm_decoder;
 +extern AVCodec ff_adpcm_adx_encoder;
 +extern AVCodec ff_adpcm_adx_decoder;
 +extern AVCodec ff_adpcm_afc_decoder;
 +extern AVCodec ff_adpcm_aica_decoder;
 +extern AVCodec ff_adpcm_ct_decoder;
 +extern AVCodec ff_adpcm_dtk_decoder;
 +extern AVCodec ff_adpcm_ea_decoder;
 +extern AVCodec ff_adpcm_ea_maxis_xa_decoder;
 +extern AVCodec ff_adpcm_ea_r1_decoder;
 +extern AVCodec ff_adpcm_ea_r2_decoder;
 +extern AVCodec ff_adpcm_ea_r3_decoder;
 +extern AVCodec ff_adpcm_ea_xas_decoder;
 +extern AVCodec ff_adpcm_g722_encoder;
 +extern AVCodec ff_adpcm_g722_decoder;
 +extern AVCodec ff_adpcm_g726_encoder;
 +extern AVCodec ff_adpcm_g726_decoder;
 +extern AVCodec ff_adpcm_g726le_encoder;
 +extern AVCodec ff_adpcm_g726le_decoder;
 +extern AVCodec ff_adpcm_ima_amv_decoder;
 +extern AVCodec ff_adpcm_ima_apc_decoder;
 +extern AVCodec ff_adpcm_ima_dat4_decoder;
 +extern AVCodec ff_adpcm_ima_dk3_decoder;
 +extern AVCodec ff_adpcm_ima_dk4_decoder;
 +extern AVCodec ff_adpcm_ima_ea_eacs_decoder;
 +extern AVCodec ff_adpcm_ima_ea_sead_decoder;
 +extern AVCodec ff_adpcm_ima_iss_decoder;
 +extern AVCodec ff_adpcm_ima_oki_decoder;
 +extern AVCodec ff_adpcm_ima_qt_encoder;
 +extern AVCodec ff_adpcm_ima_qt_decoder;
 +extern AVCodec ff_adpcm_ima_rad_decoder;
 +extern AVCodec ff_adpcm_ima_smjpeg_decoder;
 +extern AVCodec ff_adpcm_ima_wav_encoder;
 +extern AVCodec ff_adpcm_ima_wav_decoder;
 +extern AVCodec ff_adpcm_ima_ws_decoder;
 +extern AVCodec ff_adpcm_ms_encoder;
 +extern AVCodec ff_adpcm_ms_decoder;
 +extern AVCodec ff_adpcm_mtaf_decoder;
 +extern AVCodec ff_adpcm_psx_decoder;
 +extern AVCodec ff_adpcm_sbpro_2_decoder;
 +extern AVCodec ff_adpcm_sbpro_3_decoder;
 +extern AVCodec ff_adpcm_sbpro_4_decoder;
 +extern AVCodec ff_adpcm_swf_encoder;
 +extern AVCodec ff_adpcm_swf_decoder;
 +extern AVCodec ff_adpcm_thp_decoder;
 +extern AVCodec ff_adpcm_thp_le_decoder;
 +extern AVCodec ff_adpcm_vima_decoder;
 +extern AVCodec ff_adpcm_xa_decoder;
 +extern AVCodec ff_adpcm_yamaha_encoder;
 +extern AVCodec ff_adpcm_yamaha_decoder;
 +
 +/* subtitles */
 +extern AVCodec ff_ssa_encoder;
 +extern AVCodec ff_ssa_decoder;
 +extern AVCodec ff_ass_encoder;
 +extern AVCodec ff_ass_decoder;
 +extern AVCodec ff_ccaption_decoder;
 +extern AVCodec ff_dvbsub_encoder;
 +extern AVCodec ff_dvbsub_decoder;
 +extern AVCodec ff_dvdsub_encoder;
 +extern AVCodec ff_dvdsub_decoder;
 +extern AVCodec ff_jacosub_decoder;
 +extern AVCodec ff_microdvd_decoder;
 +extern AVCodec ff_movtext_encoder;
 +extern AVCodec ff_movtext_decoder;
 +extern AVCodec ff_mpl2_decoder;
 +extern AVCodec ff_pgssub_decoder;
 +extern AVCodec ff_pjs_decoder;
 +extern AVCodec ff_realtext_decoder;
 +extern AVCodec ff_sami_decoder;
 +extern AVCodec ff_srt_encoder;
 +extern AVCodec ff_srt_decoder;
 +extern AVCodec ff_stl_decoder;
 +extern AVCodec ff_subrip_encoder;
 +extern AVCodec ff_subrip_decoder;
 +extern AVCodec ff_subviewer_decoder;
 +extern AVCodec ff_subviewer1_decoder;
 +extern AVCodec ff_text_encoder;
 +extern AVCodec ff_text_decoder;
 +extern AVCodec ff_vplayer_decoder;
 +extern AVCodec ff_webvtt_encoder;
 +extern AVCodec ff_webvtt_decoder;
 +extern AVCodec ff_xsub_encoder;
 +extern AVCodec ff_xsub_decoder;
 +
 +/* external libraries */
 +extern AVCodec ff_aac_at_encoder;
 +extern AVCodec ff_aac_at_decoder;
 +extern AVCodec ff_ac3_at_decoder;
 +extern AVCodec ff_adpcm_ima_qt_at_decoder;
 +extern AVCodec ff_alac_at_encoder;
 +extern AVCodec ff_alac_at_decoder;
 +extern AVCodec ff_amr_nb_at_decoder;
 +extern AVCodec ff_eac3_at_decoder;
 +extern AVCodec ff_gsm_ms_at_decoder;
 +extern AVCodec ff_ilbc_at_encoder;
 +extern AVCodec ff_ilbc_at_decoder;
 +extern AVCodec ff_mp1_at_decoder;
 +extern AVCodec ff_mp2_at_decoder;
 +extern AVCodec ff_mp3_at_decoder;
 +extern AVCodec ff_pcm_alaw_at_encoder;
 +extern AVCodec ff_pcm_alaw_at_decoder;
 +extern AVCodec ff_pcm_mulaw_at_encoder;
 +extern AVCodec ff_pcm_mulaw_at_decoder;
 +extern AVCodec ff_qdmc_at_decoder;
 +extern AVCodec ff_qdm2_at_decoder;
 +extern AVCodec ff_libaom_av1_decoder;
++extern AVCodec ff_libaom_av1_encoder;
 +extern AVCodec ff_libcelt_decoder;
 +extern AVCodec ff_libcodec2_encoder;
 +extern AVCodec ff_libcodec2_decoder;
 +extern AVCodec ff_libfdk_aac_encoder;
 +extern AVCodec ff_libfdk_aac_decoder;
 +extern AVCodec ff_libgsm_encoder;
 +extern AVCodec ff_libgsm_decoder;
 +extern AVCodec ff_libgsm_ms_encoder;
 +extern AVCodec ff_libgsm_ms_decoder;
 +extern AVCodec ff_libilbc_encoder;
 +extern AVCodec ff_libilbc_decoder;
 +extern AVCodec ff_libmp3lame_encoder;
 +extern AVCodec ff_libopencore_amrnb_encoder;
 +extern AVCodec ff_libopencore_amrnb_decoder;
 +extern AVCodec ff_libopencore_amrwb_decoder;
 +extern AVCodec ff_libopenjpeg_encoder;
 +extern AVCodec ff_libopenjpeg_decoder;
 +extern AVCodec ff_libopus_encoder;
 +extern AVCodec ff_libopus_decoder;
 +extern AVCodec ff_librsvg_decoder;
 +extern AVCodec ff_libshine_encoder;
 +extern AVCodec ff_libspeex_encoder;
 +extern AVCodec ff_libspeex_decoder;
 +extern AVCodec ff_libtheora_encoder;
 +extern AVCodec ff_libtwolame_encoder;
 +extern AVCodec ff_libvo_amrwbenc_encoder;
 +extern AVCodec ff_libvorbis_encoder;
 +extern AVCodec ff_libvorbis_decoder;
 +extern AVCodec ff_libvpx_vp8_encoder;
 +extern AVCodec ff_libvpx_vp8_decoder;
 +extern AVCodec ff_libvpx_vp9_encoder;
 +extern AVCodec ff_libvpx_vp9_decoder;
 +extern AVCodec ff_libwavpack_encoder;
 +/* preferred over libwebp */
 +extern AVCodec ff_libwebp_anim_encoder;
 +extern AVCodec ff_libwebp_encoder;
 +extern AVCodec ff_libx262_encoder;
 +extern AVCodec ff_libx264_encoder;
 +extern AVCodec ff_libx264rgb_encoder;
 +extern AVCodec ff_libx265_encoder;
 +extern AVCodec ff_libxavs_encoder;
 +extern AVCodec ff_libxvid_encoder;
 +extern AVCodec ff_libzvbi_teletext_decoder;
 +
 +/* text */
 +extern AVCodec ff_bintext_decoder;
 +extern AVCodec ff_xbin_decoder;
 +extern AVCodec ff_idf_decoder;
  
 -#define REGISTER_DECODER(X, x)                                          \
 -    {                                                                   \
 -        extern AVCodec ff_##x##_decoder;                                \
 -        if (CONFIG_##X##_DECODER)                                       \
 -            avcodec_register(&ff_##x##_decoder);                        \
 +/* external libraries, that shouldn't be used by default if one of the
 + * above is available */
 +extern AVCodec ff_h263_v4l2m2m_encoder;
 +extern AVCodec ff_libopenh264_encoder;
 +extern AVCodec ff_libopenh264_decoder;
 +extern AVCodec ff_h264_amf_encoder;
 +extern AVCodec ff_h264_cuvid_decoder;
 +extern AVCodec ff_h264_nvenc_encoder;
 +extern AVCodec ff_h264_omx_encoder;
 +extern AVCodec ff_h264_qsv_encoder;
 +extern AVCodec ff_h264_v4l2m2m_encoder;
 +extern AVCodec ff_h264_vaapi_encoder;
 +extern AVCodec ff_h264_videotoolbox_encoder;
 +#if FF_API_NVENC_OLD_NAME
 +extern AVCodec ff_nvenc_encoder;
 +extern AVCodec ff_nvenc_h264_encoder;
 +extern AVCodec ff_nvenc_hevc_encoder;
 +#endif
 +extern AVCodec ff_hevc_amf_encoder;
 +extern AVCodec ff_hevc_cuvid_decoder;
 +extern AVCodec ff_hevc_mediacodec_decoder;
 +extern AVCodec ff_hevc_nvenc_encoder;
 +extern AVCodec ff_hevc_qsv_encoder;
 +extern AVCodec ff_hevc_v4l2m2m_encoder;
 +extern AVCodec ff_hevc_vaapi_encoder;
 +extern AVCodec ff_hevc_videotoolbox_encoder;
 +extern AVCodec ff_libkvazaar_encoder;
 +extern AVCodec ff_mjpeg_cuvid_decoder;
 +extern AVCodec ff_mjpeg_qsv_encoder;
 +extern AVCodec ff_mjpeg_vaapi_encoder;
 +extern AVCodec ff_mpeg1_cuvid_decoder;
 +extern AVCodec ff_mpeg2_cuvid_decoder;
 +extern AVCodec ff_mpeg2_qsv_encoder;
 +extern AVCodec ff_mpeg2_vaapi_encoder;
 +extern AVCodec ff_mpeg4_cuvid_decoder;
 +extern AVCodec ff_mpeg4_mediacodec_decoder;
 +extern AVCodec ff_mpeg4_v4l2m2m_encoder;
 +extern AVCodec ff_vc1_cuvid_decoder;
 +extern AVCodec ff_vp8_cuvid_decoder;
 +extern AVCodec ff_vp8_mediacodec_decoder;
 +extern AVCodec ff_vp8_qsv_decoder;
 +extern AVCodec ff_vp8_v4l2m2m_encoder;
 +extern AVCodec ff_vp8_vaapi_encoder;
 +extern AVCodec ff_vp9_cuvid_decoder;
 +extern AVCodec ff_vp9_mediacodec_decoder;
 +extern AVCodec ff_vp9_vaapi_encoder;
 +
 +#include "libavcodec/codec_list.c"
 +
 +static AVOnce av_codec_static_init = AV_ONCE_INIT;
 +static void av_codec_init_static(void)
 +{
 +    for (int i = 0; codec_list[i]; i++) {
 +        if (codec_list[i]->init_static_data)
 +            codec_list[i]->init_static_data((AVCodec*)codec_list[i]);
      }
 +}
 +
 +const AVCodec *av_codec_iterate(void **opaque)
 +{
 +    uintptr_t i = (uintptr_t)*opaque;
 +    const AVCodec *c = codec_list[i];
  
 -#define REGISTER_ENCDEC(X, x) REGISTER_ENCODER(X, x); REGISTER_DECODER(X, x)
 +    ff_thread_once(&av_codec_static_init, av_codec_init_static);
  
 -#define REGISTER_PARSER(X, x)                                           \
 -    {                                                                   \
 -        extern AVCodecParser ff_##x##_parser;                           \
 -        if (CONFIG_##X##_PARSER)                                        \
 -            av_register_codec_parser(&ff_##x##_parser);                 \
 +    if (c)
 +        *opaque = (void*)(i + 1);
 +
 +    return c;
 +}
 +
 +#if FF_API_NEXT
 +FF_DISABLE_DEPRECATION_WARNINGS
 +static AVOnce av_codec_next_init = AV_ONCE_INIT;
 +
 +static void av_codec_init_next(void)
 +{
 +    AVCodec *prev = NULL, *p;
 +    void *i = 0;
 +    while ((p = (AVCodec*)av_codec_iterate(&i))) {
 +        if (prev)
 +            prev->next = p;
 +        prev = p;
      }
 +}
 +
 +
 +
 +av_cold void avcodec_register(AVCodec *codec)
 +{
 +    ff_thread_once(&av_codec_next_init, av_codec_init_next);
 +}
 +
 +AVCodec *av_codec_next(const AVCodec *c)
 +{
 +    ff_thread_once(&av_codec_next_init, av_codec_init_next);
 +
 +    if (c)
 +        return c->next;
 +    else
 +        return (AVCodec*)codec_list[0];
 +}
  
  void avcodec_register_all(void)
  {
diff --cc libavcodec/avcodec.h
index 50c34dbff9,ac0915328c..3306910dd2
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -2933,13 -2551,9 +2933,17 @@@ 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
++
 +#define FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT            0xc0
 +#define FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT 0xc1
 +#define FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT         0xc2
 +#define FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS                0xc3
 +#define FF_PROFILE_MJPEG_JPEG_LS                         0xf7
 +
 +#define FF_PROFILE_SBC_MSBC                         1
  
      /**
       * level
diff --cc libavcodec/libaomenc.c
index 0000000000,94b3ddd326..a80bcbf522
mode 000000,100644..100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@@ -1,0 -1,583 +1,742 @@@
+ /*
+  * Copyright (c) 2010, Google, Inc.
+  *
 - * This file is part of Libav.
++ * This file is part of FFmpeg.
+  *
 - * Libav is free software; you can redistribute it and/or
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++/**
++ * @file
++ * AV1 encoder support via libaom
++ */
++
+ #define AOM_DISABLE_CTRL_TYPECHECKS 1
+ #include <aom/aom_encoder.h>
+ #include <aom/aomcx.h>
+ 
+ #include "libavutil/base64.h"
+ #include "libavutil/common.h"
+ #include "libavutil/mathematics.h"
+ #include "libavutil/opt.h"
+ #include "libavutil/pixdesc.h"
+ 
+ #include "avcodec.h"
+ #include "internal.h"
 -#include "libaom.h"
+ 
+ /*
+  * Portion of struct aom_codec_cx_pkt from aom_encoder.h.
+  * One encoded frame returned from the library.
+  */
+ struct FrameListData {
 -    void *buf;                       /* compressed data buffer */
 -    size_t sz;                       /* length of compressed data */
 -    int64_t pts;                     /* time stamp to show frame
 -                                      * (in timebase units) */
 -    unsigned long duration;          /* duration to show frame
 -                                      * (in timebase units) */
 -    uint32_t flags;                  /* flags for this frame */
++    void *buf;                       /**< compressed data buffer */
++    size_t sz;                       /**< length of compressed data */
++    int64_t pts;                     /**< time stamp to show frame
++                                          (in timebase units) */
++    unsigned long duration;          /**< duration to show frame
++                                          (in timebase units) */
++    uint32_t flags;                  /**< flags for this frame */
+     struct FrameListData *next;
+ };
+ 
+ typedef struct AOMEncoderContext {
+     AVClass *class;
+     struct aom_codec_ctx encoder;
+     struct aom_image rawimg;
+     struct aom_fixed_buf twopass_stats;
+     struct FrameListData *coded_frame_list;
+     int cpu_used;
+     int auto_alt_ref;
+     int lag_in_frames;
+     int error_resilient;
+     int crf;
+     int static_thresh;
+     int drop_threshold;
+     int noise_sensitivity;
+ } AOMContext;
+ 
+ static const char *const ctlidstr[] = {
+     [AOME_SET_CPUUSED]          = "AOME_SET_CPUUSED",
+     [AOME_SET_CQ_LEVEL]         = "AOME_SET_CQ_LEVEL",
+     [AOME_SET_ENABLEAUTOALTREF] = "AOME_SET_ENABLEAUTOALTREF",
+     [AOME_SET_STATIC_THRESHOLD] = "AOME_SET_STATIC_THRESHOLD",
++    [AV1E_SET_COLOR_RANGE]      = "AV1E_SET_COLOR_RANGE",
+ };
+ 
+ static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
+ {
+     AOMContext *ctx    = avctx->priv_data;
+     const char *error  = aom_codec_error(&ctx->encoder);
+     const char *detail = aom_codec_error_detail(&ctx->encoder);
+ 
+     av_log(avctx, AV_LOG_ERROR, "%s: %s\n", desc, error);
+     if (detail)
+         av_log(avctx, AV_LOG_ERROR, "  Additional information: %s\n", detail);
+ }
+ 
+ static av_cold void dump_enc_cfg(AVCodecContext *avctx,
+                                  const struct aom_codec_enc_cfg *cfg)
+ {
+     int width = -30;
+     int level = AV_LOG_DEBUG;
+ 
+     av_log(avctx, level, "aom_codec_enc_cfg\n");
+     av_log(avctx, level, "generic settings\n"
+                          "  %*s%u\n  %*s%u\n  %*s%u\n  %*s%u\n  %*s%u\n"
++                         "  %*s%u\n  %*s%u\n"
+                          "  %*s{%u/%u}\n  %*s%u\n  %*s%d\n  %*s%u\n",
 -           width, "g_usage:", cfg->g_usage,
 -           width, "g_threads:", cfg->g_threads,
 -           width, "g_profile:", cfg->g_profile,
 -           width, "g_w:", cfg->g_w,
 -           width, "g_h:", cfg->g_h,
 -           width, "g_timebase:", cfg->g_timebase.num, cfg->g_timebase.den,
++           width, "g_usage:",           cfg->g_usage,
++           width, "g_threads:",         cfg->g_threads,
++           width, "g_profile:",         cfg->g_profile,
++           width, "g_w:",               cfg->g_w,
++           width, "g_h:",               cfg->g_h,
++           width, "g_bit_depth:",       cfg->g_bit_depth,
++           width, "g_input_bit_depth:", cfg->g_input_bit_depth,
++           width, "g_timebase:",        cfg->g_timebase.num, cfg->g_timebase.den,
+            width, "g_error_resilient:", cfg->g_error_resilient,
 -           width, "g_pass:", cfg->g_pass,
 -           width, "g_lag_in_frames:", cfg->g_lag_in_frames);
++           width, "g_pass:",            cfg->g_pass,
++           width, "g_lag_in_frames:",   cfg->g_lag_in_frames);
+     av_log(avctx, level, "rate control settings\n"
 -                         "  %*s%u\n  %*s%d\n  %*s%p(%zu)\n  %*s%u\n",
++                         "  %*s%u\n  %*s%d\n  %*s%p("SIZE_SPECIFIER")\n  %*s%u\n",
+            width, "rc_dropframe_thresh:", cfg->rc_dropframe_thresh,
 -           width, "rc_end_usage:", cfg->rc_end_usage,
++           width, "rc_end_usage:",        cfg->rc_end_usage,
+            width, "rc_twopass_stats_in:", cfg->rc_twopass_stats_in.buf, cfg->rc_twopass_stats_in.sz,
 -           width, "rc_target_bitrate:", cfg->rc_target_bitrate);
++           width, "rc_target_bitrate:",   cfg->rc_target_bitrate);
+     av_log(avctx, level, "quantizer settings\n"
+                          "  %*s%u\n  %*s%u\n",
+            width, "rc_min_quantizer:", cfg->rc_min_quantizer,
+            width, "rc_max_quantizer:", cfg->rc_max_quantizer);
+     av_log(avctx, level, "bitrate tolerance\n"
+                          "  %*s%u\n  %*s%u\n",
+            width, "rc_undershoot_pct:", cfg->rc_undershoot_pct,
 -           width, "rc_overshoot_pct:", cfg->rc_overshoot_pct);
++           width, "rc_overshoot_pct:",  cfg->rc_overshoot_pct);
+     av_log(avctx, level, "decoder buffer model\n"
+                          "  %*s%u\n  %*s%u\n  %*s%u\n",
 -           width, "rc_buf_sz:", cfg->rc_buf_sz,
++           width, "rc_buf_sz:",         cfg->rc_buf_sz,
+            width, "rc_buf_initial_sz:", cfg->rc_buf_initial_sz,
+            width, "rc_buf_optimal_sz:", cfg->rc_buf_optimal_sz);
+     av_log(avctx, level, "2 pass rate control settings\n"
+                          "  %*s%u\n  %*s%u\n  %*s%u\n",
 -           width, "rc_2pass_vbr_bias_pct:", cfg->rc_2pass_vbr_bias_pct,
++           width, "rc_2pass_vbr_bias_pct:",       cfg->rc_2pass_vbr_bias_pct,
+            width, "rc_2pass_vbr_minsection_pct:", cfg->rc_2pass_vbr_minsection_pct,
+            width, "rc_2pass_vbr_maxsection_pct:", cfg->rc_2pass_vbr_maxsection_pct);
+     av_log(avctx, level, "keyframing settings\n"
+                          "  %*s%d\n  %*s%u\n  %*s%u\n",
 -           width, "kf_mode:", cfg->kf_mode,
++           width, "kf_mode:",     cfg->kf_mode,
+            width, "kf_min_dist:", cfg->kf_min_dist,
+            width, "kf_max_dist:", cfg->kf_max_dist);
+     av_log(avctx, level, "\n");
+ }
+ 
+ static void coded_frame_add(void *list, struct FrameListData *cx_frame)
+ {
+     struct FrameListData **p = list;
+ 
+     while (*p)
+         p = &(*p)->next;
+     *p = cx_frame;
+     cx_frame->next = NULL;
+ }
+ 
+ static av_cold void free_coded_frame(struct FrameListData *cx_frame)
+ {
+     av_freep(&cx_frame->buf);
+     av_freep(&cx_frame);
+ }
+ 
+ static av_cold void free_frame_list(struct FrameListData *list)
+ {
+     struct FrameListData *p = list;
+ 
+     while (p) {
+         list = list->next;
+         free_coded_frame(p);
+         p = list;
+     }
+ }
+ 
+ static av_cold int codecctl_int(AVCodecContext *avctx,
+                                 enum aome_enc_control_id id, int val)
+ {
+     AOMContext *ctx = avctx->priv_data;
+     char buf[80];
+     int width = -30;
+     int res;
+ 
+     snprintf(buf, sizeof(buf), "%s:", ctlidstr[id]);
+     av_log(avctx, AV_LOG_DEBUG, "  %*s%d\n", width, buf, val);
+ 
+     res = aom_codec_control(&ctx->encoder, id, val);
+     if (res != AOM_CODEC_OK) {
+         snprintf(buf, sizeof(buf), "Failed to set %s codec control",
+                  ctlidstr[id]);
+         log_encoder_error(avctx, buf);
+         return AVERROR(EINVAL);
+     }
+ 
+     return 0;
+ }
+ 
+ static av_cold int aom_free(AVCodecContext *avctx)
+ {
+     AOMContext *ctx = avctx->priv_data;
+ 
+     aom_codec_destroy(&ctx->encoder);
+     av_freep(&ctx->twopass_stats.buf);
+     av_freep(&avctx->stats_out);
+     free_frame_list(ctx->coded_frame_list);
+     return 0;
+ }
+ 
 -static av_cold int aom_init(AVCodecContext *avctx)
++static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps,
++                       struct aom_codec_enc_cfg *enccfg, aom_codec_flags_t *flags,
++                       aom_img_fmt_t *img_fmt)
++{
++    AOMContext av_unused *ctx = avctx->priv_data;
++    enccfg->g_bit_depth = enccfg->g_input_bit_depth = 8;
++    switch (avctx->pix_fmt) {
++    case AV_PIX_FMT_YUV420P:
++        enccfg->g_profile = FF_PROFILE_AV1_MAIN;
++        *img_fmt = AOM_IMG_FMT_I420;
++        return 0;
++    case AV_PIX_FMT_YUV422P:
++        enccfg->g_profile = FF_PROFILE_AV1_PROFESSIONAL;
++        *img_fmt = AOM_IMG_FMT_I422;
++        return 0;
++    case AV_PIX_FMT_GBRP:
++    case AV_PIX_FMT_YUV444P:
++        enccfg->g_profile = FF_PROFILE_AV1_HIGH;
++        *img_fmt = AOM_IMG_FMT_I444;
++        return 0;
++    case AV_PIX_FMT_YUV420P10:
++    case AV_PIX_FMT_YUV420P12:
++        if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) {
++            enccfg->g_bit_depth = enccfg->g_input_bit_depth =
++                avctx->pix_fmt == AV_PIX_FMT_YUV420P10 ? 10 : 12;
++            enccfg->g_profile =
++                enccfg->g_bit_depth == 10 ? FF_PROFILE_AV1_MAIN : FF_PROFILE_AV1_PROFESSIONAL;
++            *img_fmt = AOM_IMG_FMT_I42016;
++            *flags |= AOM_CODEC_USE_HIGHBITDEPTH;
++            return 0;
++        }
++        break;
++    case AV_PIX_FMT_YUV422P10:
++    case AV_PIX_FMT_YUV422P12:
++        if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) {
++            enccfg->g_bit_depth = enccfg->g_input_bit_depth =
++                avctx->pix_fmt == AV_PIX_FMT_YUV422P10 ? 10 : 12;
++            enccfg->g_profile = FF_PROFILE_AV1_PROFESSIONAL;
++            *img_fmt = AOM_IMG_FMT_I42216;
++            *flags |= AOM_CODEC_USE_HIGHBITDEPTH;
++            return 0;
++        }
++        break;
++    case AV_PIX_FMT_GBRP10:
++    case AV_PIX_FMT_GBRP12:
++    case AV_PIX_FMT_YUV444P10:
++    case AV_PIX_FMT_YUV444P12:
++        if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) {
++            enccfg->g_bit_depth = enccfg->g_input_bit_depth =
++                avctx->pix_fmt == AV_PIX_FMT_YUV444P10 ||
++                avctx->pix_fmt == AV_PIX_FMT_GBRP10 ? 10 : 12;
++            enccfg->g_profile =
++                enccfg->g_bit_depth == 10 ? FF_PROFILE_AV1_HIGH : FF_PROFILE_AV1_PROFESSIONAL;
++            *img_fmt = AOM_IMG_FMT_I44416;
++            *flags |= AOM_CODEC_USE_HIGHBITDEPTH;
++            return 0;
++        }
++        break;
++    default:
++        break;
++    }
++    av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format.\n");
++    return AVERROR_INVALIDDATA;
++}
++
++static void set_color_range(AVCodecContext *avctx)
++{
++    enum aom_color_range aom_cr;
++    switch (avctx->color_range) {
++    case AVCOL_RANGE_UNSPECIFIED:
++    case AVCOL_RANGE_MPEG:       aom_cr = AOM_CR_STUDIO_RANGE; break;
++    case AVCOL_RANGE_JPEG:       aom_cr = AOM_CR_FULL_RANGE;   break;
++    default:
++        av_log(avctx, AV_LOG_WARNING, "Unsupported color range (%d)\n",
++               avctx->color_range);
++        return;
++    }
++
++    codecctl_int(avctx, AV1E_SET_COLOR_RANGE, aom_cr);
++}
++
++static av_cold int aom_init(AVCodecContext *avctx,
++                            const struct aom_codec_iface *iface)
+ {
+     AOMContext *ctx = avctx->priv_data;
+     struct aom_codec_enc_cfg enccfg = { 0 };
++    aom_codec_flags_t flags = 0;
+     AVCPBProperties *cpb_props;
+     int res;
 -    const struct aom_codec_iface *iface = &aom_codec_av1_cx_algo;
++    aom_img_fmt_t img_fmt;
++    aom_codec_caps_t codec_caps = aom_codec_get_caps(iface);
+ 
+     av_log(avctx, AV_LOG_INFO, "%s\n", aom_codec_version_str());
+     av_log(avctx, AV_LOG_VERBOSE, "%s\n", aom_codec_build_config());
+ 
+     if ((res = aom_codec_enc_config_default(iface, &enccfg, 0)) != AOM_CODEC_OK) {
+         av_log(avctx, AV_LOG_ERROR, "Failed to get config: %s\n",
+                aom_codec_err_to_string(res));
+         return AVERROR(EINVAL);
+     }
++
++    if (set_pix_fmt(avctx, codec_caps, &enccfg, &flags, &img_fmt))
++        return AVERROR(EINVAL);
++
++    if(!avctx->bit_rate)
++        if(avctx->rc_max_rate || avctx->rc_buffer_size || avctx->rc_initial_buffer_occupancy) {
++            av_log( avctx, AV_LOG_ERROR, "Rate control parameters set without a bitrate\n");
++            return AVERROR(EINVAL);
++        }
++
+     dump_enc_cfg(avctx, &enccfg);
+ 
+     enccfg.g_w            = avctx->width;
+     enccfg.g_h            = avctx->height;
+     enccfg.g_timebase.num = avctx->time_base.num;
+     enccfg.g_timebase.den = avctx->time_base.den;
+     enccfg.g_threads      = avctx->thread_count;
+ 
+     if (ctx->lag_in_frames >= 0)
+         enccfg.g_lag_in_frames = ctx->lag_in_frames;
+ 
+     if (avctx->flags & AV_CODEC_FLAG_PASS1)
+         enccfg.g_pass = AOM_RC_FIRST_PASS;
+     else if (avctx->flags & AV_CODEC_FLAG_PASS2)
+         enccfg.g_pass = AOM_RC_LAST_PASS;
+     else
+         enccfg.g_pass = AOM_RC_ONE_PASS;
+ 
 -    if (!avctx->bit_rate)
 -        avctx->bit_rate = enccfg.rc_target_bitrate * 1000;
 -    else
++    if (avctx->rc_min_rate == avctx->rc_max_rate &&
++        avctx->rc_min_rate == avctx->bit_rate && avctx->bit_rate) {
++        enccfg.rc_end_usage = AOM_CBR;
++    } else if (ctx->crf >= 0) {
++        enccfg.rc_end_usage = AOM_CQ;
++        if (!avctx->bit_rate)
++            enccfg.rc_end_usage = AOM_Q;
++    }
++
++    if (avctx->bit_rate) {
+         enccfg.rc_target_bitrate = av_rescale_rnd(avctx->bit_rate, 1, 1000,
+                                                   AV_ROUND_NEAR_INF);
++    } else if (enccfg.rc_end_usage == AOM_Q) {
++    } else {
++        if (enccfg.rc_end_usage == AOM_CQ) {
++            enccfg.rc_target_bitrate = 1000000;
++        } else {
++            avctx->bit_rate = enccfg.rc_target_bitrate * 1000;
++            av_log(avctx, AV_LOG_WARNING,
++                   "Neither bitrate nor constrained quality specified, using default bitrate of %dkbit/sec\n",
++                   enccfg.rc_target_bitrate);
++        }
++    }
+ 
 -    if (ctx->crf)
 -        enccfg.rc_end_usage = AOM_CQ;
 -    else if (avctx->rc_min_rate == avctx->rc_max_rate &&
 -             avctx->rc_min_rate == avctx->bit_rate)
 -        enccfg.rc_end_usage = AOM_CBR;
 -
 -    if (avctx->qmin > 0)
++    if (avctx->qmin >= 0)
+         enccfg.rc_min_quantizer = avctx->qmin;
 -    if (avctx->qmax > 0)
++    if (avctx->qmax >= 0)
+         enccfg.rc_max_quantizer = avctx->qmax;
+ 
++    if (enccfg.rc_end_usage == AOM_CQ || enccfg.rc_end_usage == AOM_Q
++       ) {
++        if (ctx->crf < enccfg.rc_min_quantizer || ctx->crf > enccfg.rc_max_quantizer) {
++            av_log(avctx, AV_LOG_ERROR,
++                   "CQ level %d must be between minimum and maximum quantizer value (%d-%d)\n",
++                   ctx->crf, enccfg.rc_min_quantizer, enccfg.rc_max_quantizer);
++            return AVERROR(EINVAL);
++        }
++    }
++
+     enccfg.rc_dropframe_thresh = ctx->drop_threshold;
+ 
+     // 0-100 (0 => CBR, 100 => VBR)
+     enccfg.rc_2pass_vbr_bias_pct       = round(avctx->qcompress * 100);
 -    enccfg.rc_2pass_vbr_minsection_pct =
 -        avctx->rc_min_rate * 100LL / avctx->bit_rate;
++    if (avctx->bit_rate)
++        enccfg.rc_2pass_vbr_minsection_pct =
++            avctx->rc_min_rate * 100LL / avctx->bit_rate;
+     if (avctx->rc_max_rate)
+         enccfg.rc_2pass_vbr_maxsection_pct =
+             avctx->rc_max_rate * 100LL / avctx->bit_rate;
+ 
+     if (avctx->rc_buffer_size)
+         enccfg.rc_buf_sz =
+             avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
+     if (avctx->rc_initial_buffer_occupancy)
+         enccfg.rc_buf_initial_sz =
+             avctx->rc_initial_buffer_occupancy * 1000LL / avctx->bit_rate;
+     enccfg.rc_buf_optimal_sz = enccfg.rc_buf_sz * 5 / 6;
+ 
+     // _enc_init() will balk if kf_min_dist differs from max w/AOM_KF_AUTO
+     if (avctx->keyint_min >= 0 && avctx->keyint_min == avctx->gop_size)
+         enccfg.kf_min_dist = avctx->keyint_min;
+     if (avctx->gop_size >= 0)
+         enccfg.kf_max_dist = avctx->gop_size;
+ 
+     if (enccfg.g_pass == AOM_RC_FIRST_PASS)
+         enccfg.g_lag_in_frames = 0;
+     else if (enccfg.g_pass == AOM_RC_LAST_PASS) {
+         int decode_size, ret;
+ 
+         if (!avctx->stats_in) {
+             av_log(avctx, AV_LOG_ERROR, "No stats file for second pass\n");
+             return AVERROR_INVALIDDATA;
+         }
+ 
+         ctx->twopass_stats.sz = strlen(avctx->stats_in) * 3 / 4;
+         ret                   = av_reallocp(&ctx->twopass_stats.buf, ctx->twopass_stats.sz);
+         if (ret < 0) {
+             av_log(avctx, AV_LOG_ERROR,
 -                   "Stat buffer alloc (%zu bytes) failed\n",
++                   "Stat buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
+                    ctx->twopass_stats.sz);
++            ctx->twopass_stats.sz = 0;
+             return ret;
+         }
+         decode_size = av_base64_decode(ctx->twopass_stats.buf, avctx->stats_in,
+                                        ctx->twopass_stats.sz);
+         if (decode_size < 0) {
+             av_log(avctx, AV_LOG_ERROR, "Stat buffer decode failed\n");
+             return AVERROR_INVALIDDATA;
+         }
+ 
+         ctx->twopass_stats.sz      = decode_size;
+         enccfg.rc_twopass_stats_in = ctx->twopass_stats;
+     }
+ 
+     /* 0-3: For non-zero values the encoder increasingly optimizes for reduced
+      * complexity playback on low powered devices at the expense of encode
+      * quality. */
+     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;
 -    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;
 -        else
 -            avctx->profile = enccfg.g_profile = FF_PROFILE_AV1_2;
 -    }
 -
+ 
+     enccfg.g_error_resilient = ctx->error_resilient;
+ 
+     dump_enc_cfg(avctx, &enccfg);
+     /* Construct Encoder Context */
 -    res = aom_codec_enc_init(&ctx->encoder, iface, &enccfg, 0);
++    res = aom_codec_enc_init(&ctx->encoder, iface, &enccfg, flags);
+     if (res != AOM_CODEC_OK) {
+         log_encoder_error(avctx, "Failed to initialize encoder");
+         return AVERROR(EINVAL);
+     }
+ 
+     // codec control failures are currently treated only as warnings
+     av_log(avctx, AV_LOG_DEBUG, "aom_codec_control\n");
 -    if (ctx->cpu_used != INT_MIN)
 -        codecctl_int(avctx, AOME_SET_CPUUSED, ctx->cpu_used);
++    codecctl_int(avctx, AOME_SET_CPUUSED, ctx->cpu_used);
+     if (ctx->auto_alt_ref >= 0)
+         codecctl_int(avctx, AOME_SET_ENABLEAUTOALTREF, ctx->auto_alt_ref);
+ 
+     codecctl_int(avctx, AOME_SET_STATIC_THRESHOLD, ctx->static_thresh);
 -    codecctl_int(avctx, AOME_SET_CQ_LEVEL, ctx->crf);
++    if (ctx->crf >= 0)
++        codecctl_int(avctx, AOME_SET_CQ_LEVEL,          ctx->crf);
++
++    set_color_range(avctx);
+ 
+     // provide dummy value to initialize wrapper, values will be updated each _encode()
 -    aom_img_wrap(&ctx->rawimg, ff_aom_pixfmt_to_imgfmt(avctx->pix_fmt),
 -                 avctx->width, avctx->height, 1, (unsigned char *)1);
++    aom_img_wrap(&ctx->rawimg, img_fmt, avctx->width, avctx->height, 1,
++                 (unsigned char*)1);
++
++    if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH)
++        ctx->rawimg.bit_depth = enccfg.g_bit_depth;
+ 
+     cpb_props = ff_add_cpb_side_data(avctx);
+     if (!cpb_props)
+         return AVERROR(ENOMEM);
+ 
+     if (enccfg.rc_end_usage == AOM_CBR ||
+         enccfg.g_pass != AOM_RC_ONE_PASS) {
+         cpb_props->max_bitrate = avctx->rc_max_rate;
+         cpb_props->min_bitrate = avctx->rc_min_rate;
+         cpb_props->avg_bitrate = avctx->bit_rate;
+     }
+     cpb_props->buffer_size = avctx->rc_buffer_size;
+ 
+     return 0;
+ }
+ 
+ static inline void cx_pktcpy(struct FrameListData *dst,
+                              const struct aom_codec_cx_pkt *src)
+ {
+     dst->pts      = src->data.frame.pts;
+     dst->duration = src->data.frame.duration;
+     dst->flags    = src->data.frame.flags;
+     dst->sz       = src->data.frame.sz;
+     dst->buf      = src->data.frame.buf;
+ }
+ 
+ /**
+  * Store coded frame information in format suitable for return from encode2().
+  *
+  * Write information from @a cx_frame to @a pkt
+  * @return packet data size on success
+  * @return a negative AVERROR on error
+  */
+ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame,
+                       AVPacket *pkt)
+ {
 -    int ret = ff_alloc_packet(pkt, cx_frame->sz);
++    int ret = ff_alloc_packet2(avctx, pkt, cx_frame->sz, 0);
+     if (ret < 0) {
+         av_log(avctx, AV_LOG_ERROR,
 -               "Error getting output packet of size %zu.\n", cx_frame->sz);
++               "Error getting output packet of size %"SIZE_SPECIFIER".\n", cx_frame->sz);
+         return ret;
+     }
+     memcpy(pkt->data, cx_frame->buf, pkt->size);
+     pkt->pts = pkt->dts = cx_frame->pts;
+ 
+     if (!!(cx_frame->flags & AOM_FRAME_IS_KEY))
+         pkt->flags |= AV_PKT_FLAG_KEY;
+     return pkt->size;
+ }
+ 
+ /**
+  * Queue multiple output frames from the encoder, returning the front-most.
+  * In cases where aom_codec_get_cx_data() returns more than 1 frame append
+  * the frame queue. Return the head frame if available.
+  * @return Stored frame size
+  * @return AVERROR(EINVAL) on output size error
+  * @return AVERROR(ENOMEM) on coded frame queue data allocation error
+  */
+ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out)
+ {
+     AOMContext *ctx = avctx->priv_data;
+     const struct aom_codec_cx_pkt *pkt;
+     const void *iter = NULL;
+     int size = 0;
+ 
+     if (ctx->coded_frame_list) {
+         struct FrameListData *cx_frame = ctx->coded_frame_list;
+         /* return the leading frame if we've already begun queueing */
+         size = storeframe(avctx, cx_frame, pkt_out);
+         if (size < 0)
+             return size;
+         ctx->coded_frame_list = cx_frame->next;
+         free_coded_frame(cx_frame);
+     }
+ 
+     /* consume all available output from the encoder before returning. buffers
+      * are only good through the next aom_codec call */
+     while ((pkt = aom_codec_get_cx_data(&ctx->encoder, &iter))) {
+         switch (pkt->kind) {
+         case AOM_CODEC_CX_FRAME_PKT:
+             if (!size) {
+                 struct FrameListData cx_frame;
+ 
+                 /* avoid storing the frame when the list is empty and we haven't yet
+                  * provided a frame for output */
+                 assert(!ctx->coded_frame_list);
+                 cx_pktcpy(&cx_frame, pkt);
+                 size = storeframe(avctx, &cx_frame, pkt_out);
+                 if (size < 0)
+                     return size;
+             } else {
+                 struct FrameListData *cx_frame =
+                     av_malloc(sizeof(struct FrameListData));
+ 
+                 if (!cx_frame) {
+                     av_log(avctx, AV_LOG_ERROR,
+                            "Frame queue element alloc failed\n");
+                     return AVERROR(ENOMEM);
+                 }
+                 cx_pktcpy(cx_frame, pkt);
+                 cx_frame->buf = av_malloc(cx_frame->sz);
+ 
+                 if (!cx_frame->buf) {
+                     av_log(avctx, AV_LOG_ERROR,
 -                           "Data buffer alloc (%zu bytes) failed\n",
++                           "Data buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
+                            cx_frame->sz);
+                     av_freep(&cx_frame);
+                     return AVERROR(ENOMEM);
+                 }
+                 memcpy(cx_frame->buf, pkt->data.frame.buf, pkt->data.frame.sz);
+                 coded_frame_add(&ctx->coded_frame_list, cx_frame);
+             }
+             break;
+         case AOM_CODEC_STATS_PKT:
+         {
+             struct aom_fixed_buf *stats = &ctx->twopass_stats;
+             int err;
+             if ((err = av_reallocp(&stats->buf,
+                                    stats->sz +
+                                    pkt->data.twopass_stats.sz)) < 0) {
+                 stats->sz = 0;
+                 av_log(avctx, AV_LOG_ERROR, "Stat buffer realloc failed\n");
+                 return err;
+             }
+             memcpy((uint8_t *)stats->buf + stats->sz,
+                    pkt->data.twopass_stats.buf, pkt->data.twopass_stats.sz);
+             stats->sz += pkt->data.twopass_stats.sz;
+             break;
+         }
+         case AOM_CODEC_PSNR_PKT: // FIXME add support for AV_CODEC_FLAG_PSNR
+         case AOM_CODEC_CUSTOM_PKT:
+             // ignore unsupported/unrecognized packet types
+             break;
+         }
+     }
+ 
+     return size;
+ }
+ 
+ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt,
+                       const AVFrame *frame, int *got_packet)
+ {
+     AOMContext *ctx = avctx->priv_data;
+     struct aom_image *rawimg = NULL;
+     int64_t timestamp = 0;
+     int res, coded_size;
+     aom_enc_frame_flags_t flags = 0;
+ 
+     if (frame) {
+         rawimg                      = &ctx->rawimg;
+         rawimg->planes[AOM_PLANE_Y] = frame->data[0];
+         rawimg->planes[AOM_PLANE_U] = frame->data[1];
+         rawimg->planes[AOM_PLANE_V] = frame->data[2];
+         rawimg->stride[AOM_PLANE_Y] = frame->linesize[0];
+         rawimg->stride[AOM_PLANE_U] = frame->linesize[1];
+         rawimg->stride[AOM_PLANE_V] = frame->linesize[2];
+         timestamp                   = frame->pts;
+         switch (frame->color_range) {
+         case AVCOL_RANGE_MPEG:
+             rawimg->range = AOM_CR_STUDIO_RANGE;
+             break;
+         case AVCOL_RANGE_JPEG:
+             rawimg->range = AOM_CR_FULL_RANGE;
+             break;
+         }
+ 
+         if (frame->pict_type == AV_PICTURE_TYPE_I)
+             flags |= AOM_EFLAG_FORCE_KF;
+     }
+ 
+     res = aom_codec_encode(&ctx->encoder, rawimg, timestamp,
+                            avctx->ticks_per_frame, flags);
+     if (res != AOM_CODEC_OK) {
+         log_encoder_error(avctx, "Error encoding frame");
+         return AVERROR_INVALIDDATA;
+     }
+     coded_size = queue_frames(avctx, pkt);
+ 
+     if (!frame && avctx->flags & AV_CODEC_FLAG_PASS1) {
+         size_t b64_size = AV_BASE64_SIZE(ctx->twopass_stats.sz);
+ 
+         avctx->stats_out = av_malloc(b64_size);
+         if (!avctx->stats_out) {
 -            av_log(avctx, AV_LOG_ERROR, "Stat buffer alloc (%zu bytes) failed\n",
++            av_log(avctx, AV_LOG_ERROR, "Stat buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n",
+                    b64_size);
+             return AVERROR(ENOMEM);
+         }
+         av_base64_encode(avctx->stats_out, b64_size, ctx->twopass_stats.buf,
+                          ctx->twopass_stats.sz);
+     }
+ 
+     *got_packet = !!coded_size;
+     return 0;
+ }
+ 
++static const enum AVPixelFormat av1_pix_fmts[] = {
++    AV_PIX_FMT_YUV420P,
++    AV_PIX_FMT_YUV422P,
++    AV_PIX_FMT_YUV444P,
++    AV_PIX_FMT_GBRP,
++    AV_PIX_FMT_NONE
++};
++
++static const enum AVPixelFormat av1_pix_fmts_highbd[] = {
++    AV_PIX_FMT_YUV420P,
++    AV_PIX_FMT_YUV422P,
++    AV_PIX_FMT_YUV444P,
++    AV_PIX_FMT_YUV420P10,
++    AV_PIX_FMT_YUV422P10,
++    AV_PIX_FMT_YUV444P10,
++    AV_PIX_FMT_YUV420P12,
++    AV_PIX_FMT_YUV422P12,
++    AV_PIX_FMT_YUV444P12,
++    AV_PIX_FMT_GBRP,
++    AV_PIX_FMT_GBRP10,
++    AV_PIX_FMT_GBRP12,
++    AV_PIX_FMT_NONE
++};
++
++static av_cold void av1_init_static(AVCodec *codec)
++{
++    aom_codec_caps_t codec_caps = aom_codec_get_caps(aom_codec_av1_cx());
++    if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH)
++        codec->pix_fmts = av1_pix_fmts_highbd;
++    else
++        codec->pix_fmts = av1_pix_fmts;
++}
++
++static av_cold int av1_init(AVCodecContext *avctx)
++{
++    return aom_init(avctx, aom_codec_av1_cx());
++}
++
+ #define OFFSET(x) offsetof(AOMContext, x)
+ #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+ static const AVOption options[] = {
 -    { "cpu-used",        "Quality/Speed ratio modifier",           OFFSET(cpu_used),        AV_OPT_TYPE_INT, {.i64 = 1}, INT_MIN, INT_MAX, VE},
++    { "cpu-used",        "Quality/Speed ratio modifier",           OFFSET(cpu_used),        AV_OPT_TYPE_INT, {.i64 = 1}, -8, 8, VE},
+     { "auto-alt-ref",    "Enable use of alternate reference "
 -                         "frames (2-pass only)",                   OFFSET(auto_alt_ref),    AV_OPT_TYPE_INT, {.i64 = -1},      -1,      1,       VE},
++                         "frames (2-pass only)",                   OFFSET(auto_alt_ref),    AV_OPT_TYPE_INT, {.i64 = -1},      -1,      2,       VE},
+     { "lag-in-frames",   "Number of frames to look ahead at for "
+                          "alternate reference frame selection",    OFFSET(lag_in_frames),   AV_OPT_TYPE_INT, {.i64 = -1},      -1,      INT_MAX, VE},
+     { "error-resilience", "Error resilience configuration", OFFSET(error_resilient), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, VE, "er"},
+     { "default",         "Improve resiliency against losses of whole frames", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_ERROR_RESILIENT_DEFAULT}, 0, 0, VE, "er"},
+     { "partitions",      "The frame partitions are independently decodable "
+                          "by the bool decoder, meaning that partitions can be decoded even "
+                          "though earlier partitions have been lost. Note that intra predicition"
+                          " is still done over the partition boundary.",       0, AV_OPT_TYPE_CONST, {.i64 = AOM_ERROR_RESILIENT_PARTITIONS}, 0, 0, VE, "er"},
 -    { "crf",              "Select the quality for constant quality mode", offsetof(AOMContext, crf), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 63, VE },
++    { "crf",              "Select the quality for constant quality mode", offsetof(AOMContext, crf), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 63, VE },
+     { "static-thresh",    "A change threshold on blocks below which they will be skipped by the encoder", OFFSET(static_thresh), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+     { "drop-threshold",   "Frame drop threshold", offsetof(AOMContext, drop_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, VE },
+     { "noise-sensitivity", "Noise sensitivity", OFFSET(noise_sensitivity), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 4, VE},
+     { NULL }
+ };
+ 
+ static const AVCodecDefault defaults[] = {
+     { "qmin",             "-1" },
+     { "qmax",             "-1" },
+     { "g",                "-1" },
+     { "keyint_min",       "-1" },
+     { NULL },
+ };
+ 
+ static const AVClass class_aom = {
 -    .class_name = "libaom encoder",
++    .class_name = "libaom-av1 encoder",
+     .item_name  = av_default_item_name,
+     .option     = options,
+     .version    = LIBAVUTIL_VERSION_INT,
+ };
+ 
+ AVCodec ff_libaom_av1_encoder = {
+     .name           = "libaom-av1",
+     .long_name      = NULL_IF_CONFIG_SMALL("libaom AV1"),
+     .type           = AVMEDIA_TYPE_VIDEO,
+     .id             = AV_CODEC_ID_AV1,
+     .priv_data_size = sizeof(AOMContext),
 -    .init           = aom_init,
++    .init           = av1_init,
+     .encode2        = aom_encode,
+     .close          = aom_free,
+     .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_EXPERIMENTAL,
 -    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
+     .priv_class     = &class_aom,
+     .defaults       = defaults,
++    .init_static_data = av1_init_static,
+     .wrapper_name   = "libaom",
+ };



More information about the ffmpeg-cvslog mailing list