From 313a3b68e0519d7ee5857e936d114dc5c2fb8fb9 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Thu, 12 Jun 2025 16:37:14 +0300
Subject: [PATCH 01/40] Camera Video Recording

---
 .../Views/CameraView/CameraViewPage.xaml      |  10 +-
 .../Views/CameraView/CameraViewViewModel.cs   |   9 +
 .../CameraManager.android.cs                  | 160 +++++++++++++++++-
 .../CameraManager.macios.cs                   |   4 +
 .../CameraManager.net.cs                      |   2 +
 .../CameraManager.shared.cs                   |  17 ++
 .../CameraManager.tizen.cs                    |   3 +
 .../CameraManager.windows.cs                  |  45 ++++-
 .../Primitives/CameraViewDefaults.shared.cs   |  12 ++
 .../Views/CameraView.shared.cs                |  30 ++++
 10 files changed, 289 insertions(+), 3 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
index e517746091..b84d6b6574 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
@@ -57,7 +57,7 @@
             <Button Clicked="ZoomIn" Text="Zoom +" Grid.Column="2"/>
         </Grid>
 
-        <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" BackgroundColor="#80CCCCCC">
+        <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="5" BackgroundColor="#80CCCCCC">
 
             <FlexLayout Margin="5" JustifyContent="SpaceBetween" Wrap="Wrap">
 
@@ -76,6 +76,14 @@
 
                 <Button Command="{Binding StopCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
                         Text="StopCameraPreview" />
+                <Button Command="{Binding StartVideoRecordingCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}"
+                        CommandParameter="{Binding Stream}"
+                        Text="StartVideoRecording" />
+
+                <Button Command="{Binding StopVideoRecordingCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
+                        Text="StopVideoRecording" />
+
+                <Button Command="{Binding SaveVideoCommand}" Text="GetStream" />
 
             </FlexLayout>
         </Grid>
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
index 055637f821..74df8b390b 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
@@ -1,5 +1,6 @@
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Core.Primitives;
+using CommunityToolkit.Maui.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
@@ -13,6 +14,8 @@ public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseV
 
 	public CancellationToken Token => CancellationToken.None;
 
+	public Stream Stream { get; } = new MemoryStream();
+
 	public ICollection<CameraFlashMode> FlashModes { get; } = Enum.GetValues<CameraFlashMode>();
 
 	[ObservableProperty]
@@ -78,4 +81,10 @@ void UpdateResolutionText()
 	{
 		ResolutionText = $"Selected Resolution: {SelectedResolution.Width} x {SelectedResolution.Height}";
 	}
+
+	[RelayCommand]
+	async Task SaveVideo()
+	{
+		await FileSaver.SaveAsync("recording.mp4", Stream);
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index c642ca4218..ae615a17cc 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -1,16 +1,28 @@
-using System.Runtime.Versioning;
+using System.IO;
+using System.Runtime.Versioning;
 using Android.Content;
+using Android.Hardware.Camera2;
+using Android.Hardware.Camera2.Params;
+using Android.Media;
+using Android.OS;
+using Android.Runtime;
+using Android.SE.Omapi;
 using Android.Views;
 using AndroidX.Camera.Core;
 using AndroidX.Camera.Core.Impl.Utils.Futures;
 using AndroidX.Camera.Core.ResolutionSelector;
 using AndroidX.Camera.Lifecycle;
+using AndroidX.Camera.Video;
 using AndroidX.Core.Content;
 using AndroidX.Lifecycle;
 using CommunityToolkit.Maui.Extensions;
+using Java.IO;
 using Java.Lang;
 using Java.Util.Concurrent;
 using static Android.Media.Image;
+using static Android.Print.PrintAttributes;
+using static AndroidX.Camera.Core.Internal.CameraUseCaseAdapter;
+using Exception = System.Exception;
 using Math = System.Math;
 
 namespace CommunityToolkit.Maui.Core;
@@ -32,6 +44,15 @@ partial class CameraManager
 	ResolutionFilter? resolutionFilter;
 	OrientationListener? orientationListener;
 
+	MediaRecorder? mediaRecorder;
+	CameraDevice? cameraDevice;
+	CameraCaptureSession? captureSession;
+	ParcelFileDescriptor? writeFd;
+	ParcelFileDescriptor? readFd;
+	Task? pipeTask;
+	HandlerThread? cameraThread;
+	Handler? cameraHandler;
+
 	public void Dispose()
 	{
 		Dispose(true);
@@ -258,6 +279,124 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 		return ValueTask.CompletedTask;
 	}
 
+	protected virtual async partial Task PlatformStartVideoRecording(System.IO.Stream stream, CancellationToken token)
+	{
+		var cameraManager = (Android.Hardware.Camera2.CameraManager)context.GetSystemService(Context.CameraService)!;
+		var audioManager = (AudioManager)context.GetSystemService(Context.AudioService)!;
+
+		cameraThread = new HandlerThread("CameraThread");
+		cameraThread.Start();
+		cameraHandler = new Handler(cameraThread.Looper!);
+
+		mediaRecorder = OperatingSystem.IsAndroidVersionAtLeast(31)
+			? new MediaRecorder(context)
+			: new MediaRecorder();
+
+		audioManager.Mode = Mode.Normal;
+
+		mediaRecorder.SetAudioSource(AudioSource.Mic);
+		mediaRecorder.SetVideoSource(VideoSource.Surface);
+		mediaRecorder.SetOutputFormat(OutputFormat.Mpeg4);
+
+		var pipe = ParcelFileDescriptor.CreatePipe()!;
+		writeFd = pipe[1];
+		readFd = pipe[0];
+
+		mediaRecorder.SetOutputFile(writeFd.FileDescriptor);
+		mediaRecorder.SetVideoEncodingBitRate(10_000_000);
+		mediaRecorder.SetVideoFrameRate(30);
+		mediaRecorder.SetVideoEncoder(VideoEncoder.H264);
+		mediaRecorder.SetAudioEncoder(AudioEncoder.Aac);
+		mediaRecorder.Prepare();
+
+		// Start background streaming to .NET stream
+		pipeTask = Task.Run(async () =>
+		{
+			try
+			{
+				using var inputStream = new ParcelFileDescriptor.AutoCloseInputStream(readFd);
+				byte[] buffer = new byte[81920];
+				int bytesRead;
+				while ((bytesRead = inputStream.Read(buffer, 0, buffer.Length)) > 0 && !token.IsCancellationRequested)
+				{
+					await stream.WriteAsync(buffer.AsMemory(0, bytesRead), token);
+					await stream.FlushAsync(token);
+				}
+			}
+			catch (System.OperationCanceledException) { }
+			catch (Exception ex)
+			{
+				System.Diagnostics.Debug.WriteLine($"[VideoRecorder] CopyToAsync failed: {ex}");
+			}
+		}, token);
+
+		// Open camera and start recording session
+		var openTcs = new TaskCompletionSource();
+
+		var cameraCallback = new CameraStateListener(device =>
+		{
+			cameraDevice = device;
+
+			var surfaces = new List<Surface> { mediaRecorder.Surface! };
+			var sessionCallback = new CaptureStateListener(session =>
+			{
+				captureSession = session;
+				var builder = cameraDevice.CreateCaptureRequest(CameraTemplate.Record);
+				builder.AddTarget(mediaRecorder.Surface!);
+				session.SetRepeatingRequest(builder.Build(), null, cameraHandler);
+
+				mediaRecorder.Start();
+				openTcs.TrySetResult();
+			});
+
+			device.CreateCaptureSession(surfaces, sessionCallback, cameraHandler);
+		});
+
+		cameraManager.OpenCamera(cameraView.SelectedCamera!.DeviceId, cameraCallback, cameraHandler);
+
+		await openTcs.Task;
+	}
+
+	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
+	{
+		ArgumentNullException.ThrowIfNull(cameraExecutor);
+		try
+		{
+			mediaRecorder?.Stop();
+		}
+		catch (Exception ex)
+		{
+			System.Diagnostics.Debug.WriteLine($"[VideoRecorder] Stop failed: {ex}");
+		}
+
+		mediaRecorder?.Release();
+		mediaRecorder = null;
+
+		captureSession?.Close();
+		cameraDevice?.Close();
+		captureSession = null;
+		cameraDevice = null;
+
+		writeFd?.Close();
+		readFd?.Close();
+		writeFd = null;
+		readFd = null;
+
+		if (pipeTask is not null)
+		{
+			await pipeTask;
+			pipeTask = null;
+		}
+
+		if (cameraThread != null)
+		{
+			cameraThread.QuitSafely();
+			cameraThread.Join();
+			cameraThread = null;
+			cameraHandler = null;
+		}
+	}
+
 	void SetImageCaptureTargetRotation(int rotation)
 	{
 		if (imageCapture is not null)
@@ -379,4 +518,23 @@ public override void OnOrientationChanged(int orientation)
 			callback.Invoke(orientation);
 		}
 	}
+}
+
+public class CameraStateListener : CameraDevice.StateCallback
+{
+	readonly Action<CameraDevice> onOpened;
+	public CameraStateListener(Action<CameraDevice> onOpened) => this.onOpened = onOpened;
+
+	public override void OnOpened(CameraDevice camera) => onOpened(camera);
+	public override void OnDisconnected(CameraDevice camera) => camera.Close();
+	public override void OnError(CameraDevice camera, [GeneratedEnum] CameraError error) => camera.Close();
+}
+
+public class CaptureStateListener : CameraCaptureSession.StateCallback
+{
+	readonly Action<CameraCaptureSession> onConfigured;
+	public CaptureStateListener(Action<CameraCaptureSession> onConfigured) => this.onConfigured = onConfigured;
+
+	public override void OnConfigured(CameraCaptureSession session) => onConfigured(session);
+	public override void OnConfigureFailed(CameraCaptureSession session) => session.Close();
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 17941d0cf7..9e45115c5f 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -191,6 +191,10 @@ protected virtual partial void PlatformDisconnect()
 	{
 	}
 
+	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException("notSupportedMessage");
+	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException("notSupportedMessage");
+
+
 	protected virtual async partial ValueTask PlatformTakePicture(CancellationToken token)
 	{
 		ArgumentNullException.ThrowIfNull(photoOutput);
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
index 41dae1d618..445d88129e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
@@ -14,6 +14,8 @@ partial class CameraManager
 
 	public partial ValueTask UpdateCaptureResolution(Size resolution, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
+	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 	protected virtual partial Task PlatformStartCameraPreview(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
 	protected virtual partial void PlatformStopCameraPreview() => throw new NotSupportedException(notSupportedMessage);
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index d7703d2572..cf17a4ff7f 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -52,6 +52,19 @@ public async Task<bool> ArePermissionsGranted()
 	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
 	public Task StartCameraPreview(CancellationToken token) => PlatformStartCameraPreview(token);
 
+	/// <summary>
+	/// Starts the video recording.
+	/// </summary>
+	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
+	public Task StartVideoRecording(Stream stream, CancellationToken token) => PlatformStartVideoRecording(stream, token);
+
+
+	/// <summary>
+	/// Starts the video recording.
+	/// </summary>
+	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
+	public Task StopVideoRecording(CancellationToken token) => PlatformStopVideoRecording(token);
+
 	/// <summary>
 	/// Stops the camera preview.
 	/// </summary>
@@ -131,4 +144,8 @@ public async ValueTask UpdateCurrentCamera(CameraInfo? cameraInfo, CancellationT
 	/// Stops the preview from the camera, at the platform-specific level.
 	/// </summary>
 	protected virtual partial void PlatformStopCameraPreview();
+
+	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token);
+
+	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
index 9d2dd7a1a2..4030848508 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
@@ -23,4 +23,7 @@ partial class CameraManager
 	protected virtual partial void PlatformDisconnect() => throw new NotSupportedException(notSupportedMessage);
 
 	protected virtual partial ValueTask PlatformTakePicture(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index 5edf33fc77..96fc85caaf 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -1,4 +1,5 @@
-using System.Runtime.Versioning;
+using System;
+using System.Runtime.Versioning;
 using CommunityToolkit.Maui.Extensions;
 using Microsoft.UI.Xaml.Controls;
 using Windows.Media.Capture;
@@ -14,6 +15,7 @@ partial class CameraManager
 	MediaPlayerElement? mediaElement;
 	MediaCapture? mediaCapture;
 	MediaFrameSource? frameSource;
+	LowLagMediaRecording? mediaRecording;
 
 	public MediaPlayerElement CreatePlatformView()
 	{
@@ -202,4 +204,45 @@ protected async Task PlatformUpdateResolution(Size resolution, CancellationToken
 			await mediaCapture.VideoDeviceController.SetMediaStreamPropertiesAsync(MediaStreamType.Photo, filteredPropertiesList.First()).AsTask(token);
 		}
 	}
+
+	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
+	{
+		if (!IsInitialized || mediaCapture is null || mediaElement is null)
+		{
+			return;
+		}
+
+		MediaEncodingProfile profile = MediaEncodingProfile.CreateMp4(VideoEncodingQuality.Auto);
+		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, stream.AsRandomAccessStream());
+
+		frameSource = mediaCapture.FrameSources.FirstOrDefault(source =>
+			source.Value.Info.MediaStreamType == MediaStreamType.VideoRecord
+			&& source.Value.Info.SourceKind == MediaFrameSourceKind.Color).Value;
+		if (frameSource != null)
+		{
+			var frameFormat = frameSource.SupportedFormats
+					.OrderByDescending(f => f.VideoFormat.Width * f.VideoFormat.Height).FirstOrDefault();
+
+			if (frameFormat != null)
+			{
+				await frameSource.SetFormatAsync(frameFormat);
+				mediaElement.AutoPlay = true;
+				mediaElement.Source = MediaSource.CreateFromMediaFrameSource(frameSource);
+				await mediaRecording.StartAsync();
+			}
+		}
+	}
+
+	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
+	{
+		if (!IsInitialized || mediaElement is null)
+		{
+			return;
+		}
+
+		if (mediaRecording != null)
+		{
+			await mediaRecording.StopAsync();
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
index 5cd0b67e02..4e603a6765 100644
--- a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -61,4 +61,16 @@ internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)
 		var cameraView = (CameraView)bindable;
 		return new Command(_ => cameraView.StopCameraPreview());
 	}
+
+	internal static Command<Stream> CreateStartVideoRecordingCommand(BindableObject bindable)
+	{
+		var cameraView = (CameraView)bindable;
+		return new(async stream => await cameraView.StartVideoRecording(stream, CancellationToken.None).ConfigureAwait(false));
+	}
+
+	internal static ICommand CreateStopVideoRecordingCommand(BindableObject bindable)
+	{
+		var cameraView = (CameraView)bindable;
+		return new Command(_ => cameraView.StopVideoRecording(CancellationToken.None));
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index cdfbcacc5f..f4202908da 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -78,6 +78,18 @@ public partial class CameraView : View, ICameraView
 	/// </summary>
 	public static readonly BindableProperty StopCameraPreviewCommandProperty =
 		BindableProperty.CreateReadOnly(nameof(StopCameraPreviewCommand), typeof(ICommand), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopCameraPreviewCommand).BindableProperty;
+	
+	/// <summary>
+	/// Backing BindableProperty for the <see cref="StartCameraPreviewCommand"/> property.
+	/// </summary>
+	public static readonly BindableProperty StartVideoRecordingCommandProperty =
+		BindableProperty.CreateReadOnly(nameof(StartVideoRecordingCommand), typeof(Command<CancellationToken>), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStartVideoRecordingCommand).BindableProperty;
+
+	/// <summary>
+	/// Backing BindableProperty for the <see cref="StopCameraPreviewCommand"/> property.
+	/// </summary>
+	public static readonly BindableProperty StopVideoRecordingCommandProperty =
+		BindableProperty.CreateReadOnly(nameof(StopVideoRecordingCommand), typeof(ICommand), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopVideoRecordingCommand).BindableProperty;
 
 	readonly WeakEventManager weakEventManager = new();
 
@@ -127,11 +139,21 @@ public event EventHandler<MediaCapturedEventArgs> MediaCaptured
 	/// <see cref="StartCameraPreviewCommand"/> has a <see cref="Type"/> of Command&lt;CancellationToken&gt; which requires a <see cref="CancellationToken"/> as a CommandParameter. See <see cref="Command{CancellationToken}"/> and <see cref="System.Windows.Input.ICommand.Execute(object)"/> for more information on passing a <see cref="CancellationToken"/> into <see cref="Command{T}"/> as a CommandParameter
 	/// </remarks>
 	public Command<CancellationToken> StartCameraPreviewCommand => (Command<CancellationToken>)GetValue(StartCameraPreviewCommandProperty);
+	
+	/// <summary>
+	/// 
+	/// </summary>
+	public Command<Stream> StartVideoRecordingCommand => (Command<Stream>)GetValue(StartVideoRecordingCommandProperty);
 
 	/// <summary>
 	/// Gets the Command that stops the camera preview.
 	/// </summary>
 	public ICommand StopCameraPreviewCommand => (ICommand)GetValue(StopCameraPreviewCommandProperty);
+	
+	/// <summary>
+	/// 
+	/// </summary>
+	public ICommand StopVideoRecordingCommand => (ICommand)GetValue(StopVideoRecordingCommandProperty);
 
 	/// <summary>
 	/// Gets or sets the <see cref="CameraFlashMode"/>.
@@ -218,6 +240,14 @@ public Task StartCameraPreview(CancellationToken token) =>
 	public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
 
+	/// <inheritdoc cref="ICameraView.StartCameraPreview"/>
+	public Task StartVideoRecording(Stream stream, CancellationToken token) =>
+		Handler.CameraManager.StartVideoRecording(stream, token);
+
+	/// <inheritdoc cref="ICameraView.StopCameraPreview"/>
+	public Task StopVideoRecording(CancellationToken token) =>
+		Handler.CameraManager.StopVideoRecording(token);
+
 	void ICameraView.OnMediaCaptured(Stream imageData)
 	{
 		weakEventManager.HandleEvent(this, new MediaCapturedEventArgs(imageData), nameof(MediaCaptured));

From 9aded49cd8948de675b2262a06d7916bfef00504 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sat, 14 Jun 2025 12:11:16 +0300
Subject: [PATCH 02/40] Android Write to file

---
 .../CameraManager.android.cs                  | 226 +++++++-----------
 1 file changed, 85 insertions(+), 141 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index ae615a17cc..efb0eeaa90 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -1,29 +1,22 @@
-using System.IO;
+using System.Buffers;
 using System.Runtime.Versioning;
 using Android.Content;
-using Android.Hardware.Camera2;
-using Android.Hardware.Camera2.Params;
-using Android.Media;
 using Android.OS;
-using Android.Runtime;
-using Android.SE.Omapi;
+using Android.Provider;
 using Android.Views;
 using AndroidX.Camera.Core;
-using AndroidX.Camera.Core.Impl.Utils.Futures;
 using AndroidX.Camera.Core.ResolutionSelector;
 using AndroidX.Camera.Lifecycle;
 using AndroidX.Camera.Video;
 using AndroidX.Core.Content;
+using AndroidX.Core.Util;
 using AndroidX.Lifecycle;
 using CommunityToolkit.Maui.Extensions;
-using Java.IO;
 using Java.Lang;
 using Java.Util.Concurrent;
-using static Android.Media.Image;
-using static Android.Print.PrintAttributes;
-using static AndroidX.Camera.Core.Internal.CameraUseCaseAdapter;
-using Exception = System.Exception;
+using Image = Android.Media.Image;
 using Math = System.Math;
+using Object = Java.Lang.Object;
 
 namespace CommunityToolkit.Maui.Core;
 
@@ -37,6 +30,9 @@ partial class CameraManager
 	ProcessCameraProvider? processCameraProvider;
 	ImageCapture? imageCapture;
 	ImageCallBack? imageCallback;
+	VideoCapture? videoCapture;
+	Recorder? videoRecorder;
+	Recording? videoRecording;
 	ICamera? camera;
 	ICameraControl? cameraControl;
 	Preview? cameraPreview;
@@ -44,14 +40,10 @@ partial class CameraManager
 	ResolutionFilter? resolutionFilter;
 	OrientationListener? orientationListener;
 
-	MediaRecorder? mediaRecorder;
-	CameraDevice? cameraDevice;
-	CameraCaptureSession? captureSession;
+
+	Task? pipeTask;
 	ParcelFileDescriptor? writeFd;
 	ParcelFileDescriptor? readFd;
-	Task? pipeTask;
-	HandlerThread? cameraThread;
-	Handler? cameraHandler;
 
 	public void Dispose()
 	{
@@ -144,6 +136,9 @@ protected virtual void Dispose(bool disposing)
 			imageCapture?.Dispose();
 			imageCapture = null;
 
+			videoCapture?.Dispose();
+			videoCapture = null;
+
 			imageCallback?.Dispose();
 			imageCallback = null;
 
@@ -218,6 +213,12 @@ protected async Task StartUseCase(CancellationToken token)
 		.SetResolutionSelector(resolutionSelector)
 		.Build();
 
+		videoRecorder = new Recorder.Builder()
+			.SetExecutor(cameraExecutor)
+			.SetQualitySelector(QualitySelector.From(Quality.Highest!))
+			.Build();
+		videoCapture = VideoCapture.WithOutput(videoRecorder);
+
 		await StartCameraPreview(token);
 	}
 
@@ -241,6 +242,7 @@ protected virtual async partial Task PlatformStartCameraPreview(CancellationToke
 		var cameraSelector = cameraView.SelectedCamera.CameraSelector ?? throw new CameraException($"Unable to retrieve {nameof(CameraSelector)}");
 
 		var owner = (ILifecycleOwner)context;
+		processCameraProvider.UnbindAll();
 		camera = processCameraProvider.BindToLifecycle(owner, cameraSelector, cameraPreview, imageCapture);
 
 		cameraControl = camera.CameraControl;
@@ -279,122 +281,99 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 		return ValueTask.CompletedTask;
 	}
 
-	protected virtual async partial Task PlatformStartVideoRecording(System.IO.Stream stream, CancellationToken token)
+	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
-		var cameraManager = (Android.Hardware.Camera2.CameraManager)context.GetSystemService(Context.CameraService)!;
-		var audioManager = (AudioManager)context.GetSystemService(Context.AudioService)!;
+		if (previewView is null || processCameraProvider is null || cameraPreview is null || videoCapture is null || videoRecorder is null)
+		{
+			return;
+		}
 
-		cameraThread = new HandlerThread("CameraThread");
-		cameraThread.Start();
-		cameraHandler = new Handler(cameraThread.Looper!);
+		if (cameraView.SelectedCamera is null)
+		{
+			if (cameraProvider.AvailableCameras is null)
+			{
+				await cameraProvider.RefreshAvailableCameras(token);
+			}
 
-		mediaRecorder = OperatingSystem.IsAndroidVersionAtLeast(31)
-			? new MediaRecorder(context)
-			: new MediaRecorder();
+			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ?? throw new CameraException("No camera available on device");
+		}
 
-		audioManager.Mode = Mode.Normal;
+		var cameraSelector = cameraView.SelectedCamera.CameraSelector ?? throw new CameraException($"Unable to retrieve {nameof(CameraSelector)}");
 
-		mediaRecorder.SetAudioSource(AudioSource.Mic);
-		mediaRecorder.SetVideoSource(VideoSource.Surface);
-		mediaRecorder.SetOutputFormat(OutputFormat.Mpeg4);
+		var owner = (ILifecycleOwner)context;
+		processCameraProvider.UnbindAll();
+		camera = processCameraProvider.BindToLifecycle(owner, cameraSelector, cameraPreview, videoCapture);
 
+		cameraControl = camera.CameraControl;
 		var pipe = ParcelFileDescriptor.CreatePipe()!;
 		writeFd = pipe[1];
 		readFd = pipe[0];
 
-		mediaRecorder.SetOutputFile(writeFd.FileDescriptor);
-		mediaRecorder.SetVideoEncodingBitRate(10_000_000);
-		mediaRecorder.SetVideoFrameRate(30);
-		mediaRecorder.SetVideoEncoder(VideoEncoder.H264);
-		mediaRecorder.SetAudioEncoder(AudioEncoder.Aac);
-		mediaRecorder.Prepare();
+		var outputOptions = new FileDescriptorOutputOptions.Builder(writeFd).Build();
+		var name = "CameraX-recording.mp4";
+
+		var contentValues = new ContentValues();
+		contentValues.Put(MediaStore.Video.VideoColumns.DisplayName, name);
+
+		var mediaStoreOutput = new MediaStoreOutputOptions.Builder(
+				context.ContentResolver!,
+				MediaStore.Video.Media.ExternalContentUri!)
+			.SetContentValues(contentValues)
+			.Build();
+		
+		var captureListener = new CameraConsumer();
+		videoRecording = videoRecorder
+			.PrepareRecording(context, mediaStoreOutput)
+			.WithAudioEnabled()
+			.Start(ContextCompat.GetMainExecutor(context), captureListener);
 
-		// Start background streaming to .NET stream
 		pipeTask = Task.Run(async () =>
 		{
+			using var inputStream = new ParcelFileDescriptor.AutoCloseInputStream(readFd);
+			var buffer = ArrayPool<byte>.Shared.Rent(4096);
+
 			try
 			{
-				using var inputStream = new ParcelFileDescriptor.AutoCloseInputStream(readFd);
-				byte[] buffer = new byte[81920];
 				int bytesRead;
-				while ((bytesRead = inputStream.Read(buffer, 0, buffer.Length)) > 0 && !token.IsCancellationRequested)
+				long totalRead = 0;
+				while ((bytesRead = await inputStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)
 				{
-					await stream.WriteAsync(buffer.AsMemory(0, bytesRead), token);
-					await stream.FlushAsync(token);
+					await stream.WriteAsync(buffer.AsMemory(0, bytesRead), token).ConfigureAwait(false);
+					totalRead += bytesRead;
+				}
+
+				await stream.FlushAsync(token);
+				if (inputStream.Channel is not null)
+				{
+					await inputStream.Channel.TruncateAsync(totalRead).WaitAsync(token).ConfigureAwait(false);
 				}
 			}
-			catch (System.OperationCanceledException) { }
-			catch (Exception ex)
+			finally
 			{
-				System.Diagnostics.Debug.WriteLine($"[VideoRecorder] CopyToAsync failed: {ex}");
+				ArrayPool<byte>.Shared.Return(buffer);
 			}
 		}, token);
-
-		// Open camera and start recording session
-		var openTcs = new TaskCompletionSource();
-
-		var cameraCallback = new CameraStateListener(device =>
-		{
-			cameraDevice = device;
-
-			var surfaces = new List<Surface> { mediaRecorder.Surface! };
-			var sessionCallback = new CaptureStateListener(session =>
-			{
-				captureSession = session;
-				var builder = cameraDevice.CreateCaptureRequest(CameraTemplate.Record);
-				builder.AddTarget(mediaRecorder.Surface!);
-				session.SetRepeatingRequest(builder.Build(), null, cameraHandler);
-
-				mediaRecorder.Start();
-				openTcs.TrySetResult();
-			});
-
-			device.CreateCaptureSession(surfaces, sessionCallback, cameraHandler);
-		});
-
-		cameraManager.OpenCamera(cameraView.SelectedCamera!.DeviceId, cameraCallback, cameraHandler);
-
-		await openTcs.Task;
 	}
 
 	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
 	{
 		ArgumentNullException.ThrowIfNull(cameraExecutor);
-		try
+		if (videoRecording is null)
 		{
-			mediaRecorder?.Stop();
-		}
-		catch (Exception ex)
-		{
-			System.Diagnostics.Debug.WriteLine($"[VideoRecorder] Stop failed: {ex}");
+			return;
 		}
 
-		mediaRecorder?.Release();
-		mediaRecorder = null;
-
-		captureSession?.Close();
-		cameraDevice?.Close();
-		captureSession = null;
-		cameraDevice = null;
-
-		writeFd?.Close();
-		readFd?.Close();
-		writeFd = null;
-		readFd = null;
-
+		videoRecording.Stop();
 		if (pipeTask is not null)
 		{
 			await pipeTask;
 			pipeTask = null;
 		}
 
-		if (cameraThread != null)
-		{
-			cameraThread.QuitSafely();
-			cameraThread.Join();
-			cameraThread = null;
-			cameraHandler = null;
-		}
+		writeFd?.Close();
+		readFd?.Close();
+		writeFd = null;
+		readFd = null;
 	}
 
 	void SetImageCaptureTargetRotation(int rotation)
@@ -411,19 +390,6 @@ void SetImageCaptureTargetRotation(int rotation)
 		}
 	}
 
-	sealed class FutureCallback(Action<Java.Lang.Object?> action, Action<Throwable?> failure) : Java.Lang.Object, IFutureCallback
-	{
-		public void OnSuccess(Java.Lang.Object? value)
-		{
-			action.Invoke(value);
-		}
-
-		public void OnFailure(Throwable? throwable)
-		{
-			failure.Invoke(throwable);
-		}
-	}
-
 	sealed class ImageCallBack(ICameraView cameraView) : ImageCapture.OnImageCapturedCallback
 	{
 		public override void OnCaptureSuccess(IImageProxy image)
@@ -463,7 +429,7 @@ public override void OnCaptureSuccess(IImageProxy image)
 				image.Close();
 			}
 
-			static Plane? GetFirstPlane(Plane[]? planes)
+			static Image.Plane? GetFirstPlane(Image.Plane[]? planes)
 			{
 				if (planes is null || planes.Length is 0)
 				{
@@ -481,7 +447,7 @@ public override void OnError(ImageCaptureException exception)
 		}
 	}
 
-	sealed class ResolutionFilter(Android.Util.Size size) : Java.Lang.Object, IResolutionFilter
+	sealed class ResolutionFilter(Android.Util.Size size) : Object, IResolutionFilter
 	{
 		public Android.Util.Size TargetSize { get; set; } = size;
 
@@ -494,20 +460,8 @@ sealed class ResolutionFilter(Android.Util.Size size) : Java.Lang.Object, IResol
 		}
 	}
 
-	sealed class Observer(Action<Java.Lang.Object?> action) : Java.Lang.Object, IObserver
-	{
-		readonly Action<Java.Lang.Object?> observerAction = action;
-
-		public void OnChanged(Java.Lang.Object? value)
-		{
-			observerAction.Invoke(value);
-		}
-	}
-
 	sealed class OrientationListener(Action<int> callback, Context context) : OrientationEventListener(context)
 	{
-		readonly Action<int> callback = callback;
-
 		public override void OnOrientationChanged(int orientation)
 		{
 			if (orientation == OrientationUnknown)
@@ -520,21 +474,11 @@ public override void OnOrientationChanged(int orientation)
 	}
 }
 
-public class CameraStateListener : CameraDevice.StateCallback
+public class CameraConsumer : Object, IConsumer
 {
-	readonly Action<CameraDevice> onOpened;
-	public CameraStateListener(Action<CameraDevice> onOpened) => this.onOpened = onOpened;
-
-	public override void OnOpened(CameraDevice camera) => onOpened(camera);
-	public override void OnDisconnected(CameraDevice camera) => camera.Close();
-	public override void OnError(CameraDevice camera, [GeneratedEnum] CameraError error) => camera.Close();
-}
-
-public class CaptureStateListener : CameraCaptureSession.StateCallback
-{
-	readonly Action<CameraCaptureSession> onConfigured;
-	public CaptureStateListener(Action<CameraCaptureSession> onConfigured) => this.onConfigured = onConfigured;
-
-	public override void OnConfigured(CameraCaptureSession session) => onConfigured(session);
-	public override void OnConfigureFailed(CameraCaptureSession session) => session.Close();
+	public void Accept(Object? videoRecordEvent)
+	{
+		var videoRecorderEventStarted = videoRecordEvent as VideoRecordEvent.Start;
+		Console.WriteLine(videoRecorderEventStarted);
+	}
 }
\ No newline at end of file

From 50055e3b33fc0bfcf539b8fc1b42482e698787d5 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sun, 15 Jun 2025 14:02:38 +0300
Subject: [PATCH 03/40] Fix recording

---
 .../Views/CameraView/CameraViewPage.xaml      |  2 +-
 .../CameraManager.android.cs                  | 91 ++++++-------------
 .../CameraManager.macios.cs                   |  4 +-
 .../CameraManager.net.cs                      |  4 +-
 .../CameraManager.shared.cs                   |  8 +-
 .../CameraManager.tizen.cs                    |  4 +-
 .../CameraManager.windows.cs                  | 10 +-
 .../CommunityToolkit.Maui.Camera.csproj       | 14 +--
 .../Primitives/CameraViewDefaults.shared.cs   | 12 ++-
 .../Views/CameraView.shared.cs                | 14 +--
 10 files changed, 66 insertions(+), 97 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
index b84d6b6574..ced517c99d 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
@@ -77,10 +77,10 @@
                 <Button Command="{Binding StopCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
                         Text="StopCameraPreview" />
                 <Button Command="{Binding StartVideoRecordingCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}"
-                        CommandParameter="{Binding Stream}"
                         Text="StartVideoRecording" />
 
                 <Button Command="{Binding StopVideoRecordingCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
+                        CommandParameter="{Binding Stream}"
                         Text="StopVideoRecording" />
 
                 <Button Command="{Binding SaveVideoCommand}" Text="GetStream" />
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index efb0eeaa90..56bbd5c059 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -1,10 +1,10 @@
-using System.Buffers;
-using System.Runtime.Versioning;
+using System.Runtime.Versioning;
 using Android.Content;
 using Android.OS;
-using Android.Provider;
 using Android.Views;
+using Android.Widget;
 using AndroidX.Camera.Core;
+using AndroidX.Camera.Core.Internal.Utils;
 using AndroidX.Camera.Core.ResolutionSelector;
 using AndroidX.Camera.Lifecycle;
 using AndroidX.Camera.Video;
@@ -39,11 +39,7 @@ partial class CameraManager
 	ResolutionSelector? resolutionSelector;
 	ResolutionFilter? resolutionFilter;
 	OrientationListener? orientationListener;
-
-
-	Task? pipeTask;
-	ParcelFileDescriptor? writeFd;
-	ParcelFileDescriptor? readFd;
+	Java.IO.File? videoRecordingFile;
 
 	public void Dispose()
 	{
@@ -248,8 +244,8 @@ protected virtual async partial Task PlatformStartCameraPreview(CancellationToke
 		cameraControl = camera.CameraControl;
 
 		//start the camera with AutoFocus
-		MeteringPoint point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f, 0.1f);
-		FocusMeteringAction action = new FocusMeteringAction.Builder(point).Build();
+		var point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f, 0.1f);
+		var action = new FocusMeteringAction.Builder(point).Build();
 		camera.CameraControl.StartFocusAndMetering(action);
 
 		IsInitialized = true;
@@ -281,7 +277,7 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 		return ValueTask.CompletedTask;
 	}
 
-	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
+	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
 	{
 		if (previewView is null || processCameraProvider is null || cameraPreview is null || videoCapture is null || videoRecorder is null)
 		{
@@ -305,77 +301,42 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 		camera = processCameraProvider.BindToLifecycle(owner, cameraSelector, cameraPreview, videoCapture);
 
 		cameraControl = camera.CameraControl;
-		var pipe = ParcelFileDescriptor.CreatePipe()!;
-		writeFd = pipe[1];
-		readFd = pipe[0];
+		
+		videoRecordingFile = new Java.IO.File(context.CacheDir, $"{DateTime.UtcNow.Ticks}.mp4");
+		videoRecordingFile.DeleteOnExit();
 
-		var outputOptions = new FileDescriptorOutputOptions.Builder(writeFd).Build();
-		var name = "CameraX-recording.mp4";
+		var parcelFileDescriptor = ParcelFileDescriptor.Open(
+			videoRecordingFile,
+			ParcelFileMode.ReadWrite | ParcelFileMode.Create
+		);
 
-		var contentValues = new ContentValues();
-		contentValues.Put(MediaStore.Video.VideoColumns.DisplayName, name);
+		var outputOptions = new FileDescriptorOutputOptions.Builder(parcelFileDescriptor).Build();
 
-		var mediaStoreOutput = new MediaStoreOutputOptions.Builder(
-				context.ContentResolver!,
-				MediaStore.Video.Media.ExternalContentUri!)
-			.SetContentValues(contentValues)
-			.Build();
-		
 		var captureListener = new CameraConsumer();
 		videoRecording = videoRecorder
-			.PrepareRecording(context, mediaStoreOutput)
+			.PrepareRecording(context, outputOptions)
 			.WithAudioEnabled()
-			.Start(ContextCompat.GetMainExecutor(context), captureListener);
-
-		pipeTask = Task.Run(async () =>
-		{
-			using var inputStream = new ParcelFileDescriptor.AutoCloseInputStream(readFd);
-			var buffer = ArrayPool<byte>.Shared.Rent(4096);
-
-			try
-			{
-				int bytesRead;
-				long totalRead = 0;
-				while ((bytesRead = await inputStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)
-				{
-					await stream.WriteAsync(buffer.AsMemory(0, bytesRead), token).ConfigureAwait(false);
-					totalRead += bytesRead;
-				}
-
-				await stream.FlushAsync(token);
-				if (inputStream.Channel is not null)
-				{
-					await inputStream.Channel.TruncateAsync(totalRead).WaitAsync(token).ConfigureAwait(false);
-				}
-			}
-			finally
-			{
-				ArrayPool<byte>.Shared.Return(buffer);
-			}
-		}, token);
+			.Start(ContextCompat.GetMainExecutor(context)!, captureListener);
 	}
 
-	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
+	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
 		ArgumentNullException.ThrowIfNull(cameraExecutor);
-		if (videoRecording is null)
+		if (videoRecording is null || videoRecordingFile is null)
 		{
-			return;
+			return Stream.Null;
 		}
 
 		videoRecording.Stop();
-		if (pipeTask is not null)
-		{
-			await pipeTask;
-			pipeTask = null;
-		}
 
-		writeFd?.Close();
-		readFd?.Close();
-		writeFd = null;
-		readFd = null;
+		await using var inputStream = new FileStream(videoRecordingFile.AbsolutePath, FileMode.Open);
+		var memoryStream = new MemoryStream();
+		await inputStream.CopyToAsync(memoryStream, token);
+		memoryStream.Position = 0;
+		return memoryStream;
 	}
 
+
 	void SetImageCaptureTargetRotation(int rotation)
 	{
 		if (imageCapture is not null)
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 9e45115c5f..104cd62dfc 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -191,8 +191,8 @@ protected virtual partial void PlatformDisconnect()
 	{
 	}
 
-	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException("notSupportedMessage");
-	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException("notSupportedMessage");
+	protected virtual partial Task PlatformStartVideoRecording(CancellationToken token) => throw new NotSupportedException("notSupportedMessage");
+	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException("notSupportedMessage");
 
 
 	protected virtual async partial ValueTask PlatformTakePicture(CancellationToken token)
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
index 445d88129e..2266463f98 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
@@ -14,8 +14,8 @@ partial class CameraManager
 
 	public partial ValueTask UpdateCaptureResolution(Size resolution, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
-	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
-	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStartVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 	protected virtual partial Task PlatformStartCameraPreview(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
 	protected virtual partial void PlatformStopCameraPreview() => throw new NotSupportedException(notSupportedMessage);
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index cf17a4ff7f..ba8b6c7e59 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -56,14 +56,14 @@ public async Task<bool> ArePermissionsGranted()
 	/// Starts the video recording.
 	/// </summary>
 	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
-	public Task StartVideoRecording(Stream stream, CancellationToken token) => PlatformStartVideoRecording(stream, token);
+	public Task StartVideoRecording(CancellationToken token) => PlatformStartVideoRecording(token);
 
 
 	/// <summary>
 	/// Starts the video recording.
 	/// </summary>
 	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
-	public Task StopVideoRecording(CancellationToken token) => PlatformStopVideoRecording(token);
+	public Task<Stream> StopVideoRecording(CancellationToken token) => PlatformStopVideoRecording(token);
 
 	/// <summary>
 	/// Stops the camera preview.
@@ -145,7 +145,7 @@ public async ValueTask UpdateCurrentCamera(CameraInfo? cameraInfo, CancellationT
 	/// </summary>
 	protected virtual partial void PlatformStopCameraPreview();
 
-	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token);
+	protected virtual partial Task PlatformStartVideoRecording(CancellationToken token);
 
-	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token);
+	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
index 4030848508..07a70b38b6 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
@@ -23,7 +23,7 @@ partial class CameraManager
 	protected virtual partial void PlatformDisconnect() => throw new NotSupportedException(notSupportedMessage);
 
 	protected virtual partial ValueTask PlatformTakePicture(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
-	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
-	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStartVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index 96fc85caaf..bb91a76611 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -205,13 +205,15 @@ protected async Task PlatformUpdateResolution(Size resolution, CancellationToken
 		}
 	}
 
-	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
+	MemoryStream? stream;
+	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
 	{
 		if (!IsInitialized || mediaCapture is null || mediaElement is null)
 		{
 			return;
 		}
 
+		stream = new MemoryStream();
 		MediaEncodingProfile profile = MediaEncodingProfile.CreateMp4(VideoEncodingQuality.Auto);
 		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, stream.AsRandomAccessStream());
 
@@ -233,16 +235,18 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 		}
 	}
 
-	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
+	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
 		if (!IsInitialized || mediaElement is null)
 		{
-			return;
+			return Stream.Null;
 		}
 
 		if (mediaRecording != null)
 		{
 			await mediaRecording.StopAsync();
 		}
+
+		return stream ?? Stream.Null;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
index bd22368e3c..c87e48edba 100644
--- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
+++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
@@ -46,27 +46,27 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true"/>
-    <None Include="ReadMe.txt" pack="true" PackagePath="."/>
+    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true" />
+    <None Include="ReadMe.txt" pack="true" PackagePath="." />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
     <!-- Required NuGet Packages -->
-    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.1" />
-    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.1" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.2.2" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.2.2" />
 
     <!--  Ensure Linker does not remove required libraries -->
     <None Include="linker.xml" Pack="true" PackagePath="build\$(PackageId).LinkerConfigurationFile.xml" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))"/>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" Condition=" '$(Configuration)'=='Release' " PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
-    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
+    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
index 4e603a6765..6a7b596c80 100644
--- a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -62,15 +62,19 @@ internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)
 		return new Command(_ => cameraView.StopCameraPreview());
 	}
 
-	internal static Command<Stream> CreateStartVideoRecordingCommand(BindableObject bindable)
+	internal static ICommand CreateStartVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new(async stream => await cameraView.StartVideoRecording(stream, CancellationToken.None).ConfigureAwait(false));
+		return new Command(async _  => await cameraView.StartVideoRecording(CancellationToken.None).ConfigureAwait(false));
 	}
 
-	internal static ICommand CreateStopVideoRecordingCommand(BindableObject bindable)
+	internal static Command<Stream> CreateStopVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new Command(_ => cameraView.StopVideoRecording(CancellationToken.None));
+		return new Command<Stream>(async stream =>
+		{
+			var resultStream = await cameraView.StopVideoRecording(CancellationToken.None);
+			await resultStream.CopyToAsync(stream);
+		});
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index f4202908da..dd31703e1b 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -83,13 +83,13 @@ public partial class CameraView : View, ICameraView
 	/// Backing BindableProperty for the <see cref="StartCameraPreviewCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StartVideoRecordingCommandProperty =
-		BindableProperty.CreateReadOnly(nameof(StartVideoRecordingCommand), typeof(Command<CancellationToken>), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStartVideoRecordingCommand).BindableProperty;
+		BindableProperty.CreateReadOnly(nameof(StartVideoRecordingCommand), typeof(ICommand), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStartVideoRecordingCommand).BindableProperty;
 
 	/// <summary>
 	/// Backing BindableProperty for the <see cref="StopCameraPreviewCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StopVideoRecordingCommandProperty =
-		BindableProperty.CreateReadOnly(nameof(StopVideoRecordingCommand), typeof(ICommand), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopVideoRecordingCommand).BindableProperty;
+		BindableProperty.CreateReadOnly(nameof(StopVideoRecordingCommand), typeof(Command<Stream>), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopVideoRecordingCommand).BindableProperty;
 
 	readonly WeakEventManager weakEventManager = new();
 
@@ -143,7 +143,7 @@ public event EventHandler<MediaCapturedEventArgs> MediaCaptured
 	/// <summary>
 	/// 
 	/// </summary>
-	public Command<Stream> StartVideoRecordingCommand => (Command<Stream>)GetValue(StartVideoRecordingCommandProperty);
+	public ICommand StartVideoRecordingCommand => (ICommand)GetValue(StartVideoRecordingCommandProperty);
 
 	/// <summary>
 	/// Gets the Command that stops the camera preview.
@@ -153,7 +153,7 @@ public event EventHandler<MediaCapturedEventArgs> MediaCaptured
 	/// <summary>
 	/// 
 	/// </summary>
-	public ICommand StopVideoRecordingCommand => (ICommand)GetValue(StopVideoRecordingCommandProperty);
+	public Command<Stream> StopVideoRecordingCommand => (Command<Stream>)GetValue(StopVideoRecordingCommandProperty);
 
 	/// <summary>
 	/// Gets or sets the <see cref="CameraFlashMode"/>.
@@ -241,11 +241,11 @@ public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
 
 	/// <inheritdoc cref="ICameraView.StartCameraPreview"/>
-	public Task StartVideoRecording(Stream stream, CancellationToken token) =>
-		Handler.CameraManager.StartVideoRecording(stream, token);
+	public Task StartVideoRecording(CancellationToken token) =>
+		Handler.CameraManager.StartVideoRecording(token);
 
 	/// <inheritdoc cref="ICameraView.StopCameraPreview"/>
-	public Task StopVideoRecording(CancellationToken token) =>
+	public Task<Stream> StopVideoRecording(CancellationToken token) =>
 		Handler.CameraManager.StopVideoRecording(token);
 
 	void ICameraView.OnMediaCaptured(Stream imageData)

From bcdfcaf9300111e26b7777998c3e90e84e4cc656 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sun, 15 Jun 2025 14:11:06 +0300
Subject: [PATCH 04/40] Fix windows recording

---
 src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs  | 7 ++++++-
 src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs | 8 ++++----
 .../Primitives/CameraViewDefaults.shared.cs               | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index ba8b6c7e59..7cfb57236e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -63,7 +63,12 @@ public async Task<bool> ArePermissionsGranted()
 	/// Starts the video recording.
 	/// </summary>
 	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
-	public Task<Stream> StopVideoRecording(CancellationToken token) => PlatformStopVideoRecording(token);
+	public async Task<Stream> StopVideoRecording(CancellationToken token)
+	{
+		var stream = await PlatformStopVideoRecording(token);
+		stream.Position = 0;
+		return stream;
+	}
 
 	/// <summary>
 	/// Stops the camera preview.
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index bb91a76611..4b94d13798 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -205,7 +205,7 @@ protected async Task PlatformUpdateResolution(Size resolution, CancellationToken
 		}
 	}
 
-	MemoryStream? stream;
+	MemoryStream? recordingStream;
 	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
 	{
 		if (!IsInitialized || mediaCapture is null || mediaElement is null)
@@ -213,9 +213,9 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 			return;
 		}
 
-		stream = new MemoryStream();
+		recordingStream = new MemoryStream();
 		MediaEncodingProfile profile = MediaEncodingProfile.CreateMp4(VideoEncodingQuality.Auto);
-		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, stream.AsRandomAccessStream());
+		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, recordingStream.AsRandomAccessStream());
 
 		frameSource = mediaCapture.FrameSources.FirstOrDefault(source =>
 			source.Value.Info.MediaStreamType == MediaStreamType.VideoRecord
@@ -247,6 +247,6 @@ protected virtual async partial Task<Stream> PlatformStopVideoRecording(Cancella
 			await mediaRecording.StopAsync();
 		}
 
-		return stream ?? Stream.Null;
+		return recordingStream ?? Stream.Null;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
index 6a7b596c80..ae0714b468 100644
--- a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -73,7 +73,7 @@ internal static Command<Stream> CreateStopVideoRecordingCommand(BindableObject b
 		var cameraView = (CameraView)bindable;
 		return new Command<Stream>(async stream =>
 		{
-			var resultStream = await cameraView.StopVideoRecording(CancellationToken.None);
+			await using var resultStream = await cameraView.StopVideoRecording(CancellationToken.None);
 			await resultStream.CopyToAsync(stream);
 		});
 	}

From ae96f4d1dc40203473318404da8291df66113fe0 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sun, 15 Jun 2025 16:07:26 +0300
Subject: [PATCH 05/40] check for null

---
 .../CameraManager.android.cs                     |  4 +---
 .../CommunityToolkit.Maui.Camera.csproj          | 16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 56bbd5c059..2ba7221fec 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -2,9 +2,7 @@
 using Android.Content;
 using Android.OS;
 using Android.Views;
-using Android.Widget;
 using AndroidX.Camera.Core;
-using AndroidX.Camera.Core.Internal.Utils;
 using AndroidX.Camera.Core.ResolutionSelector;
 using AndroidX.Camera.Lifecycle;
 using AndroidX.Camera.Video;
@@ -308,7 +306,7 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 		var parcelFileDescriptor = ParcelFileDescriptor.Open(
 			videoRecordingFile,
 			ParcelFileMode.ReadWrite | ParcelFileMode.Create
-		);
+		) ?? throw new IOException("Unable to create recording");
 
 		var outputOptions = new FileDescriptorOutputOptions.Builder(parcelFileDescriptor).Build();
 
diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
index c87e48edba..fe17db4971 100644
--- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
+++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
@@ -38,7 +38,7 @@
     <Description>Camera contains CameraView, a view for displaying a preview of the camera output and other camera related functionalities in your .NET MAUI app.</Description>
     <PackageIcon>icon.png</PackageIcon>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.0-pre1</Version>
+    <Version>99.0.0</Version>
     <PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>dotnet,maui,toolkit,kit,communitytoolkit,dotnetcommunitytoolkit,cameraview,camera,photo</PackageTags>
@@ -46,27 +46,27 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true" />
-    <None Include="ReadMe.txt" pack="true" PackagePath="." />
+    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true"/>
+    <None Include="ReadMe.txt" pack="true" PackagePath="."/>
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
     <!-- Required NuGet Packages -->
-    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.2.2" />
-    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.2.2" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.1" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.1" />
 
     <!--  Ensure Linker does not remove required libraries -->
     <None Include="linker.xml" Pack="true" PackagePath="build\$(PackageId).LinkerConfigurationFile.xml" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))"/>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" Condition=" '$(Configuration)'=='Release' " PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
-    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
+    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
   </ItemGroup>
 
 </Project>

From a866b74b064923736ecd7e28f87e5aa892fece5b Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sun, 15 Jun 2025 16:53:41 +0300
Subject: [PATCH 06/40] Fix to work with old devices

---
 .../CameraManager.android.cs                      | 15 ++++-----------
 .../CommunityToolkit.Maui.Camera.csproj           |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 2ba7221fec..f04982bf3b 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -294,27 +294,22 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 
 		var cameraSelector = cameraView.SelectedCamera.CameraSelector ?? throw new CameraException($"Unable to retrieve {nameof(CameraSelector)}");
 
-		var owner = (ILifecycleOwner)context;
 		processCameraProvider.UnbindAll();
-		camera = processCameraProvider.BindToLifecycle(owner, cameraSelector, cameraPreview, videoCapture);
+		camera = processCameraProvider.BindToLifecycle((ILifecycleOwner)context, cameraSelector, cameraPreview, videoCapture);
 
 		cameraControl = camera.CameraControl;
 		
 		videoRecordingFile = new Java.IO.File(context.CacheDir, $"{DateTime.UtcNow.Ticks}.mp4");
+		videoRecordingFile.CreateNewFile();
 		videoRecordingFile.DeleteOnExit();
 
-		var parcelFileDescriptor = ParcelFileDescriptor.Open(
-			videoRecordingFile,
-			ParcelFileMode.ReadWrite | ParcelFileMode.Create
-		) ?? throw new IOException("Unable to create recording");
-
-		var outputOptions = new FileDescriptorOutputOptions.Builder(parcelFileDescriptor).Build();
+		var outputOptions = new FileOutputOptions.Builder(videoRecordingFile).Build();
 
 		var captureListener = new CameraConsumer();
 		videoRecording = videoRecorder
 			.PrepareRecording(context, outputOptions)
 			.WithAudioEnabled()
-			.Start(ContextCompat.GetMainExecutor(context)!, captureListener);
+			.Start(ContextCompat.GetMainExecutor(context), captureListener);
 	}
 
 	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
@@ -437,7 +432,5 @@ public class CameraConsumer : Object, IConsumer
 {
 	public void Accept(Object? videoRecordEvent)
 	{
-		var videoRecorderEventStarted = videoRecordEvent as VideoRecordEvent.Start;
-		Console.WriteLine(videoRecorderEventStarted);
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
index fe17db4971..623a6e10a2 100644
--- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
+++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
@@ -38,7 +38,7 @@
     <Description>Camera contains CameraView, a view for displaying a preview of the camera output and other camera related functionalities in your .NET MAUI app.</Description>
     <PackageIcon>icon.png</PackageIcon>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>99.0.0</Version>
+    <Version>99.0.1</Version>
     <PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>dotnet,maui,toolkit,kit,communitytoolkit,dotnetcommunitytoolkit,cameraview,camera,photo</PackageTags>

From c72a293980b8dc1bdd53c12f185ac6848d9cdc1c Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sat, 21 Jun 2025 16:33:35 +0300
Subject: [PATCH 07/40] Add camera extensions to android

---
 .../Views/CameraView/CameraViewPage.xaml      |  1 +
 .../Views/CameraView/CameraViewPage.xaml.cs   |  7 +++
 .../CameraManager.android.cs                  | 56 +++++++++++++++----
 .../CommunityToolkit.Maui.Camera.csproj       | 18 ++++--
 .../Views/CameraView.shared.cs                | 11 ++++
 5 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
index ced517c99d..c504a0a9c4 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
@@ -84,6 +84,7 @@
                         Text="StopVideoRecording" />
 
                 <Button Command="{Binding SaveVideoCommand}" Text="GetStream" />
+                <Button Clicked="SetNightMode" Text="Set Night Mode (Android)" />
 
             </FlexLayout>
         </Grid>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index 3ee62783b4..a11810aa86 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -94,4 +94,11 @@ void ZoomOut(object? sender, EventArgs e)
 	{
 		Camera.ZoomFactor -= 1.0f;
 	}
+
+	void SetNightMode(object? sender, EventArgs e)
+	{
+#if ANDROID
+		Camera.SetExtensionMode(AndroidX.Camera.Extensions.ExtensionMode.Night);
+#endif
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index f04982bf3b..53606b4349 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -1,9 +1,9 @@
 using System.Runtime.Versioning;
 using Android.Content;
-using Android.OS;
 using Android.Views;
 using AndroidX.Camera.Core;
 using AndroidX.Camera.Core.ResolutionSelector;
+using AndroidX.Camera.Extensions;
 using AndroidX.Camera.Lifecycle;
 using AndroidX.Camera.Video;
 using AndroidX.Core.Content;
@@ -38,6 +38,21 @@ partial class CameraManager
 	ResolutionFilter? resolutionFilter;
 	OrientationListener? orientationListener;
 	Java.IO.File? videoRecordingFile;
+	int extensionMode = ExtensionMode.Auto;
+
+	public void SetExtensionMode(int mode)
+	{
+		extensionMode = mode;
+		if (cameraView.SelectedCamera is null || processCameraProvider is null || cameraPreview is null || imageCapture is null || videoCapture is null)
+		{
+			return;
+		}
+
+		var cameraSelector = EnableModes(cameraView.SelectedCamera);
+		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, imageCapture, videoCapture);
+
+		cameraControl = camera.CameraControl;
+	}
 
 	public void Dispose()
 	{
@@ -54,6 +69,7 @@ public NativePlatformCameraPreviewView CreatePlatformView()
 		{
 			previewView.SetScaleType(NativePlatformCameraPreviewView.ScaleType.FitCenter);
 		}
+
 		cameraExecutor = Executors.NewSingleThreadExecutor() ?? throw new CameraException($"Unable to retrieve {nameof(IExecutorService)}");
 		orientationListener = new OrientationListener(SetImageCaptureTargetRotation, context);
 		orientationListener.Enable();
@@ -233,15 +249,10 @@ protected virtual async partial Task PlatformStartCameraPreview(CancellationToke
 			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ?? throw new CameraException("No camera available on device");
 		}
 
-		var cameraSelector = cameraView.SelectedCamera.CameraSelector ?? throw new CameraException($"Unable to retrieve {nameof(CameraSelector)}");
-
-		var owner = (ILifecycleOwner)context;
-		processCameraProvider.UnbindAll();
-		camera = processCameraProvider.BindToLifecycle(owner, cameraSelector, cameraPreview, imageCapture);
-
+		var cameraSelector = EnableModes(cameraView.SelectedCamera);
+		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, imageCapture);
 		cameraControl = camera.CameraControl;
 
-		//start the camera with AutoFocus
 		var point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f, 0.1f);
 		var action = new FocusMeteringAction.Builder(point).Build();
 		camera.CameraControl.StartFocusAndMetering(action);
@@ -292,10 +303,9 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ?? throw new CameraException("No camera available on device");
 		}
 
-		var cameraSelector = cameraView.SelectedCamera.CameraSelector ?? throw new CameraException($"Unable to retrieve {nameof(CameraSelector)}");
 
-		processCameraProvider.UnbindAll();
-		camera = processCameraProvider.BindToLifecycle((ILifecycleOwner)context, cameraSelector, cameraPreview, videoCapture);
+		var cameraSelector = EnableModes(cameraView.SelectedCamera);
+		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, videoCapture);
 
 		cameraControl = camera.CameraControl;
 		
@@ -329,6 +339,30 @@ protected virtual async partial Task<Stream> PlatformStopVideoRecording(Cancella
 		return memoryStream;
 	}
 
