mirror of
https://github.com/rustdesk/rustdesk.git
synced 2025-05-18 23:36:57 +02:00
40999c3211
* Fix ffmpeg videotoolbox wrong log when changing bitrate * Let qsv support abr, and it's safe for qsv to changing bitrate. Signed-off-by: 21pages <sunboeasy@gmail.com>
85 lines
3 KiB
Diff
85 lines
3 KiB
Diff
From d74de94b49efcf7a0b25673ace6016938d1b9272 Mon Sep 17 00:00:00 2001
|
|
From: 21pages <sunboeasy@gmail.com>
|
|
Date: Tue, 10 Dec 2024 14:12:01 +0800
|
|
Subject: [PATCH 3/5] videotoolbox changing bitrate
|
|
|
|
Signed-off-by: 21pages <sunboeasy@gmail.com>
|
|
---
|
|
libavcodec/videotoolboxenc.c | 40 ++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 40 insertions(+)
|
|
|
|
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
|
|
index da7b291b03..3c866177f5 100644
|
|
--- a/libavcodec/videotoolboxenc.c
|
|
+++ b/libavcodec/videotoolboxenc.c
|
|
@@ -279,6 +279,8 @@ typedef struct VTEncContext {
|
|
int max_slice_bytes;
|
|
int power_efficient;
|
|
int max_ref_frames;
|
|
+
|
|
+ int last_bit_rate;
|
|
} VTEncContext;
|
|
|
|
static void vtenc_free_buf_node(BufNode *info)
|
|
@@ -1180,6 +1182,7 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
|
|
int64_t one_second_value = 0;
|
|
void *nums[2];
|
|
|
|
+ vtctx->last_bit_rate = bit_rate;
|
|
int status = VTCompressionSessionCreate(kCFAllocatorDefault,
|
|
avctx->width,
|
|
avctx->height,
|
|
@@ -2638,6 +2641,42 @@ out:
|
|
return status;
|
|
}
|
|
|
|
+static void update_config(AVCodecContext *avctx)
|
|
+{
|
|
+ VTEncContext *vtctx = avctx->priv_data;
|
|
+
|
|
+ if (avctx->codec_id != AV_CODEC_ID_PRORES) {
|
|
+ if (avctx->bit_rate != vtctx->last_bit_rate) {
|
|
+ av_log(avctx, AV_LOG_INFO, "Setting bit rate to %d\n", avctx->bit_rate);
|
|
+ vtctx->last_bit_rate = avctx->bit_rate;
|
|
+ SInt32 bit_rate = avctx->bit_rate;
|
|
+ CFNumberRef bit_rate_num = CFNumberCreate(kCFAllocatorDefault,
|
|
+ kCFNumberSInt32Type,
|
|
+ &bit_rate);
|
|
+ if (!bit_rate_num) return;
|
|
+
|
|
+ if (vtctx->constant_bit_rate) {
|
|
+ int status = VTSessionSetProperty(vtctx->session,
|
|
+ compat_keys.kVTCompressionPropertyKey_ConstantBitRate,
|
|
+ bit_rate_num);
|
|
+ if (status == kVTPropertyNotSupportedErr) {
|
|
+ av_log(avctx, AV_LOG_ERROR, "Error: -constant_bit_rate true is not supported by the encoder.\n");
|
|
+ }
|
|
+ } else {
|
|
+ int status = VTSessionSetProperty(vtctx->session,
|
|
+ kVTCompressionPropertyKey_AverageBitRate,
|
|
+ bit_rate_num);
|
|
+ if (status) {
|
|
+ av_log(avctx, AV_LOG_ERROR, "Error: cannot set average bit rate: %d\n", status);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ CFRelease(bit_rate_num);
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+
|
|
static av_cold int vtenc_frame(
|
|
AVCodecContext *avctx,
|
|
AVPacket *pkt,
|
|
@@ -2650,6 +2689,7 @@ static av_cold int vtenc_frame(
|
|
CMSampleBufferRef buf = NULL;
|
|
ExtraSEI sei = {0};
|
|
|
|
+ update_config(avctx);
|
|
if (frame) {
|
|
status = vtenc_send_frame(avctx, vtctx, frame);
|
|
|
|
--
|
|
2.43.0.windows.1
|
|
|