[FFmpeg-cvslog] libsvtav1: Fix the documentation to match the actual options
ffmpeg | branch: master | Mark Thompson | Thu Jul 30 22:32:00
2020 +0100| [11a2d05b3fa977ea9437725531a4875b735c977e] | committer: Mark
Thompson
libsvtav1: Fix the documentation to match the actual options
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11a2d05b3fa977ea9437725531a4875b735c977e
---
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),
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] libsvtav1: Rename without a _
ffmpeg | branch: master | Mark Thompson | Thu Jul 30 22:31:58
2020 +0100| [30a4bdbc1f4853c1deb2cd551d8c661f7b067503] | committer: Mark
Thompson
libsvtav1: Rename without a _
The external library is called libsvtav1, so use this name everywhere.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30a4bdbc1f4853c1deb2cd551d8c661f7b067503
---
configure| 2 +-
libavcodec/Makefile | 2 +-
libavcodec/allcodecs.c | 2 +-
libavcodec/{libsvt_av1.c => libsvtav1.c} | 8
4 files changed, 7 insertions(+), 7 deletions(-)
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",
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] libsvtav1: Use _ rather than - in options
ffmpeg | branch: master | Mark Thompson | Thu Jul 30 22:31:59
2020 +0100| [ad7aa1e8e7e60d3db1264c16c8cd891782ab8887] | committer: Mark
Thompson
libsvtav1: Use _ rather than - in options
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad7aa1e8e7e60d3db1264c16c8cd891782ab8887
---
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},
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
