From patchwork Fri Mar 6 02:09:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Cao X-Patchwork-Id: 18067 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 78F1A44BC98 for ; Fri, 6 Mar 2020 04:20:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 596E068ADD7; Fri, 6 Mar 2020 04:20:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5422668A4DB for ; Fri, 6 Mar 2020 04:20:05 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id s2so345218pgv.6 for ; Thu, 05 Mar 2020 18:20:05 -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=chy+z+E+MLtLdBUrJCWjWRLDcE7oV7hWhyDubOznB5I=; b=qWFhYRAYJki4+GpBibonXV3UQSEAvfVxx1swNs49N929kEGlRmI/u72y2D9vDYosI7 +yv9yYpwWITwDN6hO4TtTRtjGD5d+TRYx06eVUUG3tGp09zXL42P9ejaIM9UzALd/arJ wQX65Lt9qAQFziw7nM57aZFAIq9WA8nZh5Fw2luXfSlpt3M5btprgziJWK82917YDEIO WmipNA8gAj2xLT7rtW2iEOam1olRHTjlYyIvbZ19ZUeXDxcZdYnmdk0Q9Ams+U2FhjTt SluhR2T3oAOA70nxhxV3WIuhTQKf5LXMQ5K4lao3V0l8uEFENurj/f3iNjX+spPdnQzr /iYg== 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=chy+z+E+MLtLdBUrJCWjWRLDcE7oV7hWhyDubOznB5I=; b=c9TFSVeFHZpPmVOMu6ZjHZCZQfiIokaBOOgnAp5Tz9tXC7mqs8LuGckMTTf4D/7mK+ hj085hQb746k08fggMlT8/I4IC7j6nUkCxtbtU8+Gz70BaXIgyKAkFNJY84jOG1K7K4T e63PgsaEJVnHRp2/HWM3tYUQuJpS/eXnkdP26ptpsu7uyepiQhop5EhAPP6v6EqSgsyB wjlxafFyr232l5iJV6CFfybPcHq8PT76zhUVChhOczXEyRnRnN/TTaJeblk/QrEyj2vN Up1/z07RO0IIsMFDM0lKJLufuZgXBrWRt5Yh4CFzmL4cvCkbOzSb1ZKGcQkYbQtCA53i klcQ== X-Gm-Message-State: ANhLgQ1MCKtrYOTlj0RlQcEVmrtpuIQetPMAWL3t7jGq9Vkrh76EnspO qHFQ7O7JWst7lyGqMXK0ZPRj8TY28ts= X-Google-Smtp-Source: ADFU+vuaPpjXhnRF5tToSr0WePObi0cAyFyALUNSQgag6FWb85AEfEURtUhO0mnC8F/OqweYkUFKuw== X-Received: by 2002:a63:4e01:: with SMTP id c1mr1009017pgb.435.1583460804775; Thu, 05 Mar 2020 18:13:24 -0800 (PST) Received: from wangcao.bej.corp.google.com ([2401:fa00:45:201:7885:4f90:fa40:35]) by smtp.gmail.com with ESMTPSA id f123sm6214577pfg.120.2020.03.05.18.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 18:13:24 -0800 (PST) From: Wang Cao X-Google-Original-From: Wang Cao To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Mar 2020 10:09:17 +0800 Message-Id: <20200306020916.58366-1-wangcao@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog In-Reply-To: <20200304093841.GB27684@sunshine.barsnick.net> References: <20200304093841.GB27684@sunshine.barsnick.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/libaomenc.c: Add super-resolution options to libaom wrapper 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 --- The changes are made according to the code review - Bump the MICRO version - Use enum for Super resolution mode consts. The original enum in libaom is not public so a enum is defined and matched the original enum doc/encoders.texi | 39 +++++++++++++++++++++++++++++++++++ libavcodec/libaomenc.c | 47 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 3 files changed, 87 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 0a74ecce9b..04f05e7c9b 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1608,6 +1608,45 @@ Enable the use of global motion for block prediction. Default is true. Enable block copy mode for intra block prediction. This mode is useful for screen content. Default is true. +@item enable-superres (@emph{boolean}) +Enable super-resolution during the encoding process. + +@item superres-mode (@emph{mode}) +Select super-resultion mode. + +@table @option +@item none (@emph{0}) +No frame superres allowed. + +@item fixed (@emph{1}) +All frames are coded at the specified scale and super-resolved. + +@item random (@emph{2}) +All frames are coded at a random scale and super-resolved. + +@item qthresh (@emph{3}) +Superres scale for a frame is determined based on q_index. + +@item auto (@emph{4}) +Automatically select superres for appropriate frames. +@end table + +@item superres_denominator +The denominator for superres to use when @option{superres-mode} is @option{fixed}. Valid value +ranges from 8 to 16. + +@item superres_kf_denominator +The denominator for superres to use on key frames when +@option{superres-mode} is @option{fixed}. Valid value ranges from 8 to 16. + +@item superres_qthresh +The q level threshold after which superres is used when @option{superres-mode} is +@option{qthresh}. Valid value ranges from 1 to 63. + +@item superres_kf_qthresh +The q level threshold after which superres is used for key frames when +@option{superres-mode} is @option{qthresh}. Valid value ranges from 1 to 63. + @end table @section libkvazaar diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index df7819b429..0f4c0377cc 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -95,6 +95,12 @@ typedef struct AOMEncoderContext { int enable_restoration; int usage; int tune; + int enable_superres; + int superres_mode; + int superres_denominator; + int superres_qthresh; + int superres_kf_denominator; + int superres_kf_qthresh; } AOMContext; static const char *const ctlidstr[] = { @@ -134,6 +140,16 @@ static const char *const ctlidstr[] = { #endif [AV1E_SET_ENABLE_CDEF] = "AV1E_SET_ENABLE_CDEF", [AOME_SET_TUNING] = "AOME_SET_TUNING", + [AV1E_SET_ENABLE_SUPERRES] = "AV1E_SET_ENABLE_SUPERRES", +}; + +enum AOMSuperresModes { + AOM_SUPERRES_MODE_NONE = 0, + AOM_SUPERRES_MODE_FIXED = 1, + AOM_SUPERRES_MODE_RANDOM = 2, + AOM_SUPERRES_MODE_QTHRESH = 3, + AOM_SUPERRES_MODE_AUTO = 4, + AOM_SUPERRES_MODE_NB }; static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc) @@ -203,6 +219,13 @@ static av_cold void dump_enc_cfg(AVCodecContext *avctx, width, "tile_width_count:", cfg->tile_width_count, width, "tile_height_count:", cfg->tile_height_count); av_log(avctx, level, "\n"); + av_log(avctx, level, "super resolution settings\n" + " %*s%u\n %*s%u\n %*s%u\n %*s%u\n %*s%u\n ", + width, "rc_superres_mode:", cfg->rc_superres_mode, + width, "rc_superres_denominator:", cfg->rc_superres_denominator, + width, "rc_superres_qthresh:", cfg->rc_superres_qthresh, + width, "rc_superres_kf_denominator:", cfg->rc_superres_kf_denominator, + width, "rc_superres_kf_qthresh:", cfg->rc_superres_kf_qthresh); } static void coded_frame_add(void *list, struct FrameListData *cx_frame) @@ -545,6 +568,17 @@ static av_cold int aom_init(AVCodecContext *avctx, return AVERROR(EINVAL); } + if (ctx->superres_mode >= 0) + enccfg.rc_superres_mode = ctx->superres_mode; + if (ctx->superres_qthresh > 0) + enccfg.rc_superres_qthresh = ctx->superres_qthresh; + if (ctx->superres_kf_qthresh > 0) + enccfg.rc_superres_kf_qthresh = ctx->superres_kf_qthresh; + if (ctx->superres_denominator >= 0) + enccfg.rc_superres_denominator = ctx->superres_denominator; + if (ctx->superres_kf_denominator >= 0) + enccfg.rc_superres_kf_denominator = ctx->superres_kf_denominator; + dump_enc_cfg(avctx, &enccfg); enccfg.g_w = avctx->width; @@ -687,6 +721,8 @@ static av_cold int aom_init(AVCodecContext *avctx, // codec control failures are currently treated only as warnings av_log(avctx, AV_LOG_DEBUG, "aom_codec_control\n"); codecctl_int(avctx, AOME_SET_CPUUSED, ctx->cpu_used); + if (ctx->enable_superres >= 0) + codecctl_int(avctx, AV1E_SET_ENABLE_SUPERRES, ctx->enable_superres); if (ctx->auto_alt_ref >= 0) codecctl_int(avctx, AOME_SET_ENABLEAUTOALTREF, ctx->auto_alt_ref); if (ctx->arnr_max_frames >= 0) @@ -1103,6 +1139,17 @@ static const AVOption options[] = { { "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"}, + { "enable-superres", "Enable super-resolution mode", OFFSET(enable_superres), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, + { "superres-mode", "Select super-resultion mode", OFFSET(superres_mode), AV_OPT_TYPE_INT, {.i64 = -1}, -1, AOM_SUPERRES_MODE_NB-1, VE, "superres_mode"}, + { "none", "No frame superres allowed", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_SUPERRES_MODE_NONE}, 0, 0, VE, "superres_mode"}, + { "fixed", "All frames are coded at the specified scale and super-resolved", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_SUPERRES_MODE_FIXED}, 0, 0, VE, "superres_mode"}, + { "random", "All frames are coded at a random scale and super-resolved.", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_SUPERRES_MODE_RANDOM}, 0, 0, VE, "superres_mode"}, + { "qthresh", "Superres scale for a frame is determined based on q_index", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_SUPERRES_MODE_QTHRESH}, 0, 0, VE, "superres_mode"}, + { "auto", "Automatically select superres for appropriate frames", 0, AV_OPT_TYPE_CONST, {.i64 = AOM_SUPERRES_MODE_AUTO}, 0, 0, VE, "superres_mode"}, + { "superres-denominator", "The denominator for superres to use.", OFFSET(superres_denominator), AV_OPT_TYPE_INT, {.i64 = 8}, 8, 16, VE}, + { "superres-qthresh", "The q level threshold after which superres is used", OFFSET(superres_qthresh), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 63, VE}, + { "superres-kf-denominator", "The denominator for superres to use on key frames.", OFFSET(superres_kf_denominator), AV_OPT_TYPE_INT, {.i64 = 8}, 8, 16, VE}, + { "superres-kf-qthresh", "The q level threshold after which superres is used for key frames.", OFFSET(superres_kf_qthresh), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 63, VE}, { NULL }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 03d7f32f1c..f9b0ae3533 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 103 +#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \