From patchwork Wed Jul 22 23:12:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Cao X-Patchwork-Id: 21234 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 AB926449E68 for ; Thu, 23 Jul 2020 02:12:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 948B768B662; Thu, 23 Jul 2020 02:12:17 +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 189A468B4FD for ; Thu, 23 Jul 2020 02:12:11 +0300 (EEST) Received: by mail-pj1-f45.google.com with SMTP id gc15so3490812pjb.0 for ; Wed, 22 Jul 2020 16:12:11 -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=zhjUOfMJ8ZkKvKIlsFlqKNocIoR5m8YuEtiPzJE1/9U=; b=dWjjPZjM93brvalDWhVxoe7x8HhF1rogpO/GfmYGCk73AX9L6M9uF6nhqT9quS/rOV 2oAP2FKflXHZShy/3dmv3R2aakajT5O7syAW6DTeWAJd5O8gtUcuYBiQAU2pw0Rm/c+2 bKBgjQDJ+ZFXgmX5Vv8YtsFfkPWMLhcNmpYZak6Zf1bR1USkMn4IvDkhPjEC9zZbSPnp tRmrjfvj7fIW6fZ0H+DHgQCpCVIlBSrs5b8/HMz8XaZm1SoxQBPSIzutLiQNqV2Affsb rb98ov1oLKImRDbonFmMqSIPWC11HsGhPuGpKNMPl7ExUBdffEe5Ca+w+UGg4UXN06cZ E/wg== 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=zhjUOfMJ8ZkKvKIlsFlqKNocIoR5m8YuEtiPzJE1/9U=; b=IqDHS2usODIrBXpD5o6D/BnIGSbZ2/bvyLyCB0Bs0BikfCYISrkenYRO/bUvLbSN7s j1diAqdBJhn754G5YPdisZe+gBGkTXhwOqzlkXTdYLVYIQc2DR8Uy2RLnWd4pBFPTRTX nY1uRjWcUTrm/VYPYQBr3f2a+oCYE1a/JanpIANBe1YnhB3nlnjzPxZfIGex5+IJQUFI VE9GILf0fJpiLGBf0x4Vgbuq0B/Fvbl3iOTPy7tYjT+f8CSJyz6L2HnYkQZREl9zn3VO Ptp4fDpY7JGekKNRxOPlB6BfErKU3qq2j0rFFr/O5DTp/rt5IsxpuMig5RPn6Cbrun+1 gNcw== X-Gm-Message-State: AOAM531mJ/83YMNVzR1a9Yuwi4e5lmZA4zu1jbbNSJeXvT6aUAAKj6Iv SGuhDziVN03x5huaxfbuXD3yoafdurs= X-Google-Smtp-Source: ABdhPJxTphz8zbhJq9Acjy/XZBVZTK3PID90wz4ih9D5Y/yp8v0HKrluQ2tPKMXfe6My8rupFXnQ3Q== X-Received: by 2002:a17:90a:cb0e:: with SMTP id z14mr1570911pjt.140.1595459528885; Wed, 22 Jul 2020 16:12:08 -0700 (PDT) Received: from wangcao.mtv.corp.google.com ([2620:0:1000:4011:725a:fff:fe36:d84d]) by smtp.gmail.com with ESMTPSA id b185sm82934pfa.148.2020.07.22.16.12.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 16:12:08 -0700 (PDT) From: Wang Cao X-Google-Original-From: Wang Cao To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Jul 2020 16:12:01 -0700 Message-Id: <20200722231201.558358-1-wangcao@google.com> X-Mailer: git-send-email 2.28.0.rc0.105.gf9edc3c819-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 | 30 ++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 23542c8a62..ecdfacbd69 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 b65e491824..d731f566d2 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 }; @@ -740,6 +752,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); @@ -1171,6 +1195,12 @@ 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.", 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}, { NULL }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index d5dca8cbda..304bf2a70e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 97 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \