diff mbox

[FFmpeg-devel,1/2] lavc/rav1e: log and doc updated for const quantizer mode

Message ID 1573549761-69180-1-git-send-email-zhongli_dev@126.com
State New
Headers show

Commit Message

zhongli_dev@126.com Nov. 12, 2019, 9:09 a.m. UTC
Signed-off-by: Zhong Li <zhongli_dev@126.com>
---
 doc/encoders.texi     | 2 +-
 libavcodec/librav1e.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Zhong Li Nov. 18, 2019, 3:11 p.m. UTC | #1
Ping?

Zhong Li <zhongli_dev@126.com> 于2019年11月12日周二 下午5:40写道:
>
> Signed-off-by: Zhong Li <zhongli_dev@126.com>
> ---
>  doc/encoders.texi     | 2 +-
>  libavcodec/librav1e.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/doc/encoders.texi b/doc/encoders.texi
> index 6cf3a74093..6b02c7798d 100644
> --- a/doc/encoders.texi
> +++ b/doc/encoders.texi
> @@ -1395,7 +1395,7 @@ Sets the maximum quantizer to use when using bitrate mode.
>  Sets the minimum quantizer to use when using bitrate mode.
>
>  @item qp
> -Uses quantizer mode to encode at the given quantizer.
> +Uses quantizer mode to encode at the given quantizer (0-255).
>
>  @item speed
>  Selects the speed preset (0-10) to encode with.
> diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c
> index 5052cac896..f25d91bb95 100644
> --- a/libavcodec/librav1e.c
> +++ b/libavcodec/librav1e.c
> @@ -356,7 +356,7 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx)
>          }
>      } else if (ctx->quantizer >= 0) {
>          if (avctx->bit_rate)
> -            av_log(avctx, AV_LOG_WARNING, "Both bitrate and quantizer specified. Using quantizer mode.");
> +            av_log(avctx, AV_LOG_WARNING, "Both bitrate and quantizer specified. Using const quantizer mode.");
>
>          rret = rav1e_config_parse_int(cfg, "quantizer", ctx->quantizer);
>          if (rret < 0) {
> @@ -533,7 +533,7 @@ retry:
>  #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
>
>  static const AVOption options[] = {
> -    { "qp", "use constant quantizer mode", OFFSET(quantizer), AV_OPT_TYPE_INT, { .i64 = 100 }, -1, 255, VE },
> +    { "qp", "qp value of constant quantizer mode", OFFSET(quantizer), AV_OPT_TYPE_INT, { .i64 = 100 }, -1, 255, VE },
>      { "speed", "what speed preset to use", OFFSET(speed), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 10, VE },
>      { "tiles", "number of tiles encode with", OFFSET(tiles), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },
>      { "tile-rows", "number of tiles rows to encode with", OFFSET(tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },
> --
> 2.16.5
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox

Patch

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 6cf3a74093..6b02c7798d 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -1395,7 +1395,7 @@  Sets the maximum quantizer to use when using bitrate mode.
 Sets the minimum quantizer to use when using bitrate mode.
 
 @item qp
-Uses quantizer mode to encode at the given quantizer.
+Uses quantizer mode to encode at the given quantizer (0-255).
 
 @item speed
 Selects the speed preset (0-10) to encode with.
diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c
index 5052cac896..f25d91bb95 100644
--- a/libavcodec/librav1e.c
+++ b/libavcodec/librav1e.c
@@ -356,7 +356,7 @@  static av_cold int librav1e_encode_init(AVCodecContext *avctx)
         }
     } else if (ctx->quantizer >= 0) {
         if (avctx->bit_rate)
-            av_log(avctx, AV_LOG_WARNING, "Both bitrate and quantizer specified. Using quantizer mode.");
+            av_log(avctx, AV_LOG_WARNING, "Both bitrate and quantizer specified. Using const quantizer mode.");
 
         rret = rav1e_config_parse_int(cfg, "quantizer", ctx->quantizer);
         if (rret < 0) {
@@ -533,7 +533,7 @@  retry:
 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
 
 static const AVOption options[] = {
-    { "qp", "use constant quantizer mode", OFFSET(quantizer), AV_OPT_TYPE_INT, { .i64 = 100 }, -1, 255, VE },
+    { "qp", "qp value of constant quantizer mode", OFFSET(quantizer), AV_OPT_TYPE_INT, { .i64 = 100 }, -1, 255, VE },
     { "speed", "what speed preset to use", OFFSET(speed), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 10, VE },
     { "tiles", "number of tiles encode with", OFFSET(tiles), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },
     { "tile-rows", "number of tiles rows to encode with", OFFSET(tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },