Skip to content

macOS: New Video Format - Squashed & memory management (rebased) #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Carti-it wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

macOS: New Video Format - Squashed & memory management (rebased) #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions FlashCap.Core/CaptureDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected CaptureDevice(object identity, string name)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
#endif
public void Dispose() =>
_ = this.DisposeAsync().ConfigureAwait(false);
_ = this.DisposeAsync().ConfigureAwait(true);

#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1
ValueTask IAsyncDisposable.DisposeAsync() =>
Expand All @@ -43,10 +43,10 @@ ValueTask IAsyncDisposable.DisposeAsync() =>
public async Task DisposeAsync()
{
using var _ = await locker.LockAsync(default).
ConfigureAwait(false);
ConfigureAwait(true);

await this.OnDisposeAsync().
ConfigureAwait(false);
ConfigureAwait(true);
}

protected virtual Task OnDisposeAsync() =>
Expand Down
142 changes: 106 additions & 36 deletions FlashCap.Core/Devices/AVFoundationDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ public sealed class AVFoundationDevice : CaptureDevice
private AVCaptureSession? session;
private FrameProcessor? frameProcessor;
private IntPtr bitmapHeader;
private VideoBufferHandler? videoBufferHandler;

private GCHandle? videoBufferHandlerHandle;

public AVFoundationDevice(string uniqueID, string modelID) :
base(uniqueID, modelID)
Expand All @@ -42,39 +45,50 @@ public AVFoundationDevice(string uniqueID, string modelID) :
}

protected override async Task OnDisposeAsync()
{
// Ensure that we stop the session if it's running
if (this.session is not null && IsRunning)
{
this.session.StopRunning();
IsRunning = false;
}
{
try
{
// Ensure that we stop the session if it's running
if (session != null && IsRunning)
{
session.StopRunning();
IsRunning = false;
}

// Clean up the video buffer handler if it exists
if (videoBufferHandlerHandle.HasValue)
{
videoBufferHandlerHandle.Value.Free();
videoBufferHandlerHandle = null;
}

// Now dispose of the session and other resources
if (session != null)
{
session.Dispose();
session = null;
}
device?.Dispose(); device = null;
deviceInput?.Dispose(); deviceInput = null;
deviceOutput?.Dispose(); deviceOutput = null;
queue?.Dispose(); queue = null;

this.session?.Dispose();
this.deviceInput?.Dispose();
this.deviceOutput?.Dispose();
this.device?.Dispose();
this.queue?.Dispose();

this.session = null;
this.deviceInput = null;
this.deviceOutput = null;
this.device = null;
this.queue = null;

if (this.bitmapHeader != IntPtr.Zero)
{
Marshal.FreeHGlobal(this.bitmapHeader);
this.bitmapHeader = IntPtr.Zero;
}
if (bitmapHeader != IntPtr.Zero)
{
NativeMethods.FreeMemory(bitmapHeader);
bitmapHeader = IntPtr.Zero;
}

if (this.frameProcessor is not null)
if (frameProcessor != null)
{
await frameProcessor.DisposeAsync().ConfigureAwait(false);
frameProcessor = null;
}
}
finally
{
await this.frameProcessor.DisposeAsync().ConfigureAwait(false);
this.frameProcessor = null;
await base.OnDisposeAsync().ConfigureAwait(false);
}

await base.OnDisposeAsync().ConfigureAwait(false);
}

protected override Task OnInitializeAsync(VideoCharacteristics characteristics, TranscodeFormats transcodeFormat,
Expand Down Expand Up @@ -142,14 +156,21 @@ format.FormatDescription.Dimensions is var dimensions &&
{
var validPixelFormat = this.deviceOutput.AvailableVideoCVPixelFormatTypes.FirstOrDefault(p => p == pixelFormatType);
this.deviceOutput.SetPixelFormatType(validPixelFormat);
this.deviceOutput.SetVideoOutputSize(characteristics.Width, characteristics.Height, validPixelFormat);
}
else
{
// Fallback to the mapped pixel format if no available list is provided
this.deviceOutput.SetPixelFormatType(pixelFormatType);
}

this.deviceOutput.SetSampleBufferDelegate(new VideoBufferHandler(this), this.queue);

videoBufferHandler = new VideoBufferHandler(this);

this.deviceOutput.SetSampleBufferDelegate(videoBufferHandler, this.queue);

// Protect against GC moving the delegate
videoBufferHandlerHandle = GCHandle.Alloc(videoBufferHandler);

this.deviceOutput.AlwaysDiscardsLateVideoFrames = true;
}
finally
Expand All @@ -174,31 +195,80 @@ format.FormatDescription.Dimensions is var dimensions &&
catch
{
NativeMethods.FreeMemory(this.bitmapHeader);
this.bitmapHeader = IntPtr.Zero;

this.queue?.Dispose();
this.queue = null;
this.device?.Dispose();
this.device = null;
this.deviceInput?.Dispose();
this.deviceInput = null;
this.deviceOutput?.Dispose();
this.deviceOutput = null;

throw;
}
}

protected override Task OnStartAsync(CancellationToken ct)
{
this.session?.StartRunning();
return TaskCompat.CompletedTask;
try
{
if(session== null)
throw new InvalidOperationException("Session is null");
this.session?.StartRunning();
this.IsRunning = true;
return TaskCompat.CompletedTask;
}catch (Exception ex)
{
Debug.WriteLine($"Error starting session: {ex.Message}");
throw new InvalidOperationException("Failed to start the capture session.", ex);
}

}

protected override Task OnStopAsync(CancellationToken ct)
{
this.session?.StopRunning();
try
{
if(session== null)
throw new InvalidOperationException("Session is null");
if (this.IsRunning)
{
this.session?.StopRunning();
this.IsRunning = false;

}

}catch (Exception ex)
{
Debug.WriteLine($"Error stopping session: {ex.Message}");
throw new InvalidOperationException("Failed to stop the capture session.", ex);
}
return TaskCompat.CompletedTask;
}

protected override void OnCapture(IntPtr pData, int size, long timestampMicroseconds, long frameIndex, PixelBuffer buffer)
{
buffer.CopyIn(this.bitmapHeader, pData, size, timestampMicroseconds, frameIndex, TranscodeFormats.Auto);
try
{
if (this.bitmapHeader == IntPtr.Zero) return;
if (pData == IntPtr.Zero || size <= 0)
{
throw new ArgumentException("Invalid pixel data or size.");
}
buffer.CopyIn(this.bitmapHeader, pData, size, timestampMicroseconds, frameIndex, TranscodeFormats.Auto);
}catch (Exception ex)
{
Debug.WriteLine($"Error capturing frame: {ex.Message}");
throw new InvalidOperationException("Failed to capture frame.", ex);
}
}

internal sealed class VideoBufferHandler : AVCaptureVideoDataOutputSampleBuffer
{
private readonly AVFoundationDevice device;
private int frameIndex;
private int frameIndex = 0;

public VideoBufferHandler(AVFoundationDevice device)
{
Expand Down
1 change: 1 addition & 0 deletions FlashCap.Core/FlashCap.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);CS0649</NoWarn>
<IsPackable>true</IsPackable>
<Version>1.0.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading