a4cd64f0d5
* fix qsv memory leak by updating ffmpeg * Memory leaks occur when destroying FFmpeg QSV VRAM encoders. This issue is resolved with FFmpeg version 7. * FFmpeg requires ffnvcodec version 12.1.14.0 or higher, and an NVIDIA driver version greater than 530. For more details, https://github.com/FFmpeg/nv-codec-headers/tree/n12.1.14.0. * The code of NVIDIA VRAM encoder is not changed, still use Video Codec SDK version 11, which is unaffected by FFmpeg. Drivers newer than 470 can support this, but we may consider an update later, as the support check by sdk code may not be accurate for FFmpeg RAM encoders. * The issue is related to FFmpeg, not libmfx. FFmpeg version 7 recommends using libvpl, but vcpkg currently lacks ports for libvpl. We can add these in the future. * D3D11 Texture Rendering: The "Shared GPU Memory" in the task manager continue increasing when using D3D11 texture render, which can exceed the GPU memory limit (e.g., reaching up to 100GB). I don't know what it is and will try to find it out. * Roughly tests on Windows, Linux, macOS, and Android for quick fix. Further testing will be performed, and I will share the results in this pr. Signed-off-by: 21pages <sunboeasy@gmail.com> * update flutter_gpu_texture_render, fix shared gpu memory leak while rendering Signed-off-by: 21pages <sunboeasy@gmail.com> --------- Signed-off-by: 21pages <sunboeasy@gmail.com>
72 lines
3.3 KiB
Diff
72 lines
3.3 KiB
Diff
From f6988e5424e041ff6f6e241f4d8fa69a04c05e64 Mon Sep 17 00:00:00 2001
|
|
From: 21pages <sunboeasy@gmail.com>
|
|
Date: Thu, 5 Sep 2024 16:26:20 +0800
|
|
Subject: [PATCH 1/3] 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 2dbd378ef8..d636673a9d 100644
|
|
--- a/libavcodec/amfenc.h
|
|
+++ b/libavcodec/amfenc.h
|
|
@@ -89,6 +89,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 c1d5f4054e..415828f005 100644
|
|
--- a/libavcodec/amfenc_h264.c
|
|
+++ b/libavcodec/amfenc_h264.c
|
|
@@ -135,6 +135,7 @@ static const AVOption options[] = {
|
|
{ "aud", "Inserts AU Delimiter NAL unit", OFFSET(aud) ,AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
|
|
|
{ "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 },
|
|
@@ -222,6 +223,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 33a167aa52..65259d7153 100644
|
|
--- a/libavcodec/amfenc_hevc.c
|
|
+++ b/libavcodec/amfenc_hevc.c
|
|
@@ -98,6 +98,7 @@ static const AVOption options[] = {
|
|
{ "aud", "Inserts AU Delimiter NAL unit", OFFSET(aud) ,AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE },
|
|
|
|
{ "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 },
|
|
@@ -183,6 +184,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
|
|
|