+	CameraSelector EnableModes(CameraInfo selectedCamera)
+	{
+		var cameraSelector = selectedCamera.CameraSelector ?? throw new CameraException($"Unable to retrieve {nameof(CameraSelector)}");
+		var androidCameraProvider = (AndroidX.Camera.Core.ICameraProvider)(ProcessCameraProvider.GetInstance(context).Get() ?? throw new CameraException($"Unable to retrieve {nameof(ProcessCameraProvider)}"));
+
+		var extensionsManagerFuture = ExtensionsManager.GetInstanceAsync(context, androidCameraProvider);
+		var extensionsManager = (ExtensionsManager)extensionsManagerFuture.Get()!;
+
+		if (extensionsManager.IsExtensionAvailable(cameraSelector, extensionMode))
+		{
+			return extensionsManager.GetExtensionEnabledCameraSelector(cameraSelector, extensionMode);
+		}
+
+		return cameraSelector;
+	}
+
+	ICamera RebindCamera(ProcessCameraProvider provider, CameraSelector cameraSelector, params UseCase[] useCases)
+	{
+		provider.UnbindAll();
+		return provider.BindToLifecycle(
+			(ILifecycleOwner)context,
+			cameraSelector,
+			useCases);
+	}
 
 	void SetImageCaptureTargetRotation(int rotation)
 	{
diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
index 623a6e10a2..512ea62554 100644
--- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
+++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
@@ -38,7 +38,7 @@
     <Description>Camera contains CameraView, a view for displaying a preview of the camera output and other camera related functionalities in your .NET MAUI app.</Description>
     <PackageIcon>icon.png</PackageIcon>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>99.0.1</Version>
+    <Version>99.0.2</Version>
     <PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>dotnet,maui,toolkit,kit,communitytoolkit,dotnetcommunitytoolkit,cameraview,camera,photo</PackageTags>
@@ -46,8 +46,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true"/>
-    <None Include="ReadMe.txt" pack="true" PackagePath="."/>
+    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true" />
+    <None Include="ReadMe.txt" pack="true" PackagePath="." />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
@@ -60,13 +60,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))"/>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="[$(MauiPackageVersion),$(NextMauiPackageVersion))" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" Condition=" '$(Configuration)'=='Release' " PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
-    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
+    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="..\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
+    <PackageReference Include="Xamarin.AndroidX.Camera.Extensions">
+      <Version>1.4.1</Version>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index dd31703e1b..af57a41155 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -228,6 +228,17 @@ public async ValueTask<IReadOnlyList<CameraInfo>> GetAvailableCameras(Cancellati
 		return CameraProvider.AvailableCameras;
 	}
 
+#if ANDROID
+	/// <summary>
+	/// Set Extension Mode
+	/// </summary>
+	/// <param name="mode">mode</param>
+	public void SetExtensionMode(int mode)
+	{
+		Handler.CameraManager.SetExtensionMode(mode);
+	}
+#endif
+
 	/// <inheritdoc cref="ICameraView.CaptureImage"/>
 	public ValueTask CaptureImage(CancellationToken token) =>
 		Handler.CameraManager.TakePicture(token);

From 4fbfac98d7743104538cbaf29c762ec08e70272d Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sat, 21 Jun 2025 18:32:09 +0300
Subject: [PATCH 08/40] Fix crash

---
 .../Views/CameraView/CameraViewPage.xaml.cs   |  6 +-
 .../CameraManager.android.cs                  | 88 ++++++++++++-------
 .../CommunityToolkit.Maui.Camera.csproj       |  2 +-
 .../Views/CameraView.shared.cs                |  4 +-
 4 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index a11810aa86..0ce241534f 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -95,10 +95,12 @@ void ZoomOut(object? sender, EventArgs e)
 		Camera.ZoomFactor -= 1.0f;
 	}
 
-	void SetNightMode(object? sender, EventArgs e)
+	async void SetNightMode(object? sender, EventArgs e)
 	{
 #if ANDROID
-		Camera.SetExtensionMode(AndroidX.Camera.Extensions.ExtensionMode.Night);
+		await Camera.SetExtensionMode(AndroidX.Camera.Extensions.ExtensionMode.Night);
+#else
+await Task.CompletedTask;
 #endif
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 53606b4349..d7486662be 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -21,7 +21,8 @@ namespace CommunityToolkit.Maui.Core;
 [SupportedOSPlatform("android21.0")]
 partial class CameraManager
 {
-	readonly Context context = mauiContext.Context ?? throw new CameraException($"Unable to retrieve {nameof(Context)}");
+	readonly Context context =
+		mauiContext.Context ?? throw new CameraException($"Unable to retrieve {nameof(Context)}");
 
 	NativePlatformCameraPreviewView? previewView;
 	IExecutorService? cameraExecutor;
@@ -40,15 +41,16 @@ partial class CameraManager
 	Java.IO.File? videoRecordingFile;
 	int extensionMode = ExtensionMode.Auto;
 
-	public void SetExtensionMode(int mode)
+	public async Task SetExtensionMode(int mode)
 	{
 		extensionMode = mode;
-		if (cameraView.SelectedCamera is null || processCameraProvider is null || cameraPreview is null || imageCapture is null || videoCapture is null)
+		if (cameraView.SelectedCamera is null || processCameraProvider is null || cameraPreview is null ||
+		    imageCapture is null || videoCapture is null)
 		{
 			return;
 		}
 
-		var cameraSelector = EnableModes(cameraView.SelectedCamera);
+		var cameraSelector = await EnableModes(cameraView.SelectedCamera);
 		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, imageCapture, videoCapture);
 
 		cameraControl = camera.CameraControl;
@@ -70,7 +72,8 @@ public NativePlatformCameraPreviewView CreatePlatformView()
 			previewView.SetScaleType(NativePlatformCameraPreviewView.ScaleType.FitCenter);
 		}
 
-		cameraExecutor = Executors.NewSingleThreadExecutor() ?? throw new CameraException($"Unable to retrieve {nameof(IExecutorService)}");
+		cameraExecutor = Executors.NewSingleThreadExecutor() ??
+		                 throw new CameraException($"Unable to retrieve {nameof(IExecutorService)}");
 		orientationListener = new OrientationListener(SetImageCaptureTargetRotation, context);
 		orientationListener.Enable();
 
@@ -97,7 +100,7 @@ public async partial ValueTask UpdateCaptureResolution(Size resolution, Cancella
 		if (resolutionFilter is not null)
 		{
 			if (Math.Abs(resolutionFilter.TargetSize.Width - resolution.Width) < double.Epsilon &&
-				Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
+			    Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
 			{
 				return;
 			}
@@ -117,9 +120,9 @@ public async partial ValueTask UpdateCaptureResolution(Size resolution, Cancella
 		resolutionSelector?.Dispose();
 
 		resolutionSelector = new ResolutionSelector.Builder()
-		.SetAllowedResolutionMode(ResolutionSelector.PreferHigherResolutionOverCaptureRate)
-		.SetResolutionFilter(resolutionFilter)
-		.Build();
+			.SetAllowedResolutionMode(ResolutionSelector.PreferHigherResolutionOverCaptureRate)
+			.SetResolutionFilter(resolutionFilter)
+			.Build();
 
 		if (IsInitialized)
 		{
@@ -182,7 +185,9 @@ protected virtual async partial Task PlatformConnectCamera(CancellationToken tok
 
 		cameraProviderFuture.AddListener(new Runnable(async () =>
 		{
-			processCameraProvider = (ProcessCameraProvider)(cameraProviderFuture.Get() ?? throw new CameraException($"Unable to retrieve {nameof(ProcessCameraProvider)}"));
+			processCameraProvider = (ProcessCameraProvider)(cameraProviderFuture.Get() ??
+			                                                throw new CameraException(
+				                                                $"Unable to retrieve {nameof(ProcessCameraProvider)}"));
 
 			if (cameraProvider.AvailableCameras is null)
 			{
@@ -197,7 +202,6 @@ protected virtual async partial Task PlatformConnectCamera(CancellationToken tok
 			await StartUseCase(token);
 
 			cameraProviderTCS.SetResult();
-
 		}), ContextCompat.GetMainExecutor(context));
 
 		await cameraProviderTCS.Task.WaitAsync(token);
@@ -219,9 +223,9 @@ protected async Task StartUseCase(CancellationToken token)
 		cameraPreview.SetSurfaceProvider(cameraExecutor, previewView?.SurfaceProvider);
 
 		imageCapture = new ImageCapture.Builder()
-		.SetCaptureMode(ImageCapture.CaptureModeMaximizeQuality)
-		.SetResolutionSelector(resolutionSelector)
-		.Build();
+			.SetCaptureMode(ImageCapture.CaptureModeMaximizeQuality)
+			.SetResolutionSelector(resolutionSelector)
+			.Build();
 
 		videoRecorder = new Recorder.Builder()
 			.SetExecutor(cameraExecutor)
@@ -246,14 +250,16 @@ protected virtual async partial Task PlatformStartCameraPreview(CancellationToke
 				await cameraProvider.RefreshAvailableCameras(token);
 			}
 
-			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ?? throw new CameraException("No camera available on device");
+			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ??
+			                            throw new CameraException("No camera available on device");
 		}
 
-		var cameraSelector = EnableModes(cameraView.SelectedCamera);
+		var cameraSelector = await EnableModes(cameraView.SelectedCamera);
 		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, imageCapture);
 		cameraControl = camera.CameraControl;
 
-		var point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f, 0.1f);
+		var point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f,
+			0.1f);
 		var action = new FocusMeteringAction.Builder(point).Build();
 		camera.CameraControl.StartFocusAndMetering(action);
 
@@ -274,7 +280,6 @@ protected virtual partial void PlatformStopCameraPreview()
 
 	protected virtual partial void PlatformDisconnect()
 	{
-
 	}
 
 	protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
@@ -288,7 +293,8 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 
 	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
 	{
-		if (previewView is null || processCameraProvider is null || cameraPreview is null || videoCapture is null || videoRecorder is null)
+		if (previewView is null || processCameraProvider is null || cameraPreview is null || videoCapture is null ||
+		    videoRecorder is null)
 		{
 			return;
 		}
@@ -300,15 +306,16 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 				await cameraProvider.RefreshAvailableCameras(token);
 			}
 
-			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ?? throw new CameraException("No camera available on device");
+			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ??
+			                            throw new CameraException("No camera available on device");
 		}
 
 
-		var cameraSelector = EnableModes(cameraView.SelectedCamera);
+		var cameraSelector = await EnableModes(cameraView.SelectedCamera);
 		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, videoCapture);
 
 		cameraControl = camera.CameraControl;
-		
+
 		videoRecordingFile = new Java.IO.File(context.CacheDir, $"{DateTime.UtcNow.Ticks}.mp4");
 		videoRecordingFile.CreateNewFile();
 		videoRecordingFile.DeleteOnExit();
@@ -339,19 +346,33 @@ protected virtual async partial Task<Stream> PlatformStopVideoRecording(Cancella
 		return memoryStream;
 	}
 
-	CameraSelector EnableModes(CameraInfo selectedCamera)
+	async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
 	{
+		var cameraFutureCts = new TaskCompletionSource();
 		var cameraSelector = selectedCamera.CameraSelector ?? throw new CameraException($"Unable to retrieve {nameof(CameraSelector)}");
-		var androidCameraProvider = (AndroidX.Camera.Core.ICameraProvider)(ProcessCameraProvider.GetInstance(context).Get() ?? throw new CameraException($"Unable to retrieve {nameof(ProcessCameraProvider)}"));
-
-		var extensionsManagerFuture = ExtensionsManager.GetInstanceAsync(context, androidCameraProvider);
-		var extensionsManager = (ExtensionsManager)extensionsManagerFuture.Get()!;
-
-		if (extensionsManager.IsExtensionAvailable(cameraSelector, extensionMode))
+		var cameraProviderFuture = ProcessCameraProvider.GetInstance(context) ?? throw new CameraException($"Unable to retrieve {nameof(ProcessCameraProvider)}");
+		cameraProviderFuture.AddListener(new Runnable(() =>
 		{
-			return extensionsManager.GetExtensionEnabledCameraSelector(cameraSelector, extensionMode);
-		}
-
+			if (cameraProviderFuture.Get() is not AndroidX.Camera.Core.ICameraProvider androidCameraProvider)
+			{
+				cameraFutureCts.SetResult();
+				return;
+			}
+			
+			var extensionsManagerFuture = ExtensionsManager.GetInstanceAsync(context, androidCameraProvider);
+			extensionsManagerFuture.AddListener(new Runnable(() =>
+			{
+				var extensionsManager = (ExtensionsManager)extensionsManagerFuture.Get()!;
+				if (extensionsManager.IsExtensionAvailable(cameraSelector, extensionMode))
+				{
+					cameraSelector = extensionsManager.GetExtensionEnabledCameraSelector(cameraSelector, extensionMode);
+				}
+				
+				cameraFutureCts.SetResult();
+			}), ContextCompat.GetMainExecutor(context));
+		}), ContextCompat.GetMainExecutor(context));
+		
+		await cameraFutureCts.Task;
 		return cameraSelector;
 	}
 
@@ -441,7 +462,8 @@ sealed class ResolutionFilter(Android.Util.Size size) : Object, IResolutionFilte
 
 		public IList<Android.Util.Size> Filter(IList<Android.Util.Size> supportedSizes, int rotationDegrees)
 		{
-			var filteredList = supportedSizes.Where(size => size.Width <= TargetSize.Width && size.Height <= TargetSize.Height)
+			var filteredList = supportedSizes
+				.Where(size => size.Width <= TargetSize.Width && size.Height <= TargetSize.Height)
 				.OrderByDescending(size => size.Width * size.Height).ToList();
 
 			return filteredList.Count is 0 ? supportedSizes : filteredList;
diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
index 512ea62554..3d1a18d683 100644
--- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
+++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
@@ -38,7 +38,7 @@
     <Description>Camera contains CameraView, a view for displaying a preview of the camera output and other camera related functionalities in your .NET MAUI app.</Description>
     <PackageIcon>icon.png</PackageIcon>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>99.0.2</Version>
+    <Version>99.0.4</Version>
     <PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>dotnet,maui,toolkit,kit,communitytoolkit,dotnetcommunitytoolkit,cameraview,camera,photo</PackageTags>
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index af57a41155..ea4cd62eda 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -233,9 +233,9 @@ public async ValueTask<IReadOnlyList<CameraInfo>> GetAvailableCameras(Cancellati
 	/// Set Extension Mode
 	/// </summary>
 	/// <param name="mode">mode</param>
-	public void SetExtensionMode(int mode)
+	public Task SetExtensionMode(int mode)
 	{
-		Handler.CameraManager.SetExtensionMode(mode);
+		return Handler.CameraManager.SetExtensionMode(mode);
 	}
 #endif
 

From 803e21f97940a2a25407422473becd8943831cf6 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Mon, 23 Jun 2025 11:09:27 +0300
Subject: [PATCH 09/40] updatr csproj

---
 .../CameraManager.android.cs                        |  3 ++-
 .../CommunityToolkit.Maui.Camera.csproj             | 13 ++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index d7486662be..4a97de5792 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -353,7 +353,8 @@ async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
 		var cameraProviderFuture = ProcessCameraProvider.GetInstance(context) ?? throw new CameraException($"Unable to retrieve {nameof(ProcessCameraProvider)}");
 		cameraProviderFuture.AddListener(new Runnable(() =>
 		{
-			if (cameraProviderFuture.Get() is not AndroidX.Camera.Core.ICameraProvider androidCameraProvider)
+			var cameraProviderInstance = cameraProviderFuture.Get();
+			if (cameraProviderInstance is not AndroidX.Camera.Core.ICameraProvider androidCameraProvider)
 			{
 				cameraFutureCts.SetResult();
 				return;
diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
index 3d1a18d683..79efa2fe61 100644
--- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
+++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
@@ -38,7 +38,7 @@
     <Description>Camera contains CameraView, a view for displaying a preview of the camera output and other camera related functionalities in your .NET MAUI app.</Description>
     <PackageIcon>icon.png</PackageIcon>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>99.0.4</Version>
+    <Version>99.0.0-preview</Version>
     <PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>dotnet,maui,toolkit,kit,communitytoolkit,dotnetcommunitytoolkit,cameraview,camera,photo</PackageTags>
@@ -52,8 +52,9 @@
 
   <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
     <!-- Required NuGet Packages -->
-    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.1" />
-    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.1" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.4.2.2" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.4.2.2" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.Extensions" Version="1.4.2.2" />
 
     <!--  Ensure Linker does not remove required libraries -->
     <None Include="linker.xml" Pack="true" PackagePath="build\$(PackageId).LinkerConfigurationFile.xml" />
@@ -69,10 +70,4 @@
     <None Include="..\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.Camera.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
-    <PackageReference Include="Xamarin.AndroidX.Camera.Extensions">
-      <Version>1.4.1</Version>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>

From e5fb573230585102aadadca6e1987b012ed82db1 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sun, 6 Jul 2025 14:38:02 +0300
Subject: [PATCH 10/40] Fix merge conflicts

---
 .../CameraManager.android.cs                     |  2 +-
 .../Interfaces/ICameraView.shared.cs             | 10 ++++++++++
 .../Views/CameraView.shared.cs                   | 16 +++++-----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 4a97de5792..8e8ffdfe7d 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -326,7 +326,7 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 		videoRecording = videoRecorder
 			.PrepareRecording(context, outputOptions)
 			.WithAudioEnabled()
-			.Start(ContextCompat.GetMainExecutor(context), captureListener);
+			.Start(ContextCompat.GetMainExecutor(context)!, captureListener);
 	}
 
 	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
diff --git a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
index 739617d0be..d214386623 100644
--- a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
@@ -75,6 +75,16 @@ public interface ICameraView : IView
 	/// </remarks>
 	void StopCameraPreview();
 
+	/// <summary>
+	/// Starts the video recording.
+	/// </summary>
+	Task StartVideoRecording(CancellationToken token);
+
+	/// <summary>
+	/// Stops the video recording.
+	/// </summary>
+	Task<Stream> StopVideoRecording(CancellationToken token);
+
 	/// <summary>
 	/// Retrieves the cameras available on the current device.
 	/// </summary>
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index 3773237815..df8686c8d3 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -77,23 +77,19 @@ public partial class CameraView : View, ICameraView, IDisposable
 	/// Backing BindableProperty for the <see cref="StopCameraPreviewCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StopCameraPreviewCommandProperty =
-<<<<<<< feature/camera-video-recording -- Incoming Change
-		BindableProperty.CreateReadOnly(nameof(StopCameraPreviewCommand), typeof(ICommand), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopCameraPreviewCommand).BindableProperty;
+		BindableProperty.CreateReadOnly(nameof(StopCameraPreviewCommand), typeof(ICommand), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopCameraPreviewCommand).BindableProperty;
 	
 	/// <summary>
 	/// Backing BindableProperty for the <see cref="StartCameraPreviewCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StartVideoRecordingCommandProperty =
-		BindableProperty.CreateReadOnly(nameof(StartVideoRecordingCommand), typeof(ICommand), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStartVideoRecordingCommand).BindableProperty;
+		BindableProperty.CreateReadOnly(nameof(StartVideoRecordingCommand), typeof(ICommand), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStartVideoRecordingCommand).BindableProperty;
 
 	/// <summary>
 	/// Backing BindableProperty for the <see cref="StopCameraPreviewCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StopVideoRecordingCommandProperty =
-		BindableProperty.CreateReadOnly(nameof(StopVideoRecordingCommand), typeof(Command<Stream>), typeof(CameraView), default, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopVideoRecordingCommand).BindableProperty;
-=======
 		BindableProperty.CreateReadOnly(nameof(StopCameraPreviewCommand), typeof(ICommand), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopCameraPreviewCommand).BindableProperty;
->>>>>>> main -- Current Change
 
 
 	readonly SemaphoreSlim captureImageSemaphoreSlim = new(1, 1);
@@ -295,15 +291,14 @@ public Task StartCameraPreview(CancellationToken token) =>
 	public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
 
-<<<<<<< feature/camera-video-recording -- Incoming Change
-	/// <inheritdoc cref="ICameraView.StartCameraPreview"/>
+	/// <inheritdoc cref="ICameraView.StartVideoRecording"/>
 	public Task StartVideoRecording(CancellationToken token) =>
 		Handler.CameraManager.StartVideoRecording(token);
 
-	/// <inheritdoc cref="ICameraView.StopCameraPreview"/>
+	/// <inheritdoc cref="ICameraView.StopVideoRecording"/>
 	public Task<Stream> StopVideoRecording(CancellationToken token) =>
 		Handler.CameraManager.StopVideoRecording(token);
-=======
+
 	/// <inheritdoc/>
 	protected virtual void Dispose(bool disposing)
 	{
@@ -317,7 +312,6 @@ protected virtual void Dispose(bool disposing)
 			isDisposed = true;
 		}
 	}
->>>>>>> main -- Current Change
 
 	void ICameraView.OnMediaCaptured(Stream imageData)
 	{

From be1ef9e0a3cce3fa08c7729fbbc360ef31868987 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sun, 6 Jul 2025 15:39:08 +0300
Subject: [PATCH 11/40] implement ios

---
 .../CameraManager.macios.cs                   | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 104cd62dfc..88524b919e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -191,8 +191,46 @@ protected virtual partial void PlatformDisconnect()
 	{
 	}
 
-	protected virtual partial Task PlatformStartVideoRecording(CancellationToken token) => throw new NotSupportedException("notSupportedMessage");
-	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException("notSupportedMessage");
+	protected virtual partial async Task PlatformStartVideoRecording(CancellationToken token)
+	{
+		var isPermissionGranted = await AVCaptureDevice.RequestAccessForMediaTypeAsync(AVAuthorizationMediaType.Video);
+		if (!isPermissionGranted)
+		{
+			throw new CameraException("Camera permission is not granted. Please enable it in the app settings.");
+		}
+
+		if (captureSession is null)
+		{
+			throw new CameraException("Capture session is not initialized. Call ConnectCamera first.");
+		}
+
+		var videoDevice = AVCaptureDevice.GetDefaultDevice(AVMediaTypes.Video) ?? throw new CameraException("Unable to get video device");
+
+		var videoInput = new AVCaptureDeviceInput(videoDevice, out NSError? error);
+
+		if (!captureSession.CanAddInput(videoInput))
+		{
+			throw new CameraException("Unable to add video input to capture session.");
+		}
+
+		captureSession.AddInput(videoInput);
+
+		var videoOutput = new AVCaptureMovieFileOutput();
+		
+		if (!captureSession.CanAddOutput(videoOutput))
+		{
+			throw new CameraException("Unable to add video output to capture session.");
+		}
+
+		captureSession.AddOutput(videoOutput);
+		captureSession.StartRunning();
+		//videoOutput.StartRecordingToOutputFile(new NSUrl("video.mp4"));
+	}
+
+	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
+	{
+		captureSession?.StopRunning();
+	}
 
 
 	protected virtual async partial ValueTask PlatformTakePicture(CancellationToken token)

From f23cd6baa87ed91d10f6b5c55c2cdc0da4941547 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Sun, 6 Jul 2025 15:50:56 +0300
Subject: [PATCH 12/40] fix build

---
 src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 88524b919e..24347d0019 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -191,7 +191,7 @@ protected virtual partial void PlatformDisconnect()
 	{
 	}
 
-	protected virtual partial async Task PlatformStartVideoRecording(CancellationToken token)
+	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
 	{
 		var isPermissionGranted = await AVCaptureDevice.RequestAccessForMediaTypeAsync(AVAuthorizationMediaType.Video);
 		if (!isPermissionGranted)
@@ -230,6 +230,7 @@ protected virtual partial async Task PlatformStartVideoRecording(CancellationTok
 	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
 		captureSession?.StopRunning();
+		return Task.FromResult(Stream.Null);
 	}
 
 

From 8f74aa983bd719fb97c97bbbbb208f4b0d6efa4f Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Mon, 7 Jul 2025 08:19:12 +0300
Subject: [PATCH 13/40] Fix sample app

---
 .../Views/CameraView/CameraViewViewModel.cs          |  2 --
 .../CameraManager.shared.cs                          | 12 +++++++++++-
 .../Views/CameraView.shared.cs                       |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
index 74df8b390b..3bfb201148 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
@@ -8,8 +8,6 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
 
 public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseViewModel
 {
-	readonly ICameraProvider cameraProvider = cameraProvider;
-
 	public IReadOnlyList<CameraInfo> Cameras => cameraProvider.AvailableCameras ?? [];
 
 	public CancellationToken Token => CancellationToken.None;
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index 7cfb57236e..f377c9a33c 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -56,7 +56,17 @@ public async Task<bool> ArePermissionsGranted()
 	/// Starts the video recording.
 	/// </summary>
 	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
-	public Task StartVideoRecording(CancellationToken token) => PlatformStartVideoRecording(token);
+	public async Task StartVideoRecording(CancellationToken token)
+	{
+		var cameraRequest = await Permissions.RequestAsync<Permissions.Camera>();
+		var microphoneRequest = await Permissions.RequestAsync<Permissions.Microphone>();
+		if (cameraRequest != PermissionStatus.Granted || microphoneRequest != PermissionStatus.Granted)
+		{
+			throw new CameraException("Camera and/or Microphone permissions are not granted.");
+		}
+
+		await PlatformStartVideoRecording(token);
+	}
 
 
 	/// <summary>
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index df8686c8d3..1846253719 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -80,16 +80,16 @@ public partial class CameraView : View, ICameraView, IDisposable
 		BindableProperty.CreateReadOnly(nameof(StopCameraPreviewCommand), typeof(ICommand), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopCameraPreviewCommand).BindableProperty;
 	
 	/// <summary>
-	/// Backing BindableProperty for the <see cref="StartCameraPreviewCommand"/> property.
+	/// Backing BindableProperty for the <see cref="StartVideoRecordingCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StartVideoRecordingCommandProperty =
 		BindableProperty.CreateReadOnly(nameof(StartVideoRecordingCommand), typeof(ICommand), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStartVideoRecordingCommand).BindableProperty;
 
 	/// <summary>
-	/// Backing BindableProperty for the <see cref="StopCameraPreviewCommand"/> property.
+	/// Backing BindableProperty for the <see cref="StopVideoRecordingCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StopVideoRecordingCommandProperty =
-		BindableProperty.CreateReadOnly(nameof(StopCameraPreviewCommand), typeof(ICommand), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopCameraPreviewCommand).BindableProperty;
+		BindableProperty.CreateReadOnly(nameof(StopVideoRecordingCommand), typeof(Command<Stream>), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopVideoRecordingCommand).BindableProperty;
 
 
 	readonly SemaphoreSlim captureImageSemaphoreSlim = new(1, 1);

From 0b336c1eec5088f8ac192fd23c2e87992a2f1c35 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Mon, 7 Jul 2025 09:48:39 +0300
Subject: [PATCH 14/40] Fix video recording finalization

---
 .../CameraManager.android.cs                  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 8e8ffdfe7d..98a089c7e3 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -39,6 +39,7 @@ partial class CameraManager
 	ResolutionFilter? resolutionFilter;
 	OrientationListener? orientationListener;
 	Java.IO.File? videoRecordingFile;
+	TaskCompletionSource? videoRecordingFinalizeTcs;
 	int extensionMode = ExtensionMode.Auto;
 
 	public async Task SetExtensionMode(int mode)
@@ -294,7 +295,7 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
 	{
 		if (previewView is null || processCameraProvider is null || cameraPreview is null || videoCapture is null ||
-		    videoRecorder is null)
+		    videoRecorder is null || videoRecordingFile is not null)
 		{
 			return;
 		}
@@ -310,7 +311,6 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 			                            throw new CameraException("No camera available on device");
 		}
 
-
 		var cameraSelector = await EnableModes(cameraView.SelectedCamera);
 		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, videoCapture);
 
@@ -318,11 +318,11 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 
 		videoRecordingFile = new Java.IO.File(context.CacheDir, $"{DateTime.UtcNow.Ticks}.mp4");
 		videoRecordingFile.CreateNewFile();
-		videoRecordingFile.DeleteOnExit();
 
 		var outputOptions = new FileOutputOptions.Builder(videoRecordingFile).Build();
 
-		var captureListener = new CameraConsumer();
+		videoRecordingFinalizeTcs = new TaskCompletionSource();
+		var captureListener = new CameraConsumer(videoRecordingFinalizeTcs);
 		videoRecording = videoRecorder
 			.PrepareRecording(context, outputOptions)
 			.WithAudioEnabled()
@@ -332,17 +332,22 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
 		ArgumentNullException.ThrowIfNull(cameraExecutor);
-		if (videoRecording is null || videoRecordingFile is null)
+		if (videoRecording is null || videoRecordingFile is null || videoRecordingFinalizeTcs is null)
 		{
 			return Stream.Null;
 		}
 
 		videoRecording.Stop();
+		await videoRecordingFinalizeTcs.Task.WaitAsync(token);
 
 		await using var inputStream = new FileStream(videoRecordingFile.AbsolutePath, FileMode.Open);
 		var memoryStream = new MemoryStream();
 		await inputStream.CopyToAsync(memoryStream, token);
 		memoryStream.Position = 0;
+		videoRecordingFile.Delete();
+		videoRecording.Dispose();
+		videoRecording = null;
+		videoRecordingFinalizeTcs = null;
 		return memoryStream;
 	}
 
@@ -485,9 +490,15 @@ public override void OnOrientationChanged(int orientation)
 	}
 }
 
-public class CameraConsumer : Object, IConsumer
+public class CameraConsumer(TaskCompletionSource finalizeTcs) : Object, IConsumer
 {
+	readonly TaskCompletionSource? finalizeTcs = finalizeTcs;
+
 	public void Accept(Object? videoRecordEvent)
 	{
+		if (videoRecordEvent is VideoRecordEvent and VideoRecordEvent.Finalize)
+		{
+			finalizeTcs?.SetResult();
+		}
 	}
 }
\ No newline at end of file

From d42d978a3418c6d1a98380ea62345d5006e5146a Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vladislav.antonyuk@dataart.com>
Date: Mon, 7 Jul 2025 13:29:55 +0300
Subject: [PATCH 15/40] Move stream as input parameter to avoid memory streams

---
 .../CommunityToolkit.Maui.Sample.csproj       |  7 ++++++-
 .../Views/CameraView/CameraViewPage.xaml      |  8 ++++----
 .../Views/CameraView/CameraViewPage.xaml.cs   |  8 ++++++++
 .../Views/CameraView/CameraViewViewModel.cs   |  2 +-
 .../CameraManager.android.cs                  | 16 +++++++--------
 .../CameraManager.macios.cs                   |  6 +++---
 .../CameraManager.net.cs                      |  4 ++--
 .../CameraManager.shared.cs                   | 14 ++++++-------
 .../CameraManager.windows.cs                  | 10 ++++------
 .../Interfaces/ICameraView.shared.cs          |  4 ++--
 .../Primitives/CameraViewDefaults.shared.cs   | 12 ++++-------
 .../Views/CameraView.shared.cs                | 20 +++++++++----------
 12 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index 0436550172..c2bd9c4efc 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -73,7 +73,7 @@
   <PropertyGroup>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
@@ -93,6 +93,11 @@
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='android' and $(Configuration) == 'Debug'">
+    <RuntimeIdentifiers>android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>android-arm</RuntimeIdentifiers>
+  </PropertyGroup>
+
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('windows'))=='false' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='maccatalyst' and $(Configuration) == 'Debug'">
     <RuntimeIdentifiers>maccatalyst-arm64;maccatalyst-x64</RuntimeIdentifiers>
   </PropertyGroup>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
index c504a0a9c4..9092920f4d 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
@@ -76,12 +76,12 @@
 
                 <Button Command="{Binding StopCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
                         Text="StopCameraPreview" />
-                <Button Command="{Binding StartVideoRecordingCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}"
+                <Button Clicked="StartCameraRecording"
                         Text="StartVideoRecording" />
 
-                <Button Command="{Binding StopVideoRecordingCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
-                        CommandParameter="{Binding Stream}"
-                        Text="StopVideoRecording" />
+                <Button  Command="{Binding StopVideoRecordingCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}"
+                         CommandParameter="{Binding Token}"
+                         Text="StopVideoRecording" />
 
                 <Button Command="{Binding SaveVideoCommand}" Text="GetStream" />
                 <Button Clicked="SetNightMode" Text="Set Night Mode (Android)" />
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index 0ce241534f..47698d3240 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -6,11 +6,13 @@ namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
 public partial class CameraViewPage : BasePage<CameraViewViewModel>
 {
+	readonly CameraViewViewModel viewModel;
 	readonly string imagePath;
 	int pageCount;
 
 	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem) : base(viewModel)
 	{
+		this.viewModel = viewModel;
 		InitializeComponent();
 
 		imagePath = Path.Combine(fileSystem.CacheDirectory, "camera-view-image.jpg");
@@ -103,4 +105,10 @@ async void SetNightMode(object? sender, EventArgs e)
 await Task.CompletedTask;
 #endif
 	}
+
+	async void StartCameraRecording(object? sender, EventArgs e)
+	{
+		viewModel.Stream = new MemoryStream();
+		await Camera.StartVideoRecording(viewModel.Stream, CancellationToken.None);
+	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
index 3bfb201148..27ec29dc80 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
@@ -12,7 +12,7 @@ public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseV
 
 	public CancellationToken Token => CancellationToken.None;
 
-	public Stream Stream { get; } = new MemoryStream();
+	public Stream Stream { get; set; } = new MemoryStream();
 
 	public ICollection<CameraFlashMode> FlashModes { get; } = Enum.GetValues<CameraFlashMode>();
 
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 98a089c7e3..1394a379f9 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -40,6 +40,7 @@ partial class CameraManager
 	OrientationListener? orientationListener;
 	Java.IO.File? videoRecordingFile;
 	TaskCompletionSource? videoRecordingFinalizeTcs;
+	Stream? videoRecordingStream;
 	int extensionMode = ExtensionMode.Auto;
 
 	public async Task SetExtensionMode(int mode)
@@ -292,7 +293,7 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 		return ValueTask.CompletedTask;
 	}
 
-	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
+	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
 		if (previewView is null || processCameraProvider is null || cameraPreview is null || videoCapture is null ||
 		    videoRecorder is null || videoRecordingFile is not null)
@@ -300,6 +301,8 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 			return;
 		}
 
+		videoRecordingStream = stream;
+
 		if (cameraView.SelectedCamera is null)
 		{
 			if (cameraProvider.AvailableCameras is null)
@@ -329,26 +332,23 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 			.Start(ContextCompat.GetMainExecutor(context)!, captureListener);
 	}
 
-	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
+	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
 	{
 		ArgumentNullException.ThrowIfNull(cameraExecutor);
-		if (videoRecording is null || videoRecordingFile is null || videoRecordingFinalizeTcs is null)
+		if (videoRecording is null || videoRecordingFile is null || videoRecordingFinalizeTcs is null || videoRecordingStream is null)
 		{
-			return Stream.Null;
+			return;
 		}
 
 		videoRecording.Stop();
 		await videoRecordingFinalizeTcs.Task.WaitAsync(token);
 
 		await using var inputStream = new FileStream(videoRecordingFile.AbsolutePath, FileMode.Open);
-		var memoryStream = new MemoryStream();
-		await inputStream.CopyToAsync(memoryStream, token);
-		memoryStream.Position = 0;
+		await inputStream.CopyToAsync(videoRecordingStream, token);
 		videoRecordingFile.Delete();
 		videoRecording.Dispose();
 		videoRecording = null;
 		videoRecordingFinalizeTcs = null;
-		return memoryStream;
 	}
 
 	async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 24347d0019..57a6042de1 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -191,7 +191,7 @@ protected virtual partial void PlatformDisconnect()
 	{
 	}
 
-	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
+	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
 		var isPermissionGranted = await AVCaptureDevice.RequestAccessForMediaTypeAsync(AVAuthorizationMediaType.Video);
 		if (!isPermissionGranted)
@@ -227,10 +227,10 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 		//videoOutput.StartRecordingToOutputFile(new NSUrl("video.mp4"));
 	}
 
-	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
+	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token)
 	{
 		captureSession?.StopRunning();
-		return Task.FromResult(Stream.Null);
+		return Task.CompletedTask;
 	}
 
 
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
index 2266463f98..445d88129e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
@@ -14,8 +14,8 @@ partial class CameraManager
 
 	public partial ValueTask UpdateCaptureResolution(Size resolution, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
-	protected virtual partial Task PlatformStartVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
-	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 	protected virtual partial Task PlatformStartCameraPreview(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
 	protected virtual partial void PlatformStopCameraPreview() => throw new NotSupportedException(notSupportedMessage);
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index f377c9a33c..06147f755e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -56,7 +56,7 @@ public async Task<bool> ArePermissionsGranted()
 	/// Starts the video recording.
 	/// </summary>
 	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
-	public async Task StartVideoRecording(CancellationToken token)
+	public async Task StartVideoRecording(Stream stream, CancellationToken token)
 	{
 		var cameraRequest = await Permissions.RequestAsync<Permissions.Camera>();
 		var microphoneRequest = await Permissions.RequestAsync<Permissions.Microphone>();
@@ -65,7 +65,7 @@ public async Task StartVideoRecording(CancellationToken token)
 			throw new CameraException("Camera and/or Microphone permissions are not granted.");
 		}
 
-		await PlatformStartVideoRecording(token);
+		await PlatformStartVideoRecording(stream, token);
 	}
 
 
@@ -73,11 +73,9 @@ public async Task StartVideoRecording(CancellationToken token)
 	/// Starts the video recording.
 	/// </summary>
 	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
-	public async Task<Stream> StopVideoRecording(CancellationToken token)
+	public Task StopVideoRecording(CancellationToken token)
 	{
-		var stream = await PlatformStopVideoRecording(token);
-		stream.Position = 0;
-		return stream;
+		return PlatformStopVideoRecording(token);
 	}
 
 	/// <summary>
@@ -160,7 +158,7 @@ public async ValueTask UpdateCurrentCamera(CameraInfo? cameraInfo, CancellationT
 	/// </summary>
 	protected virtual partial void PlatformStopCameraPreview();
 
-	protected virtual partial Task PlatformStartVideoRecording(CancellationToken token);
+	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token);
 
-	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token);
+	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index 4b94d13798..a64ea4ba89 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -206,7 +206,7 @@ protected async Task PlatformUpdateResolution(Size resolution, CancellationToken
 	}
 
 	MemoryStream? recordingStream;
