From: Andriy Gelman <andriy.gel...@gmail.com>
Hard coded parameters for qmin and qmax are currently used to initialize
v4l2_m2m device. This commit uses values from avctx->{qmin,qmax} if they
are set.
Signed-off-by: Andriy Gelman <andriy.gel...@gmail.com>
---
libavcodec/v4l2_m2m_enc.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c
index 0098d5314bb..500a0b757e5 100644
--- a/libavcodec/v4l2_m2m_enc.c
+++ b/libavcodec/v4l2_m2m_enc.c
@@ -31,6 +31,7 @@
#include "v4l2_context.h"
#include "v4l2_m2m.h"
#include "v4l2_fmt.h"
+#include "internal.h"
#define MPEG_CID(x) V4L2_CID_MPEG_VIDEO_##x
#define MPEG_VIDEO(x) V4L2_MPEG_VIDEO_##x
@@ -239,11 +240,16 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s)
return 0;
}
- if (qmin != avctx->qmin || qmax != avctx->qmax)
- av_log(avctx, AV_LOG_WARNING, "Encoder adjusted: qmin (%d), qmax
(%d)\n", qmin, qmax);
+ if (avctx->qmin >= 0)
+ qmin = avctx->qmin;
- v4l2_set_ext_ctrl(s, qmin_cid, qmin, "minimum video quantizer scale", 0);
- v4l2_set_ext_ctrl(s, qmax_cid, qmax, "maximum video quantizer scale", 0);
+ if (avctx->qmax >= 0)
+ qmax = avctx->qmax;
+
+ v4l2_set_ext_ctrl(s, qmin_cid, qmin, "minimum video quantizer scale",
+ avctx->qmin >= 0);
+ v4l2_set_ext_ctrl(s, qmax_cid, qmax, "maximum video quantizer scale",
+ avctx->qmax >= 0);
return 0;
}
@@ -356,6 +362,12 @@ static const AVOption options[] = {
{ NULL },
};
+static const AVCodecDefault v4l2_m2m_defaults[] = {
+ { "qmin", "-1" },
+ { "qmax", "-1" },
+ { NULL },
+};
+
#define M2MENC_CLASS(NAME) \
static const AVClass v4l2_m2m_ ## NAME ## _enc_class = { \
.class_name = #NAME "_v4l2m2m_encoder", \
@@ -377,6 +389,7 @@ static const AVOption options[] = {
.send_frame = v4l2_send_frame, \
.receive_packet = v4l2_receive_packet, \
.close = v4l2_encode_close, \
+ .defaults = v4l2_m2m_defaults, \
.capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \
.wrapper_name = "v4l2m2m", \
};
--
2.25.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
