mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-14 23:34:08 +00:00
mac-virtualcam: Fix IOSurface memory leak
This change fixes a memory leak in the mac-virtualcam plugin that causes OBS to not release the CVPixelBuffers (and underlying IOSurfaces) it emits to the virtual camera consumers. Pull request https://github.com/obsproject/obs-studio/pull/6573 (Avoid transcoding where possible) updated the mac-virtualcam to share the virtual camera feed with other processes via IOSurfaces. Although the changes work correctly, users have observed that OBS memory usage keeps increasing when the virtual camera is active until OBS runs out of memory or the consuming application is closed. See the report by @SciTechNick for more information: https://github.com/obsproject/obs-studio/pull/6573#issuecomment-1161979765 After some debugging, I have found that the plugin is leaking Mach ports associated with IOSurfaces, preventing them from being re-used. The previous approach using `NSMachPort` does not seem to properly release the Mach port allocated via `CVPixelBufferGetIOSurface` and `IOSurfaceLookupFromMachPort`. Instead, we must explicitly deallocate the port using `mach_port_deallocate`. I have tested the changes on a Macbook Pro (M1) running macOS Monterey with Google Chrome, Zoom, and Cameo. OBS shows no signs of memory leakage after multiple minutes.
This commit is contained in:
parent
72830ea553
commit
b02e4b109b
|
@ -101,14 +101,30 @@
|
|||
break;
|
||||
case MachMsgIdFrame:
|
||||
VLog(@"Received frame message");
|
||||
if (components.count >= 4) {
|
||||
|
||||
if (components.count < 4)
|
||||
return;
|
||||
|
||||
@autoreleasepool {
|
||||
NSMachPort *framePort = (NSMachPort *)components[0];
|
||||
|
||||
if (!framePort)
|
||||
return;
|
||||
|
||||
IOSurfaceRef surface = IOSurfaceLookupFromMachPort(
|
||||
[framePort machPort]);
|
||||
mach_port_deallocate(mach_task_self(),
|
||||
[framePort machPort]);
|
||||
|
||||
if (!surface) {
|
||||
ELog(@"Failed to obtain IOSurface from Mach port");
|
||||
return;
|
||||
}
|
||||
|
||||
CVPixelBufferRef frame;
|
||||
CVPixelBufferCreateWithIOSurface(kCFAllocatorDefault,
|
||||
surface, NULL, &frame);
|
||||
CFRelease(surface);
|
||||
|
||||
uint64_t timestamp;
|
||||
[components[1] getBytes:×tamp
|
||||
|
@ -131,7 +147,6 @@
|
|||
fpsDenominator:fpsDenominator];
|
||||
|
||||
CVPixelBufferRelease(frame);
|
||||
CFRelease(surface);
|
||||
}
|
||||
break;
|
||||
case MachMsgIdStop:
|
||||
|
|
|
@ -397,7 +397,10 @@
|
|||
}
|
||||
|
||||
err = CMSimpleQueueEnqueue(self.queue, sampleBuffer);
|
||||
|
||||
if (err != noErr) {
|
||||
CFRelease(sampleBuffer);
|
||||
|
||||
DLog(@"CMSimpleQueueEnqueue err %d", err);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -147,23 +147,33 @@
|
|||
dataWithBytes:&fpsDenominator
|
||||
length:sizeof(fpsDenominator)];
|
||||
|
||||
NSPort *framePort = [NSMachPort
|
||||
portWithMachPort:IOSurfaceCreateMachPort(
|
||||
CVPixelBufferGetIOSurface(
|
||||
frame))];
|
||||
IOSurfaceRef surface = CVPixelBufferGetIOSurface(frame);
|
||||
|
||||
if (!surface) {
|
||||
blog(LOG_ERROR,
|
||||
"unable to access IOSurface associated with CVPixelBuffer");
|
||||
return;
|
||||
}
|
||||
|
||||
mach_port_t framePort = IOSurfaceCreateMachPort(surface);
|
||||
|
||||
if (!framePort) {
|
||||
blog(LOG_ERROR,
|
||||
"unable to allocate mach port for pixel buffer");
|
||||
"unable to allocate mach port for IOSurface");
|
||||
return;
|
||||
}
|
||||
|
||||
[self sendMessageToClientsWithMsgId:MachMsgIdFrame
|
||||
components:@[
|
||||
framePort, timestampData,
|
||||
[NSMachPort
|
||||
portWithMachPort:framePort
|
||||
options:NSMachPortDeallocateNone],
|
||||
timestampData,
|
||||
fpsNumeratorData,
|
||||
fpsDenominatorData
|
||||
]];
|
||||
|
||||
mach_port_deallocate(mach_task_self(), framePort);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue