From patchwork Thu Jul 30 21:31:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21392 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 D69F344AB52 for ; Fri, 31 Jul 2020 00:42:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC23D68B654; Fri, 31 Jul 2020 00:42:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E4DE68B51E for ; Fri, 31 Jul 2020 00:41:57 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id 3so7513392wmi.1 for ; Thu, 30 Jul 2020 14:41:57 -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:mime-version :content-transfer-encoding; bh=BZf6Y9z2imKCAgRtSBcBpYMdWYG/XlWJjQ1sQQpKBsA=; b=jd86h5W8R4qkQ/dTLH1R9UoF00gg48dwgPUExLGy5ZvT/pjUvM4mpjSKNRWSd74PGJ Akgwbx4Wz+S8n9T/YmyS1+Ves0ogxtn1k+vgyFAdXavGHoWJX7FQlDfWVyPCE73KYqzy xRvxSQNHieoFMMM2i/2N4irc+SPtFsVIXcbvODgf+8TPIQYPVQhZb85ra6EvqZArJLS7 fbKBnTGbgWuZ9kTdQOvniZfnMUIEt7ilP8oT1JOYelkbgENkmye/5RioWRDLP/SL9Iw4 f2I7qG4tJd76I4ulz+Jb2YLAqFUmxxBIxKzShvQ68xPuydspcEaoMr9PhxNfuwo0zyOt +Uog== 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:mime-version :content-transfer-encoding; bh=BZf6Y9z2imKCAgRtSBcBpYMdWYG/XlWJjQ1sQQpKBsA=; b=AZ5NOTA7jG7PHKX8syLeNWC9JGkYBC5EUcvk/KSeF7jwuKA/B4HTYYYb5N03kRvto5 cbDiqV2JZPbiBZT4+9jDQ/cMWgecPuON5hXvCCL4Cx82GKoggWbY82e0Ke59U2LB3Xzn KbM3u7PTQ38P+hEKDtqP/miO3V4pz8g3seU4uQhIbSAsKzofw3vBYbAo7wfeE+K/Jmod utMRYOwYgk42PImg0hgIZ+IwDDvBZcypQlIvoscGzvvQ1C6OCt4RQLI4e83hY4prLBGh nXZyYajmKKKOnr3uHslCDo8jt2niKAne/OqWiiq66muJkDxhNpSWlkJMxyNyg47qxMXQ 3Ewg== X-Gm-Message-State: AOAM5338ArFG3TdKItTBKcWuTfs1X6EM+3yvUaD4auOg9VpMhlFPP0FE LP+vZOUoLCRBiWlJJDLuVUlY67VhNgQ= X-Google-Smtp-Source: ABdhPJyuNP9jwX9wjP3Y3v0YbrK5Vqi1HDXThGlGtoysbVTWNkvAeVgiLRAb6/Lhfc1P23N+SEsvUg== X-Received: by 2002:a1c:47:: with SMTP id 68mr988052wma.106.1596144861364; Thu, 30 Jul 2020 14:34:21 -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 f17sm12432427wme.14.2020.07.30.14.34.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2020 14:34:20 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jul 2020 22:31:58 +0100 Message-Id: <20200730213200.1944356-1-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] libsvtav1: Rename without a - 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" The external library is called libsvtav1, so use this name everywhere. --- configure | 2 +- libavcodec/Makefile | 2 +- libavcodec/allcodecs.c | 2 +- libavcodec/{libsvt_av1.c => libsvtav1.c} | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) rename libavcodec/{libsvt_av1.c => libsvtav1.c} (99%) diff --git a/configure b/configure index 169f23e17f..b137669dd3 100755 --- a/configure +++ b/configure @@ -3245,7 +3245,7 @@ libshine_encoder_select="audio_frame_queue" libspeex_decoder_deps="libspeex" libspeex_encoder_deps="libspeex" libspeex_encoder_select="audio_frame_queue" -libsvt_av1_encoder_deps="libsvtav1" +libsvtav1_encoder_deps="libsvtav1" libtheora_encoder_deps="libtheora" libtwolame_encoder_deps="libtwolame" libvo_amrwbenc_encoder_deps="libvo_amrwbenc" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9d4d52d048..98b388e260 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1026,7 +1026,7 @@ OBJS-$(CONFIG_LIBRAV1E_ENCODER) += librav1e.o OBJS-$(CONFIG_LIBSHINE_ENCODER) += libshine.o OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o -OBJS-$(CONFIG_LIBSVT_AV1_ENCODER) += libsvt_av1.o +OBJS-$(CONFIG_LIBSVTAV1_ENCODER) += libsvtav1.o OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 80142899fe..2e291f749f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -727,7 +727,7 @@ extern AVCodec ff_librsvg_decoder; extern AVCodec ff_libshine_encoder; extern AVCodec ff_libspeex_encoder; extern AVCodec ff_libspeex_decoder; -extern AVCodec ff_libsvt_av1_encoder; +extern AVCodec ff_libsvtav1_encoder; extern AVCodec ff_libtheora_encoder; extern AVCodec ff_libtwolame_encoder; extern AVCodec ff_libvo_amrwbenc_encoder; diff --git a/libavcodec/libsvt_av1.c b/libavcodec/libsvtav1.c similarity index 99% rename from libavcodec/libsvt_av1.c rename to libavcodec/libsvtav1.c index c7ae5f9691..0c951286c7 100644 --- a/libavcodec/libsvt_av1.c +++ b/libavcodec/libsvtav1.c @@ -543,7 +543,7 @@ static const AVOption options[] = { }; static const AVClass class = { - .class_name = "libsvt_av1", + .class_name = "libsvtav1", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, @@ -557,8 +557,8 @@ static const AVCodecDefault eb_enc_defaults[] = { { NULL }, }; -AVCodec ff_libsvt_av1_encoder = { - .name = "libsvt_av1", +AVCodec ff_libsvtav1_encoder = { + .name = "libsvtav1", .long_name = NULL_IF_CONFIG_SMALL("SVT-AV1(Scalable Video Technology for AV1) encoder"), .priv_data_size = sizeof(SvtContext), .type = AVMEDIA_TYPE_VIDEO, @@ -573,5 +573,5 @@ AVCodec ff_libsvt_av1_encoder = { .priv_class = &class, .defaults = eb_enc_defaults, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .wrapper_name = "libsvt_av1", + .wrapper_name = "libsvtav1", }; From patchwork Thu Jul 30 21:31:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21391 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 A9F37449C77 for ; Fri, 31 Jul 2020 00:40:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9186068B66C; Fri, 31 Jul 2020 00:40:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B27A568B66A for ; Fri, 31 Jul 2020 00:40:36 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id q76so6289207wme.4 for ; Thu, 30 Jul 2020 14:40:36 -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=FfyAfLAfBNA6D+Id9htU1pxhumoSaGe/TB2HZbeDBJM=; b=pis9rX4GGqevh2nsJ/9PYKRMv15x0NHGvceEUlkr7koQgoLA8la8hV2aMYDqs0z4eh I+4drnlPB8CxWCK0UKcZ+W255zILfcyvaZObgVe8r27UIPpFz1lN6sYdoTLjX2WJjgKj rUnsEj6UdIpokJN9SRjhgBRlC6oAqyp+p/CxjxkJophYZBavutx0IKBtxgnuLX5bz0kS dCzIwQpAqkkBvxWGT2nyX27FRQZf7r8Z6OflkUSJq7WQRulCO86jKLu12h46LaZChEvp loYX6dD9VBLChTDaQu2LAFZhlHbpKRY06WsdmHR4zvBjRAPXTNmeozzOiGVkZd3FcpEG uRFQ== 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=FfyAfLAfBNA6D+Id9htU1pxhumoSaGe/TB2HZbeDBJM=; b=QXyDeoxIyYJNvJeEH1/2a54IjdsfoF/B8lNw9kdixs6TiiW87kgxidEfBRCmO6OVek psS5lQoMGEbxZYYAhcOHIHbgCm7xMVAGGywoaXZQfQH2CfaN2pOeUUOJhJvgjnOZh4KE w9SoI3r4ImHffCJMm1tEwgqnhdqBml4c/ZMBj5Dc5M9TMjzlc3rsfIuf6ys554daPwFT 5zfDseyTwbKNlx4qMXT5+ahefqbV6tt+dAbC25reB99SOKvdyTjUwVgyQ6If9IUHKANL U026IMzj+kbApYGZdK5kw+SNxDKOSzx1hk53kxXwEs6kvW8CZAhQpX3dVSNSq//MDjyZ PxNQ== X-Gm-Message-State: AOAM532fzN/7ELOdm44X2n8Jlvk8rI3ZYeeA/nX26x2lEgTQpu7We2J8 N/iidrH3c9yzXXwnM0pnRZunjGHH3fM= X-Google-Smtp-Source: ABdhPJwElNZTozkBEzwQEx+8OIZsv+pFmfcMJwF9mpiy/nOKT3ZctZEdENIi42QW0ZLBGOVuBoOYWQ== X-Received: by 2002:a7b:c7c3:: with SMTP id z3mr619238wmk.101.1596144862170; Thu, 30 Jul 2020 14:34:22 -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 f17sm12432427wme.14.2020.07.30.14.34.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2020 14:34:21 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jul 2020 22:31:59 +0100 Message-Id: <20200730213200.1944356-2-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200730213200.1944356-1-sw@jkqxz.net> References: <20200730213200.1944356-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] libsvtav1: Use _ rather than - in 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" --- libavcodec/libsvtav1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 0c951286c7..13d3adc0f8 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -536,8 +536,8 @@ static const AVOption options[] = { { "sc_detection", "Scene change detection", OFFSET(scd), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, - { "tile-columns", "Log2 of number of tile columns to use", OFFSET(tile_columns), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 4, VE}, - { "tile-rows", "Log2 of number of tile rows to use", OFFSET(tile_rows), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 6, VE}, + { "tile_columns", "Log2 of number of tile columns to use", OFFSET(tile_columns), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 4, VE}, + { "tile_rows", "Log2 of number of tile rows to use", OFFSET(tile_rows), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 6, VE}, {NULL}, }; From patchwork Thu Jul 30 21:32:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21390 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 7B7AF449C77 for ; Fri, 31 Jul 2020 00:40:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55E1468B63E; Fri, 31 Jul 2020 00:40:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FF2568B4AB for ; Fri, 31 Jul 2020 00:40:24 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id 3so7510941wmi.1 for ; Thu, 30 Jul 2020 14:40:24 -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=rKWFvqzVUPOE0QGxUsWu1M8ZwkfyTdwomVbYt8WnocA=; b=yJ41u2D1WaV7KqGq34f11ts2r0h9sQiY0t1G93STkRh+WJ3KHNDDbfb3mGhMeayR2N vSH/EUMVWWF4M7Kio75PDqTGKoGhMCmvszjVcZnpbA4IEXTJgEVcFVRPRC4JEDFExlAB nvao11HxfOYKRaxb2XQk3QpJ6zUQvfiPNPar4zBOF4nLsYNG4yziyiqxf/KrR+a8NhML SD3q8JUNAUtIhnL2YMoLQUUdFtbowVqaYULlHLYAqrAG0gi+rDnWUYmQ+DQ/XtW0UrN0 NLRpsjUasz21iakN9R7zXsVCGYcR94/i6Wa1PR+eh/BZ44sUnaDTxpY8An/dOhAEqpXr LFyQ== 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=rKWFvqzVUPOE0QGxUsWu1M8ZwkfyTdwomVbYt8WnocA=; b=XslpDJ55hTAkPObnpsExSNXYV2aRYvh1/zBn5TJrG5Filo5VwmjtytWabnZyEKqv9/ EW7m/I0jiLz4XaDZHagke+KVahtxazQv/7BmqhQxmIsLx4R0e+LmXeKAb0pQ3EBjN/k0 ODVfO/PnDWX5Fj4VgQLD0rDCIgmTw/Nh2c8WWNjc2yBX204z3o2HnZJ5W8hEZEvVOmBJ WSpE1iVWWNaPm6BVp4GUTHnD5MNdtAEuMpnlsj9++gHfEPnP9KIiKDKg8FeuXrgmSVAM e3+nvGK1MxSubr/GCYzwnOJIXjagQBBWJSU1pYNH0alVZ1XMS/oR5BWt8BQ2MrYV3YZA amZw== X-Gm-Message-State: AOAM531DEQues+7EC3QE/F4PVyApI6UOq8PkgonGOEBJd8w97j6w57hX l20ZEfDm4E2hX6yFZyps1+ZH9mCbIts= X-Google-Smtp-Source: ABdhPJw87JEdHPlb5oPFbVZf544mF9/IIcg8+o8UuCnCdjCBAOem+gEgYw1wV51bR5W2eKsPoQkVgw== X-Received: by 2002:a1c:e908:: with SMTP id q8mr1025957wmc.59.1596144863003; Thu, 30 Jul 2020 14:34:23 -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 f17sm12432427wme.14.2020.07.30.14.34.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2020 14:34:22 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jul 2020 22:32:00 +0100 Message-Id: <20200730213200.1944356-3-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200730213200.1944356-1-sw@jkqxz.net> References: <20200730213200.1944356-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] libsvtav1: 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 | 48 +++++++++++++++++++++++++++++++----------- libavcodec/libsvtav1.c | 6 +++--- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index af7d2ba983..2f5457fb26 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1687,7 +1687,7 @@ Enable smooth interintra mode. Default is true. @end table -@section libsvt-av1 +@section libsvtav1 SVT-AV1 encoder wrapper. @@ -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 Set number of frames to look ahead (0-120). @item preset -Set encoding preset. +Set the quality-speed tradeoff, in the range 0 to 8. Higher values are +faster but lower quality. Defaults to 8 (highest speed). -@item tier - -@item tile-rows -Selects how many rows of tiles to encode with (0-6). +@item tile_rows +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). +@item tile_columns +Set log2 of the number of columns of tiles to use (0-4). @end table diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 13d3adc0f8..40942c6f6a 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.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),