Merge pull request #280 from taublast/applecam

quick ios cam video fix + gitignore

Author: taublast

.gitignore

@@ -25,6 +25,8 @@
 docfx_project/log.txt
 log.txt
 
+src/Native/* linguist-vendored
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/

src/Maui/Addons/DrawnUi.Maui.Camera/Apple/SkiaCamera.Apple.cs

@@ -308,16 +308,9 @@ private async Task CaptureFrameCore()
                         }
                     }
 
-                    if (imageToDraw == null)
-                    {
-                        var raw = nativeCam.GetRawFullImage();
-                        if (raw.Image != null)
-                        {
-                            imageToDraw = raw.Image;
-                            imageRotation = raw.Rotation;
-                            imageFlip = raw.Flip;
-                        }
-                    }
+                    // No fallback to GetRawFullImage - it reads _latestRecordingFrame which was
+                    // populated earlier and can be older than what zero-copy previously encoded,
+                    // causing out-of-order frames in the video. Better to drop a frame than glitch.
                 }
 
                 // Fallback to standard preview image (slower, already rotated)

src/Maui/Samples/Camera/CameraTestPage.AppCamera.cs

@@ -7,43 +7,55 @@ public partial class CameraTestPage
         public class AppCamera : SkiaCamera
         {
             // Audio visualizer (switch between AudioOscillograph and AudioLevels)
-            private IAudioVisualizer _audioVisualizer = new AudioLevelsVU();
+            private IAudioVisualizer _audioVisualizer = null;
             private int _visualizerIndex = 0;
 
             public static readonly BindableProperty VisualizerNameProperty = BindableProperty.Create(
                 nameof(VisualizerName),
                 typeof(string),
                 typeof(AppCamera),
-                "VU Meter");
+                "None");
 
             public string VisualizerName
             {
                 get => (string)GetValue(VisualizerNameProperty);
                 set => SetValue(VisualizerNameProperty, value);
             }
 
-            public void SwitchVisualizer()
+            public void SwitchVisualizer(int index = -1)
             {
-                _visualizerIndex++;
-                if (_visualizerIndex > 6) _visualizerIndex = 0;
+                if (index >= 0)
+                {
+                    _visualizerIndex = index;
+                }
+                else
+                {
+                    _visualizerIndex++;
+                }
+                if (_visualizerIndex > 8) _visualizerIndex = 0;
 
                 var old = _audioVisualizer;
-                bool useGain = true; 
+                bool useGain = true;
 
                 switch (_visualizerIndex)
                 {
                     case 0:
+                        _audioVisualizer = new AudioSoundBars();
+                        useGain = true;
+                        VisualizerName = "Sound Bars";
+                        break;
+                    case 1:
                         _audioVisualizer = new AudioLevelsVU();
                         VisualizerName = "VU Meter";
                         break;
-                    case 1:
+                    case 2:
                         _audioVisualizer = new AudioLevelsPeak();
                         VisualizerName = "Peak Monitor";
                         break;
-                    case 2:
-                        _audioVisualizer = new AudioLevels();
-                        VisualizerName = "Spectrum";
-                        break;
+                    //case 2:
+                    //    _audioVisualizer = new AudioLevels();
+                    //    VisualizerName = "Spectrum";
+                    //    break;
                     case 3:
                         _audioVisualizer = new AudioOscillograph();
                         useGain = true;
@@ -59,6 +71,10 @@ public void SwitchVisualizer()
                         VisualizerName = "Tuner";
                         break;
                     case 6:
+                        _audioVisualizer = new AudioWaveformBars();
+                        VisualizerName = "Waveform Bars";
+                        break;
+                    case 8:
                         _audioVisualizer = null;
                         VisualizerName = "None";
                         break;
@@ -89,7 +105,7 @@ public override void OnWillDisposeWithChildren()
                 _paintRec = null;
                 _paintPreview?.Dispose();
                 _paintPreview = null;
-                
+
                 (_audioVisualizer as IDisposable)?.Dispose();
                 _audioVisualizer = null;
             }
@@ -158,6 +174,6 @@ public void DrawOverlay(DrawableFrame frame)
             private SKPaint _paintRec;
         }
 
-      
+
     }
 }

src/Maui/Samples/Camera/CameraTestPage.cs

@@ -263,14 +263,18 @@ private void CreateContent()
                                         CornerRadius = 8,
                                         UseCache = SkiaCacheType.Image
                                     }
-                                    .OnTapped(me => { CameraControl.SwitchVisualizer(); })
+                                    .OnTapped(me =>
+                                    {
+                                        CameraControl.SwitchVisualizer();
+                                    })
                                     .ObserveProperty(CameraControl, nameof(CameraControl.VisualizerName), me =>
                                     {
-                                        me.Text = $"Vis: {CameraControl.VisualizerName}";
+                                        me.Text = $"{CameraControl.VisualizerName}";
                                     })
                                     .ObserveProperty(CameraControl, nameof(CameraControl.CaptureMode), me =>
                                     {
-                                        me.IsVisible = CameraControl.CaptureMode == CaptureModeType.Video;
+                                        CameraControl.SwitchVisualizer(0);
+                                        //me.IsVisible = CameraControl.CaptureMode == CaptureModeType.Video;
                                     }),
 
                                 // Take Picture button (only visible in Still mode)