From patchwork Wed Jul 15 02:08:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Cao X-Patchwork-Id: 21027 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 BC4EB448733 for ; Wed, 15 Jul 2020 05:08:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8EBDA68A94D; Wed, 15 Jul 2020 05:08:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC79E68A0EA for ; Wed, 15 Jul 2020 05:08:19 +0300 (EEST) Received: by mail-pj1-f45.google.com with SMTP id k5so1275954pjg.3 for ; Tue, 14 Jul 2020 19:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3/Nsge7yI/eHpgRmEq5AI9N5enNjDtNlkxU4BR8mT/Y=; b=AgrVQDyOn/g5/jOVhgK2QpnymiuU/RVig7FiWSJNcH8mqJnIvZUONSaoeX09zUOaF1 VZtTWHDOUy+XCHbhVkTyF8zzptXux2+VIffznutDczN/AyQmfvsCL5c9TbRERgzum90o NWhFdz+fF/DDQvIKhqX9wYxYjhc4ft/CtsvA7tUGNaB1RGxvEjhOM4w3i9mRTu1ELpys NqpCxWnisf0qkGUzLjKO4lgFQ2E5egKoBWUgw0/crJQ30LSYoVVxbez+DZ9f65ckVMt3 sP4A5UXzVkArw8Bbchi40wIpA63M243zSJ0cInLaYQj0pwKJ48yUpJDuPlK5Rf9MV0OU z8MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3/Nsge7yI/eHpgRmEq5AI9N5enNjDtNlkxU4BR8mT/Y=; b=k3/uWsGQ74s11suPKr5KHHRubQi3QGtDTg8tq0sLBHPR6Kt5UR43ViDUfhtVaJA3OH KjphhMYOm7oYJfxHiTiHbfrGmNPDeApJRAKxtUg0BAjKNPZUGzxagSG2zLWI90/kx8dU CX+0V8GupsDnw71oUeRwhtJQi4qRw+6vtkcaK7nuRUUvh42kJz6JFD+uchSsmCmghlwQ tkQhYx+KKdpsAE3LHh0MuGwoMXku+6NN0X1ti908mtPMZnqfmQmsZ8i39snoMTeCLZ9f r0MbU0Yqi4JjX+w8btVUjqxudz4LAa4C1tu0GimReaWPjFKlgJI+bwxnC9DH3u3qzTYA /D/Q== X-Gm-Message-State: AOAM531bZ1xRfY4/9fFjZumKsXAWMJt/wn58kDP7uf77HgeOLBS8jdFq 2RFq6TvLC7gXSnSVVcZ3Udhx7MRHXFg= X-Google-Smtp-Source: ABdhPJxjbNu/6sGpxDW8WQCuu3PxW+/hZw9t6XgGFwXrdDjR9/U9RPmr6QorZvwOFwxLWlZQXo6/+g== X-Received: by 2002:a17:90a:ea05:: with SMTP id w5mr7646443pjy.175.1594778897419; Tue, 14 Jul 2020 19:08:17 -0700 (PDT) Received: from wangcao.mtv.corp.google.com ([2620:0:1000:4011:725a:fff:fe36:d84d]) by smtp.gmail.com with ESMTPSA id d14sm302475pjc.20.2020.07.14.19.08.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 19:08:16 -0700 (PDT) From: Wang Cao X-Google-Original-From: Wang Cao To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jul 2020 19:08:10 -0700 Message-Id: <20200715020810.614371-1-wangcao@google.com> X-Mailer: git-send-email 2.27.0.389.gc38d7665816-goog In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] libavcodec/libaomenc.c: Add command-line options for tx tools. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Wang Cao Signed-off-by: Wang Cao --- doc/encoders.texi | 20 ++++++++++++++++++++ libavcodec/libaomenc.c | 32 ++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 5406d20c00..e6ef401a9a 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1629,6 +1629,26 @@ Enable paeth predictor in intra prediction. Default is true. @item enable-palette (@emph{boolean}) (Requires libaom >= v2.0.0) Enable palette prediction mode. Default is true. +@item enable-flip-idtx (@emph{boolean}) (Requires libaom >= v2.0.0) +Enable extended transform type, including FLIPADST_DCT, DCT_FLIPADST, +FLIPADST_FLIPADST, ADST_FLIPADST, FLIPADST_ADST, IDTX, V_DCT, H_DCT, +V_ADST, H_ADST, V_FLIPADST, H_FLIPADST. Default is true. + +@item enable-tx64 (@emph{boolean}) (Requires libaom >= v2.0.0) +Enable 64-pt transform. Default is true. + +@item reduced-tx-type-set (@emph{boolean}) (Requires libaom >= v2.0.0) +Use reduced set of transform types. Default is false. + +@item use-intra-dct-only (@emph{boolean}) (Requires libaom >= v2.0.0) +Use DCT only for INTRA modes. Default is false. + +@item use-inter-dct-only (@emph{boolean}) (Requires libaom >= v2.0.0) +Use DCT only for INTER modes. Default is false. + +@item use-intra-default-tx-only (@emph{boolean}) (Requires libaom >= v2.0.0) +Use Default-transform only for INTRA modes. Default is false. + @end table @section libkvazaar diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 2ecb3de3a7..b01e6c7283 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -106,6 +106,12 @@ typedef struct AOMEncoderContext { int enable_intra_edge_filter; int enable_palette; int enable_filter_intra; + int enable_flip_idtx; + int enable_tx64; + int reduced_tx_type_set; + int use_intra_dct_only; + int use_inter_dct_only; + int use_intra_default_tx_only; } AOMContext; static const char *const ctlidstr[] = { @@ -156,6 +162,12 @@ static const char *const ctlidstr[] = { [AV1E_SET_ENABLE_PAETH_INTRA] = "AV1E_SET_ENABLE_PAETH_INTRA", [AV1E_SET_ENABLE_SMOOTH_INTRA] = "AV1E_SET_ENABLE_SMOOTH_INTRA", [AV1E_SET_ENABLE_PALETTE] = "AV1E_SET_ENABLE_PALETTE", + [AV1E_SET_ENABLE_FLIP_IDTX] = "AV1E_SET_ENABLE_FLIP_IDTX", + [AV1E_SET_ENABLE_TX64] = "AV1E_SET_ENABLE_TX64", + [AV1E_SET_INTRA_DCT_ONLY] = "AV1E_SET_INTRA_DCT_ONLY", + [AV1E_SET_INTER_DCT_ONLY] = "AV1E_SET_INTER_DCT_ONLY", + [AV1E_SET_INTRA_DEFAULT_TX_ONLY] = "AV1E_SET_INTRA_DEFAULT_TX_ONLY", + [AV1E_SET_REDUCED_TX_TYPE_SET] = "AV1E_SET_REDUCED_TX_TYPE_SET", #endif }; @@ -741,6 +753,18 @@ static av_cold int aom_init(AVCodecContext *avctx, codecctl_int(avctx, AV1E_SET_ENABLE_SMOOTH_INTRA, ctx->enable_smooth_intra); if (ctx->enable_palette >= 0) codecctl_int(avctx, AV1E_SET_ENABLE_PALETTE, ctx->enable_palette); + if (ctx->enable_tx64 >= 0) + codecctl_int(avctx, AV1E_SET_ENABLE_TX64, ctx->enable_tx64); + if (ctx->enable_flip_idtx >= 0) + codecctl_int(avctx, AV1E_SET_ENABLE_FLIP_IDTX, ctx->enable_flip_idtx); + if (ctx->use_intra_dct_only >= 0) + codecctl_int(avctx, AV1E_SET_INTRA_DCT_ONLY, ctx->use_intra_dct_only); + if (ctx->use_inter_dct_only >= 0) + codecctl_int(avctx, AV1E_SET_INTER_DCT_ONLY, ctx->use_inter_dct_only); + if (ctx->use_intra_default_tx_only >= 0) + codecctl_int(avctx, AV1E_SET_INTRA_DEFAULT_TX_ONLY, ctx->use_intra_default_tx_only); + if (ctx->reduced_tx_type_set >= 0) + codecctl_int(avctx, AV1E_SET_REDUCED_TX_TYPE_SET, ctx->reduced_tx_type_set); #endif codecctl_int(avctx, AOME_SET_STATIC_THRESHOLD, ctx->static_thresh); @@ -1152,6 +1176,7 @@ static const AVOption options[] = { { "psnr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_PSNR}, 0, 0, VE, "tune"}, { "ssim", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_SSIM}, 0, 0, VE, "tune"}, FF_AV1_PROFILE_OPTS +#if AOM_ENCODER_ABI_VERSION >= 22 { "enable-rect-partitions", "Enable rectangular partitions", OFFSET(enable_rect_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-1to4-partitions", "Enable 1:4/4:1 partitions", OFFSET(enable_1to4_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-ab-partitions", "Enable ab shape partitions", OFFSET(enable_ab_partitions), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, @@ -1162,6 +1187,13 @@ static const AVOption options[] = { { "enable-smooth-intra", "Enable smooth intra prediction mode", OFFSET(enable_smooth_intra), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-paeth-intra", "Enable paeth predictor in intra prediction", OFFSET(enable_paeth_intra), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { "enable-palette", "Enable palette prediction mode", OFFSET(enable_palette), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "enable-flip-idtx", "Enable extended transform type", OFFSET(enable_flip_idtx), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "enable-tx64", "Enable 64-pt transform", OFFSET(enable_tx64), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "reduced-tx-type-set", "Use reduced set of transform types. Default is false", OFFSET(reduced_tx_type_set), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "use-intra-dct-only", "Use DCT only for INTRA modes", OFFSET(use_intra_dct_only), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "use-inter-dct-only", "Use DCT only for INTER modes", OFFSET(use_inter_dct_only), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "use-intra-default-tx-only", "Use Default-transform only for INTRA modes", OFFSET(use_intra_default_tx_only), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, +#endif { NULL }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index ad0bfd619d..6442d6e752 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 96 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \