Fixed Metal renderer memory leak (#3909)

pjsip · Mar 29, 2024 · 51e5206 · 51e5206
1 parent 478aeb9
commit 51e5206
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/pjmedia/src/pjmedia-codec/vid_toolbox.m b/pjmedia/src/pjmedia-codec/vid_toolbox.m
@@ -554,17 +554,20 @@ static OSStatus create_encoder(vtool_codec_data *vtool_data)
 
     ret = VTSessionCopySupportedPropertyDictionary(vtool_data->enc,
                                                    &supported_prop);
-    if (ret == noErr &&
-        CFDictionaryContainsKey(supported_prop,
+    if (ret == noErr) {
+        if (CFDictionaryContainsKey(supported_prop,
                                 kVTCompressionPropertyKey_MaxH264SliceBytes))
-    {
-        /* kVTCompressionPropertyKey_MaxH264SliceBytes is not yet supported
-         * by Apple. We leave it here for possible future enhancements.
-        SET_PROPERTY(vtool_data->enc,
-                     kVTCompressionPropertyKey_MaxH264SliceBytes,
-                     // param->enc_mtu - NAL_HEADER_ADD_0X30BYTES
-                     (__bridge CFTypeRef)@(param->enc_mtu - 50));
-         */
+        {
+            /* kVTCompressionPropertyKey_MaxH264SliceBytes is not yet supported
+             * by Apple. We leave it here for possible future enhancements.
+            SET_PROPERTY(vtool_data->enc,
+                         kVTCompressionPropertyKey_MaxH264SliceBytes,
+                         // param->enc_mtu - NAL_HEADER_ADD_0X30BYTES
+                         (__bridge CFTypeRef)@(param->enc_mtu - 50));
+             */
+        }
+
+        CFRelease(supported_prop);
     }
 
     VTCompressionSessionPrepareToEncodeFrames(vtool_data->enc);

diff --git a/pjmedia/src/pjmedia-videodev/metal_dev.m b/pjmedia/src/pjmedia-videodev/metal_dev.m
@@ -428,6 +428,11 @@ - (nonnull instancetype)initWithMetalKitView:(nonnull MTKView *)mtkView
         textureCoordBuffer = [device newBufferWithBytes:textureCoordinates
                                      length:sizeof(textureCoordinates)
                                      options:MTLResourceStorageModeShared];
+
+        [pQuadPipelineStateDescriptor release];
+        [fragmentProgram release];
+        [vertexProgram release];
+        [shaderLibrary release];
     }
 
     return self;
@@ -509,6 +514,8 @@ - (void)update_image
     [commandBuffer presentDrawable:drawable];
     [commandBuffer commit];
 
+    [texture release];
+
     stream->is_rendering = PJ_FALSE;
 }