Fixed CameraView Video Orientation (#1583)

Co-authored-by: Gerald Versluis <[email protected]>

Author: GUOLDEV

samples/XCT.Sample/Pages/Views/CameraViewPage.xaml

@@ -6,7 +6,7 @@
     xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
     xmlns:xct="http://xamarin.com/schemas/2020/toolkit">
     <ScrollView>
-        <Grid RowDefinitions="300, Auto">
+        <Grid RowDefinitions="300, Auto, *">
             <Grid ColumnDefinitions="*, *" Grid.Row="0">
                 <xct:CameraView
                     Grid.Column="0"
@@ -43,7 +43,6 @@
                     HorizontalOptions="FillAndExpand"
                     VerticalOptions="End" />
             </Grid>
-            
 
             <StackLayout Grid.Row="1" Orientation="Horizontal">
                 <Label x:Name="zoomLabel" />

src/CommunityToolkit/Xamarin.CommunityToolkit/Views/CameraView/iOS/CameraViewRenderer.ios.cs

@@ -183,9 +183,12 @@ protected override void OnElementPropertyChanged(object? sender, System.Componen
 				case nameof(CameraView.CameraOptions):
 					Control.RetrieveCameraDevice(Element.CameraOptions);
 					break;
+				case nameof(Element.Height):
+				case nameof(Element.Width):
 				case nameof(VisualElement.HeightProperty):
 				case nameof(VisualElement.WidthProperty):
 					Control.SetBounds(Element.Width, Element.Height);
+					Control.SetOrientation();
 					break;
 				case nameof(CameraView.VideoStabilization):
 					Control.VideoStabilization = Element.VideoStabilization;

src/CommunityToolkit/Xamarin.CommunityToolkit/Views/CameraView/iOS/FormsCameraView.ios.cs

@@ -61,32 +61,54 @@ public FormsCameraView()
 			AddConstraints(NSLayoutConstraint.FromVisualFormat("H:|[mainView]|", NSLayoutFormatOptions.AlignAllTop, null, new NSDictionary("mainView", mainView)));
 		}
 
-		void SetStartOrientation()
+		internal void SetOrientation()
 		{
-			var previewLayerFrame = previewLayer.Frame;
+			SetFrameOrientation();
+			SetVideoOrientation();
+		}
 
-			switch (UIApplication.SharedApplication.StatusBarOrientation)
+		void SetFrameOrientation()
+		{
+			try
 			{
-				case UIInterfaceOrientation.Portrait:
-				case UIInterfaceOrientation.PortraitUpsideDown:
-					previewLayerFrame.Height = UIScreen.MainScreen.Bounds.Height;
-					previewLayerFrame.Width = UIScreen.MainScreen.Bounds.Width;
-					break;
-
-				case UIInterfaceOrientation.LandscapeLeft:
-				case UIInterfaceOrientation.LandscapeRight:
-					previewLayerFrame.Width = UIScreen.MainScreen.Bounds.Width;
-					previewLayerFrame.Height = UIScreen.MainScreen.Bounds.Height;
-					break;
+				var previewLayerFrame = previewLayer.Frame;
+				previewLayerFrame.Height = mainView.Bounds.Height;
+				previewLayerFrame.Width = mainView.Bounds.Width;
+				previewLayer.Frame = previewLayerFrame;
+			}
+			catch (Exception error)
+			{
+				LogError("Failed to adjust frame", error);
 			}
+		}
 
+		void SetVideoOrientation()
+		{
 			try
 			{
-				previewLayer.Frame = previewLayerFrame;
+				if (previewLayer?.Connection?.SupportsVideoOrientation == true)
+					previewLayer.Connection.VideoOrientation = GetVideoOrientation();
 			}
 			catch (Exception error)
 			{
-				LogError("Failed to adjust frame", error);
+				LogError("Failed to set video orientation", error);
+			}
+		}
+
+		AVCaptureVideoOrientation GetVideoOrientation()
+		{
+			switch (UIApplication.SharedApplication.StatusBarOrientation)
+			{
+				case UIInterfaceOrientation.Portrait:
+					return AVCaptureVideoOrientation.Portrait;
+				case UIInterfaceOrientation.PortraitUpsideDown:
+					return AVCaptureVideoOrientation.PortraitUpsideDown;
+				case UIInterfaceOrientation.LandscapeLeft:
+					return AVCaptureVideoOrientation.LandscapeLeft;
+				case UIInterfaceOrientation.LandscapeRight:
+					return AVCaptureVideoOrientation.LandscapeRight;
+				default:
+					throw new ArgumentOutOfRangeException(nameof(UIApplication.SharedApplication.StatusBarOrientation));
 			}
 		}
 
@@ -555,8 +577,7 @@ void InitializeCamera()
 
 				InvokeOnMainThread(() =>
 				{
-					captureConnection = previewLayer.Connection;
-					SetStartOrientation();
+					SetOrientation();
 					captureSession.StartRunning();
 				});
 			}