The branch, master has been updated
via fc45127bcc79731a2e3ec5858a00c35c6cfbc1c0 (commit)
via 73750489a67dcf99a6142009edfe45f504d55e8e (commit)
from fb4407797ee709b0bd6cd1fbe779dc27d226f60e (commit)
- Log -----------------------------------------------------------------
commit fc45127bcc79731a2e3ec5858a00c35c6cfbc1c0
Author: Zhao Zhili <[email protected]>
AuthorDate: Mon Sep 1 01:36:25 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Fri Sep 5 09:20:36 2025 +0000
avcodec/videotoolboxenc: support global_quality without qscale
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index c3704810d2..e423da6933 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -1245,8 +1245,10 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
return AVERROR_EXTERNAL;
}
- if (avctx->flags & AV_CODEC_FLAG_QSCALE) {
- Float32 quality = fminf(avctx->global_quality / 100.0f / FF_QP2LAMBDA,
1.0f);
+ if (avctx->flags & AV_CODEC_FLAG_QSCALE || avctx->global_quality > 0) {
+ float factor = (avctx->flags & AV_CODEC_FLAG_QSCALE) ?
+ FF_QP2LAMBDA * 100.0f : 100.0f;
+ Float32 quality = fminf(avctx->global_quality / factor, 1.0f);
CFNumberRef quality_num = CFNumberCreate(kCFAllocatorDefault,
kCFNumberFloat32Type,
&quality);
commit 73750489a67dcf99a6142009edfe45f504d55e8e
Author: Zhao Zhili <[email protected]>
AuthorDate: Mon Sep 1 01:17:08 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Fri Sep 5 09:20:36 2025 +0000
avcodec/videotoolboxenc: fix the loss of precision when calculating quality
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index b748ecda61..c3704810d2 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -1185,9 +1185,7 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
VTEncContext *vtctx = avctx->priv_data;
SInt32 bit_rate = avctx->bit_rate;
SInt32 max_rate = avctx->rc_max_rate;
- Float32 quality = avctx->global_quality / FF_QP2LAMBDA;
CFNumberRef bit_rate_num;
- CFNumberRef quality_num;
CFNumberRef bytes_per_second;
CFNumberRef one_second;
CFArrayRef data_rate_limits;
@@ -1248,10 +1246,10 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
}
if (avctx->flags & AV_CODEC_FLAG_QSCALE) {
- quality = quality >= 100 ? 1.0 : quality / 100;
- quality_num = CFNumberCreate(kCFAllocatorDefault,
- kCFNumberFloat32Type,
- &quality);
+ Float32 quality = fminf(avctx->global_quality / 100.0f / FF_QP2LAMBDA,
1.0f);
+ CFNumberRef quality_num = CFNumberCreate(kCFAllocatorDefault,
+ kCFNumberFloat32Type,
+ &quality);
if (!quality_num) return AVERROR(ENOMEM);
status = VTSessionSetProperty(vtctx->session,
-----------------------------------------------------------------------
Summary of changes:
libavcodec/videotoolboxenc.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
