Update to SDK version 15.9.5

visioforge · Apr 16, 2024 · de5bc3a · de5bc3a
1 parent cf0bb49
commit de5bc3a
Show file tree

Hide file tree

Showing 873 changed files with 3,241 additions and 3,249 deletions.
diff --git a/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net7.csproj b/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net7.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
-    <PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.4" />
-    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.5" />
+    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.5" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net8.csproj b/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net8.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
-    <PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.4" />
-    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.5" />
+    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.5" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Media Blocks SDK/Android/RTSP Client/RTSP Client net7.csproj b/Media Blocks SDK/Android/RTSP Client/RTSP Client net7.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
-    <PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.4" />
-    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.5" />
+    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.5" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Media Blocks SDK/Android/RTSP Client/RTSP Client net8.csproj b/Media Blocks SDK/Android/RTSP Client/RTSP Client net8.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
-    <PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.4" />
-    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.5" />
+    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.5" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Media Blocks SDK/Android/Simple Video Capture/Simple Video Capture net7.csproj b/Media Blocks SDK/Android/Simple Video Capture/Simple Video Capture net7.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
-    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.4" />
-    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.5" />
+    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.5" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Media Blocks SDK/Android/Simple Video Capture/Simple Video Capture net8.csproj b/Media Blocks SDK/Android/Simple Video Capture/Simple Video Capture net8.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
-    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.4" />
-    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.5" />
+    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.5" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Media Blocks SDK/Avalonia/Simple Player/SimplePlayerAvalonia/SimplePlayerAvalonia.csproj b/Media Blocks SDK/Avalonia/Simple Player/SimplePlayerAvalonia/SimplePlayerAvalonia.csproj
@@ -25,7 +25,7 @@
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.4" />
-    <PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.5" />
+    <PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.9.5" />
   </ItemGroup>
 </Project>
diff --git a/Media Blocks SDK/Console/HLS Streamer/HLSStreamer.csproj b/Media Blocks SDK/Console/HLS Streamer/HLSStreamer.csproj
@@ -6,7 +6,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.5" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />

diff --git a/Media Blocks SDK/Console/Media Info CLI/Media Info CLI.csproj b/Media Blocks SDK/Console/Media Info CLI/Media Info CLI.csproj
@@ -23,7 +23,7 @@
     <AOTMode>None</AOTMode>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.5" />
   </ItemGroup>
   <ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
     <PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />

diff --git a/Media Blocks SDK/Console/RTSPView/RTSPView.csproj b/Media Blocks SDK/Console/RTSPView/RTSPView.csproj
@@ -9,7 +9,7 @@
     <ApplicationId>com.visioforge.rtspviewcli</ApplicationId>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.5" />
   </ItemGroup>
   <ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
     <PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />

diff --git a/Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj b/Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj
@@ -9,8 +9,8 @@
     <ApplicationId>com.visioforge.rtspviewcvcli</ApplicationId>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.4" />
-    <PackageReference Include="VisioForge.DotNet.Core.CVD" Version="15.9.4" />
+    <PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.5" />
+    <PackageReference Include="VisioForge.DotNet.Core.CVD" Version="15.9.5" />
   </ItemGroup>
   <ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
     <PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />

diff --git a/Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml b/Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml
@@ -7,13 +7,17 @@
     <Grid>
         <!--WidthRequest="1280" HeightRequest="720"-->
         <Grid RowDefinitions="*,Auto" >
-
-            <my:VideoView Grid.Row="0"               
-                HorizontalOptions="FillAndExpand"
-                VerticalOptions="FillAndExpand"
-                x:Name="videoView"
-                Background="Black"/>
-
+            <Grid x:Name="videoViewHost"
+                  Grid.Row="0"               
+                  HorizontalOptions="FillAndExpand"
+                  VerticalOptions="FillAndExpand"
+                  Background="Black">
+                <my:VideoView 
+                    x:Name="videoView"
+                    HorizontalOptions="FillAndExpand"
+                    VerticalOptions="FillAndExpand" />
+            </Grid>
+
             <StackLayout Grid.Row="1" x:Name="pnMain" Orientation="Vertical" HorizontalOptions="Fill" Background="#1e1e1e">
 
                 <Grid>

diff --git a/Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs b/Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs
@@ -16,6 +16,7 @@
 using VisioForge.Core.Types.X.Output;
 using VisioForge.Core.Types.X.Sinks;
 using VisioForge.Core.Types.X.Sources;
+using VisioForge.Core.UI.MAUI;
 
 namespace SimpleCapture
 {
@@ -37,9 +38,9 @@ public partial class MainPage : ContentPage, INotifyPropertyChanged
 
         private MP4SinkBlock _mp4Sink;
 
-        private H264EncoderBlock _h264Encoder;
+        private H264EncoderBlock _videoEncoder;
 
-        private MP3EncoderBlock _mp3Encoder;
+        private OPUSEncoderBlock _audioEncoder;
 
         private VideoCaptureDeviceInfo[] _cameras;
 
@@ -76,7 +77,13 @@ private void MainPage_Unloaded(object sender, EventArgs e)
         private void CreateEngine()
         {
             _pipeline = new MediaBlocksPipeline(live: true);
+
+#if __IOS__ && !__MACCATALYST__
+            var vv = videoView.Handler.PlatformView;
+            _videoRenderer = new VideoRendererBlock(_pipeline, (IVideoView)vv);
+#else
             _videoRenderer = new VideoRendererBlock(_pipeline, videoView);
+#endif
 
             _pipeline.OnError += Core_OnError;
         }
@@ -198,8 +205,8 @@ private async Task StopAllAsync()
                 _pipeline = null;
             }
 
-            _h264Encoder?.Dispose();
-            _h264Encoder = null;
+            _videoEncoder?.Dispose();
+            _videoEncoder = null;
 
             _mp4Sink?.Dispose();
             _mp4Sink = null;
@@ -216,8 +223,8 @@ private async Task StopAllAsync()
             _audioTee?.Dispose();
             _audioTee = null;
 
-            _mp3Encoder?.Dispose();
-            _mp3Encoder = null;
+            _audioEncoder?.Dispose();
+            _audioEncoder = null;
 
             _videoRenderer?.Dispose();
             _videoRenderer = null;
@@ -226,14 +233,6 @@ private async Task StopAllAsync()
             _audioOutput = null;
         }
 
-        private void slVolume_ValueChanged(object sender, ValueChangedEventArgs e)
-        {
-            if (_audioOutput != null)
-            {
-                _audioOutput.Volume = e.NewValue / 100.0;
-            }
-        }
-
 #if __IOS__ && !__MACCATALYST__
         private void AddVideoToPhotosLibrary(string filePath)
         {
@@ -251,11 +250,11 @@ private void AddVideoToPhotosLibrary(string filePath)
                     {
                         if (success)
                         {
-                            Console.WriteLine("Video saved to Photos library.");
+                            Debug.WriteLine("Video saved to Photos library.");
                         }
                         else
                         {
-                            Console.WriteLine($"Error saving video: {error?.LocalizedDescription}");
+                            Debug.WriteLine($"Error saving video: {error?.LocalizedDescription}");
                         }
                     });
                 }
@@ -265,7 +264,7 @@ private void AddVideoToPhotosLibrary(string filePath)
 
         private async void btStop_Clicked(object sender, EventArgs e)
         {
-            _pipeline.Debug_SavePipeline("main");
+            // _pipeline.Debug_SavePipeline("main");
 
 #if __IOS__ && !__MACCATALYST__
             bool capture = _mp4Sink != null;
@@ -285,7 +284,7 @@ private async void btStop_Clicked(object sender, EventArgs e)
                 AddVideoToPhotosLibrary(filename);
             }
 #endif
-
+            
             btStartPreview.Text = "PREVIEW";
             btStartCapture.Text = "CAPTURE";
         }
@@ -355,15 +354,15 @@ private async Task ConfigurePreviewAsync(bool connect)
                 var device = (await DeviceEnumerator.Shared.VideoSourcesAsync()).FirstOrDefault(x => x.DisplayName == deviceName);
                 if (device != null)
                 {
-                    var formatItem = device.VideoFormats.Find(x => (x.Width == 1920 && x.Height == 1080)); //device.GetHDOrAnyVideoFormatAndFrameRate(out var frameRate);
+                    var formatItem = device.VideoFormats.Find(x => (x.Width == 1920)); 
                     if (formatItem != null)
                     {
                         videoSourceSettings = new VideoCaptureDeviceSourceSettings(device)
                         {
                             Format = formatItem.ToFormat()
                         };
 
-                        videoSourceSettings.Format.FrameRate = new VideoFrameRate(120); //frameRate;
+                        videoSourceSettings.Format.FrameRate = new VideoFrameRate(30); //frameRate;
                     }
                 }
             }
@@ -373,25 +372,21 @@ private async Task ConfigurePreviewAsync(bool connect)
                 await DisplayAlert("Error", "Unable to configure camera settings", "OK");
             }
 
-            #if __IOS__ && !__MACCATALYST__
-            videoSourceSettings.Orientation = IOSVideoSourceOrientation.Portrait;
-            #endif
-
             _videoSource = new SystemVideoSourceBlock(videoSourceSettings);
 