-	protected virtual async partial Task PlatformStartVideoRecording(CancellationToken token)
+	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
 		if (!IsInitialized || mediaCapture is null || mediaElement is null)
 		{
@@ -215,7 +215,7 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 
 		recordingStream = new MemoryStream();
 		MediaEncodingProfile profile = MediaEncodingProfile.CreateMp4(VideoEncodingQuality.Auto);
-		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, recordingStream.AsRandomAccessStream());
+		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, stream.AsRandomAccessStream());
 
 		frameSource = mediaCapture.FrameSources.FirstOrDefault(source =>
 			source.Value.Info.MediaStreamType == MediaStreamType.VideoRecord
@@ -235,18 +235,16 @@ protected virtual async partial Task PlatformStartVideoRecording(CancellationTok
 		}
 	}
 
-	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
+	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
 	{
 		if (!IsInitialized || mediaElement is null)
 		{
-			return Stream.Null;
+			return;
 		}
 
 		if (mediaRecording != null)
 		{
 			await mediaRecording.StopAsync();
 		}
-
-		return recordingStream ?? Stream.Null;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
index d214386623..042e48cdcd 100644
--- a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
@@ -78,12 +78,12 @@ public interface ICameraView : IView
 	/// <summary>
 	/// Starts the video recording.
 	/// </summary>
-	Task StartVideoRecording(CancellationToken token);
+	Task StartVideoRecording(Stream stream, CancellationToken token);
 
 	/// <summary>
 	/// Stops the video recording.
 	/// </summary>
-	Task<Stream> StopVideoRecording(CancellationToken token);
+	Task StopVideoRecording(CancellationToken token);
 
 	/// <summary>
 	/// Retrieves the cameras available on the current device.
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
index a9e30dad1c..1c10030fd9 100644
--- a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -62,19 +62,15 @@ internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)
 		return new Command(_ => cameraView.StopCameraPreview());
 	}
 
-	internal static ICommand CreateStartVideoRecordingCommand(BindableObject bindable)
+	internal static Command<Stream> CreateStartVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new Command(async _  => await cameraView.StartVideoRecording(CancellationToken.None).ConfigureAwait(false));
+		return new Command<Stream>(async stream => await cameraView.StartVideoRecording(stream, CancellationToken.None).ConfigureAwait(false));
 	}
 
-	internal static Command<Stream> CreateStopVideoRecordingCommand(BindableObject bindable)
+	internal static Command<CancellationToken> CreateStopVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new Command<Stream>(async stream =>
-		{
-			await using var resultStream = await cameraView.StopVideoRecording(CancellationToken.None);
-			await resultStream.CopyToAsync(stream);
-		});
+		return new Command<CancellationToken>(token => cameraView.StopVideoRecording(token).ConfigureAwait(false));
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index 1846253719..4647036f11 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -83,13 +83,13 @@ public partial class CameraView : View, ICameraView, IDisposable
 	/// Backing BindableProperty for the <see cref="StartVideoRecordingCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StartVideoRecordingCommandProperty =
-		BindableProperty.CreateReadOnly(nameof(StartVideoRecordingCommand), typeof(ICommand), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStartVideoRecordingCommand).BindableProperty;
+		BindableProperty.CreateReadOnly(nameof(StartVideoRecordingCommand), typeof(Command<Stream>), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStartVideoRecordingCommand).BindableProperty;
 
 	/// <summary>
 	/// Backing BindableProperty for the <see cref="StopVideoRecordingCommand"/> property.
 	/// </summary>
 	public static readonly BindableProperty StopVideoRecordingCommandProperty =
-		BindableProperty.CreateReadOnly(nameof(StopVideoRecordingCommand), typeof(Command<Stream>), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopVideoRecordingCommand).BindableProperty;
+		BindableProperty.CreateReadOnly(nameof(StopVideoRecordingCommand), typeof(Command<CancellationToken>), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopVideoRecordingCommand).BindableProperty;
 
 
 	readonly SemaphoreSlim captureImageSemaphoreSlim = new(1, 1);
@@ -145,19 +145,19 @@ public event EventHandler<MediaCapturedEventArgs> MediaCaptured
 	public Command<CancellationToken> StartCameraPreviewCommand => (Command<CancellationToken>)GetValue(StartCameraPreviewCommandProperty);
 	
 	/// <summary>
-	/// 
+	/// Gets the Command that stops the camera preview.
 	/// </summary>
-	public ICommand StartVideoRecordingCommand => (ICommand)GetValue(StartVideoRecordingCommandProperty);
+	public ICommand StopCameraPreviewCommand => (ICommand)GetValue(StopCameraPreviewCommandProperty);
 
 	/// <summary>
-	/// Gets the Command that stops the camera preview.
+	/// 
 	/// </summary>
-	public ICommand StopCameraPreviewCommand => (ICommand)GetValue(StopCameraPreviewCommandProperty);
+	public Command<Stream> StartVideoRecordingCommand => (Command<Stream>)GetValue(StartVideoRecordingCommandProperty);
 	
 	/// <summary>
 	/// 
 	/// </summary>
-	public Command<Stream> StopVideoRecordingCommand => (Command<Stream>)GetValue(StopVideoRecordingCommandProperty);
+	public Command<CancellationToken> StopVideoRecordingCommand => (Command<CancellationToken>)GetValue(StopVideoRecordingCommandProperty);
 
 	/// <summary>
 	/// Gets or sets the <see cref="CameraFlashMode"/>.
@@ -292,11 +292,11 @@ public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
 
 	/// <inheritdoc cref="ICameraView.StartVideoRecording"/>
-	public Task StartVideoRecording(CancellationToken token) =>
-		Handler.CameraManager.StartVideoRecording(token);
+	public Task StartVideoRecording(Stream stream, CancellationToken token) =>
+		Handler.CameraManager.StartVideoRecording(stream, token);
 
 	/// <inheritdoc cref="ICameraView.StopVideoRecording"/>
-	public Task<Stream> StopVideoRecording(CancellationToken token) =>
+	public Task StopVideoRecording(CancellationToken token) =>
 		Handler.CameraManager.StopVideoRecording(token);
 
 	/// <inheritdoc/>

From e8b8a26c22577804d6013413cdb4ff6ac1852981 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Tue, 8 Jul 2025 11:20:12 +0300
Subject: [PATCH 16/40] Fixes video recording stream handling

Ensures proper handling of the video recording stream by setting appropriate file access and share options.
Also, explicitly flushes the stream and nullifies the file after copying to prevent potential issues with file access or deletion.
Addresses an issue where the `VideoRecordEvent` was not correctly identified as the final event.
---
 src/CommunityToolkit.Maui.Camera/CameraManager.android.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 1394a379f9..8b8e8a9aff 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -1,4 +1,4 @@
-using System.Runtime.Versioning;
+using System.Runtime.Versioning;
 using Android.Content;
 using Android.Views;
 using AndroidX.Camera.Core;
@@ -343,12 +343,14 @@ protected virtual async partial Task PlatformStopVideoRecording(CancellationToke
 		videoRecording.Stop();
 		await videoRecordingFinalizeTcs.Task.WaitAsync(token);
 
-		await using var inputStream = new FileStream(videoRecordingFile.AbsolutePath, FileMode.Open);
+		await using var inputStream = new FileStream(videoRecordingFile.AbsolutePath, FileMode.Open, FileAccess.Read, FileShare.Read);
 		await inputStream.CopyToAsync(videoRecordingStream, token);
+		await videoRecordingStream.FlushAsync(token);
 		videoRecordingFile.Delete();
 		videoRecording.Dispose();
 		videoRecording = null;
 		videoRecordingFinalizeTcs = null;
+		videoRecordingFile = null;
 	}
 
 	async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
@@ -496,7 +498,7 @@ public class CameraConsumer(TaskCompletionSource finalizeTcs) : Object, IConsume
 
 	public void Accept(Object? videoRecordEvent)
 	{
-		if (videoRecordEvent is VideoRecordEvent and VideoRecordEvent.Finalize)
+		if (videoRecordEvent is VideoRecordEvent.Finalize)
 		{
 			finalizeTcs?.SetResult();
 		}

From fb1d056ec7e6a502ae7cffa4bce2f072cf340810 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Tue, 8 Jul 2025 12:21:43 +0300
Subject: [PATCH 17/40] Updates PlatformStartVideoRecording signature

Updates the `PlatformStartVideoRecording` method signature on Tizen to accept a stream, allowing for greater flexibility in handling video data.
---
 src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
index 07a70b38b6..4030848508 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
@@ -23,7 +23,7 @@ partial class CameraManager
 	protected virtual partial void PlatformDisconnect() => throw new NotSupportedException(notSupportedMessage);
 
 	protected virtual partial ValueTask PlatformTakePicture(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
-	protected virtual partial Task PlatformStartVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
-	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
 }
\ No newline at end of file

From d76920def84ab5f07123214ea1e47ed29f23f368 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Wed, 16 Jul 2025 12:37:14 +0300
Subject: [PATCH 18/40] Fix Android extension modes

---
 .../CommunityToolkit.Maui.Sample.csproj           |  4 ++--
 .../CameraManager.android.cs                      | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index c2bd9c4efc..34dcf42033 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -93,10 +93,10 @@
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='android' and $(Configuration) == 'Debug'">
+  <!--<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='android' and $(Configuration) == 'Debug'">
     <RuntimeIdentifiers>android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
     <RuntimeIdentifiers>android-arm</RuntimeIdentifiers>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('windows'))=='false' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='maccatalyst' and $(Configuration) == 'Debug'">
     <RuntimeIdentifiers>maccatalyst-arm64;maccatalyst-x64</RuntimeIdentifiers>
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 8b8e8a9aff..cf8c157ea2 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -1,5 +1,7 @@
 using System.Runtime.Versioning;
 using Android.Content;
+using Android.Provider;
+using Android.Runtime;
 using Android.Views;
 using AndroidX.Camera.Core;
 using AndroidX.Camera.Core.ResolutionSelector;
@@ -322,6 +324,10 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 		videoRecordingFile = new Java.IO.File(context.CacheDir, $"{DateTime.UtcNow.Ticks}.mp4");
 		videoRecordingFile.CreateNewFile();
 
+		var name = $"CameraX-recording-{DateTime.UtcNow.Ticks}.mp4";
+        var contentValues = new ContentValues();
+		contentValues.Put(MediaStore.IMediaColumns.DisplayName, name);
+
 		var outputOptions = new FileOutputOptions.Builder(videoRecordingFile).Build();
 
 		videoRecordingFinalizeTcs = new TaskCompletionSource();
@@ -360,14 +366,13 @@ async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
 		var cameraProviderFuture = ProcessCameraProvider.GetInstance(context) ?? throw new CameraException($"Unable to retrieve {nameof(ProcessCameraProvider)}");
 		cameraProviderFuture.AddListener(new Runnable(() =>
 		{
-			var cameraProviderInstance = cameraProviderFuture.Get();
-			if (cameraProviderInstance is not AndroidX.Camera.Core.ICameraProvider androidCameraProvider)
+			var cameraProviderInstance = cameraProviderFuture.Get().JavaCast<AndroidX.Camera.Core.ICameraProvider>();
+			if (cameraProviderInstance is null)
 			{
-				cameraFutureCts.SetResult();
 				return;
 			}
-			
-			var extensionsManagerFuture = ExtensionsManager.GetInstanceAsync(context, androidCameraProvider);
+
+			var extensionsManagerFuture = ExtensionsManager.GetInstanceAsync(context, cameraProviderInstance);
 			extensionsManagerFuture.AddListener(new Runnable(() =>
 			{
 				var extensionsManager = (ExtensionsManager)extensionsManagerFuture.Get()!;

From 0f0c926e8c27548f9f65ca2c7b4c24fb29aa952d Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Sat, 19 Jul 2025 14:33:25 +0300
Subject: [PATCH 19/40] Rework Android binding and add iOS implementation

---
 .../CameraManager.android.cs                  |  76 ++++++++----
 .../CameraManager.macios.cs                   | 110 ++++++++++++++++--
 2 files changed, 153 insertions(+), 33 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index cf8c157ea2..f290a3e76d 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -49,13 +49,12 @@ public async Task SetExtensionMode(int mode)
 	{
 		extensionMode = mode;
 		if (cameraView.SelectedCamera is null || processCameraProvider is null || cameraPreview is null ||
-		    imageCapture is null || videoCapture is null)
+			imageCapture is null || videoCapture is null)
 		{
 			return;
 		}
 
-		var cameraSelector = await EnableModes(cameraView.SelectedCamera);
-		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, imageCapture, videoCapture);
+		camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, cameraPreview, imageCapture, videoCapture);
 
 		cameraControl = camera.CameraControl;
 	}
@@ -77,7 +76,7 @@ public NativePlatformCameraPreviewView CreatePlatformView()
 		}
 
 		cameraExecutor = Executors.NewSingleThreadExecutor() ??
-		                 throw new CameraException($"Unable to retrieve {nameof(IExecutorService)}");
+						 throw new CameraException($"Unable to retrieve {nameof(IExecutorService)}");
 		orientationListener = new OrientationListener(SetImageCaptureTargetRotation, context);
 		orientationListener.Enable();
 
@@ -104,7 +103,7 @@ public async partial ValueTask UpdateCaptureResolution(Size resolution, Cancella
 		if (resolutionFilter is not null)
 		{
 			if (Math.Abs(resolutionFilter.TargetSize.Width - resolution.Width) < double.Epsilon &&
-			    Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
+				Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
 			{
 				return;
 			}
@@ -138,6 +137,8 @@ protected virtual void Dispose(bool disposing)
 	{
 		if (disposing)
 		{
+			CleanupVideoRecordingResources();
+
 			camera?.Dispose();
 			camera = null;
 
@@ -190,8 +191,8 @@ protected virtual async partial Task PlatformConnectCamera(CancellationToken tok
 		cameraProviderFuture.AddListener(new Runnable(async () =>
 		{
 			processCameraProvider = (ProcessCameraProvider)(cameraProviderFuture.Get() ??
-			                                                throw new CameraException(
-				                                                $"Unable to retrieve {nameof(ProcessCameraProvider)}"));
+															throw new CameraException(
+																$"Unable to retrieve {nameof(ProcessCameraProvider)}"));
 
 			if (cameraProvider.AvailableCameras is null)
 			{
@@ -223,6 +224,9 @@ protected async Task StartUseCase(CancellationToken token)
 		cameraPreview?.Dispose();
 		imageCapture?.Dispose();
 
+		videoCapture?.Dispose();
+		videoRecorder?.Dispose();
+
 		cameraPreview = new Preview.Builder().SetResolutionSelector(resolutionSelector).Build();
 		cameraPreview.SetSurfaceProvider(cameraExecutor, previewView?.SurfaceProvider);
 
@@ -242,7 +246,7 @@ protected async Task StartUseCase(CancellationToken token)
 
 	protected virtual async partial Task PlatformStartCameraPreview(CancellationToken token)
 	{
-		if (previewView is null || processCameraProvider is null || cameraPreview is null || imageCapture is null)
+		if (previewView is null || processCameraProvider is null || cameraPreview is null || imageCapture is null || videoCapture is null)
 		{
 			return;
 		}
@@ -255,11 +259,10 @@ protected virtual async partial Task PlatformStartCameraPreview(CancellationToke
 			}
 
 			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ??
-			                            throw new CameraException("No camera available on device");
+										throw new CameraException("No camera available on device");
 		}
 
-		var cameraSelector = await EnableModes(cameraView.SelectedCamera);
-		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, imageCapture);
+		camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, cameraPreview, imageCapture, videoCapture);
 		cameraControl = camera.CameraControl;
 
 		var point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f,
@@ -297,8 +300,8 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 
 	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
-		if (previewView is null || processCameraProvider is null || cameraPreview is null || videoCapture is null ||
-		    videoRecorder is null || videoRecordingFile is not null)
+		if (previewView is null || processCameraProvider is null || cameraPreview is null || imageCapture is null || videoCapture is null ||
+			videoRecorder is null || videoRecordingFile is not null)
 		{
 			return;
 		}
@@ -313,19 +316,20 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 			}
 
 			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ??
-			                            throw new CameraException("No camera available on device");
+										throw new CameraException("No camera available on device");
 		}
 
-		var cameraSelector = await EnableModes(cameraView.SelectedCamera);
-		camera = RebindCamera(processCameraProvider, cameraSelector, cameraPreview, videoCapture);
-
-		cameraControl = camera.CameraControl;
+		if (camera is null || !IsVideoCaptureAlreadyBound())
+		{
+			camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, cameraPreview, imageCapture, videoCapture);
+			cameraControl = camera.CameraControl;
+		}
 
 		videoRecordingFile = new Java.IO.File(context.CacheDir, $"{DateTime.UtcNow.Ticks}.mp4");
 		videoRecordingFile.CreateNewFile();
 
 		var name = $"CameraX-recording-{DateTime.UtcNow.Ticks}.mp4";
-        var contentValues = new ContentValues();
+		var contentValues = new ContentValues();
 		contentValues.Put(MediaStore.IMediaColumns.DisplayName, name);
 
 		var outputOptions = new FileOutputOptions.Builder(videoRecordingFile).Build();
@@ -352,11 +356,32 @@ protected virtual async partial Task PlatformStopVideoRecording(CancellationToke
 		await using var inputStream = new FileStream(videoRecordingFile.AbsolutePath, FileMode.Open, FileAccess.Read, FileShare.Read);
 		await inputStream.CopyToAsync(videoRecordingStream, token);
 		await videoRecordingStream.FlushAsync(token);
-		videoRecordingFile.Delete();
-		videoRecording.Dispose();
+		CleanupVideoRecordingResources();
+		await StartCameraPreview(token);
+	}
+
+	bool IsVideoCaptureAlreadyBound()
+	{
+		return processCameraProvider is not null && videoCapture is not null && processCameraProvider.IsBound(videoCapture);
+	}
+
+	void CleanupVideoRecordingResources()
+	{
+		videoRecording?.Dispose();
 		videoRecording = null;
+
+		if (videoRecordingFile is not null)
+		{
+			if (videoRecordingFile.Exists())
+			{
+				videoRecordingFile.Delete();
+			}
+
+			videoRecordingFile = null;
+		}
+
 		videoRecordingFinalizeTcs = null;
-		videoRecordingFile = null;
+		videoRecordingStream = null;
 	}
 
 	async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
@@ -380,17 +405,18 @@ async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
 				{
 					cameraSelector = extensionsManager.GetExtensionEnabledCameraSelector(cameraSelector, extensionMode);
 				}
-				
+
 				cameraFutureCts.SetResult();
 			}), ContextCompat.GetMainExecutor(context));
 		}), ContextCompat.GetMainExecutor(context));
-		
+
 		await cameraFutureCts.Task;
 		return cameraSelector;
 	}
 
-	ICamera RebindCamera(ProcessCameraProvider provider, CameraSelector cameraSelector, params UseCase[] useCases)
+	async Task<ICamera> RebindCamera(ProcessCameraProvider provider, CameraInfo cameraInfo, params UseCase[] useCases)
 	{
+		var cameraSelector = await EnableModes(cameraInfo);
 		provider.UnbindAll();
 		return provider.BindToLifecycle(
 			(ILifecycleOwner)context,
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 57a6042de1..2ddb421f50 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -23,6 +23,12 @@ partial class CameraManager
 	PreviewView? previewView;
 	AVCaptureVideoOrientation videoOrientation;
 
+	AVCaptureDeviceInput? videoInput;
+	AVCaptureMovieFileOutput? videoOutput;
+	TaskCompletionSource? videoRecordingFinalizeTcs;
+	Stream? videoRecordingStream;
+	string? videoRecordingFile;
+
 	// IN the future change the return type to be an alias
 	public UIView CreatePlatformView()
 	{
@@ -204,35 +210,108 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 			throw new CameraException("Capture session is not initialized. Call ConnectCamera first.");
 		}
 
+		CleanupVideoRecordingResources();
+
 		var videoDevice = AVCaptureDevice.GetDefaultDevice(AVMediaTypes.Video) ?? throw new CameraException("Unable to get video device");
 
-		var videoInput = new AVCaptureDeviceInput(videoDevice, out NSError? error);
+		videoInput = new AVCaptureDeviceInput(videoDevice, out NSError? error);
+		if (error is not null)
+		{
+			throw new CameraException($"Error creating video input: {error.LocalizedDescription}");
+		}
 
 		if (!captureSession.CanAddInput(videoInput))
 		{
+			videoInput?.Dispose();
 			throw new CameraException("Unable to add video input to capture session.");
 		}
 
+		captureSession.BeginConfiguration();
 		captureSession.AddInput(videoInput);
 
-		var videoOutput = new AVCaptureMovieFileOutput();
-		
+		videoOutput = new AVCaptureMovieFileOutput();
+
 		if (!captureSession.CanAddOutput(videoOutput))
 		{
+			captureSession.RemoveInput(videoInput);
+			videoInput?.Dispose();
+			videoOutput?.Dispose();
+			captureSession.CommitConfiguration();
 			throw new CameraException("Unable to add video output to capture session.");
 		}
 
 		captureSession.AddOutput(videoOutput);
-		captureSession.StartRunning();
-		//videoOutput.StartRecordingToOutputFile(new NSUrl("video.mp4"));
+		captureSession.CommitConfiguration();
+
+		videoRecordingStream = stream;
+		videoRecordingFinalizeTcs = new TaskCompletionSource();
+		videoRecordingFile = Path.GetTempFileName();
+
+		if (!captureSession.Running)
+		{
+			captureSession.StartRunning();
+		}
+
+		var outputUrl = NSUrl.FromFilename(videoRecordingFile);
+		videoOutput.StartRecordingToOutputFile(outputUrl, new AVCaptureMovieFileOutputRecordingDelegate(videoRecordingFinalizeTcs));
 	}
 
-	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token)
+	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
 	{
-		captureSession?.StopRunning();
-		return Task.CompletedTask;
+		if (captureSession is null || videoRecordingFile is null || videoInput is null || videoOutput is null || videoRecordingStream is null || videoRecordingFinalizeTcs is null)
+		{
+			return;
+		}
+
+		videoOutput.StopRecording();
+		await videoRecordingFinalizeTcs.Task.WaitAsync(token);
+
+		if (File.Exists(videoRecordingFile))
+		{
+			await using var inputStream = new FileStream(videoRecordingFile, FileMode.Open, FileAccess.Read, FileShare.Read);
+			await inputStream.CopyToAsync(videoRecordingStream, token);
+			await videoRecordingStream.FlushAsync(token);
+		}
+		CleanupVideoRecordingResources();
 	}
 
+	void CleanupVideoRecordingResources()
+	{
+		if (captureSession is not null)
+		{
+			captureSession.BeginConfiguration();
+
+			if (videoInput is not null)
+			{
+				captureSession.RemoveInput(videoInput);
+				videoInput.Dispose();
+				videoInput = null;
+			}
+
+			if (videoOutput is not null)
+			{
+				captureSession.RemoveOutput(videoOutput);
+				videoOutput.Dispose();
+				videoOutput = null;
+			}
+
+			captureSession.CommitConfiguration();
+		}
+
+		// Clean up temporary file
+		if (videoRecordingFile is not null)
+		{
+			if (File.Exists(videoRecordingFile))
+			{
+				File.Delete(videoRecordingFile);
+			}
+
+			videoRecordingFile = null;
+		}
+
+		videoRecordingFinalizeTcs = null;
+		videoRecordingStream = null;
+	}
 
 	protected virtual async partial ValueTask PlatformTakePicture(CancellationToken token)
 	{
@@ -293,6 +372,8 @@ protected virtual void Dispose(bool disposing)
 	{
 		if (disposing)
 		{
+			CleanupVideoRecordingResources();
+
 			captureSession?.StopRunning();
 			captureSession?.Dispose();
 			captureSession = null;
@@ -300,11 +381,15 @@ protected virtual void Dispose(bool disposing)
 			captureInput?.Dispose();
 			captureInput = null;
 
+			captureDevice = null;
+
 			orientationDidChangeObserver?.Dispose();
 			orientationDidChangeObserver = null;
 
 			photoOutput?.Dispose();
 			photoOutput = null;
+
+			previewView = null;
 		}
 	}
 
@@ -393,4 +478,13 @@ public void UpdatePreviewVideoOrientation(AVCaptureVideoOrientation videoOrienta
 			}
 		}
 	}
+}
+
+class AVCaptureMovieFileOutputRecordingDelegate(TaskCompletionSource taskCompletionSource) : AVCaptureFileOutputRecordingDelegate
+{
+	public override void FinishedRecording(AVCaptureFileOutput captureOutput, NSUrl outputFileUrl, NSObject[] connections, NSError? error)
+	{
+		base.FinishedRecording(captureOutput, outputFileUrl, connections, error);
+		taskCompletionSource.SetResult();
+	}
 }
\ No newline at end of file

From 331b99070d59e13603abda684c66d58bb703a101 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Sat, 19 Jul 2025 14:58:30 +0300
Subject: [PATCH 20/40] Add video recording controls and improve async handling

Updated CameraViewPage.xaml to include buttons for starting/stopping video recording and setting night mode. Changed "GetStream" button text to "Save Video Recording" and repositioned "Capture Image" button.

Simplified video file creation in CameraManager.android.cs by removing unnecessary ContentValues. Modified PlatformStopVideoRecording to change flow after stopping video recording.

Enhanced CreateStopVideoRecordingCommand to use async lambda for better asynchronous operation handling.
---
 .../Pages/Views/CameraView/CameraViewPage.xaml       | 12 ++++++++----
 .../CameraManager.android.cs                         |  5 -----
 .../Primitives/CameraViewDefaults.shared.cs          |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
index 9092920f4d..e189adf7ce 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
@@ -67,15 +67,14 @@
                     ItemsSource="{Binding FlashModes}"
                     SelectedItem="{Binding FlashMode}" />
 
-                <Button Command="{Binding CaptureImageCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
-                        CommandParameter="{Binding Token}"
-                        Text="Capture Image"/>
                 <Button Command="{Binding StartCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}"
                         CommandParameter="{Binding Token}"
                         Text="StartCameraPreview" />
 
                 <Button Command="{Binding StopCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
                         Text="StopCameraPreview" />
+
+
                 <Button Clicked="StartCameraRecording"
                         Text="StartVideoRecording" />
 
@@ -83,7 +82,12 @@
                          CommandParameter="{Binding Token}"
                          Text="StopVideoRecording" />
 
-                <Button Command="{Binding SaveVideoCommand}" Text="GetStream" />
+                <Button Command="{Binding SaveVideoCommand}" Text="Save Video Recording" />
+
+                <Button Command="{Binding CaptureImageCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
+                        CommandParameter="{Binding Token}"
+                        Text="Capture Image"/>
+
                 <Button Clicked="SetNightMode" Text="Set Night Mode (Android)" />
 
             </FlexLayout>
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index f290a3e76d..5f4badf8f8 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -328,10 +328,6 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 		videoRecordingFile = new Java.IO.File(context.CacheDir, $"{DateTime.UtcNow.Ticks}.mp4");
 		videoRecordingFile.CreateNewFile();
 
-		var name = $"CameraX-recording-{DateTime.UtcNow.Ticks}.mp4";
-		var contentValues = new ContentValues();
-		contentValues.Put(MediaStore.IMediaColumns.DisplayName, name);
-
 		var outputOptions = new FileOutputOptions.Builder(videoRecordingFile).Build();
 
 		videoRecordingFinalizeTcs = new TaskCompletionSource();
@@ -357,7 +353,6 @@ protected virtual async partial Task PlatformStopVideoRecording(CancellationToke
 		await inputStream.CopyToAsync(videoRecordingStream, token);
 		await videoRecordingStream.FlushAsync(token);
 		CleanupVideoRecordingResources();
-		await StartCameraPreview(token);
 	}
 
 	bool IsVideoCaptureAlreadyBound()
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
index 1c10030fd9..e7383a3219 100644
--- a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -71,6 +71,6 @@ internal static Command<Stream> CreateStartVideoRecordingCommand(BindableObject
 	internal static Command<CancellationToken> CreateStopVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new Command<CancellationToken>(token => cameraView.StopVideoRecording(token).ConfigureAwait(false));
+		return new Command<CancellationToken>(async token => await cameraView.StopVideoRecording(token).ConfigureAwait(false));
 	}
 }
\ No newline at end of file

From 6f91cd7e0436d928fe8384c6e7cc1eb5bee594af Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Sat, 19 Jul 2025 15:19:03 +0300
Subject: [PATCH 21/40] Add summary

---
 .../CommunityToolkit.Maui.Sample.csproj       |  2 +-
 .../CameraManager.android.cs                  | 24 +++++------------
 .../CameraManager.shared.cs                   | 26 ++++++++++++++++---
 .../CameraManager.windows.cs                  |  2 --
 .../CommunityToolkit.Maui.Camera.csproj       |  2 +-
 .../Interfaces/ICameraView.shared.cs          | 19 +++++++++++---
 .../Primitives/CameraViewDefaults.shared.cs   |  2 +-
 .../Views/CameraView.shared.cs                | 19 ++++++++++----
 8 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index 34dcf42033..2799e4fcf7 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -73,7 +73,7 @@
   <PropertyGroup>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 5f4badf8f8..96a8320e7a 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -23,8 +23,7 @@ namespace CommunityToolkit.Maui.Core;
 [SupportedOSPlatform("android21.0")]
 partial class CameraManager
 {
-	readonly Context context =
-		mauiContext.Context ?? throw new CameraException($"Unable to retrieve {nameof(Context)}");
+	readonly Context context = mauiContext.Context ?? throw new CameraException($"Unable to retrieve {nameof(Context)}");
 
 	NativePlatformCameraPreviewView? previewView;
 	IExecutorService? cameraExecutor;
@@ -75,8 +74,7 @@ public NativePlatformCameraPreviewView CreatePlatformView()
 			previewView.SetScaleType(NativePlatformCameraPreviewView.ScaleType.FitCenter);
 		}
 
-		cameraExecutor = Executors.NewSingleThreadExecutor() ??
-						 throw new CameraException($"Unable to retrieve {nameof(IExecutorService)}");
+		cameraExecutor = Executors.NewSingleThreadExecutor() ?? throw new CameraException($"Unable to retrieve {nameof(IExecutorService)}");
 		orientationListener = new OrientationListener(SetImageCaptureTargetRotation, context);
 		orientationListener.Enable();
 
@@ -190,9 +188,7 @@ protected virtual async partial Task PlatformConnectCamera(CancellationToken tok
 
 		cameraProviderFuture.AddListener(new Runnable(async () =>
 		{
-			processCameraProvider = (ProcessCameraProvider)(cameraProviderFuture.Get() ??
-															throw new CameraException(
-																$"Unable to retrieve {nameof(ProcessCameraProvider)}"));
+			processCameraProvider = (ProcessCameraProvider)(cameraProviderFuture.Get() ?? throw new CameraException($"Unable to retrieve {nameof(ProcessCameraProvider)}"));
 
 			if (cameraProvider.AvailableCameras is null)
 			{
@@ -258,15 +254,13 @@ protected virtual async partial Task PlatformStartCameraPreview(CancellationToke
 				await cameraProvider.RefreshAvailableCameras(token);
 			}
 
-			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ??
-										throw new CameraException("No camera available on device");
+			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ?? throw new CameraException("No camera available on device");
 		}
 
 		camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, cameraPreview, imageCapture, videoCapture);
 		cameraControl = camera.CameraControl;
 
-		var point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f,
-			0.1f);
+		var point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f, 0.1f);
 		var action = new FocusMeteringAction.Builder(point).Build();
 		camera.CameraControl.StartFocusAndMetering(action);
 
@@ -315,8 +309,7 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 				await cameraProvider.RefreshAvailableCameras(token);
 			}
 
-			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ??
-										throw new CameraException("No camera available on device");
+			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ?? throw new CameraException("No camera available on device");
 		}
 
 		if (camera is null || !IsVideoCaptureAlreadyBound())
@@ -413,10 +406,7 @@ async Task<ICamera> RebindCamera(ProcessCameraProvider provider, CameraInfo came
 	{
 		var cameraSelector = await EnableModes(cameraInfo);
 		provider.UnbindAll();
-		return provider.BindToLifecycle(
-			(ILifecycleOwner)context,
-			cameraSelector,
-			useCases);
+		return provider.BindToLifecycle((ILifecycleOwner)context, cameraSelector, useCases);
 	}
 
 	void SetImageCaptureTargetRotation(int rotation)
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index 06147f755e..44482d126e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -52,10 +52,14 @@ public async Task<bool> ArePermissionsGranted()
 	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
 	public Task StartCameraPreview(CancellationToken token) => PlatformStartCameraPreview(token);
 
+
 	/// <summary>
 	/// Starts the video recording.
 	/// </summary>
-	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
+	/// <param name="stream">The output stream for video recording</param>
+	/// <param name="token"><see cref="CancellationToken"/></param>
+	/// <returns>A <see cref="Task"/> that can be awaited.</returns>
+	/// <exception cref="CameraException"></exception>
 	public async Task StartVideoRecording(Stream stream, CancellationToken token)
 	{
 		var cameraRequest = await Permissions.RequestAsync<Permissions.Camera>();
@@ -70,9 +74,10 @@ public async Task StartVideoRecording(Stream stream, CancellationToken token)
 
 
 	/// <summary>
-	/// Starts the video recording.
+	/// Stops the video recording.
 	/// </summary>
-	/// <returns>A <see cref="ValueTask"/> that can be awaited.</returns>
+	/// <param name="token"><see cref="CancellationToken"/></param>
+	/// <returns>A <see cref="Task"/> that can be awaited.</returns>
 	public Task StopVideoRecording(CancellationToken token)
 	{
 		return PlatformStopVideoRecording(token);
@@ -158,7 +163,22 @@ public async ValueTask UpdateCurrentCamera(CameraInfo? cameraInfo, CancellationT
 	/// </summary>
 	protected virtual partial void PlatformStopCameraPreview();
 
+	/// <summary>
+	/// Starts video recording and writes the recorded data to the specified stream.
+	/// </summary>
+	/// <remarks>This method is platform-specific and should be overridden in a derived class to provide the actual
+	/// implementation. Ensure that the stream remains open and writable for the duration of the recording.</remarks>
+	/// <param name="stream">The stream to which the video data will be written. Must be writable and not null.</param>
+	/// <param name="token">A cancellation token that can be used to cancel the video recording operation.</param>
+	/// <returns>A task that represents the asynchronous video recording operation.</returns>
 	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token);
 
+	/// <summary>
+	/// Stops the video recording process asynchronously.
+	/// </summary>
+	/// <remarks>This method is platform-specific and should be overridden in a derived class to implement the stop
+	/// functionality.</remarks>
+	/// <param name="token">A cancellation token that can be used to cancel the stop operation.</param>
+	/// <returns>A task that represents the asynchronous stop operation.</returns>
 	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index a64ea4ba89..96fc85caaf 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -205,7 +205,6 @@ protected async Task PlatformUpdateResolution(Size resolution, CancellationToken
 		}
 	}
 
-	MemoryStream? recordingStream;
 	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
 		if (!IsInitialized || mediaCapture is null || mediaElement is null)
@@ -213,7 +212,6 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 			return;
 		}
 
-		recordingStream = new MemoryStream();
 		MediaEncodingProfile profile = MediaEncodingProfile.CreateMp4(VideoEncodingQuality.Auto);
 		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, stream.AsRandomAccessStream());
 
diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
index 79efa2fe61..e318badb0f 100644
--- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
+++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj
@@ -38,7 +38,7 @@
     <Description>Camera contains CameraView, a view for displaying a preview of the camera output and other camera related functionalities in your .NET MAUI app.</Description>
     <PackageIcon>icon.png</PackageIcon>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>99.0.0-preview</Version>
+    <Version>1.0.0-pre1</Version>
     <PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>dotnet,maui,toolkit,kit,communitytoolkit,dotnetcommunitytoolkit,cameraview,camera,photo</PackageTags>
diff --git a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
index 042e48cdcd..9f4502137e 100644
--- a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
@@ -76,14 +76,25 @@ public interface ICameraView : IView
 	void StopCameraPreview();
 
 	/// <summary>
-	/// Starts the video recording.
+	/// Starts recording video and writes the output to the specified stream.
 	/// </summary>
-	Task StartVideoRecording(Stream stream, CancellationToken token);
+	/// <remarks>Ensure that the stream is properly disposed of after the recording is complete. The recording will
+	/// stop if the cancellation token is triggered.</remarks>
+	/// <param name="stream">The stream to which the video data will be written. The stream must be writable and remain open for the duration of
+	/// the recording.</param>
+	/// <param name="token">A cancellation token that can be used to cancel the video recording operation.</param>
+	/// <returns>A task that represents the asynchronous video recording operation.</returns>
+	Task StartVideoRecording(Stream stream, CancellationToken token = default);
 
 	/// <summary>
-	/// Stops the video recording.
+	/// Stops the ongoing video recording operation.
 	/// </summary>
-	Task StopVideoRecording(CancellationToken token);
+	/// <remarks>This method should be called to terminate the video recording process. Ensure that the recording
+	/// has been started before invoking this method. The operation can be cancelled by passing a  cancellation
+	/// token.</remarks>
+	/// <param name="token">A cancellation token that can be used to cancel the stop operation.</param>
+	/// <returns>A task that represents the asynchronous stop operation.</returns>
+	Task StopVideoRecording(CancellationToken token = default);
 
 	/// <summary>
 	/// Retrieves the cameras available on the current device.
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
index e7383a3219..6da7e2c028 100644
--- a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -65,7 +65,7 @@ internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)
 	internal static Command<Stream> CreateStartVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new Command<Stream>(async stream => await cameraView.StartVideoRecording(stream, CancellationToken.None).ConfigureAwait(false));
+		return new Command<Stream>(async stream => await cameraView.StartVideoRecording(stream).ConfigureAwait(false));
 	}
 
 	internal static Command<CancellationToken> CreateStopVideoRecordingCommand(BindableObject bindable)
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index 4647036f11..550576870a 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -150,13 +150,22 @@ public event EventHandler<MediaCapturedEventArgs> MediaCaptured
 	public ICommand StopCameraPreviewCommand => (ICommand)GetValue(StopCameraPreviewCommandProperty);
 
 	/// <summary>
-	/// 
+	/// Gets the Command that starts video recording.
 	/// </summary>
+	/// <remarks>
+	/// <see cref="StartVideoRecordingCommand"/> has a <see cref="Type"/> of Command&lt;Stream&gt; which requires a <see cref="Stream"/> as a CommandParameter.
+	/// The <see cref="Stream"/> parameter represents the destination where the recorded video will be saved.
+	/// See <see cref="Command{Stream}"/> and <see cref="System.Windows.Input.ICommand.Execute(object)"/> for more information on passing a <see cref="Stream"/> into <see cref="Command{T}"/> as a CommandParameter.
+	/// </remarks>
 	public Command<Stream> StartVideoRecordingCommand => (Command<Stream>)GetValue(StartVideoRecordingCommandProperty);
-	
+
 	/// <summary>
-	/// 
+	/// Gets the Command that stops video recording.
 	/// </summary>
+	/// <remarks>
+	/// <see cref="StopVideoRecordingCommand"/> has a <see cref="Type"/> of Command&lt;CancellationToken&gt;, which requires a <see cref="CancellationToken"/> as a CommandParameter. 
+	/// See <see cref="Command{CancellationToken}"/> and <see cref="System.Windows.Input.ICommand.Execute(object)"/> for more information on passing a <see cref="CancellationToken"/> into <see cref="Command{T}"/> as a CommandParameter.
+	/// </remarks>
 	public Command<CancellationToken> StopVideoRecordingCommand => (Command<CancellationToken>)GetValue(StopVideoRecordingCommandProperty);
 
 	/// <summary>
@@ -292,11 +301,11 @@ public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
 
 	/// <inheritdoc cref="ICameraView.StartVideoRecording"/>
-	public Task StartVideoRecording(Stream stream, CancellationToken token) =>
+	public Task StartVideoRecording(Stream stream, CancellationToken token = default) =>
 		Handler.CameraManager.StartVideoRecording(stream, token);
 
 	/// <inheritdoc cref="ICameraView.StopVideoRecording"/>
-	public Task StopVideoRecording(CancellationToken token) =>
+	public Task StopVideoRecording(CancellationToken token = default) =>
 		Handler.CameraManager.StopVideoRecording(token);
 
 	/// <inheritdoc/>

From 528c70da5603c957bf82952588ecff6c866dc9ac Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Sat, 19 Jul 2025 15:29:13 +0300
Subject: [PATCH 22/40] add tests

---
 .../Views/CameraView/CameraViewTests.cs          | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraViewTests.cs
index 3f09ad0341..4f4b43b517 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraViewTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraViewTests.cs
@@ -61,6 +61,22 @@ public void OnMediaCaptured_RaisesMediaCapturedEvent()
 		Assert.True(eventRaised);
 	}
 
+	[Fact]
+	public async Task StartVideoRecording_ShouldThrowException()
+	{
+		var imageData = new MemoryStream();
+
+		await Assert.ThrowsAsync<InvalidOperationException>(() => cameraView.StartVideoRecording(imageData, TestContext.Current.CancellationToken));
+	}
+
+	[Fact]
+	public async Task StopVideoRecording_ShouldThrowException()
+	{
+		var imageData = new MemoryStream();
+
+		await Assert.ThrowsAsync<InvalidOperationException>(() => cameraView.StopVideoRecording(TestContext.Current.CancellationToken));
+	}
+
 	[Fact(Timeout = (int)TestDuration.Short)]
 	public async Task OnMediaCapturedFailed_RaisesMediaCaptureFailedEvent()
 	{

From cdd819acd0441edfda148f2843ea4c9197d66cdb Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Sun, 27 Jul 2025 17:24:44 +0300
Subject: [PATCH 23/40] remove !

Refactor video recording logic and improve null checks

- Updated `StartUseCase` in `CameraManager.android.cs` to use a builder pattern for `videoRecorder`, allowing for null checks on `Quality.Highest`.
- Changed executor retrieval in `PlatformStartVideoRecording` to enhance readability and error handling.
- Improved null safety in `EnableModes` by checking for nullability of `extensionsManager`.
- Updated `SupportedOSPlatform` in `CameraManager.windows.cs` to require a higher minimum Windows version.
- Refactored `PlatformStartVideoRecording` to use `var` for `profile` and modernized null-checking style for `frameSource` and `frameFormat`.
---
 .../CameraManager.android.cs                  | 20 ++++++++++++-------
 .../CameraManager.windows.cs                  | 18 ++++++++---------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 96a8320e7a..f8072d186e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -231,10 +231,15 @@ protected async Task StartUseCase(CancellationToken token)
 			.SetResolutionSelector(resolutionSelector)
 			.Build();
 
-		videoRecorder = new Recorder.Builder()
-			.SetExecutor(cameraExecutor)
-			.SetQualitySelector(QualitySelector.From(Quality.Highest!))
-			.Build();
+		var videoRecorderBuilder = new Recorder.Builder()
+			.SetExecutor(cameraExecutor);
+
+		if (Quality.Highest is not null)
+		{
+			videoRecorderBuilder = videoRecorderBuilder.SetQualitySelector(QualitySelector.From(Quality.Highest));
+		}
+
+		videoRecorder = videoRecorderBuilder.Build();
 		videoCapture = VideoCapture.WithOutput(videoRecorder);
 
 		await StartCameraPreview(token);
@@ -325,10 +330,11 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 
 		videoRecordingFinalizeTcs = new TaskCompletionSource();
 		var captureListener = new CameraConsumer(videoRecordingFinalizeTcs);
+		var executor = ContextCompat.GetMainExecutor(context) ?? throw new CameraException($"Unable to retrieve {nameof(IExecutorService)}");
 		videoRecording = videoRecorder
 			.PrepareRecording(context, outputOptions)
 			.WithAudioEnabled()
-			.Start(ContextCompat.GetMainExecutor(context)!, captureListener);
+			.Start(executor, captureListener);
 	}
 
 	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
@@ -388,8 +394,8 @@ async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
 			var extensionsManagerFuture = ExtensionsManager.GetInstanceAsync(context, cameraProviderInstance);
 			extensionsManagerFuture.AddListener(new Runnable(() =>
 			{
-				var extensionsManager = (ExtensionsManager)extensionsManagerFuture.Get()!;
-				if (extensionsManager.IsExtensionAvailable(cameraSelector, extensionMode))
+				var extensionsManager = (ExtensionsManager?)extensionsManagerFuture.Get();
+				if (extensionsManager is not null && extensionsManager.IsExtensionAvailable(cameraSelector, extensionMode))
 				{
 					cameraSelector = extensionsManager.GetExtensionEnabledCameraSelector(cameraSelector, extensionMode);
 				}
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index 96fc85caaf..f5941e4a5f 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.Versioning;
+using System.Runtime.Versioning;
 using CommunityToolkit.Maui.Extensions;
 using Microsoft.UI.Xaml.Controls;
 using Windows.Media.Capture;
@@ -9,7 +8,7 @@
 
 namespace CommunityToolkit.Maui.Core;
 
-[SupportedOSPlatform("windows10.0.10240.0")]
+[SupportedOSPlatform("windows10.0.16299.0")]
 partial class CameraManager
 {
 	MediaPlayerElement? mediaElement;
@@ -212,18 +211,19 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 			return;
 		}
 
-		MediaEncodingProfile profile = MediaEncodingProfile.CreateMp4(VideoEncodingQuality.Auto);
+		var profile = MediaEncodingProfile.CreateMp4(VideoEncodingQuality.Auto);
 		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, stream.AsRandomAccessStream());
 
 		frameSource = mediaCapture.FrameSources.FirstOrDefault(source =>
-			source.Value.Info.MediaStreamType == MediaStreamType.VideoRecord
-			&& source.Value.Info.SourceKind == MediaFrameSourceKind.Color).Value;
-		if (frameSource != null)
+			source.Value.Info.MediaStreamType == MediaStreamType.VideoRecord && 
+			source.Value.Info.SourceKind == MediaFrameSourceKind.Color).Value;
+		if (frameSource is not null)
 		{
 			var frameFormat = frameSource.SupportedFormats
-					.OrderByDescending(f => f.VideoFormat.Width * f.VideoFormat.Height).FirstOrDefault();
+					.OrderByDescending(f => f.VideoFormat.Width * f.VideoFormat.Height)
+					.FirstOrDefault();
 
-			if (frameFormat != null)
+			if (frameFormat is not null)
 			{
 				await frameSource.SetFormatAsync(frameFormat);
 				mediaElement.AutoPlay = true;

From 690dd3bad737f4f0c2c0fd16ce03f976f7e8719d Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Sun, 7 Sep 2025 14:06:03 -0700
Subject: [PATCH 24/40] Remove unused fields

---
 .../Pages/Views/CameraView/CameraViewPage.xaml.cs | 15 +++++----------
 .../CameraManager.shared.cs                       | 13 ++++++++++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index 47698d3240..443abfb6e9 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -6,23 +6,18 @@ namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
 public partial class CameraViewPage : BasePage<CameraViewViewModel>
 {
-	readonly CameraViewViewModel viewModel;
 	readonly string imagePath;
 	int pageCount;
 
 	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem) : base(viewModel)
 	{
-		this.viewModel = viewModel;
 		InitializeComponent();
 
 		imagePath = Path.Combine(fileSystem.CacheDirectory, "camera-view-image.jpg");
 
 		Camera.MediaCaptured += OnMediaCaptured;
 
-		Loaded += (s, e) =>
-		{
-			pageCount = Navigation.NavigationStack.Count;
-		};
+		Loaded += (s, e) => { pageCount = Navigation.NavigationStack.Count; };
 	}
 
 	protected override async void OnAppearing()
@@ -53,6 +48,7 @@ async void OnImageTapped(object? sender, TappedEventArgs args)
 		{
 			return;
 		}
+
 		await Navigation.PushAsync(new ImageViewPage(imagePath));
 	}
 
@@ -84,7 +80,6 @@ void OnMediaCaptured(object? sender, MediaCapturedEventArgs e)
 
 			debugText.Text = $"Image saved to {imagePath}";
 		});
-
 	}
 
 	void ZoomIn(object? sender, EventArgs e)
@@ -102,13 +97,13 @@ async void SetNightMode(object? sender, EventArgs e)
 #if ANDROID
 		await Camera.SetExtensionMode(AndroidX.Camera.Extensions.ExtensionMode.Night);
 #else
