mirror of
https://github.com/rustdesk/rustdesk.git
synced 2025-05-18 23:36:57 +02:00
b544a2889b
1. version changes: * vcpkg: 2024.07.12 -> 2024.11.16 * aom (except linux sciter): 3.9.1 -> 3.11.0 * libvpx: 1.14.1 -> 1.15.0 * libyuv: not update because compiled failed on arm64, and didn't apply different version on different archs * opus: already the latest version * ffmpeg: 7.0.2 -> 7.1 2. other changes: * android 5.0 required, otherwise crash when start, because FFmpeg 7.1 link to mediandk directly 3. Tests: * Except arm, arm64, linux amf, ios, all the other codecs are tested * Compile on arm32 linux is not tested, ci is failed before vcpkg install * Tested windows FFmpeg qsv, still no memory leak Signed-off-by: 21pages <sunboeasy@gmail.com>
71 lines
3 KiB
Diff
71 lines
3 KiB
Diff
From da6921d5bcb50961193526f47aa2dbe71ee5fe81 Mon Sep 17 00:00:00 2001
|
|
From: 21pages <sunboeasy@gmail.com>
|
|
Date: Tue, 10 Dec 2024 13:40:46 +0800
|
|
Subject: [PATCH 1/5] avcodec/amfenc: add query_timeout option for h264/hevc
|
|
|
|
Signed-off-by: 21pages <sunboeasy@gmail.com>
|
|
---
|
|
libavcodec/amfenc.h | 1 +
|
|
libavcodec/amfenc_h264.c | 4 ++++
|
|
libavcodec/amfenc_hevc.c | 4 ++++
|
|
3 files changed, 9 insertions(+)
|
|
|
|
diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h
|
|
index d985d01bb1..320c66919e 100644
|
|
--- a/libavcodec/amfenc.h
|
|
+++ b/libavcodec/amfenc.h
|
|
@@ -91,6 +91,7 @@ typedef struct AmfContext {
|
|
int quality;
|
|
int b_frame_delta_qp;
|
|
int ref_b_frame_delta_qp;
|
|
+ int64_t query_timeout;
|
|
|
|
// Dynamic options, can be set after Init() call
|
|
|
|
diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c
|
|
index 8edd39c633..6ad4961b2f 100644
|
|
--- a/libavcodec/amfenc_h264.c
|
|
+++ b/libavcodec/amfenc_h264.c
|
|
@@ -137,6 +137,7 @@ static const AVOption options[] = {
|
|
|
|
|
|
{ "log_to_dbg", "Enable AMF logging to debug output", OFFSET(log_to_dbg) , AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
|
+ { "query_timeout", "Timeout for QueryOutput call in ms", OFFSET(query_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, 1000, VE },
|
|
|
|
//Pre Analysis options
|
|
{ "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },
|
|
@@ -228,6 +229,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|
|
|
AMF_ASSIGN_PROPERTY_RATE(res, ctx->encoder, AMF_VIDEO_ENCODER_FRAMERATE, framerate);
|
|
|
|
+ if (ctx->query_timeout >= 0)
|
|
+ AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_QUERY_TIMEOUT, ctx->query_timeout);
|
|
+
|
|
switch (avctx->profile) {
|
|
case AV_PROFILE_H264_BASELINE:
|
|
profile = AMF_VIDEO_ENCODER_PROFILE_BASELINE;
|
|
diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c
|
|
index 4898824f3a..22cb95c7ce 100644
|
|
--- a/libavcodec/amfenc_hevc.c
|
|
+++ b/libavcodec/amfenc_hevc.c
|
|
@@ -104,6 +104,7 @@ static const AVOption options[] = {
|
|
|
|
|
|
{ "log_to_dbg", "Enable AMF logging to debug output", OFFSET(log_to_dbg), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE },
|
|
+ { "query_timeout", "Timeout for QueryOutput call in ms", OFFSET(query_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, 1000, VE },
|
|
|
|
//Pre Analysis options
|
|
{ "preanalysis", "Enable preanalysis", OFFSET(preanalysis), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },
|
|
@@ -194,6 +195,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|
|
|
AMF_ASSIGN_PROPERTY_RATE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_FRAMERATE, framerate);
|
|
|
|
+ if (ctx->query_timeout >= 0)
|
|
+ AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_QUERY_TIMEOUT, ctx->query_timeout);
|
|
+
|
|
switch (avctx->profile) {
|
|
case AV_PROFILE_HEVC_MAIN:
|
|
profile = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN;
|
|
--
|
|
2.43.0.windows.1
|
|
|