From patchwork Wed Jul 29 22:50:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21376 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 CA40D44BAEF for ; Thu, 30 Jul 2020 01:52:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B15CF68BAA7; Thu, 30 Jul 2020 01:52:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFC0768BAA0 for ; Thu, 30 Jul 2020 01:52:43 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id r4so20132371wrx.9 for ; Wed, 29 Jul 2020 15:52:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=b3ykMAhKqPsNbMH/kg+LNdr9IuDjAgIm4Pyhq7ZLpRE=; b=yotvtW5tS50TwSxGMsms9B0SDCSnfYSc/WZSBZykY4c+h1G/p4pcXPUMJUvJHOMRbM c3cF7trrk8U55acRyvJNjGoM5lNLH/dJMunPwifVCTdseePx4IFoHA3s+B4Nmv6qih2z jWR+D172o/QkJakyDt6/MTA1+rnFaG4Q0o/z/UkWzHkveFC7BRGEmb8ScXZzyIHoLIaA QD1EVrpFL+nYQVDxKhMERZf1Evds1uFPXnslXAA4EtxHNkwoksNwfR+aHkHPKxPNM5bT PiPvEwSMXEaTQl7wnRa648EAb+NvfTwo29g8nBs0UdtU42xXmVIRZNswJuWwz8LjyJyu /fuQ== 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=b3ykMAhKqPsNbMH/kg+LNdr9IuDjAgIm4Pyhq7ZLpRE=; b=rOgXSg7go2ThIoIqZ4Ad4TIBAnr5zvY/X8AKDhA+9DxxBkFQS7L7oz8of4KAYZXB/3 /m5jHB4zb39ypyVIUi2ETi7b5txYwQ3774Q1nDfSi2xjhsFo1cUCYK/e0+UrT6fpOvpx vHK50jCDsMP9cY5rB/b+NFF2KTkxWCM8W2wuWlX6zR/TPWo0tIaT0XWP4jB7v+r5oDnY ZAFHOiwc0wk8LyaEKKVukN27pxbqCVghtmXep5M2nI/I0LahY15KcPBoC0SeYzT0CqgM BqyTn/hbd8zuevH/KG3TLkyPlT/z72F7cbW/jC9vcMs7kqF5U104N5ZOb8MM4CT4xniH BrXQ== X-Gm-Message-State: AOAM533bNeirfHxIuG/wG5d7QxoF6AV3N6uCCrVn4wvBjtONXQ7aCFhj d5arBpBCPlgFK6kk6lmkhOr3J3T+ZqE= X-Google-Smtp-Source: ABdhPJyaYyZPSd1T0m2uM0wkm2VggyU4/ehqrsBjHvkdzDGKS/y+dmNJNWH61vQ4DG+nwAZe4T0cdg== X-Received: by 2002:adf:df06:: with SMTP id y6mr566156wrl.89.1596063160613; Wed, 29 Jul 2020 15:52:40 -0700 (PDT) Received: from localhost.localdomain (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id t14sm7471823wrg.38.2020.07.29.15.52.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 15:52:40 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jul 2020 23:50:08 +0100 Message-Id: <20200729225008.1893933-2-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200729225008.1893933-1-sw@jkqxz.net> References: <20200729225008.1893933-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] libsvt-av1: Fix the documentation to match the actual options 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" --- doc/encoders.texi | 44 +++++++++++++++++++++++++++++++---------- libavcodec/libsvt_av1.c | 6 +++--- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index af7d2ba983..d05ecca8db 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1697,31 +1697,55 @@ You need to explicitly configure the build with @code{--enable-libsvtav1}. @subsection Options @table @option +@item profile +Set the encoding profile. + +@item level +Set the operating point level. + +@item tier +Set the operating point tier. + +@item rc +Set the rate control mode to use. + +Possible modes: +@table @option +@item cqp +Constant quantizer: use fixed values of qindex (dependent on the frame type) +throughout the stream. This mode is the default. + +@item vbr +Variable bitrate: use a target bitrate for the whole stream. + +@item cvbr +Constrained variable bitrate: use a target bitrate for each GOP. +@end table + @item qmax -Sets the maximum quantizer to use when using bitrate mode. +Set the maximum quantizer to use when using a bitrate mode. @item qmin -Sets the minimum quantizer to use when using bitrate mode. +Set the minimum quantizer to use when using a bitrate mode. @item qp -Uses quantizer mode to encode at the given quantizer (0-63). +Set the quantizer used in cqp rate control mode (0-63). -@item hielevel +@item sc-detection Enable scene change detection. -@item la_depth +@item la-depth Set number of frames to look ahead (0-120). @item preset -Set encoding preset. - -@item tier +Set the quality-speed tradeoff, in the range 0 to 8. Higher values are +faster but lower quality. Defaults to 8 (highest speed). @item tile-rows -Selects how many rows of tiles to encode with (0-6). +Set log2 of the number of rows of tiles to use (0-6). @item tile-columns -Selects how many columns of tiles to encode with (0-4). +Set log2 of the number of columns of tiles to use (0-4). @end table diff --git a/libavcodec/libsvt_av1.c b/libavcodec/libsvt_av1.c index 3229551d2b..e3d932d134 100644 --- a/libavcodec/libsvt_av1.c +++ b/libavcodec/libsvt_av1.c @@ -489,7 +489,7 @@ static const AVOption options[] = { { "preset", "Encoding preset [0, 8]", OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = MAX_ENC_PRESET }, 0, MAX_ENC_PRESET, VE }, - { "tier", "Set tier (general_tier_flag)", OFFSET(tier), + { "tier", "Set operating point tier", OFFSET(tier), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, "tier" }, { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, VE, "tier" }, { "high", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, VE, "tier" }, @@ -526,11 +526,11 @@ static const AVOption options[] = { { "rc", "Bit rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, VE , "rc"}, - { "cqp", "Const Quantization Parameter", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" }, + { "cqp", "Constant quantizer", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" }, { "vbr", "Variable Bit Rate, use a target bitrate for the entire stream", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "rc" }, { "cvbr", "Constrained Variable Bit Rate, use a target bitrate for each GOP", 0, AV_OPT_TYPE_CONST,{ .i64 = 2 }, INT_MIN, INT_MAX, VE, "rc" }, - { "qp", "QP value for intra frames", OFFSET(qp), + { "qp", "Quantizer to use with cqp rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 50 }, 0, 63, VE }, { "sc-detection", "Scene change detection", OFFSET(scd),