From patchwork Tue Oct 27 20:38:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bohan Li X-Patchwork-Id: 23258 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 99FD944A005 for ; Tue, 27 Oct 2020 22:38:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 750C56891E1; Tue, 27 Oct 2020 22:38:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92A176882E3 for ; Tue, 27 Oct 2020 22:38:20 +0200 (EET) Received: by mail-yb1-f202.google.com with SMTP id a12so2708688ybc.20 for ; Tue, 27 Oct 2020 13:38:20 -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=0tHyDEkOtTrS9sUvfXRLou8Y3DM9AMX3/WFpSF3CZAk=; b=VCsqByIvexvlvzZOeQSaQUl7Ied1jaLwFboxIbakl4bW8vHx72EdPNUMHaWY7yxV0h FR6dl0tfEPUdFt0dPvZen4r7AZUIAOR5P2eGTKwuDwLCxExN9rSzkr17vyrM/70OsNZI rQ560feSoBTl7LueOuucDQPjbTsH58FAV0Tp2ddcApz4QQatNuAvMyZrNK5jnaA4JGgN bUB7YyVaoOiUC1CnJBSkgJqrbORt2ClrsnrLmKB1YUY9VDxXnm5E7T3XBk7haXMIDqka iMQs5UhxeqHYqKeYgxR+xh1nB99H2mY5vS/xw75lxxHpRb5jBFSWVAebn1EyksKnFNTM PWnQ== 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=0tHyDEkOtTrS9sUvfXRLou8Y3DM9AMX3/WFpSF3CZAk=; b=RQDAPJ1r3oEW+gnkknj4FWSOghZ6sQ/MJuL83gfwrK285cuDG46wxPqnnCyi2vvY7X P5pnDDisywvRCjhOD6bk1fMlJSpbMBw9Rj6v2ZNrcAjVcQ112vkKd0ZPWOhiQNnAO4Rm Xps6DsuAa44Ofqu1+SgqlOxmbODCWF3HcHcTTt7wTJ4SI8NFKBlT/JWwfGG2nIwV1ZmB XgyLbSCoz21vR5TBQ7zTRL2gF9XvXp1bNNWAQOkZqEZXNHeXJ5wto3q3TwiVAMIBbn5+ kfjEJ5FCceI4JgafPSAZ2xBsaQueTjEcycxseGkhSsI6CXDhXk44A+bhg6bYckzATMhx 8UDA== X-Gm-Message-State: AOAM533TxV4u0Uw1KSpE6PBJkwzPuNBmoJ++M120LuHYbzBuMVe7F9QV 7EljIuGLePx6S1ZhoYYfQQuFW763nTSTK1UrzrOfv6i3OoSzdDO+j9Cb2cACdEL5n1imMlnUL+l mD7CrAz7YL1HqxqOi/81/Vn1rp9GYIPVySUKafRbL4iit32aZ5mVY5VdrApQ7/sDkXg== X-Google-Smtp-Source: ABdhPJwKX4NH6RXh91kHHcT8VxBMLp98xwbuXo4jQgrxzw9k1PVSc0pvncfwTKBWf7UtO5ka9laUncozI0Jn X-Received: from bohanli.mtv.corp.google.com ([2620:0:1000:2511:1ea0:b8ff:fe73:500c]) (user=bohanli job=sendgmr) by 2002:a25:8012:: with SMTP id m18mr5362797ybk.361.1603831098980; Tue, 27 Oct 2020 13:38:18 -0700 (PDT) Date: Tue, 27 Oct 2020 13:38:15 -0700 In-Reply-To: <20201026210132.4027342-1-bohanli@google.com> Message-Id: <20201027203815.131648-1-bohanli@google.com> Mime-Version: 1.0 References: <20201026210132.4027342-1-bohanli@google.com> X-Mailer: git-send-email 2.29.0.rc2.309.g374f81d7ae-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 | 17 +++++++++++++++++ libavcodec/libaomenc.c | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 0b1c69e982..c80a520a20 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1685,6 +1685,23 @@ 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. Temporal filtering of key frames improves +compression efficiency, but may introduce key frames that are blurred at times. +Adding an overlay to filtered frames mitigates the blurring issue, but could +potentially confuse video players when performing random access. +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 }, };