-await Task.CompletedTask;
+		await Task.CompletedTask;
 #endif
 	}
 
 	async void StartCameraRecording(object? sender, EventArgs e)
 	{
-		viewModel.Stream = new MemoryStream();
-		await Camera.StartVideoRecording(viewModel.Stream, CancellationToken.None);
+		BindingContext.Stream = new MemoryStream();
+		await Camera.StartVideoRecording(BindingContext.Stream, CancellationToken.None);
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index 44482d126e..291be61bef 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -1,4 +1,6 @@
-namespace CommunityToolkit.Maui.Core;
+using System.Diagnostics;
+
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// A class that manages the camera functionality.
@@ -64,9 +66,14 @@ public async Task StartVideoRecording(Stream stream, CancellationToken token)
 	{
 		var cameraRequest = await Permissions.RequestAsync<Permissions.Camera>();
 		var microphoneRequest = await Permissions.RequestAsync<Permissions.Microphone>();
-		if (cameraRequest != PermissionStatus.Granted || microphoneRequest != PermissionStatus.Granted)
+		if (cameraRequest is not PermissionStatus.Granted)
+		{
+			Trace.TraceInformation("Camera permission is not granted.");
+		}
+		
+		if (microphoneRequest is not PermissionStatus.Granted)
 		{
-			throw new CameraException("Camera and/or Microphone permissions are not granted.");
+			Trace.TraceInformation("Microphone permission is not granted.");
 		}
 
 		await PlatformStartVideoRecording(stream, token);

From cba0b9ed9dc2c6f0347583950aeb709f85a6681f Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Sun, 7 Sep 2025 14:22:15 -0700
Subject: [PATCH 25/40] Implement Disposables

---
 .../CameraManager.android.cs                  | 17 ++++++++++---
 .../CameraManager.macios.cs                   | 25 +++++++++++--------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index f8072d186e..a2af5b1acd 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -48,7 +48,7 @@ public async Task SetExtensionMode(int mode)
 	{
 		extensionMode = mode;
 		if (cameraView.SelectedCamera is null || processCameraProvider is null || cameraPreview is null ||
-			imageCapture is null || videoCapture is null)
+		    imageCapture is null || videoCapture is null)
 		{
 			return;
 		}
@@ -101,7 +101,7 @@ public async partial ValueTask UpdateCaptureResolution(Size resolution, Cancella
 		if (resolutionFilter is not null)
 		{
 			if (Math.Abs(resolutionFilter.TargetSize.Width - resolution.Width) < double.Epsilon &&
-				Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
+			    Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
 			{
 				return;
 			}
@@ -300,7 +300,7 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
 		if (previewView is null || processCameraProvider is null || cameraPreview is null || imageCapture is null || videoCapture is null ||
-			videoRecorder is null || videoRecordingFile is not null)
+		    videoRecorder is null || videoRecordingFile is not null)
 		{
 			return;
 		}
@@ -371,11 +371,20 @@ void CleanupVideoRecordingResources()
 				videoRecordingFile.Delete();
 			}
 
+			videoRecordingFile.Dispose();
 			videoRecordingFile = null;
 		}
 
-		videoRecordingFinalizeTcs = null;
+		videoRecorder?.Dispose();
+		videoRecorder = null;
+		
+		videoRecordingStream?.Dispose();
 		videoRecordingStream = null;
+		
+		videoCapture?.Dispose();
+		videoCapture = null;
+		
+		videoRecordingFinalizeTcs = null;
 	}
 
 	async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 2ddb421f50..2cf067f2b9 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -27,7 +27,7 @@ partial class CameraManager
 	AVCaptureMovieFileOutput? videoOutput;
 	TaskCompletionSource? videoRecordingFinalizeTcs;
 	Stream? videoRecordingStream;
-	string? videoRecordingFile;
+	string? videoRecordingFileName;
 
 	// IN the future change the return type to be an alias
 	public UIView CreatePlatformView()
@@ -245,20 +245,20 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 
 		videoRecordingStream = stream;
 		videoRecordingFinalizeTcs = new TaskCompletionSource();
-		videoRecordingFile = Path.GetTempFileName();
+		videoRecordingFileName = Path.GetTempFileName();
 
 		if (!captureSession.Running)
 		{
 			captureSession.StartRunning();
 		}
 
-		var outputUrl = NSUrl.FromFilename(videoRecordingFile);
+		var outputUrl = NSUrl.FromFilename(videoRecordingFileName);
 		videoOutput.StartRecordingToOutputFile(outputUrl, new AVCaptureMovieFileOutputRecordingDelegate(videoRecordingFinalizeTcs));
 	}
 
 	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
 	{
-		if (captureSession is null || videoRecordingFile is null || videoInput is null || videoOutput is null || videoRecordingStream is null || videoRecordingFinalizeTcs is null)
+		if (captureSession is null || videoRecordingFileName is null || videoInput is null || videoOutput is null || videoRecordingStream is null || videoRecordingFinalizeTcs is null)
 		{
 			return;
 		}
@@ -266,9 +266,9 @@ protected virtual async partial Task PlatformStopVideoRecording(CancellationToke
 		videoOutput.StopRecording();
 		await videoRecordingFinalizeTcs.Task.WaitAsync(token);
 
-		if (File.Exists(videoRecordingFile))
+		if (File.Exists(videoRecordingFileName))
 		{
-			await using var inputStream = new FileStream(videoRecordingFile, FileMode.Open, FileAccess.Read, FileShare.Read);
+			await using var inputStream = new FileStream(videoRecordingFileName, FileMode.Open, FileAccess.Read, FileShare.Read);
 			await inputStream.CopyToAsync(videoRecordingStream, token);
 			await videoRecordingStream.FlushAsync(token);
 		}
@@ -299,17 +299,19 @@ void CleanupVideoRecordingResources()
 		}
 
 		// Clean up temporary file
-		if (videoRecordingFile is not null)
+		if (videoRecordingFileName is not null)
 		{
-			if (File.Exists(videoRecordingFile))
+			if (File.Exists(videoRecordingFileName))
 			{
-				File.Delete(videoRecordingFile);
+				File.Delete(videoRecordingFileName);
 			}
-
-			videoRecordingFile = null;
+			
+			videoRecordingFileName = null;
 		}
 
 		videoRecordingFinalizeTcs = null;
+		
+		videoRecordingStream?.Dispose();
 		videoRecordingStream = null;
 	}
 
@@ -389,6 +391,7 @@ protected virtual void Dispose(bool disposing)
 			photoOutput?.Dispose();
 			photoOutput = null;
 
+			previewView?.Dispose();
 			previewView = null;
 		}
 	}

From 352a7e958408a2bdb3eb258286946e53a1321ffd Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Sun, 7 Sep 2025 14:40:27 -0700
Subject: [PATCH 26/40] Move `Stream` to CameraViewPage

---
 .../Views/CameraView/CameraViewPage.xaml      |  2 +-
 .../Views/CameraView/CameraViewPage.xaml.cs   | 25 +++++++++++++++----
 .../Views/CameraView/CameraViewViewModel.cs   | 10 --------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
index e189adf7ce..adb9d09ca6 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
@@ -82,7 +82,7 @@
                          CommandParameter="{Binding Token}"
                          Text="StopVideoRecording" />
 
-                <Button Command="{Binding SaveVideoCommand}" Text="Save Video Recording" />
+                <Button Clicked="SaveVideo" Text="Save Video Recording" />
 
                 <Button Command="{Binding CaptureImageCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
                         CommandParameter="{Binding Token}"
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index 443abfb6e9..0472051aee 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -1,24 +1,34 @@
 using System.Diagnostics;
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Sample.ViewModels.Views;
+using CommunityToolkit.Maui.Storage;
 
 namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
-public partial class CameraViewPage : BasePage<CameraViewViewModel>
+public sealed partial class CameraViewPage : BasePage<CameraViewViewModel>, IDisposable
 {
+	readonly IFileSaver fileSaver;
 	readonly string imagePath;
+
+	MemoryStream videoRecordingStream = new();
 	int pageCount;
 
-	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem) : base(viewModel)
+	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem, IFileSaver fileSaver) : base(viewModel)
 	{
 		InitializeComponent();
-
+		
+		this.fileSaver = fileSaver;
 		imagePath = Path.Combine(fileSystem.CacheDirectory, "camera-view-image.jpg");
 
 		Camera.MediaCaptured += OnMediaCaptured;
 
 		Loaded += (s, e) => { pageCount = Navigation.NavigationStack.Count; };
 	}
+	
+	public void Dispose()
+	{
+		videoRecordingStream.Dispose();
+	}
 
 	protected override async void OnAppearing()
 	{
@@ -103,7 +113,12 @@ async void SetNightMode(object? sender, EventArgs e)
 
 	async void StartCameraRecording(object? sender, EventArgs e)
 	{
-		BindingContext.Stream = new MemoryStream();
-		await Camera.StartVideoRecording(BindingContext.Stream, CancellationToken.None);
+		videoRecordingStream = new MemoryStream();
+		await Camera.StartVideoRecording(videoRecordingStream, CancellationToken.None);
+	}
+	
+	async void SaveVideo(object? sender, EventArgs e)
+	{
+		await fileSaver.SaveAsync("recording.mp4", videoRecordingStream);
 	}
 }
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
index 27ec29dc80..aece6625fe 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
@@ -1,6 +1,4 @@
 using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.Core.Primitives;
-using CommunityToolkit.Maui.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 
@@ -12,8 +10,6 @@ public partial class CameraViewViewModel(ICameraProvider cameraProvider) : BaseV
 
 	public CancellationToken Token => CancellationToken.None;
 
-	public Stream Stream { get; set; } = new MemoryStream();
-
 	public ICollection<CameraFlashMode> FlashModes { get; } = Enum.GetValues<CameraFlashMode>();
 
 	[ObservableProperty]
@@ -79,10 +75,4 @@ void UpdateResolutionText()
 	{
 		ResolutionText = $"Selected Resolution: {SelectedResolution.Width} x {SelectedResolution.Height}";
 	}
-
-	[RelayCommand]
-	async Task SaveVideo()
-	{
-		await FileSaver.SaveAsync("recording.mp4", Stream);
-	}
 }
\ No newline at end of file

From 4354246d1da6443298fb2ef8b035dc422266e74c Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Sun, 7 Sep 2025 14:45:06 -0700
Subject: [PATCH 27/40] Move disposal of videoRecordingStream to `Dispose()`

---
 src/CommunityToolkit.Maui.Camera/CameraManager.android.cs | 6 +++---
 src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index a2af5b1acd..38ef2f8b7a 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -173,6 +173,9 @@ protected virtual void Dispose(bool disposing)
 			orientationListener?.Disable();
 			orientationListener?.Dispose();
 			orientationListener = null;
+			
+			videoRecordingStream?.Dispose();
+			videoRecordingStream = null;
 		}
 	}
 
@@ -378,9 +381,6 @@ void CleanupVideoRecordingResources()
 		videoRecorder?.Dispose();
 		videoRecorder = null;
 		
-		videoRecordingStream?.Dispose();
-		videoRecordingStream = null;
-		
 		videoCapture?.Dispose();
 		videoCapture = null;
 		
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 2cf067f2b9..4bd98b6b63 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -310,9 +310,6 @@ void CleanupVideoRecordingResources()
 		}
 
 		videoRecordingFinalizeTcs = null;
-		
-		videoRecordingStream?.Dispose();
-		videoRecordingStream = null;
 	}
 
 	protected virtual async partial ValueTask PlatformTakePicture(CancellationToken token)
@@ -393,6 +390,9 @@ protected virtual void Dispose(bool disposing)
 
 			previewView?.Dispose();
 			previewView = null;
+			
+			videoRecordingStream?.Dispose();
+			videoRecordingStream = null;
 		}
 	}
 

From 6be4152bfb9d3fba7e50455b80f6799947713856 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Sun, 7 Sep 2025 14:54:23 -0700
Subject: [PATCH 28/40] Refactor `StartVideoRecording` to return `Task<Stream>`

---
 .../Pages/Views/CameraView/CameraViewPage.xaml.cs           | 5 ++---
 src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs    | 6 ++++--
 .../Interfaces/ICameraView.shared.cs                        | 6 ++----
 .../Primitives/CameraViewDefaults.shared.cs                 | 6 +++---
 src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs | 4 ++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index 0472051aee..dca357c8ad 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -10,7 +10,7 @@ public sealed partial class CameraViewPage : BasePage<CameraViewViewModel>, IDis
 	readonly IFileSaver fileSaver;
 	readonly string imagePath;
 
-	MemoryStream videoRecordingStream = new();
+	Stream videoRecordingStream = Stream.Null;
 	int pageCount;
 
 	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem, IFileSaver fileSaver) : base(viewModel)
@@ -113,8 +113,7 @@ async void SetNightMode(object? sender, EventArgs e)
 
 	async void StartCameraRecording(object? sender, EventArgs e)
 	{
-		videoRecordingStream = new MemoryStream();
-		await Camera.StartVideoRecording(videoRecordingStream, CancellationToken.None);
+		videoRecordingStream = await Camera.StartVideoRecording(CancellationToken.None);
 	}
 	
 	async void SaveVideo(object? sender, EventArgs e)
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index 291be61bef..a8beffa36e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -58,11 +58,10 @@ public async Task<bool> ArePermissionsGranted()
 	/// <summary>
 	/// Starts the video recording.
 	/// </summary>
-	/// <param name="stream">The output stream for video recording</param>
 	/// <param name="token"><see cref="CancellationToken"/></param>
 	/// <returns>A <see cref="Task"/> that can be awaited.</returns>
 	/// <exception cref="CameraException"></exception>
-	public async Task StartVideoRecording(Stream stream, CancellationToken token)
+	public async Task<Stream> StartVideoRecording(CancellationToken token)
 	{
 		var cameraRequest = await Permissions.RequestAsync<Permissions.Camera>();
 		var microphoneRequest = await Permissions.RequestAsync<Permissions.Microphone>();
@@ -76,7 +75,10 @@ public async Task StartVideoRecording(Stream stream, CancellationToken token)
 			Trace.TraceInformation("Microphone permission is not granted.");
 		}
 
+		var stream = new MemoryStream();
 		await PlatformStartVideoRecording(stream, token);
+
+		return stream;
 	}
 
 
diff --git a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
index 9f4502137e..a481bf3e10 100644
--- a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
@@ -80,11 +80,9 @@ public interface ICameraView : IView
 	/// </summary>
 	/// <remarks>Ensure that the stream is properly disposed of after the recording is complete. The recording will
 	/// stop if the cancellation token is triggered.</remarks>
-	/// <param name="stream">The stream to which the video data will be written. The stream must be writable and remain open for the duration of
-	/// the recording.</param>
 	/// <param name="token">A cancellation token that can be used to cancel the video recording operation.</param>
-	/// <returns>A task that represents the asynchronous video recording operation.</returns>
-	Task StartVideoRecording(Stream stream, CancellationToken token = default);
+	/// <returns>A <see cref="Task"/> of type <see cref="Stream"/> where the recording will be saved in memory as the video records.</returns>
+	Task<Stream> StartVideoRecording(CancellationToken token = default);
 
 	/// <summary>
 	/// Stops the ongoing video recording operation.
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
index 6da7e2c028..7636a06a83 100644
--- a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -62,15 +62,15 @@ internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)
 		return new Command(_ => cameraView.StopCameraPreview());
 	}
 
-	internal static Command<Stream> CreateStartVideoRecordingCommand(BindableObject bindable)
+	internal static Command<CancellationToken> CreateStartVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new Command<Stream>(async stream => await cameraView.StartVideoRecording(stream).ConfigureAwait(false));
+		return new(async token => await cameraView.StartVideoRecording(token).ConfigureAwait(false));
 	}
 
 	internal static Command<CancellationToken> CreateStopVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new Command<CancellationToken>(async token => await cameraView.StopVideoRecording(token).ConfigureAwait(false));
+		return new(async token => await cameraView.StopVideoRecording(token).ConfigureAwait(false));
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index 550576870a..4bcc14e1fe 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -301,8 +301,8 @@ public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
 
 	/// <inheritdoc cref="ICameraView.StartVideoRecording"/>
-	public Task StartVideoRecording(Stream stream, CancellationToken token = default) =>
-		Handler.CameraManager.StartVideoRecording(stream, token);
+	public Task<Stream> StartVideoRecording(CancellationToken token = default) =>
+		Handler.CameraManager.StartVideoRecording(token);
 
 	/// <inheritdoc cref="ICameraView.StopVideoRecording"/>
 	public Task StopVideoRecording(CancellationToken token = default) =>

From be078910335fd69123fbbd5f09a62f2e7d4b474c Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 12 Sep 2025 13:03:30 +0300
Subject: [PATCH 29/40] Revert "Refactor `StartVideoRecording` to return
 `Task<Stream>`"

This reverts commit 6be4152bfb9d3fba7e50455b80f6799947713856.
---
 .../Pages/Views/CameraView/CameraViewPage.xaml.cs           | 5 +++--
 src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs    | 6 ++----
 .../Interfaces/ICameraView.shared.cs                        | 6 ++++--
 .../Primitives/CameraViewDefaults.shared.cs                 | 6 +++---
 src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs | 4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index dca357c8ad..0472051aee 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -10,7 +10,7 @@ public sealed partial class CameraViewPage : BasePage<CameraViewViewModel>, IDis
 	readonly IFileSaver fileSaver;
 	readonly string imagePath;
 
-	Stream videoRecordingStream = Stream.Null;
+	MemoryStream videoRecordingStream = new();
 	int pageCount;
 
 	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem, IFileSaver fileSaver) : base(viewModel)
@@ -113,7 +113,8 @@ async void SetNightMode(object? sender, EventArgs e)
 
 	async void StartCameraRecording(object? sender, EventArgs e)
 	{
-		videoRecordingStream = await Camera.StartVideoRecording(CancellationToken.None);
+		videoRecordingStream = new MemoryStream();
+		await Camera.StartVideoRecording(videoRecordingStream, CancellationToken.None);
 	}
 	
 	async void SaveVideo(object? sender, EventArgs e)
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index a8beffa36e..291be61bef 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -58,10 +58,11 @@ public async Task<bool> ArePermissionsGranted()
 	/// <summary>
 	/// Starts the video recording.
 	/// </summary>
+	/// <param name="stream">The output stream for video recording</param>
 	/// <param name="token"><see cref="CancellationToken"/></param>
 	/// <returns>A <see cref="Task"/> that can be awaited.</returns>
 	/// <exception cref="CameraException"></exception>
-	public async Task<Stream> StartVideoRecording(CancellationToken token)
+	public async Task StartVideoRecording(Stream stream, CancellationToken token)
 	{
 		var cameraRequest = await Permissions.RequestAsync<Permissions.Camera>();
 		var microphoneRequest = await Permissions.RequestAsync<Permissions.Microphone>();
@@ -75,10 +76,7 @@ public async Task<Stream> StartVideoRecording(CancellationToken token)
 			Trace.TraceInformation("Microphone permission is not granted.");
 		}
 
-		var stream = new MemoryStream();
 		await PlatformStartVideoRecording(stream, token);
-
-		return stream;
 	}
 
 
diff --git a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
index a481bf3e10..9f4502137e 100644
--- a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
@@ -80,9 +80,11 @@ public interface ICameraView : IView
 	/// </summary>
 	/// <remarks>Ensure that the stream is properly disposed of after the recording is complete. The recording will
 	/// stop if the cancellation token is triggered.</remarks>
+	/// <param name="stream">The stream to which the video data will be written. The stream must be writable and remain open for the duration of
+	/// the recording.</param>
 	/// <param name="token">A cancellation token that can be used to cancel the video recording operation.</param>
-	/// <returns>A <see cref="Task"/> of type <see cref="Stream"/> where the recording will be saved in memory as the video records.</returns>
-	Task<Stream> StartVideoRecording(CancellationToken token = default);
+	/// <returns>A task that represents the asynchronous video recording operation.</returns>
+	Task StartVideoRecording(Stream stream, CancellationToken token = default);
 
 	/// <summary>
 	/// Stops the ongoing video recording operation.
diff --git a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
index 7636a06a83..6da7e2c028 100644
--- a/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Primitives/CameraViewDefaults.shared.cs
@@ -62,15 +62,15 @@ internal static ICommand CreateStopCameraPreviewCommand(BindableObject bindable)
 		return new Command(_ => cameraView.StopCameraPreview());
 	}
 
-	internal static Command<CancellationToken> CreateStartVideoRecordingCommand(BindableObject bindable)
+	internal static Command<Stream> CreateStartVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new(async token => await cameraView.StartVideoRecording(token).ConfigureAwait(false));
+		return new Command<Stream>(async stream => await cameraView.StartVideoRecording(stream).ConfigureAwait(false));
 	}
 
 	internal static Command<CancellationToken> CreateStopVideoRecordingCommand(BindableObject bindable)
 	{
 		var cameraView = (CameraView)bindable;
-		return new(async token => await cameraView.StopVideoRecording(token).ConfigureAwait(false));
+		return new Command<CancellationToken>(async token => await cameraView.StopVideoRecording(token).ConfigureAwait(false));
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index 4bcc14e1fe..550576870a 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -301,8 +301,8 @@ public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
 
 	/// <inheritdoc cref="ICameraView.StartVideoRecording"/>
-	public Task<Stream> StartVideoRecording(CancellationToken token = default) =>
-		Handler.CameraManager.StartVideoRecording(token);
+	public Task StartVideoRecording(Stream stream, CancellationToken token = default) =>
+		Handler.CameraManager.StartVideoRecording(stream, token);
 
 	/// <inheritdoc cref="ICameraView.StopVideoRecording"/>
 	public Task StopVideoRecording(CancellationToken token = default) =>

From 1fab40fc7812b7bff0d0d81c108b77b24b99342d Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 12 Sep 2025 15:48:23 +0300
Subject: [PATCH 30/40] Fix Apple video recording

---
 .../CameraManager.macios.cs                   | 111 ++++++++++++------
 1 file changed, 72 insertions(+), 39 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index 4bd98b6b63..d3873bf614 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -1,8 +1,9 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using AVFoundation;
 using CommunityToolkit.Maui.Extensions;
 using CoreMedia;
 using Foundation;
+using ObjCRuntime;
 using UIKit;
 
 namespace CommunityToolkit.Maui.Core;
@@ -11,26 +12,33 @@ partial class CameraManager
 {
 	// TODO: Check if we really need this
 	readonly NSDictionary<NSString, NSObject> codecSettings = new([AVVideo.CodecKey], [new NSString("jpeg")]);
+	AVCaptureDeviceInput? audioInput;
+	AVCaptureDevice? captureDevice;
+	AVCaptureInput? captureInput;
 
 	AVCaptureSession? captureSession;
-	AVCapturePhotoOutput? photoOutput;
-	AVCaptureInput? captureInput;
-	AVCaptureDevice? captureDevice;
 
 	AVCaptureFlashMode flashMode;
 
 	IDisposable? orientationDidChangeObserver;
+	AVCapturePhotoOutput? photoOutput;
 	PreviewView? previewView;
-	AVCaptureVideoOrientation videoOrientation;
 
 	AVCaptureDeviceInput? videoInput;
+	AVCaptureVideoOrientation videoOrientation;
 	AVCaptureMovieFileOutput? videoOutput;
+	string? videoRecordingFileName;
 	TaskCompletionSource? videoRecordingFinalizeTcs;
 	Stream? videoRecordingStream;
-	string? videoRecordingFileName;
 
-	// IN the future change the return type to be an alias
-	public UIView CreatePlatformView()
+	/// <inheritdoc />
+	public void Dispose()
+	{
+		Dispose(true);
+		GC.SuppressFinalize(this);
+	}
+
+	public NativePlatformCameraPreviewView CreatePlatformView()
 	{
 		captureSession = new AVCaptureSession
 		{
@@ -48,13 +56,6 @@ public UIView CreatePlatformView()
 		return previewView;
 	}
 
-	/// <inheritdoc/>
-	public void Dispose()
-	{
-		Dispose(true);
-		GC.SuppressFinalize(this);
-	}
-
 	public partial void UpdateFlashMode(CameraFlashMode flashMode)
 	{
 		this.flashMode = flashMode.ToPlatform();
@@ -229,11 +230,40 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 		captureSession.BeginConfiguration();
 		captureSession.AddInput(videoInput);
 
+		try
+		{
+			var audioDevice = AVCaptureDevice.GetDefaultDevice(AVMediaTypes.Audio);
+			if (audioDevice is not null)
+			{
+				audioInput = new AVCaptureDeviceInput(audioDevice, out var audioError);
+				if (audioError is null && captureSession.CanAddInput(audioInput))
+				{
+					captureSession.AddInput(audioInput);
+				}
+				else
+				{
+					audioInput?.Dispose();
+					audioInput = null;
+				}
+			}
+		}
+		catch
+		{
+			// Ignore audio configuration issues; proceed with video-only recording
+		}
+
 		videoOutput = new AVCaptureMovieFileOutput();
 
 		if (!captureSession.CanAddOutput(videoOutput))
 		{
 			captureSession.RemoveInput(videoInput);
+			if (audioInput is not null)
+			{
+				captureSession.RemoveInput(audioInput);
+				audioInput.Dispose();
+				audioInput = null;
+			}
+
 			videoInput?.Dispose();
 			videoOutput?.Dispose();
 			captureSession.CommitConfiguration();
@@ -245,12 +275,7 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 
 		videoRecordingStream = stream;
 		videoRecordingFinalizeTcs = new TaskCompletionSource();
-		videoRecordingFileName = Path.GetTempFileName();
-
-		if (!captureSession.Running)
-		{
-			captureSession.StartRunning();
-		}
+		videoRecordingFileName = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid()}.mov");
 
 		var outputUrl = NSUrl.FromFilename(videoRecordingFileName);
 		videoOutput.StartRecordingToOutputFile(outputUrl, new AVCaptureMovieFileOutputRecordingDelegate(videoRecordingFinalizeTcs));
@@ -271,7 +296,12 @@ protected virtual async partial Task PlatformStopVideoRecording(CancellationToke
 			await using var inputStream = new FileStream(videoRecordingFileName, FileMode.Open, FileAccess.Read, FileShare.Read);
 			await inputStream.CopyToAsync(videoRecordingStream, token);
 			await videoRecordingStream.FlushAsync(token);
+			if (videoRecordingStream.CanSeek)
+			{
+				videoRecordingStream.Position = 0;
+			}
 		}
+
 		CleanupVideoRecordingResources();
 	}
 
@@ -281,23 +311,27 @@ void CleanupVideoRecordingResources()
 		{
 			captureSession.BeginConfiguration();
 
-			if (videoInput is not null)
+			foreach (var input in captureSession.Inputs)
 			{
-				captureSession.RemoveInput(videoInput);
-				videoInput.Dispose();
-				videoInput = null;
+				captureSession.RemoveInput(input);
+				input.Dispose();
 			}
 
-			if (videoOutput is not null)
+			foreach (var output in captureSession.Outputs)
 			{
-				captureSession.RemoveOutput(videoOutput);
-				videoOutput.Dispose();
-				videoOutput = null;
+				captureSession.RemoveOutput(output);
+				output.Dispose();
 			}
 
+			// Restore to photo preset for preview after video recording
+			captureSession.SessionPreset = AVCaptureSession.PresetPhoto;
 			captureSession.CommitConfiguration();
 		}
 
+		videoOutput = null;
+		videoInput = null;
+		audioInput = null;
+
 		// Clean up temporary file
 		if (videoRecordingFileName is not null)
 		{
@@ -305,7 +339,7 @@ void CleanupVideoRecordingResources()
 			{
 				File.Delete(videoRecordingFileName);
 			}
-			
+
 			videoRecordingFileName = null;
 		}
 
@@ -390,7 +424,7 @@ protected virtual void Dispose(bool disposing)
 
 			previewView?.Dispose();
 			previewView = null;
-			
+
 			videoRecordingStream?.Dispose();
 			videoRecordingStream = null;
 		}
@@ -446,19 +480,13 @@ sealed record CapturePhotoResult
 		public NSError? Error { get; init; }
 	}
 
-	sealed class PreviewView : UIView
+	sealed class PreviewView : NativePlatformCameraPreviewView
 	{
 		public PreviewView()
 		{
 			PreviewLayer.VideoGravity = AVLayerVideoGravity.ResizeAspectFill;
 		}
 
-		[Export("layerClass")]
-		public static ObjCRuntime.Class GetLayerClass()
-		{
-			return new ObjCRuntime.Class(typeof(AVCaptureVideoPreviewLayer));
-		}
-
 		public AVCaptureSession? Session
 		{
 			get => PreviewLayer.Session;
@@ -467,6 +495,12 @@ public AVCaptureSession? Session
 
 		AVCaptureVideoPreviewLayer PreviewLayer => (AVCaptureVideoPreviewLayer)Layer;
 
+		[Export("layerClass")]
+		public static Class GetLayerClass()
+		{
+			return new Class(typeof(AVCaptureVideoPreviewLayer));
+		}
+
 		public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();
@@ -487,7 +521,6 @@ class AVCaptureMovieFileOutputRecordingDelegate(TaskCompletionSource taskComplet
 {
 	public override void FinishedRecording(AVCaptureFileOutput captureOutput, NSUrl outputFileUrl, NSObject[] connections, NSError? error)
 	{
-		base.FinishedRecording(captureOutput, outputFileUrl, connections, error);
 		taskCompletionSource.SetResult();
 	}
 }
\ No newline at end of file

From 17f202f450c99bd9d9727f083f53f2c853820f60 Mon Sep 17 00:00:00 2001
From: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
Date: Fri, 12 Sep 2025 16:00:44 +0300
Subject: [PATCH 31/40] Requests microphone permission for video recording

Updates the camera permission request to also request microphone permissions.

This ensures that the application has the necessary permissions
to record audio when capturing video.
---
 .../CameraManager.shared.cs                   | 34 +++++++++++--------
 .../Handlers/CameraViewHandler.shared.cs      |  6 +++-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index 291be61bef..8e3cce93b0 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -29,7 +29,23 @@ partial class CameraManager(
 	/// </summary>
 	/// <returns>Returns <c>true</c> if permission has been granted, <c>false</c> otherwise.</returns>
 	public async Task<bool> ArePermissionsGranted()
-		=> await Permissions.RequestAsync<Permissions.Camera>() is PermissionStatus.Granted;
+	{
+		var cameraRequest = await Permissions.RequestAsync<Permissions.Camera>();
+		var microphoneRequest = await Permissions.RequestAsync<Permissions.Microphone>();
+		if (cameraRequest is not PermissionStatus.Granted)
+		{
+			Trace.TraceInformation("Camera permission is not granted.");
+			return false;
+		}
+
+		if (microphoneRequest is not PermissionStatus.Granted)
+		{
+			Trace.TraceInformation("Microphone permission is not granted.");
+			return false;
+		}
+
+		return true;
+	}
 
 	/// <summary>
 	/// Connects to the camera.
@@ -62,21 +78,9 @@ public async Task<bool> ArePermissionsGranted()
 	/// <param name="token"><see cref="CancellationToken"/></param>
 	/// <returns>A <see cref="Task"/> that can be awaited.</returns>
 	/// <exception cref="CameraException"></exception>
-	public async Task StartVideoRecording(Stream stream, CancellationToken token)
+	public Task StartVideoRecording(Stream stream, CancellationToken token)
 	{
-		var cameraRequest = await Permissions.RequestAsync<Permissions.Camera>();
-		var microphoneRequest = await Permissions.RequestAsync<Permissions.Microphone>();
-		if (cameraRequest is not PermissionStatus.Granted)
-		{
-			Trace.TraceInformation("Camera permission is not granted.");
-		}
-		
-		if (microphoneRequest is not PermissionStatus.Granted)
-		{
-			Trace.TraceInformation("Microphone permission is not granted.");
-		}
-
-		await PlatformStartVideoRecording(stream, token);
+		return PlatformStartVideoRecording(stream, token);
 	}
 
 
diff --git a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
index 9f4b12f36c..5310542da6 100644
--- a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
@@ -88,7 +88,11 @@ protected override async void ConnectHandler(NativePlatformCameraPreviewView pla
 	{
 		base.ConnectHandler(platformView);
 
-		await CameraManager.ArePermissionsGranted();
+		if (!await CameraManager.ArePermissionsGranted())
+		{
+			return;
+		}
+		
 		await CameraManager.ConnectCamera(CancellationToken.None);
 		await cameraProvider.RefreshAvailableCameras(CancellationToken.None);
 	}

From cd5a30d65db6ad334bd4e9f967fee2687c6a02bd Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:36:16 -0700
Subject: [PATCH 32/40] Add
 `ICameraView.StartVideoRecording(CancellationToken)`

---
 .../Views/CameraView/CameraViewPage.xaml      | 10 +++----
 .../Views/CameraView/CameraViewPage.xaml.cs   | 28 ++++++++++++-------
 .../CameraManager.android.cs                  |  8 ++++--
 .../CameraManager.macios.cs                   |  8 ++++--
 .../CameraManager.net.cs                      |  2 +-
 .../CameraManager.shared.cs                   |  7 ++---
 .../CameraManager.tizen.cs                    |  2 +-
 .../CameraManager.windows.cs                  | 14 ++++------
 .../Interfaces/ICameraView.shared.cs          | 20 +++++++------
 .../Views/CameraView.shared.cs                | 15 ++++++++--
 10 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
index adb9d09ca6..6da5d48f3f 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml
@@ -69,18 +69,18 @@
 
                 <Button Command="{Binding StartCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}"
                         CommandParameter="{Binding Token}"
-                        Text="StartCameraPreview" />
+                        Text="Start Camera Preview" />
 
                 <Button Command="{Binding StopCameraPreviewCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}" 
-                        Text="StopCameraPreview" />
+                        Text="Stop Camera Preview" />
 
 
                 <Button Clicked="StartCameraRecording"
-                        Text="StartVideoRecording" />
+                        Text="Start Video Recording" />
 
-                <Button  Command="{Binding StopVideoRecordingCommand, Source={x:Reference Camera}, x:DataType=toolkit:CameraView}"
+                <Button  Clicked="StopCameraRecording"
                          CommandParameter="{Binding Token}"
-                         Text="StopVideoRecording" />
+                         Text="Stop Video Recording" />
 
                 <Button Clicked="SaveVideo" Text="Save Video Recording" />
 
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index 0472051aee..4e632b4487 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -5,13 +5,13 @@
 
 namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
-public sealed partial class CameraViewPage : BasePage<CameraViewViewModel>, IDisposable
+public sealed partial class CameraViewPage : BasePage<CameraViewViewModel>
 {
 	readonly IFileSaver fileSaver;
 	readonly string imagePath;
 
-	MemoryStream videoRecordingStream = new();
 	int pageCount;
+	Stream videoRecordingStream = Stream.Null;
 
 	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem, IFileSaver fileSaver) : base(viewModel)
 	{
@@ -24,11 +24,6 @@ public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem, IFi
 
 		Loaded += (s, e) => { pageCount = Navigation.NavigationStack.Count; };
 	}
-	
-	public void Dispose()
-	{
-		videoRecordingStream.Dispose();
-	}
 
 	protected override async void OnAppearing()
 	{
@@ -113,12 +108,25 @@ async void SetNightMode(object? sender, EventArgs e)
 
 	async void StartCameraRecording(object? sender, EventArgs e)
 	{
-		videoRecordingStream = new MemoryStream();
-		await Camera.StartVideoRecording(videoRecordingStream, CancellationToken.None);
+		await Camera.StartVideoRecording(CancellationToken.None);
+	}
+	
+	async void StopCameraRecording(object? sender, EventArgs e)
+	{
+		videoRecordingStream = await Camera.StopVideoRecording(CancellationToken.None);
 	}
 	
 	async void SaveVideo(object? sender, EventArgs e)
 	{
-		await fileSaver.SaveAsync("recording.mp4", videoRecordingStream);
+		if (videoRecordingStream == Stream.Null)
+		{
+			await DisplayAlert("Unable to Save Video", "Stream is null", "OK");
+		}
+		else
+		{
+			await fileSaver.SaveAsync("recording.mp4", videoRecordingStream);
+			await videoRecordingStream.DisposeAsync();
+			videoRecordingStream = Stream.Null;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 38ef2f8b7a..d8e1a03469 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -1,4 +1,4 @@
-using System.Runtime.Versioning;
+using System.Runtime.Versioning;
 using Android.Content;
 using Android.Provider;
 using Android.Runtime;
@@ -340,12 +340,12 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 			.Start(executor, captureListener);
 	}
 
-	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
+	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
 		ArgumentNullException.ThrowIfNull(cameraExecutor);
 		if (videoRecording is null || videoRecordingFile is null || videoRecordingFinalizeTcs is null || videoRecordingStream is null)
 		{
-			return;
+			return Stream.Null;
 		}
 
 		videoRecording.Stop();
@@ -355,6 +355,8 @@ protected virtual async partial Task PlatformStopVideoRecording(CancellationToke
 		await inputStream.CopyToAsync(videoRecordingStream, token);
 		await videoRecordingStream.FlushAsync(token);
 		CleanupVideoRecordingResources();
+
+		return videoRecordingStream;
 	}
 
 	bool IsVideoCaptureAlreadyBound()
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index d3873bf614..f9500f35ca 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using AVFoundation;
 using CommunityToolkit.Maui.Extensions;
 using CoreMedia;
@@ -281,11 +281,11 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 		videoOutput.StartRecordingToOutputFile(outputUrl, new AVCaptureMovieFileOutputRecordingDelegate(videoRecordingFinalizeTcs));
 	}
 
-	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
+	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
 		if (captureSession is null || videoRecordingFileName is null || videoInput is null || videoOutput is null || videoRecordingStream is null || videoRecordingFinalizeTcs is null)
 		{
-			return;
+			return Stream.Null;
 		}
 
 		videoOutput.StopRecording();
@@ -303,6 +303,8 @@ protected virtual async partial Task PlatformStopVideoRecording(CancellationToke
 		}
 
 		CleanupVideoRecordingResources();
+
+		return videoRecordingStream;
 	}
 
 	void CleanupVideoRecordingResources()
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
index 445d88129e..215459bf07 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.net.cs
@@ -15,7 +15,7 @@ partial class CameraManager
 	public partial ValueTask UpdateCaptureResolution(Size resolution, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
 	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
-	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 	protected virtual partial Task PlatformStartCameraPreview(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
 	protected virtual partial void PlatformStopCameraPreview() => throw new NotSupportedException(notSupportedMessage);
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
index 8e3cce93b0..fd16ef81a8 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.shared.cs
@@ -89,10 +89,7 @@ public Task StartVideoRecording(Stream stream, CancellationToken token)
 	/// </summary>
 	/// <param name="token"><see cref="CancellationToken"/></param>
 	/// <returns>A <see cref="Task"/> that can be awaited.</returns>
-	public Task StopVideoRecording(CancellationToken token)
-	{
-		return PlatformStopVideoRecording(token);
-	}
+	public Task<Stream> StopVideoRecording(CancellationToken token) => PlatformStopVideoRecording(token);
 
 	/// <summary>
 	/// Stops the camera preview.
@@ -191,5 +188,5 @@ public async ValueTask UpdateCurrentCamera(CameraInfo? cameraInfo, CancellationT
 	/// functionality.</remarks>
 	/// <param name="token">A cancellation token that can be used to cancel the stop operation.</param>
 	/// <returns>A task that represents the asynchronous stop operation.</returns>
-	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token);
+	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token);
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
index 4030848508..3bb3cb9347 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.tizen.cs
@@ -24,6 +24,6 @@ partial class CameraManager
 
 	protected virtual partial ValueTask PlatformTakePicture(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 	protected virtual partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
-	protected virtual partial Task PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
+	protected virtual partial Task<Stream> PlatformStopVideoRecording(CancellationToken token) => throw new NotSupportedException(notSupportedMessage);
 
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index f5941e4a5f..a64a7c22d3 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -233,16 +233,14 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 		}
 	}
 
-	protected virtual async partial Task PlatformStopVideoRecording(CancellationToken token)
+	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
-		if (!IsInitialized || mediaElement is null)
+		if (!IsInitialized || mediaElement is null || mediaRecording is null)
 		{
-			return;
-		}
-
-		if (mediaRecording != null)
-		{
-			await mediaRecording.StopAsync();
+			return Stream.Null;
 		}
+		
+		await mediaRecording.StopAsync();
+		return mediaRecording
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
index 9f4502137e..1b98bd1ee6 100644
--- a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraView.shared.cs
@@ -75,13 +75,19 @@ public interface ICameraView : IView
 	/// </remarks>
 	void StopCameraPreview();
 
+	/// <summary>
+	/// Starts recording video and writes the output to a <see cref="MemoryStream"/>
+	/// </summary>
+	/// <remarks>Ensure that the stream is properly disposed of after the recording is complete. The recording will be cancelled if cancellation token is triggered. Call <see cref="ICameraView.StopVideoRecording"/> to return the recorded <see cref="Stream"/></remarks>
+	/// <param name="token">A cancellation token that can be used to cancel the video recording operation.</param>
+	/// <returns>A task that represents the asynchronous video recording operation.</returns>
+	Task StartVideoRecording(CancellationToken token = default);
+
 	/// <summary>
 	/// Starts recording video and writes the output to the specified stream.
 	/// </summary>
-	/// <remarks>Ensure that the stream is properly disposed of after the recording is complete. The recording will
-	/// stop if the cancellation token is triggered.</remarks>
-	/// <param name="stream">The stream to which the video data will be written. The stream must be writable and remain open for the duration of
-	/// the recording.</param>
+	/// <remarks>Be sure to properly disposed of the provided <see cref="Stream"/> parameter after the recording has completed. The recording will stop if the cancellation token is triggered.</remarks>
+	/// <param name="stream">The stream to which the video data will be written. The stream must be writable and remain open for the duration of the recording.</param>
 	/// <param name="token">A cancellation token that can be used to cancel the video recording operation.</param>
 	/// <returns>A task that represents the asynchronous video recording operation.</returns>
 	Task StartVideoRecording(Stream stream, CancellationToken token = default);
@@ -89,12 +95,10 @@ public interface ICameraView : IView
 	/// <summary>
 	/// Stops the ongoing video recording operation.
 	/// </summary>
-	/// <remarks>This method should be called to terminate the video recording process. Ensure that the recording
-	/// has been started before invoking this method. The operation can be cancelled by passing a  cancellation
-	/// token.</remarks>
+	/// <remarks>This method is called to terminate the video recording process. Ensure that either <see cref="StartVideoRecording(CancellationToken)"/> or <see cref="StartVideoRecording(Stream, CancellationToken)"/> has been called before invoking this method. The operation can be cancelled by passing a cancellation token.</remarks>
 	/// <param name="token">A cancellation token that can be used to cancel the stop operation.</param>
 	/// <returns>A task that represents the asynchronous stop operation.</returns>
-	Task StopVideoRecording(CancellationToken token = default);
+	Task<Stream> StopVideoRecording(CancellationToken token = default);
 
 	/// <summary>
 	/// Retrieves the cameras available on the current device.
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index 550576870a..8e731670cf 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -299,13 +299,24 @@ public Task StartCameraPreview(CancellationToken token) =>
 	/// <inheritdoc cref="ICameraView.StopCameraPreview"/>
 	public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
+	
+	/// <inheritdoc cref="ICameraView.StartVideoRecording(CancellationToken)"/>
+	public Task StartVideoRecording(CancellationToken token = default) => 
+		StartVideoRecording(new MemoryStream(), token);
 
-	/// <inheritdoc cref="ICameraView.StartVideoRecording"/>
+	/// <inheritdoc cref="ICameraView.StartVideoRecording(Stream,CancellationToken)"/>
 	public Task StartVideoRecording(Stream stream, CancellationToken token = default) =>
 		Handler.CameraManager.StartVideoRecording(stream, token);
 
 	/// <inheritdoc cref="ICameraView.StopVideoRecording"/>
-	public Task StopVideoRecording(CancellationToken token = default) =>
+	public async Task<TStream> StopVideoRecording<TStream>(CancellationToken token = default) where TStream : Stream
+	{
+		var stream = await Handler.CameraManager.StopVideoRecording(token);
+		return (TStream)stream;
+	}
+
+	/// <inheritdoc cref="ICameraView.StopVideoRecording"/>
+	public Task<Stream> StopVideoRecording(CancellationToken token = default) =>
 		Handler.CameraManager.StopVideoRecording(token);
 
 	/// <inheritdoc/>

From ceb400a980abf8e45cd457f8f00bbaed143f7936 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:48:28 -0700
Subject: [PATCH 33/40] Update CameraManager.windows.cs

---
 src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index a64a7c22d3..1a670e8052 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -15,6 +15,7 @@ partial class CameraManager
 	MediaCapture? mediaCapture;
 	MediaFrameSource? frameSource;
 	LowLagMediaRecording? mediaRecording;
+	Stream? videoCaptureStream;
 
 	public MediaPlayerElement CreatePlatformView()
 	{
@@ -211,6 +212,8 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 			return;
 		}
 
+		videoCaptureStream = stream;
+
 		var profile = MediaEncodingProfile.CreateMp4(VideoEncodingQuality.Auto);
 		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, stream.AsRandomAccessStream());
 
@@ -235,12 +238,12 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 
 	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
-		if (!IsInitialized || mediaElement is null || mediaRecording is null)
+		if (!IsInitialized || mediaElement is null || mediaRecording is null || videoCaptureStream is null)
 		{
 			return Stream.Null;
 		}
 		
 		await mediaRecording.StopAsync();
-		return mediaRecording
+		return videoCaptureStream;
 	}
 }
\ No newline at end of file

From a3990588d9f99a208e643a6115f43a1f0d167751 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:54:04 -0700
Subject: [PATCH 34/40] Remove `SupportedOSPlatform`

---
 src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index 1a670e8052..8d2bcc8078 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -1,5 +1,4 @@
-using System.Runtime.Versioning;
-using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Extensions;
 using Microsoft.UI.Xaml.Controls;
 using Windows.Media.Capture;
 using Windows.Media.Capture.Frames;
@@ -8,7 +7,6 @@
 
 namespace CommunityToolkit.Maui.Core;
 
-[SupportedOSPlatform("windows10.0.16299.0")]
 partial class CameraManager
 {
 	MediaPlayerElement? mediaElement;

From 718da2a72ece54b65d8327b83a2676dcae7ff2a0 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Tue, 14 Oct 2025 16:58:15 -0700
Subject: [PATCH 35/40] `dotnet format`

---
 .../Views/CameraView/CameraViewPage.xaml.cs   |    6 +-
 .../Views/CameraView/CameraViewViewModel.cs   |    2 +-
 .../CameraManager.android.cs                  |   12 +-
 .../CameraManager.windows.cs                  |    4 +-
 .../Handlers/CameraViewHandler.shared.cs      |    2 +-
 .../Interfaces/ICameraProvider.shared.cs      |    2 +-
 .../Providers/CameraProvider.shared.cs        |    4 +-
 .../Views/CameraView.shared.cs                |    8 +-
 .../Views/CameraView/CameraProviderTests.cs   | 1164 ++++++++---------
 9 files changed, 602 insertions(+), 602 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
index 4e632b4487..38a987a1c5 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/CameraView/CameraViewPage.xaml.cs
@@ -16,7 +16,7 @@ public sealed partial class CameraViewPage : BasePage<CameraViewViewModel>
 	public CameraViewPage(CameraViewViewModel viewModel, IFileSystem fileSystem, IFileSaver fileSaver) : base(viewModel)
 	{
 		InitializeComponent();
-		
+
 		this.fileSaver = fileSaver;
 		imagePath = Path.Combine(fileSystem.CacheDirectory, "camera-view-image.jpg");
 
@@ -110,12 +110,12 @@ async void StartCameraRecording(object? sender, EventArgs e)
 	{
 		await Camera.StartVideoRecording(CancellationToken.None);
 	}
-	
+
 	async void StopCameraRecording(object? sender, EventArgs e)
 	{
 		videoRecordingStream = await Camera.StopVideoRecording(CancellationToken.None);
 	}
-	
+
 	async void SaveVideo(object? sender, EventArgs e)
 	{
 		if (videoRecordingStream == Stream.Null)
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
index 53407a2eb8..69be156548 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/CameraView/CameraViewViewModel.cs
@@ -84,7 +84,7 @@ void UpdateResolutionText()
 	{
 		ResolutionText = $"Selected Resolution: {SelectedResolution.Width} x {SelectedResolution.Height}";
 	}
-	
+
 	void HandleAvailableCamerasChanged(object? sender, IReadOnlyList<CameraInfo>? e)
 	{
 		OnPropertyChanged(nameof(Cameras));
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index d8e1a03469..6297c7ffff 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -48,7 +48,7 @@ public async Task SetExtensionMode(int mode)
 	{
 		extensionMode = mode;
 		if (cameraView.SelectedCamera is null || processCameraProvider is null || cameraPreview is null ||
-		    imageCapture is null || videoCapture is null)
+			imageCapture is null || videoCapture is null)
 		{
 			return;
 		}
@@ -101,7 +101,7 @@ public async partial ValueTask UpdateCaptureResolution(Size resolution, Cancella
 		if (resolutionFilter is not null)
 		{
 			if (Math.Abs(resolutionFilter.TargetSize.Width - resolution.Width) < double.Epsilon &&
-			    Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
+				Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
 			{
 				return;
 			}
@@ -173,7 +173,7 @@ protected virtual void Dispose(bool disposing)
 			orientationListener?.Disable();
 			orientationListener?.Dispose();
 			orientationListener = null;
-			
+
 			videoRecordingStream?.Dispose();
 			videoRecordingStream = null;
 		}
@@ -303,7 +303,7 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
 		if (previewView is null || processCameraProvider is null || cameraPreview is null || imageCapture is null || videoCapture is null ||
-		    videoRecorder is null || videoRecordingFile is not null)
+			videoRecorder is null || videoRecordingFile is not null)
 		{
 			return;
 		}
@@ -382,10 +382,10 @@ void CleanupVideoRecordingResources()
 
 		videoRecorder?.Dispose();
 		videoRecorder = null;
-		
+
 		videoCapture?.Dispose();
 		videoCapture = null;
-		
+
 		videoRecordingFinalizeTcs = null;
 	}
 
diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
index 8d2bcc8078..ddef2fc467 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs
@@ -216,7 +216,7 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 		mediaRecording = await mediaCapture.PrepareLowLagRecordToStreamAsync(profile, stream.AsRandomAccessStream());
 
 		frameSource = mediaCapture.FrameSources.FirstOrDefault(source =>
-			source.Value.Info.MediaStreamType == MediaStreamType.VideoRecord && 
+			source.Value.Info.MediaStreamType == MediaStreamType.VideoRecord &&
 			source.Value.Info.SourceKind == MediaFrameSourceKind.Color).Value;
 		if (frameSource is not null)
 		{
@@ -240,7 +240,7 @@ protected virtual async partial Task<Stream> PlatformStopVideoRecording(Cancella
 		{
 			return Stream.Null;
 		}
-		
+
 		await mediaRecording.StopAsync();
 		return videoCaptureStream;
 	}
diff --git a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
index 5310542da6..d888d0323f 100644
--- a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
@@ -92,7 +92,7 @@ protected override async void ConnectHandler(NativePlatformCameraPreviewView pla
 		{
 			return;
 		}
-		
+
 		await CameraManager.ConnectCamera(CancellationToken.None);
 		await cameraProvider.RefreshAvailableCameras(CancellationToken.None);
 	}
diff --git a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraProvider.shared.cs b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraProvider.shared.cs
index e1601760bf..9e41e51306 100644
--- a/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraProvider.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Interfaces/ICameraProvider.shared.cs
@@ -11,7 +11,7 @@ public interface ICameraProvider
 	/// Event fires when the contents <see cref="AvailableCameras"/> has changed
 	/// </summary>
 	event EventHandler<IReadOnlyList<CameraInfo>?> AvailableCamerasChanged;
-	
+
 	/// <summary>
 	/// Cameras available on device
 	/// </summary>
diff --git a/src/CommunityToolkit.Maui.Camera/Providers/CameraProvider.shared.cs b/src/CommunityToolkit.Maui.Camera/Providers/CameraProvider.shared.cs
index 7e7298461d..1bf348cb37 100644
--- a/src/CommunityToolkit.Maui.Camera/Providers/CameraProvider.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Providers/CameraProvider.shared.cs
@@ -6,7 +6,7 @@
 partial class CameraProvider : ICameraProvider
 {
 	readonly WeakEventManager availableCamerasChangedEventManager = new();
-	
+
 	public event EventHandler<IReadOnlyList<CameraInfo>?> AvailableCamerasChanged
 	{
 		add => availableCamerasChangedEventManager.AddEventHandler(value);
@@ -22,7 +22,7 @@ private set
 			if (!AreCameraInfoListsEqual(field, value))
 			{
 				field = value;
-				availableCamerasChangedEventManager.HandleEvent(this, value, nameof(AvailableCamerasChanged));	
+				availableCamerasChangedEventManager.HandleEvent(this, value, nameof(AvailableCamerasChanged));
 			}
 		}
 	}
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index 8e731670cf..c82932762c 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -78,7 +78,7 @@ public partial class CameraView : View, ICameraView, IDisposable
 	/// </summary>
 	public static readonly BindableProperty StopCameraPreviewCommandProperty =
 		BindableProperty.CreateReadOnly(nameof(StopCameraPreviewCommand), typeof(ICommand), typeof(CameraView), null, BindingMode.OneWayToSource, defaultValueCreator: CameraViewDefaults.CreateStopCameraPreviewCommand).BindableProperty;
-	
+
 	/// <summary>
 	/// Backing BindableProperty for the <see cref="StartVideoRecordingCommand"/> property.
 	/// </summary>
@@ -143,7 +143,7 @@ public event EventHandler<MediaCapturedEventArgs> MediaCaptured
 	/// <see cref="StartCameraPreviewCommand"/> has a <see cref="Type"/> of Command&lt;CancellationToken&gt; which requires a <see cref="CancellationToken"/> as a CommandParameter. See <see cref="Command{CancellationToken}"/> and <see cref="System.Windows.Input.ICommand.Execute(object)"/> for more information on passing a <see cref="CancellationToken"/> into <see cref="Command{T}"/> as a CommandParameter
 	/// </remarks>
 	public Command<CancellationToken> StartCameraPreviewCommand => (Command<CancellationToken>)GetValue(StartCameraPreviewCommandProperty);
-	
+
 	/// <summary>
 	/// Gets the Command that stops the camera preview.
 	/// </summary>
@@ -299,9 +299,9 @@ public Task StartCameraPreview(CancellationToken token) =>
 	/// <inheritdoc cref="ICameraView.StopCameraPreview"/>
 	public void StopCameraPreview() =>
 		Handler.CameraManager.StopCameraPreview();
-	
+
 	/// <inheritdoc cref="ICameraView.StartVideoRecording(CancellationToken)"/>
-	public Task StartVideoRecording(CancellationToken token = default) => 
+	public Task StartVideoRecording(CancellationToken token = default) =>
 		StartVideoRecording(new MemoryStream(), token);
 
 	/// <inheritdoc cref="ICameraView.StartVideoRecording(Stream,CancellationToken)"/>
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraProviderTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraProviderTests.cs
index 5731093af3..cdef941d24 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraProviderTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/CameraView/CameraProviderTests.cs
@@ -10,586 +10,586 @@ namespace CommunityToolkit.Maui.UnitTests;
 /// </summary>
 public class CameraProviderTests
 {
-    #region Null Handling Tests
-
-    [Fact]
-    public void AreCameraInfoListsEqual_BothListsNull_ShouldConsiderEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting null when already null
-        typeof(MockCameraProvider)
-            .GetProperty(nameof(MockCameraProvider.AvailableCameras))!
-            .SetValue(provider, null);
-
-        // Assert - No event should be raised as both are null
-        Assert.Equal(0, eventRaisedCount);
-        Assert.Null(provider.AvailableCameras);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_FirstNullSecondNotNull_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        var cameras = new List<CameraInfo>
-        {
-            CreateCameraInfo("Camera1")
-        };
-
-        // Act - Setting non-null when currently null
-        SetAvailableCameras(provider, cameras);
-
-        // Assert - Event should be raised as they're different
-        Assert.Equal(1, eventRaisedCount);
-        Assert.NotNull(provider.AvailableCameras);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_FirstNotNullSecondNull_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        var cameras = new List<CameraInfo> { CreateCameraInfo("Camera1") };
-        SetAvailableCameras(provider, cameras);
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting null when currently non-null
-        SetAvailableCameras(provider, null);
-
-        // Assert - Event should be raised as they're different
-        Assert.Equal(1, eventRaisedCount);
-        Assert.Null(provider.AvailableCameras);
-    }
-
-    #endregion
-
-    #region Empty List Tests
-
-    [Fact]
-    public void AreCameraInfoListsEqual_BothListsEmpty_ShouldConsiderEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo>());
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting another empty list
-        SetAvailableCameras(provider, new List<CameraInfo>());
-
-        // Assert - No event should be raised
-        Assert.Equal(0, eventRaisedCount);
-        Assert.NotNull(provider.AvailableCameras);
-        Assert.Empty(provider.AvailableCameras);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_EmptyListVsNull_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo>());
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting null when currently empty
-        SetAvailableCameras(provider, null);
-
-        // Assert - Event should be raised
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_EmptyListVsNonEmpty_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo>());
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting non-empty when currently empty
-        SetAvailableCameras(provider, new List<CameraInfo> { CreateCameraInfo("Camera1") });
-
-        // Assert - Event should be raised
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    #endregion
-
-    #region Same Content Tests
-
-    [Fact]
-    public void AreCameraInfoListsEqual_SameSingleCamera_ShouldConsiderEqual()
-    {
-        // Arrange
-        var camera = CreateCameraInfo("Camera1");
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { camera });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting list with same camera
-        SetAvailableCameras(provider, new List<CameraInfo> { camera });
-
-        // Assert - No event should be raised
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_SameMultipleCameras_ShouldConsiderEqual()
-    {
-        // Arrange
-        var camera1 = CreateCameraInfo("Camera1");
-        var camera2 = CreateCameraInfo("Camera2");
-        var camera3 = CreateCameraInfo("Camera3");
-        
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2, camera3 });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting list with same cameras
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2, camera3 });
-
-        // Assert - No event should be raised
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_SameCamerasDifferentOrder_ShouldConsiderEqual()
-    {
-        // Arrange
-        var camera1 = CreateCameraInfo("Camera1");
-        var camera2 = CreateCameraInfo("Camera2");
-        var camera3 = CreateCameraInfo("Camera3");
-        
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2, camera3 });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting list with same cameras in different order
-        SetAvailableCameras(provider, new List<CameraInfo> { camera3, camera1, camera2 });
-
-        // Assert - No event should be raised (order-independent comparison)
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_SameReferenceList_ShouldConsiderEqual()
-    {
-        // Arrange
-        var cameras = new List<CameraInfo> { CreateCameraInfo("Camera1") };
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, cameras);
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting the exact same list reference
-        SetAvailableCameras(provider, cameras);
-
-        // Assert - No event should be raised
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    #endregion
-
-    #region Different Content Tests
-
-    [Fact]
-    public void AreCameraInfoListsEqual_DifferentSingleCamera_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { CreateCameraInfo("Camera1") });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting list with different camera
-        SetAvailableCameras(provider, new List<CameraInfo> { CreateCameraInfo("Camera2") });
-
-        // Assert - Event should be raised
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_DifferentCameraCount_MoreInSecond_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var camera1 = CreateCameraInfo("Camera1");
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1 });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting list with more cameras
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1, CreateCameraInfo("Camera2") });
-
-        // Assert - Event should be raised
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_DifferentCameraCount_LessInSecond_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var camera1 = CreateCameraInfo("Camera1");
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1, CreateCameraInfo("Camera2") });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting list with fewer cameras
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1 });
-
-        // Assert - Event should be raised
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_PartiallyOverlappingLists_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var camera1 = CreateCameraInfo("Camera1");
-        var camera2 = CreateCameraInfo("Camera2");
-        var camera3 = CreateCameraInfo("Camera3");
-        
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2 });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting list with one common camera and one different
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera3 });
-
-        // Assert - Event should be raised
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_CompletelyDifferentLists_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> 
-        { 
-            CreateCameraInfo("Camera1"), 
-            CreateCameraInfo("Camera2") 
-        });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting completely different list
-        SetAvailableCameras(provider, new List<CameraInfo> 
-        { 
-            CreateCameraInfo("Camera3"), 
-            CreateCameraInfo("Camera4") 
-        });
-
-        // Assert - Event should be raised
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    #endregion
-
-    #region Duplicate Handling Tests
-
-    [Fact]
-    public void AreCameraInfoListsEqual_ListWithDuplicates_ShouldHandleCorrectly()
-    {
-        // Arrange
-        var camera = CreateCameraInfo("Camera1");
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { camera, camera });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting same list with duplicates
-        SetAvailableCameras(provider, new List<CameraInfo> { camera, camera });
-
-        // Assert - No event should be raised
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    #endregion
-
-    #region CameraInfo Property Variations Tests
-
-    [Fact]
-    public void AreCameraInfoListsEqual_DifferentCameraName_ShouldNotConsiderNotEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> 
-        { 
-            CreateCameraInfo("Camera1", "device1", CameraPosition.Front) 
-        });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Different name, same device and position
-        SetAvailableCameras(provider, new List<CameraInfo> 
-        { 
-            CreateCameraInfo("Camera2", "device1", CameraPosition.Front) 
-        });
-
-        // Assert - Event should be raised (different camera)
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_DifferentDeviceId_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> 
-        { 
-            CreateCameraInfo("Camera1", "device1", CameraPosition.Front) 
-        });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Same name and position, different device
-        SetAvailableCameras(provider, new List<CameraInfo> 
-        { 
-            CreateCameraInfo("Camera1", "device2", CameraPosition.Front) 
-        });
-
-        // Assert - Event should be raised (different camera)
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_AllPropertiesSame_ShouldConsiderEqual()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> 
-        { 
-            CreateFullCameraInfo("Camera1", "device1", CameraPosition.Front, true, 1.0f, 5.0f) 
-        });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - All properties identical
-        SetAvailableCameras(provider, new List<CameraInfo> 
-        { 
-            CreateFullCameraInfo("Camera1", "device1", CameraPosition.Front, true, 1.0f, 5.0f) 
-        });
-
-        // Assert - No event should be raised
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    #endregion
-
-    #region Sequential Changes Tests
-
-    [Fact]
-    public void AreCameraInfoListsEqual_MultipleSequentialChanges_ShouldRaiseEventForEachChange()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        var camera1 = CreateCameraInfo("Camera1");
-        var camera2 = CreateCameraInfo("Camera2");
-        var camera3 = CreateCameraInfo("Camera3");
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Multiple different changes
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1 });
-        SetAvailableCameras(provider, new List<CameraInfo> { camera2 });
-        SetAvailableCameras(provider, new List<CameraInfo> { camera3 });
-        SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2 });
-
-        // Assert - Event raised for each change
-        Assert.Equal(4, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_AlternatingBetweenTwoStates_ShouldRaiseEventForEachChange()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        var state1 = new List<CameraInfo> { CreateCameraInfo("Camera1") };
-        var state2 = new List<CameraInfo> { CreateCameraInfo("Camera2") };
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Alternating between two different states
-        SetAvailableCameras(provider, state1);
-        SetAvailableCameras(provider, state2);
-        SetAvailableCameras(provider, state1);
-        SetAvailableCameras(provider, state2);
-
-        // Assert - Event raised for each change
-        Assert.Equal(4, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_NoChangeBetweenUpdates_ShouldNotRaiseEvent()
-    {
-        // Arrange
-        var camera = CreateCameraInfo("Camera1");
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, new List<CameraInfo> { camera });
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Multiple updates with same content
-        SetAvailableCameras(provider, new List<CameraInfo> { camera });
-        SetAvailableCameras(provider, new List<CameraInfo> { camera });
-        SetAvailableCameras(provider, new List<CameraInfo> { camera });
-
-        // Assert - No events raised
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    #endregion
-
-    #region Large List Tests
-
-    [Fact]
-    public void AreCameraInfoListsEqual_LargeLists_SameContent_ShouldConsiderEqual()
-    {
-        // Arrange
-        var cameras = Enumerable.Range(0, 100)
-            .Select(i => CreateCameraInfo($"Camera{i}"))
-            .ToList();
-
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, cameras);
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - Setting same large list
-        SetAvailableCameras(provider, cameras.ToList());
-
-        // Assert - No event should be raised
-        Assert.Equal(0, eventRaisedCount);
-    }
-
-    [Fact]
-    public void AreCameraInfoListsEqual_LargeLists_OneDifferent_ShouldConsiderNotEqual()
-    {
-        // Arrange
-        var cameras1 = Enumerable.Range(0, 100)
-            .Select(i => CreateCameraInfo($"Camera{i}"))
-            .ToList();
-
-        var cameras2 = Enumerable.Range(0, 100)
-            .Select(i => i == 50 ? CreateCameraInfo($"DifferentCamera{i}") : CreateCameraInfo($"Camera{i}"))
-            .ToList();
-
-        var provider = new MockCameraProvider();
-        SetAvailableCameras(provider, cameras1);
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Act - One camera different in large list
-        SetAvailableCameras(provider, cameras2);
-
-        // Assert - Event should be raised
-        Assert.Equal(1, eventRaisedCount);
-    }
-
-    #endregion
-
-    #region Edge Cases
-
-    [Fact]
-    public async Task AreCameraInfoListsEqual_AfterRefresh_ShouldCompareCorrectly()
-    {
-        // Arrange
-        var provider = new MockCameraProvider();
-        var initialCameras = provider.AvailableCameras;
-
-        // Act - Refresh creates new cameras
-        await provider.RefreshAvailableCameras(CancellationToken.None);
-        var firstCamera = provider.AvailableCameras?[0];
-
-        var eventRaisedCount = 0;
-        provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
-
-        // Refresh again (will create different camera due to new GUID)
-        await provider.RefreshAvailableCameras(CancellationToken.None);
-
-        // Assert - Event should be raised because GUIDs are different
-        Assert.Equal(1, eventRaisedCount);
-        Assert.NotNull(provider.AvailableCameras);
-        Assert.Single(provider.AvailableCameras);
-    }
-
-    #endregion
-
-    #region Helper Methods
-
-    static void SetAvailableCameras(MockCameraProvider provider, IReadOnlyList<CameraInfo>? cameras)
-    {
-        var property = typeof(MockCameraProvider).GetProperty(nameof(MockCameraProvider.AvailableCameras)) ?? throw new InvalidOperationException();
-        property.SetValue(provider, cameras);
-    }
-
-    static CameraInfo CreateCameraInfo(string name, string? deviceId = null, CameraPosition position = CameraPosition.Front)
-    {
-        return new CameraInfo(
-            name,
-            deviceId ?? Guid.NewGuid().ToString(),
-            position,
-            false,
-            1.0f,
-            5.0f,
-            [new Size(1920, 1080)]);
-    }
-
-    static CameraInfo CreateFullCameraInfo(
-        string name, 
-        string deviceId, 
-        CameraPosition position, 
-        bool isSupported, 
-        float minZoom, 
-        float maxZoom)
-    {
-        return new CameraInfo(
-            name,
-            deviceId,
-            position,
-            isSupported,
-            minZoom,
-            maxZoom,
-            [new Size(1920, 1080)]);
-    }
-
-    #endregion
+	#region Null Handling Tests
+
+	[Fact]
+	public void AreCameraInfoListsEqual_BothListsNull_ShouldConsiderEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting null when already null
+		typeof(MockCameraProvider)
+			.GetProperty(nameof(MockCameraProvider.AvailableCameras))!
+			.SetValue(provider, null);
+
+		// Assert - No event should be raised as both are null
+		Assert.Equal(0, eventRaisedCount);
+		Assert.Null(provider.AvailableCameras);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_FirstNullSecondNotNull_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		var cameras = new List<CameraInfo>
+		{
+			CreateCameraInfo("Camera1")
+		};
+
+		// Act - Setting non-null when currently null
+		SetAvailableCameras(provider, cameras);
+
+		// Assert - Event should be raised as they're different
+		Assert.Equal(1, eventRaisedCount);
+		Assert.NotNull(provider.AvailableCameras);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_FirstNotNullSecondNull_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		var cameras = new List<CameraInfo> { CreateCameraInfo("Camera1") };
+		SetAvailableCameras(provider, cameras);
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting null when currently non-null
+		SetAvailableCameras(provider, null);
+
+		// Assert - Event should be raised as they're different
+		Assert.Equal(1, eventRaisedCount);
+		Assert.Null(provider.AvailableCameras);
+	}
+
+	#endregion
+
+	#region Empty List Tests
+
+	[Fact]
+	public void AreCameraInfoListsEqual_BothListsEmpty_ShouldConsiderEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo>());
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting another empty list
+		SetAvailableCameras(provider, new List<CameraInfo>());
+
+		// Assert - No event should be raised
+		Assert.Equal(0, eventRaisedCount);
+		Assert.NotNull(provider.AvailableCameras);
+		Assert.Empty(provider.AvailableCameras);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_EmptyListVsNull_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo>());
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting null when currently empty
+		SetAvailableCameras(provider, null);
+
+		// Assert - Event should be raised
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_EmptyListVsNonEmpty_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo>());
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting non-empty when currently empty
+		SetAvailableCameras(provider, new List<CameraInfo> { CreateCameraInfo("Camera1") });
+
+		// Assert - Event should be raised
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	#endregion
+
+	#region Same Content Tests
+
+	[Fact]
+	public void AreCameraInfoListsEqual_SameSingleCamera_ShouldConsiderEqual()
+	{
+		// Arrange
+		var camera = CreateCameraInfo("Camera1");
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { camera });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting list with same camera
+		SetAvailableCameras(provider, new List<CameraInfo> { camera });
+
+		// Assert - No event should be raised
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_SameMultipleCameras_ShouldConsiderEqual()
+	{
+		// Arrange
+		var camera1 = CreateCameraInfo("Camera1");
+		var camera2 = CreateCameraInfo("Camera2");
+		var camera3 = CreateCameraInfo("Camera3");
+
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2, camera3 });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting list with same cameras
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2, camera3 });
+
+		// Assert - No event should be raised
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_SameCamerasDifferentOrder_ShouldConsiderEqual()
+	{
+		// Arrange
+		var camera1 = CreateCameraInfo("Camera1");
+		var camera2 = CreateCameraInfo("Camera2");
+		var camera3 = CreateCameraInfo("Camera3");
+
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2, camera3 });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting list with same cameras in different order
+		SetAvailableCameras(provider, new List<CameraInfo> { camera3, camera1, camera2 });
+
+		// Assert - No event should be raised (order-independent comparison)
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_SameReferenceList_ShouldConsiderEqual()
+	{
+		// Arrange
+		var cameras = new List<CameraInfo> { CreateCameraInfo("Camera1") };
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, cameras);
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting the exact same list reference
+		SetAvailableCameras(provider, cameras);
+
+		// Assert - No event should be raised
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	#endregion
+
+	#region Different Content Tests
+
+	[Fact]
+	public void AreCameraInfoListsEqual_DifferentSingleCamera_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { CreateCameraInfo("Camera1") });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting list with different camera
+		SetAvailableCameras(provider, new List<CameraInfo> { CreateCameraInfo("Camera2") });
+
+		// Assert - Event should be raised
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_DifferentCameraCount_MoreInSecond_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var camera1 = CreateCameraInfo("Camera1");
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1 });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting list with more cameras
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1, CreateCameraInfo("Camera2") });
+
+		// Assert - Event should be raised
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_DifferentCameraCount_LessInSecond_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var camera1 = CreateCameraInfo("Camera1");
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1, CreateCameraInfo("Camera2") });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting list with fewer cameras
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1 });
+
+		// Assert - Event should be raised
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_PartiallyOverlappingLists_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var camera1 = CreateCameraInfo("Camera1");
+		var camera2 = CreateCameraInfo("Camera2");
+		var camera3 = CreateCameraInfo("Camera3");
+
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2 });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting list with one common camera and one different
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera3 });
+
+		// Assert - Event should be raised
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_CompletelyDifferentLists_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo>
+		{
+			CreateCameraInfo("Camera1"),
+			CreateCameraInfo("Camera2")
+		});
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting completely different list
+		SetAvailableCameras(provider, new List<CameraInfo>
+		{
+			CreateCameraInfo("Camera3"),
+			CreateCameraInfo("Camera4")
+		});
+
+		// Assert - Event should be raised
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	#endregion
+
+	#region Duplicate Handling Tests
+
+	[Fact]
+	public void AreCameraInfoListsEqual_ListWithDuplicates_ShouldHandleCorrectly()
+	{
+		// Arrange
+		var camera = CreateCameraInfo("Camera1");
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { camera, camera });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting same list with duplicates
+		SetAvailableCameras(provider, new List<CameraInfo> { camera, camera });
+
+		// Assert - No event should be raised
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	#endregion
+
+	#region CameraInfo Property Variations Tests
+
+	[Fact]
+	public void AreCameraInfoListsEqual_DifferentCameraName_ShouldNotConsiderNotEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo>
+		{
+			CreateCameraInfo("Camera1", "device1", CameraPosition.Front)
+		});
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Different name, same device and position
+		SetAvailableCameras(provider, new List<CameraInfo>
+		{
+			CreateCameraInfo("Camera2", "device1", CameraPosition.Front)
+		});
+
+		// Assert - Event should be raised (different camera)
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_DifferentDeviceId_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo>
+		{
+			CreateCameraInfo("Camera1", "device1", CameraPosition.Front)
+		});
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Same name and position, different device
+		SetAvailableCameras(provider, new List<CameraInfo>
+		{
+			CreateCameraInfo("Camera1", "device2", CameraPosition.Front)
+		});
+
+		// Assert - Event should be raised (different camera)
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_AllPropertiesSame_ShouldConsiderEqual()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo>
+		{
+			CreateFullCameraInfo("Camera1", "device1", CameraPosition.Front, true, 1.0f, 5.0f)
+		});
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - All properties identical
+		SetAvailableCameras(provider, new List<CameraInfo>
+		{
+			CreateFullCameraInfo("Camera1", "device1", CameraPosition.Front, true, 1.0f, 5.0f)
+		});
+
+		// Assert - No event should be raised
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	#endregion
+
+	#region Sequential Changes Tests
+
+	[Fact]
+	public void AreCameraInfoListsEqual_MultipleSequentialChanges_ShouldRaiseEventForEachChange()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		var camera1 = CreateCameraInfo("Camera1");
+		var camera2 = CreateCameraInfo("Camera2");
+		var camera3 = CreateCameraInfo("Camera3");
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Multiple different changes
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1 });
+		SetAvailableCameras(provider, new List<CameraInfo> { camera2 });
+		SetAvailableCameras(provider, new List<CameraInfo> { camera3 });
+		SetAvailableCameras(provider, new List<CameraInfo> { camera1, camera2 });
+
+		// Assert - Event raised for each change
+		Assert.Equal(4, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_AlternatingBetweenTwoStates_ShouldRaiseEventForEachChange()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		var state1 = new List<CameraInfo> { CreateCameraInfo("Camera1") };
+		var state2 = new List<CameraInfo> { CreateCameraInfo("Camera2") };
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Alternating between two different states
+		SetAvailableCameras(provider, state1);
+		SetAvailableCameras(provider, state2);
+		SetAvailableCameras(provider, state1);
+		SetAvailableCameras(provider, state2);
+
+		// Assert - Event raised for each change
+		Assert.Equal(4, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_NoChangeBetweenUpdates_ShouldNotRaiseEvent()
+	{
+		// Arrange
+		var camera = CreateCameraInfo("Camera1");
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, new List<CameraInfo> { camera });
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Multiple updates with same content
+		SetAvailableCameras(provider, new List<CameraInfo> { camera });
+		SetAvailableCameras(provider, new List<CameraInfo> { camera });
+		SetAvailableCameras(provider, new List<CameraInfo> { camera });
+
+		// Assert - No events raised
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	#endregion
+
+	#region Large List Tests
+
+	[Fact]
+	public void AreCameraInfoListsEqual_LargeLists_SameContent_ShouldConsiderEqual()
+	{
+		// Arrange
+		var cameras = Enumerable.Range(0, 100)
+			.Select(i => CreateCameraInfo($"Camera{i}"))
+			.ToList();
+
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, cameras);
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - Setting same large list
+		SetAvailableCameras(provider, cameras.ToList());
+
+		// Assert - No event should be raised
+		Assert.Equal(0, eventRaisedCount);
+	}
+
+	[Fact]
+	public void AreCameraInfoListsEqual_LargeLists_OneDifferent_ShouldConsiderNotEqual()
+	{
+		// Arrange
+		var cameras1 = Enumerable.Range(0, 100)
+			.Select(i => CreateCameraInfo($"Camera{i}"))
+			.ToList();
+
+		var cameras2 = Enumerable.Range(0, 100)
+			.Select(i => i == 50 ? CreateCameraInfo($"DifferentCamera{i}") : CreateCameraInfo($"Camera{i}"))
+			.ToList();
+
+		var provider = new MockCameraProvider();
+		SetAvailableCameras(provider, cameras1);
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Act - One camera different in large list
+		SetAvailableCameras(provider, cameras2);
+
+		// Assert - Event should be raised
+		Assert.Equal(1, eventRaisedCount);
+	}
+
+	#endregion
+
+	#region Edge Cases
+
+	[Fact]
+	public async Task AreCameraInfoListsEqual_AfterRefresh_ShouldCompareCorrectly()
+	{
+		// Arrange
+		var provider = new MockCameraProvider();
+		var initialCameras = provider.AvailableCameras;
+
+		// Act - Refresh creates new cameras
+		await provider.RefreshAvailableCameras(CancellationToken.None);
+		var firstCamera = provider.AvailableCameras?[0];
+
+		var eventRaisedCount = 0;
+		provider.AvailableCamerasChanged += (s, c) => eventRaisedCount++;
+
+		// Refresh again (will create different camera due to new GUID)
+		await provider.RefreshAvailableCameras(CancellationToken.None);
+
+		// Assert - Event should be raised because GUIDs are different
+		Assert.Equal(1, eventRaisedCount);
+		Assert.NotNull(provider.AvailableCameras);
+		Assert.Single(provider.AvailableCameras);
+	}
+
+	#endregion
+
+	#region Helper Methods
+
+	static void SetAvailableCameras(MockCameraProvider provider, IReadOnlyList<CameraInfo>? cameras)
+	{
+		var property = typeof(MockCameraProvider).GetProperty(nameof(MockCameraProvider.AvailableCameras)) ?? throw new InvalidOperationException();
+		property.SetValue(provider, cameras);
+	}
+
+	static CameraInfo CreateCameraInfo(string name, string? deviceId = null, CameraPosition position = CameraPosition.Front)
+	{
+		return new CameraInfo(
+			name,
+			deviceId ?? Guid.NewGuid().ToString(),
+			position,
+			false,
+			1.0f,
+			5.0f,
+			[new Size(1920, 1080)]);
+	}
+
+	static CameraInfo CreateFullCameraInfo(
+		string name,
+		string deviceId,
+		CameraPosition position,
+		bool isSupported,
+		float minZoom,
+		float maxZoom)
+	{
+		return new CameraInfo(
+			name,
+			deviceId,
+			position,
+			isSupported,
+			minZoom,
+			maxZoom,
+			[new Size(1920, 1080)]);
+	}
+
+	#endregion
 }
\ No newline at end of file

From 9ae9ef97dc19bcb9026f1c3935709a73bea82cc7 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Tue, 14 Oct 2025 17:07:45 -0700
Subject: [PATCH 36/40] Remove unnecessary code

---
 .../CommunityToolkit.Maui.Sample.csproj                    | 5 -----
 .../Handlers/CameraViewHandler.shared.cs                   | 7 ++-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
index 1dcbad2005..3dbaf48846 100644
--- a/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
+++ b/samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
@@ -93,11 +93,6 @@
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
 
-  <!--<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='android' and $(Configuration) == 'Debug'">
-    <RuntimeIdentifiers>android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
-    <RuntimeIdentifiers>android-arm</RuntimeIdentifiers>
-  </PropertyGroup>-->
-
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('windows'))=='false' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))=='maccatalyst' and $(Configuration) == 'Debug'">
     <RuntimeIdentifiers>maccatalyst-arm64;maccatalyst-x64</RuntimeIdentifiers>
   </PropertyGroup>
diff --git a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
index d888d0323f..e3ae815359 100644
--- a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Views;
 using Microsoft.Maui.Handlers;
 
 namespace CommunityToolkit.Maui.Core.Handlers;
@@ -88,11 +89,7 @@ protected override async void ConnectHandler(NativePlatformCameraPreviewView pla
 	{
 		base.ConnectHandler(platformView);
 
-		if (!await CameraManager.ArePermissionsGranted())
-		{
-			return;
-		}
-
+		await CameraManager.ArePermissionsGranted();
 		await CameraManager.ConnectCamera(CancellationToken.None);
 		await cameraProvider.RefreshAvailableCameras(CancellationToken.None);
 	}

From 55150a7ef331a5e09f13c0213629355af8af91d1 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Tue, 14 Oct 2025 17:09:50 -0700
Subject: [PATCH 37/40] Update CameraViewHandler.shared.cs

---
 .../Handlers/CameraViewHandler.shared.cs                         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
index e3ae815359..9f4b12f36c 100644
--- a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs
@@ -1,5 +1,4 @@
 using CommunityToolkit.Maui.Extensions;
-using CommunityToolkit.Maui.Views;
 using Microsoft.Maui.Handlers;
 
 namespace CommunityToolkit.Maui.Core.Handlers;

From 2b2f78205408ffd669de5aa1e2988454101a46ea Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Tue, 14 Oct 2025 17:19:16 -0700
Subject: [PATCH 38/40] Implement `CancellationToken`

---
 .../CameraManager.android.cs                  | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 6297c7ffff..11f95ecb0e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -47,8 +47,11 @@ partial class CameraManager
 	public async Task SetExtensionMode(int mode)
 	{
 		extensionMode = mode;
-		if (cameraView.SelectedCamera is null || processCameraProvider is null || cameraPreview is null ||
-			imageCapture is null || videoCapture is null)
+		if (cameraView.SelectedCamera is null
+		    || processCameraProvider is null
+		    || cameraPreview is null
+		    || imageCapture is null
+		    || videoCapture is null)
 		{
 			return;
 		}
@@ -101,7 +104,7 @@ public async partial ValueTask UpdateCaptureResolution(Size resolution, Cancella
 		if (resolutionFilter is not null)
 		{
 			if (Math.Abs(resolutionFilter.TargetSize.Width - resolution.Width) < double.Epsilon &&
-				Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
+			    Math.Abs(resolutionFilter.TargetSize.Height - resolution.Height) < double.Epsilon)
 			{
 				return;
 			}
@@ -302,8 +305,13 @@ protected virtual partial ValueTask PlatformTakePicture(CancellationToken token)
 
 	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
-		if (previewView is null || processCameraProvider is null || cameraPreview is null || imageCapture is null || videoCapture is null ||
-			videoRecorder is null || videoRecordingFile is not null)
+		if (previewView is null
+		    || processCameraProvider is null
+		    || cameraPreview is null
+		    || imageCapture is null
+		    || videoCapture is null
+		    || videoRecorder is null
+		    || videoRecordingFile is not null)
 		{
 			return;
 		}
@@ -322,7 +330,7 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 
 		if (camera is null || !IsVideoCaptureAlreadyBound())
 		{
-			camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, cameraPreview, imageCapture, videoCapture);
+			camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, token, cameraPreview, imageCapture, videoCapture);
 			cameraControl = camera.CameraControl;
 		}
 
@@ -343,7 +351,10 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
 		ArgumentNullException.ThrowIfNull(cameraExecutor);
-		if (videoRecording is null || videoRecordingFile is null || videoRecordingFinalizeTcs is null || videoRecordingStream is null)
+		if (videoRecording is null
+		    || videoRecordingFile is null
+		    || videoRecordingFinalizeTcs is null
+		    || videoRecordingStream is null)
 		{
 			return Stream.Null;
 		}
@@ -361,7 +372,9 @@ protected virtual async partial Task<Stream> PlatformStopVideoRecording(Cancella
 
 	bool IsVideoCaptureAlreadyBound()
 	{
-		return processCameraProvider is not null && videoCapture is not null && processCameraProvider.IsBound(videoCapture);
+		return processCameraProvider is not null
+		       && videoCapture is not null
+		       && processCameraProvider.IsBound(videoCapture);
 	}
 
 	void CleanupVideoRecordingResources()
@@ -389,7 +402,7 @@ void CleanupVideoRecordingResources()
 		videoRecordingFinalizeTcs = null;
 	}
 
-	async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
+	async Task<CameraSelector> EnableModes(CameraInfo selectedCamera, CancellationToken token)
 	{
 		var cameraFutureCts = new TaskCompletionSource();
 		var cameraSelector = selectedCamera.CameraSelector ?? throw new CameraException($"Unable to retrieve {nameof(CameraSelector)}");
@@ -415,13 +428,13 @@ async Task<CameraSelector> EnableModes(CameraInfo selectedCamera)
 			}), ContextCompat.GetMainExecutor(context));
 		}), ContextCompat.GetMainExecutor(context));
 
-		await cameraFutureCts.Task;
+		await cameraFutureCts.Task.WaitAsync(token);
 		return cameraSelector;
 	}
 
-	async Task<ICamera> RebindCamera(ProcessCameraProvider provider, CameraInfo cameraInfo, params UseCase[] useCases)
+	async Task<ICamera> RebindCamera(ProcessCameraProvider provider, CameraInfo cameraInfo, CancellationToken token, params UseCase[] useCases)
 	{
-		var cameraSelector = await EnableModes(cameraInfo);
+		var cameraSelector = await EnableModes(cameraInfo, token);
 		provider.UnbindAll();
 		return provider.BindToLifecycle((ILifecycleOwner)context, cameraSelector, useCases);
 	}

From 4985341c36831762dc9afd19d7da0ef041b9c9ba Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Tue, 14 Oct 2025 18:36:23 -0700
Subject: [PATCH 39/40] Update CameraManager.macios.cs

---
 .../CameraManager.macios.cs                           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
index f9500f35ca..a3d91ce63e 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs
@@ -200,7 +200,7 @@ protected virtual partial void PlatformDisconnect()
 
 	protected virtual async partial Task PlatformStartVideoRecording(Stream stream, CancellationToken token)
 	{
-		var isPermissionGranted = await AVCaptureDevice.RequestAccessForMediaTypeAsync(AVAuthorizationMediaType.Video);
+		var isPermissionGranted = await AVCaptureDevice.RequestAccessForMediaTypeAsync(AVAuthorizationMediaType.Video).WaitAsync(token);
 		if (!isPermissionGranted)
 		{
 			throw new CameraException("Camera permission is not granted. Please enable it in the app settings.");
@@ -235,7 +235,7 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 			var audioDevice = AVCaptureDevice.GetDefaultDevice(AVMediaTypes.Audio);
 			if (audioDevice is not null)
 			{
-				audioInput = new AVCaptureDeviceInput(audioDevice, out var audioError);
+				audioInput = new AVCaptureDeviceInput(audioDevice, out NSError? audioError);
 				if (audioError is null && captureSession.CanAddInput(audioInput))
 				{
 					captureSession.AddInput(audioInput);
@@ -283,7 +283,12 @@ protected virtual async partial Task PlatformStartVideoRecording(Stream stream,
 
 	protected virtual async partial Task<Stream> PlatformStopVideoRecording(CancellationToken token)
 	{
-		if (captureSession is null || videoRecordingFileName is null || videoInput is null || videoOutput is null || videoRecordingStream is null || videoRecordingFinalizeTcs is null)
+		if (captureSession is null 
+		    || videoRecordingFileName is null 
+		    || videoInput is null 
+		    || videoOutput is null 
+		    || videoRecordingStream is null 
+		    || videoRecordingFinalizeTcs is null)
 		{
 			return Stream.Null;
 		}

From d097fede2643a8db398a866181ade2d4731c8ab7 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com>
Date: Wed, 15 Oct 2025 08:59:52 -0700
Subject: [PATCH 40/40] Add `CancellationToken`

---
 src/CommunityToolkit.Maui.Camera/CameraManager.android.cs   | 6 +++---
 src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
index 11f95ecb0e..a7e5b10138 100644
--- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
+++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs
@@ -44,7 +44,7 @@ partial class CameraManager
 	Stream? videoRecordingStream;
 	int extensionMode = ExtensionMode.Auto;
 
-	public async Task SetExtensionMode(int mode)
+	public async Task SetExtensionMode(int mode, CancellationToken token)
 	{
 		extensionMode = mode;
 		if (cameraView.SelectedCamera is null
@@ -56,7 +56,7 @@ public async Task SetExtensionMode(int mode)
 			return;
 		}
 
-		camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, cameraPreview, imageCapture, videoCapture);
+		camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, token, cameraPreview, imageCapture, videoCapture);
 
 		cameraControl = camera.CameraControl;
 	}
@@ -268,7 +268,7 @@ protected virtual async partial Task PlatformStartCameraPreview(CancellationToke
 			cameraView.SelectedCamera = cameraProvider.AvailableCameras?.FirstOrDefault() ?? throw new CameraException("No camera available on device");
 		}
 
-		camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, cameraPreview, imageCapture, videoCapture);
+		camera = await RebindCamera(processCameraProvider, cameraView.SelectedCamera, token, cameraPreview, imageCapture, videoCapture);
 		cameraControl = camera.CameraControl;
 
 		var point = previewView.MeteringPointFactory.CreatePoint(previewView.Width / 2.0f, previewView.Height / 2.0f, 0.1f);
diff --git a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
index c82932762c..03ab095ab0 100644
--- a/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
+++ b/src/CommunityToolkit.Maui.Camera/Views/CameraView.shared.cs
@@ -253,9 +253,9 @@ public async ValueTask<IReadOnlyList<CameraInfo>> GetAvailableCameras(Cancellati
 	/// Set Extension Mode
 	/// </summary>
 	/// <param name="mode">mode</param>
-	public Task SetExtensionMode(int mode)
+	public Task SetExtensionMode(int mode, CancellationToken token = default)
 	{
-		return Handler.CameraManager.SetExtensionMode(mode);
+		return Handler.CameraManager.SetExtensionMode(mode, token);
 	}
 #endif