jellyfin/jellyfin-ffmpeg
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-ffmpeg.git synced 2026-09-03 05:09:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #433 from jellyfin/jellyfin-fix-vt-leak

Browse Source 
avutil/hwcontext_videotoolbox: fix leak and spamming
This commit is contained in:
gnattu
2024-08-10 15:53:48 +08:00
committed by GitHub
parent d1775186f8 c43b5de07d
commit 587d4e0db1
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/patches/0049-backport-fixes-for-videotoolbox-from-upstream.patch
Vendored
+12 -5
View File
@@ -291,7 +291,7 @@ Index: FFmpeg/libavcodec/videotoolboxenc.c
//Populates extradata - output frames are flushed and param sets are available.
status = VTCompressionSessionCompleteFrames(vtctx->session,
@@ -2766,10 +2783,19 @@ static int vtenc_populate_extradata(AVCo
@@ -2766,10 +2783,26 @@ static int vtenc_populate_extradata(AVCo
pe_cleanup:
CVPixelBufferRelease(pix_buf);
@@ -299,9 +299,16 @@ Index: FFmpeg/libavcodec/videotoolboxenc.c
+
+ if (status) {
+ vtenc_reset(vtctx);
+ } else if (vtctx->session) {
+ CFRelease(vtctx->session);
+ vtctx->session = NULL;
+ } else {
+ if (vtctx->session) {
+ CFRelease(vtctx->session);
+ vtctx->session = NULL;
+ }
+
+ if (vtctx->supported_props) {
+ CFRelease(vtctx->supported_props);
+ vtctx->supported_props = NULL;
+ }
+ }
+
vtctx->frame_ct_out = 0;
@@ -390,7 +397,7 @@ Index: FFmpeg/libavutil/hwcontext_videotoolbox.c
+ colormatrix, kCVAttachmentMode_ShouldPropagate);
+ else {
+ CVBufferRemoveAttachment(pixbuf, kCVImageBufferYCbCrMatrixKey);
+ if (src->colorspace != AVCOL_SPC_UNSPECIFIED)
+ if (src->colorspace != AVCOL_SPC_UNSPECIFIED && src->colorspace != AVCOL_SPC_RGB)
+ av_log(log_ctx, AV_LOG_WARNING,
+ "Color space %s is not supported.\n",
+ av_color_space_name(src->colorspace));