-            // audio source
-            IAudioCaptureDeviceSourceSettings audioSourceSettings = null;
-
-            deviceName = btMic.Text;
-            if (!string.IsNullOrEmpty(deviceName))
-            {
-                var device = (await DeviceEnumerator.Shared.AudioSourcesAsync()).FirstOrDefault(x => x.DisplayName == deviceName);
-                if (device != null)
-                {
-                    var formatItem = device.GetDefaultFormat();
-                    audioSourceSettings = device.CreateSourceSettings(formatItem);
-                }
-            }
+             // audio source
+             IAudioCaptureDeviceSourceSettings audioSourceSettings = null;
+            
+             deviceName = btMic.Text;
+             if (!string.IsNullOrEmpty(deviceName))
+             {
+                 var device = (await DeviceEnumerator.Shared.AudioSourcesAsync()).FirstOrDefault(x => x.DisplayName == deviceName);
+                 if (device != null)
+                 {
+                     var formatItem = device.GetDefaultFormat();
+                     audioSourceSettings = device.CreateSourceSettings(formatItem);
+                 }
+             }
 
             _audioSource = new SystemAudioSourceBlock(audioSourceSettings);
 
@@ -416,12 +411,12 @@ private void ConfigureCapture()
             _pipeline.Connect(_audioTee.Outputs[0], _audioOutput.Input);
 
             // add video encoder
-            _h264Encoder = new H264EncoderBlock(H264EncoderBlock.GetDefaultSettings());
-            _pipeline.Connect(_videoTee.Outputs[1], _h264Encoder.Input);
+            _videoEncoder = new H264EncoderBlock(H264EncoderBlock.GetDefaultSettings());
+            _pipeline.Connect(_videoTee.Outputs[1], _videoEncoder.Input);
 
             // add audio encoder
-            _mp3Encoder = new MP3EncoderBlock(new MP3EncoderSettings());
-            _pipeline.Connect(_audioTee.Outputs[1], _mp3Encoder.Input);
+            _audioEncoder = new OPUSEncoderBlock(new OPUSEncoderSettings());
+            _pipeline.Connect(_audioTee.Outputs[1], _audioEncoder.Input);
 
             // add sink
             var now = DateTime.Now;
@@ -437,8 +432,8 @@ private void ConfigureCapture()
             var sinkSettings = new MP4SinkSettings(filename);
             _mp4Sink = new MP4SinkBlock(sinkSettings);
 
-            _pipeline.Connect(_h264Encoder.Output, _mp4Sink.CreateNewInput(MediaBlockPadMediaType.Video));
-            _pipeline.Connect(_mp3Encoder.Output, _mp4Sink.CreateNewInput(MediaBlockPadMediaType.Audio));
+            _pipeline.Connect(_videoEncoder.Output, _mp4Sink.CreateNewInput(MediaBlockPadMediaType.Video));
+            _pipeline.Connect(_audioEncoder.Output, _mp4Sink.CreateNewInput(MediaBlockPadMediaType.Audio));
         }
 
         private async void btStartPreview_Clicked(object sender, EventArgs e)
@@ -489,44 +484,44 @@ private async void btStartPreview_Clicked(object sender, EventArgs e)
         private async void btStartCapture_Clicked(object sender, EventArgs e)
         {
             await StopAllAsync();
-
+            
             CreateEngine();
-
+            
             switch (_pipeline.State)
             {
                 case PlaybackState.Play:
                     {
                         await _pipeline.PauseAsync();
-
+            
                         btStartCapture.Text = "CAPTURE";
                     }
-
+            
                     break;
                 case PlaybackState.Pause:
                     {
                         await _pipeline.ResumeAsync();
-
+            
                         btStartCapture.Text = "PAUSE";
                     }
-
+            
                     break;
                 case PlaybackState.Free:
                     {
                         if (_pipeline.State == PlaybackState.Play || _pipeline.State == PlaybackState.Pause)
                         {
                             return;
                         }
-
+            
                         await ConfigurePreviewAsync(false);
-
+            
                         ConfigureCapture();
-
+            
                         // start
                         await _pipeline.StartAsync();      
-
+            
                         btStartCapture.Text = "PAUSE";
                     }
-
+            
                     break;
                 default:
                     break;

diff --git a/Media Blocks SDK/MAUI/SimpleCapture/Platforms/iOS/Info.plist b/Media Blocks SDK/MAUI/SimpleCapture/Platforms/iOS/Info.plist
@@ -16,15 +16,10 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/appicon.appiconset</string>