From patchwork Tue Feb 9 04:04:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bohan Li X-Patchwork-Id: 25520 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C7104449442 for ; Tue, 9 Feb 2021 06:04:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99A8D689A5E; Tue, 9 Feb 2021 06:04:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8476C6880F8 for ; Tue, 9 Feb 2021 06:04:53 +0200 (EET) Received: by mail-yb1-f201.google.com with SMTP id 78so15734052ybn.14 for ; Mon, 08 Feb 2021 20:04:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=T+RCQk2KLChOCq0bbvn4jeCY/lm6vQSUiyGPE7JQ9b8=; b=Ddy0/pq6Ru0O7IvO5pNe5M4UvmbpXavYffdzpphUwRw5MQTsfsGJAzPcpX1VYLUV1Q pfE6ygYe1wKsXv7aQiXv7BofWO/vxyHwPsOtE1W9/Rc+HxJK0mKVw3vVXAmlcHXatNnh 8ZDvHnn0zfv8B2lGKS1jgkdSrxk9u3eI9J4uMs/isyrSWzP656V2OZFdRw+cIoN3Pi20 s56REn2Z2XASANOL/oPQ32/OesCJlxAGiNTbe8TNJ1NvLV+ypMPE9wjXcDrD8qVsa1pa uFma84LB3gv898eJkyoXRZSY85DivHdKJ5PdaQTSz3Fser5bcPdKLaAcOCF1b3fuaSri 3UWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=T+RCQk2KLChOCq0bbvn4jeCY/lm6vQSUiyGPE7JQ9b8=; b=niy8kx5JwFisWuGtjBUdlWtBFYwQ7QxtcT7jHeWoIcB+eOk8eJhkl3zqDwGmWo5JwA VkOz3lBGY+vVhqWIBCHmXwytuFQ7Wpl6b6pZfbthllLhwxjWuiKjPck5ltoN0bjvuVWy bF2r1vt/eLceKHkuQSBYeAbxc7q7erA6iO3/eZi2Iqg/Av9TmO01cZI3QMDeIYDUomD6 yqbMNrPNKRPeHJJFwUsu6xRsW38FSyc1dOOHpdeurQnFYxJdFLzXBkhe593wgIZXYqXv GfxspUGXWrOee3woJeLxPB0N5J9sKZfLU/q+FKBC/kL4Hj9zjBAqppLe6br6jm7DoRiu vt6Q== X-Gm-Message-State: AOAM532p1j89/XVKYUmtzDSg6s9Sq289rMEqjOj2+6nEiCGx2Tp06pEN g6A9CgMKMVUt4CYJeDbGQeiWz2CID4d4N9NAtUXSrTkeLCLNldOBxKv9+Le3lJ16rJYPkL5ceKY F8oOsb1+IUpoTbt127F1zzCnNBw4tBAombSyqTFlnr3fVzfIw7oVVDkVVtqTUzXQtDQ== X-Google-Smtp-Source: ABdhPJzLghdwi7k3rXfWv86kgGo+BCddJKfrwHolG/DMPcCRDEValmjKQn/mgFAcV3DvxnwPtMLrFwj3IU2z X-Received: from bohanli.mtv.corp.google.com ([2620:0:1000:2511:1081:67d0:2721:7f81]) (user=bohanli job=sendgmr) by 2002:a25:1385:: with SMTP id 127mr28659094ybt.437.1612843491524; Mon, 08 Feb 2021 20:04:51 -0800 (PST) Date: Mon, 8 Feb 2021 20:04:41 -0800 In-Reply-To: Message-Id: <20210209040441.462673-1-bohanli@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog From: Bohan Li To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2] Add support for the new key & value API in libaom. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Bohan Li Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This key & value API can greatly help with users who wants to try libaom-av1 specific options that are not supported by ffmpeg options. As was previously discussed in this thread: https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2020-October/271658. The commit that added the API to libaom: https://aomedia.googlesource.com/aom/+/c1d42fe6615c96fc929257 The libaom issue tracker: https://bugs.chromium.org/p/aomedia/issues/detail?id=2875 Signed-off-by: Bohan Li --- doc/encoders.texi | 11 +++++++++++ libavcodec/libaomenc.c | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index c2ba7d3e6f..8fb573c416 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1684,6 +1684,17 @@ Enable interintra compound. Default is true. @item enable-smooth-interintra (@emph{boolean}) (Requires libaom >= v2.0.0) Enable smooth interintra mode. Default is true. +@item aom-params +Set libaom options using a list of @var{key}=@var{value} pairs separated +by ":". For a list of supported options, see @command{aomenc --help} under the +section "AV1 Specific Options". + +For example to specify libaom encoding options with @option{-aom-params}: + +@example +ffmpeg -i input -c:v libaom-av1 -b:v 500K -aom-params tune=psnr:enable-tpl-model=1 output.mp4 +@end example + @end table @section libsvtav1 diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 342d0883e4..9a26b5f9ef 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -124,6 +124,7 @@ typedef struct AOMEncoderContext { int enable_diff_wtd_comp; int enable_dist_wtd_comp; int enable_dual_filter; + AVDictionary *aom_params; } AOMContext; static const char *const ctlidstr[] = { @@ -874,6 +875,20 @@ static av_cold int aom_init(AVCodecContext *avctx, codecctl_int(avctx, AV1E_SET_ENABLE_INTRABC, ctx->enable_intrabc); #endif +#if AOM_ENCODER_ABI_VERSION >= 23 + { + AVDictionaryEntry *en = NULL; + + while ((en = av_dict_get(ctx->aom_params, "", en, AV_DICT_IGNORE_SUFFIX))) { + int ret = aom_codec_set_option(&ctx->encoder, en->key, en->value); + if (ret != AOM_CODEC_OK) { + log_encoder_error(avctx, en->key); + return AVERROR_EXTERNAL; + } + } + } +#endif + // 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); @@ -1299,6 +1314,9 @@ static const AVOption options[] = { { "enable-masked-comp", "Enable masked compound", OFFSET(enable_masked_comp), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-interintra-comp", "Enable interintra compound", OFFSET(enable_interintra_comp), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-smooth-interintra", "Enable smooth interintra mode", OFFSET(enable_smooth_interintra), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, +#if AOM_ENCODER_ABI_VERSION >= 23 + { "aom-params", "Set libaom options using a :-separated list of key=value pairs", OFFSET(aom_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, +#endif { NULL }, };