From patchwork Mon Oct 26 22:04:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bohan Li X-Patchwork-Id: 23239 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 7BAC444B609 for ; Tue, 27 Oct 2020 00:04:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4AB0F68810D; Tue, 27 Oct 2020 00:04:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB228687F29 for ; Tue, 27 Oct 2020 00:04:40 +0200 (EET) Received: by mail-pl1-f201.google.com with SMTP id y9so6893053pll.18 for ; Mon, 26 Oct 2020 15:04:40 -0700 (PDT) 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=yUqfQt8LyC9JAgcKfmyjxG3Yk4jTt7+jE/qoOZKOynM=; b=repoGKN0CAYJxn47AWkVSLaqQJDEHNMI35grKIU1EMs3bb/GrWsjqgRiSkjJ4ENd/o Ej+6NjJLNY2kHMOIW8W7RODNrOEBo7B4uwxWy80/Y0g/bZJxBOzD8lg6+PI/HJjrOrQy x5tHBEzOw/O4ejUYWhkGHzty+xOvgcZ99H7WWNCgrfr4sxEO0omF7x0Q6QfvXig6JfhD AvQDmsRUpLHRQ53yo4AwDKSEvF+DGe4jiseRBSrNrvcMgR+GL+3sSnb8tethOvfJvqoJ nQKy69lS41US9xTPWIX3+Ihr4yuzMckpN9cZqG2agGy5tjOR3J10hhEG8IhxItRUsfiA NBBw== 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=yUqfQt8LyC9JAgcKfmyjxG3Yk4jTt7+jE/qoOZKOynM=; b=eFZ3ZDpvIcgFV9xB6lGL4sc06ABS6fkqCgtqhA3ptSr2uALEGK8c7LEUWI1lzCd97m C210as6tgRtqtwopyJMrlHK1SW6Uxs7M+HIYTNh82UCJd1dD2Tx6tcXMVpILjTJPzRXA gYYvgw8lkyQIh+NuG7D2yJT531jO6jSA8x7ugxbyuI1JjBqkLgi+7hp+LeMQiP8D8ajw 4LOY7Z/wrNGnK+8INAxSr3lr05A8XuSb5dQv7LHRaWOasB6XFH0wlmoNV+3Ogf6Bjaw+ XZ3usqZgeZJ/nGze2Eq3gR4phA+MZi5PHYxh4qAxeVgNTv3EhusO8Y4B4xQaEfyc7w4S W0rw== X-Gm-Message-State: AOAM5332D1ugCaT71LCrI/tDl37jERXWzPrlSb8ortr3VmIET04HtENE ATcm79y+7wwc7qD5DxdQ+7ECVymeo5XSy9z/7rsbeti95iSiusBIaDLrK7BwaMpV6Rar0QYcNlS mEYzN+FlOAVUaR1kgMH1FnVXpNDOxIqNaPon3CR0leZmKVYHq/v8dQ+2Q5lIWi15L7w== X-Google-Smtp-Source: ABdhPJzUvScgVOg/ighqQ58DLBWoifoU7hzufcs7YpdL8kQooRJFm0lxA1bGmmH14lTdHrlXkDcIhjcYIlBP X-Received: from bohanli.mtv.corp.google.com ([2620:0:1000:2511:1ea0:b8ff:fe73:500c]) (user=bohanli job=sendgmr) by 2002:a17:90a:4e47:: with SMTP id t7mr17824563pjl.26.1603749878337; Mon, 26 Oct 2020 15:04:38 -0700 (PDT) Date: Mon, 26 Oct 2020 15:04:31 -0700 In-Reply-To: <20201026210132.4027342-1-bohanli@google.com> Message-Id: <20201026220431.4046922-1-bohanli@google.com> Mime-Version: 1.0 References: <20201026210132.4027342-1-bohanli@google.com> X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog From: Bohan Li To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] Add enable_keyframe_filtering option for libaom-av1 encoder. 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" Add the option to use -enable-keyframe-filtering with libaom-av1 codec. The option controls the encoder behavior on performing temporal filtering on keyframes. Signed-off-by: Bohan Li --- doc/encoders.texi | 13 +++++++++++++ libavcodec/libaomenc.c | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 0b1c69e982..8914546694 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1685,6 +1685,19 @@ 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 enable-keyframe-filtering (Requires libaom >= v2.0.0) +Filtering type for key frames. Possible values: +@table @samp +@item @emph{-1} +Use the default in libaom (default). +@item @emph{0} +Do not filter key frames. +@item @emph{1} +Filter key frames but do not apply overlays. +@item @emph{2} +Filter key frames and apply overlays to them (experimental). +@end table + @end table @section libsvtav1 diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 2b0581b15a..77c25770a4 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; + int enable_keyframe_filtering; } AOMContext; static const char *const ctlidstr[] = { @@ -192,6 +193,7 @@ static const char *const ctlidstr[] = { [AV1E_SET_REDUCED_REFERENCE_SET] = "AV1E_SET_REDUCED_REFERENCE_SET", [AV1E_SET_ENABLE_SMOOTH_INTERINTRA] = "AV1E_SET_ENABLE_SMOOTH_INTERINTRA", [AV1E_SET_ENABLE_REF_FRAME_MVS] = "AV1E_SET_ENABLE_REF_FRAME_MVS", + [AV1E_SET_ENABLE_KEYFRAME_FILTERING] = "AV1E_SET_ENABLE_KEYFRAME_FILTERING" #endif }; @@ -812,6 +814,8 @@ static av_cold int aom_init(AVCodecContext *avctx, codecctl_int(avctx, AV1E_SET_ENABLE_ONESIDED_COMP, ctx->enable_onesided_comp); if (ctx->enable_smooth_interintra >= 0) codecctl_int(avctx, AV1E_SET_ENABLE_SMOOTH_INTERINTRA, ctx->enable_smooth_interintra); + if (ctx->enable_keyframe_filtering >= 0) + codecctl_int(avctx, AV1E_SET_ENABLE_KEYFRAME_FILTERING, ctx->enable_keyframe_filtering); #endif codecctl_int(avctx, AOME_SET_STATIC_THRESHOLD, ctx->static_thresh); @@ -1261,6 +1265,7 @@ 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}, + { "enable-keyframe-filtering", "Keyframe filtering type", OFFSET(enable_keyframe_filtering), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 3, VE}, { NULL }, };