From patchwork Fri Mar 6 02:06:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Cao X-Patchwork-Id: 18068 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 EE3DB44BCC2 for ; Fri, 6 Mar 2020 04:38:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5F1E68AAFD; Fri, 6 Mar 2020 04:38:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8208668AAFD for ; Fri, 6 Mar 2020 04:38:34 +0200 (EET) Received: by mail-oi1-f196.google.com with SMTP id x75so1086372oix.5 for ; Thu, 05 Mar 2020 18:38:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mu5OS4pz64bweTLWaQ9xQVHvGOOTS5FFOaU3CfZiku0=; b=uqwEuRZpUFMnnaslLA2KsXfaBZApxcObIKaEbWvZuSTb9jORv+Lc8rXGI8GRUmm6sY D2dcidz178+YVXVl/w3YVAh7vKf0VeAGbrFN6lL5TMQ17d8EYemZlxo4VcD/G1xK3vQL Xpf2ncdJiSMKPULGo2WR7DRf7kv4l6gZ+4j6K88+XB85qRdru/5nWAai6Cya+QYowIJ0 iN8LKuiSOAr2/2r+cdpoiV/4Tg/l/INiaButNl4TryMWqHhse8DVkiw8Gl4RdnjqcbOJ l4X3GYnjeNDVkNHbInUB9N/TrJ/6s1Ta2UF6McXcUawkXRosxDwRdzX8bm1OloshW3dK hMWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mu5OS4pz64bweTLWaQ9xQVHvGOOTS5FFOaU3CfZiku0=; b=Pyvq89kfFMMwi+kKK2BwPu55SHdEBAit/RhSym5w0x0eaKSeq9epm24mFiCfzjSo56 ohJ9p6z/h1yCN6P131gxZGCw9WRVU+1hjcFmr4HH2iXRdHHWgO12Cl92i4d+owOi2yAA Qoh+FXuwxjwS3zOAqX57lG3HDdit8zPZtKpWIq8rpB4pzCzbn7oiMFbS6EoFBVGbpL49 LdYMSkYbRRTnvjM6z/aCoLVJrHGFLtfnsia6SMDj9pJSJZrPS/Tg/QoHVYDn7wgR3i0T 1xWV0hLmtQLzGjWYobPpPpN0+9r4jMZFUaBlOOqk52eUROoCyXOumJ9xaXegVkBWE+0N 30KQ== X-Gm-Message-State: ANhLgQ2X8bYFmJB6UkQzS5XZuMiImrzCZ14XeCn0IxrB0fcPsH2dfd+4 eO4GjW7cHqITUoBG21othGpfZVwcPA4= X-Google-Smtp-Source: ADFU+vuboSrPAyBC0Jh3KhfHFDgwkvcOlWUljVzljepaLKsh531pp/lSGML4FUVCVfFCuUY7XisXeA== X-Received: by 2002:a17:90a:da03:: with SMTP id e3mr1107454pjv.57.1583460515957; Thu, 05 Mar 2020 18:08:35 -0800 (PST) Received: from wangcao.bej.corp.google.com ([2401:fa00:45:201:7885:4f90:fa40:35]) by smtp.gmail.com with ESMTPSA id k72sm7531912pjb.47.2020.03.05.18.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 18:08:35 -0800 (PST) From: Wang Cao X-Google-Original-From: Wang Cao To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Mar 2020 10:06:13 +0800 Message-Id: <20200306020611.58100-1-wangcao@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog In-Reply-To: <20200304093824.GA27684@sunshine.barsnick.net> References: <20200304093824.GA27684@sunshine.barsnick.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec/libaomenc.c: Add a libaom command-line option 'tune' 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: Wang Cao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Wang Cao --- Made changes according to the review. - Bump the MICRO version of libavcodec. - Use enum for 'tune' option consts for better consistency doc/encoders.texi | 11 +++++++++++ libavcodec/libaomenc.c | 7 +++++++ libavcodec/version.h | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index e23b6b32fe..0a74ecce9b 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1508,6 +1508,17 @@ Complexity-based. Cyclic refresh. @end table +@item tune (@emph{tune}) +Set the distortion metric the encoder is tune with. Default is @code{psnr}. + +@table @samp +@item psnr (@emph{0}) +PSNR as distortion metric + +@item ssim (@emph{1}) +SSIM as distortion metric +@end table + @item lag-in-frames Set the maximum number of frames which the encoder may keep in flight at any one time for lookahead purposes. Defaults to the internal diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 096aadbe1c..df7819b429 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -94,6 +94,7 @@ typedef struct AOMEncoderContext { int enable_intrabc; int enable_restoration; int usage; + int tune; } AOMContext; static const char *const ctlidstr[] = { @@ -132,6 +133,7 @@ static const char *const ctlidstr[] = { [AV1E_SET_ENABLE_INTRABC] = "AV1E_SET_ENABLE_INTRABC", #endif [AV1E_SET_ENABLE_CDEF] = "AV1E_SET_ENABLE_CDEF", + [AOME_SET_TUNING] = "AOME_SET_TUNING", }; static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc) @@ -699,6 +701,8 @@ static av_cold int aom_init(AVCodecContext *avctx, codecctl_int(avctx, AOME_SET_STATIC_THRESHOLD, ctx->static_thresh); if (ctx->crf >= 0) codecctl_int(avctx, AOME_SET_CQ_LEVEL, ctx->crf); + if (ctx->tune >= 0) + codecctl_int(avctx, AOME_SET_TUNING, ctx->tune); codecctl_int(avctx, AV1E_SET_COLOR_PRIMARIES, avctx->color_primaries); codecctl_int(avctx, AV1E_SET_MATRIX_COEFFICIENTS, avctx->colorspace); @@ -1096,6 +1100,9 @@ static const AVOption options[] = { { "usage", "Quality and compression efficiency vs speed tradeof", OFFSET(usage), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, VE, "usage"}, { "good", "Good quality", 0, AV_OPT_TYPE_CONST, {.i64 = 0 /* AOM_USAGE_GOOD_QUALITY */}, 0, 0, VE, "usage"}, { "realtime", "Realtime encoding", 0, AV_OPT_TYPE_CONST, {.i64 = 1 /* AOM_USAGE_REALTIME */}, 0, 0, VE, "usage"}, + { "tune", "The metric that encoder tunes for. Automatically choosen by encoder by default", OFFSET(tune), AV_OPT_TYPE_INT, {.i64 = -1}, -1, AOM_TUNE_SSIM, VE, "tune"}, + { "psnr", "PSNR as distortion metric", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_PSNR}, 0, 0, VE, "tune"}, + { "ssim", "SSIM as distortion metric", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_SSIM}, 0, 0, VE, "tune"}, { NULL }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 36536c3725..03d7f32f1c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 73 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \