This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new c639ea5eeb avcodec/libsvtjpegxsenc: set bitrate to a sane default if
unset
c639ea5eeb is described below
commit c639ea5eebc1ce671df01f33b8910b6479ec3430
Author: James Almer <[email protected]>
AuthorDate: Sun Dec 14 12:48:07 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Sun Dec 14 17:34:57 2025 -0300
avcodec/libsvtjpegxsenc: set bitrate to a sane default if unset
Better than failing with an impossibly low bitrate.
Signed-off-by: James Almer <[email protected]>
---
libavcodec/libsvtjpegxsenc.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/libavcodec/libsvtjpegxsenc.c b/libavcodec/libsvtjpegxsenc.c
index ba626b03c0..d8dbc93075 100644
--- a/libavcodec/libsvtjpegxsenc.c
+++ b/libavcodec/libsvtjpegxsenc.c
@@ -192,14 +192,17 @@ static av_cold int svt_jpegxs_enc_init(AVCodecContext*
avctx) {
svt_enc->encoder.verbose = log_level < AV_LOG_DEBUG ? VERBOSE_ERRORS :
log_level == AV_LOG_DEBUG ?
VERBOSE_SYSTEM_INFO : VERBOSE_WARNINGS;
- if (avctx->bit_rate <= 0) {
- av_log(avctx, AV_LOG_ERROR, "bitrate can't be 0\n");
- return AVERROR(EINVAL);
- }
if (avctx->framerate.num <= 0 || avctx->framerate.den <= 0) {
av_log(avctx, AV_LOG_ERROR, "framerate must be set\n");
return AVERROR(EINVAL);
}
+ if (avctx->bit_rate == 0) {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+ // default to a 1.5 compression ratio
+ avctx->bit_rate = (int64_t)avctx->width * avctx->height *
+ (av_get_bits_per_pixel(desc) * 2 / 3) *
av_q2d(avctx->framerate);
+ av_log(avctx, AV_LOG_WARNING, "No bitrate set, defaulting to
%"PRId64"\n", avctx->bit_rate);
+ }
av_reduce(&bpp.num, &bpp.den, avctx->bit_rate, (int64_t)avctx->width *
avctx->height, INT_MAX);
bpp = av_div_q(bpp, avctx->framerate);
@@ -249,6 +252,11 @@ static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_NONE
};
+static const FFCodecDefault svt_jpegxs_defaults[] = {
+ { "b", "0" },
+ { NULL },
+};
+
#define OFFSET(x) offsetof(SvtJpegXsEncodeContext, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption svtjpegxs_enc_options[] = {
@@ -284,6 +292,7 @@ const FFCodec ff_libsvtjpegxs_encoder = {
.priv_data_size = sizeof(SvtJpegXsEncodeContext),
.init = svt_jpegxs_enc_init,
.close = svt_jpegxs_enc_free,
+ .defaults = svt_jpegxs_defaults,
FF_CODEC_ENCODE_CB(svt_jpegxs_enc_encode),
.p.capabilities = AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
