diff --git a/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net7.csproj b/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net7.csproj index 504284bcd5..40142b01aa 100644 --- a/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net7.csproj +++ b/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net7.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net8.csproj b/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net8.csproj index 656d4227eb..3f9d291f25 100644 --- a/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net8.csproj +++ b/Media Blocks SDK/Android/MediaPlayer/MediaPlayer net8.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/Media Blocks SDK/Android/RTSP Client/RTSP Client net7.csproj b/Media Blocks SDK/Android/RTSP Client/RTSP Client net7.csproj index f9025fa148..310b4b11a1 100644 --- 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 @@ - - + + diff --git a/Media Blocks SDK/Android/RTSP Client/RTSP Client net8.csproj b/Media Blocks SDK/Android/RTSP Client/RTSP Client net8.csproj index ff80e1fa71..09af4abbfb 100644 --- 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 @@ - - + + 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 index ad1ad4ba24..0b7cbead61 100644 --- 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 @@ - - + + 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 index 24a1280920..3b327db4aa 100644 --- 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 @@ - - + + diff --git a/Media Blocks SDK/Avalonia/Simple Player/SimplePlayerAvalonia/SimplePlayerAvalonia.csproj b/Media Blocks SDK/Avalonia/Simple Player/SimplePlayerAvalonia/SimplePlayerAvalonia.csproj index d7635f6fd2..e48cd20efb 100644 --- a/Media Blocks SDK/Avalonia/Simple Player/SimplePlayerAvalonia/SimplePlayerAvalonia.csproj +++ b/Media Blocks SDK/Avalonia/Simple Player/SimplePlayerAvalonia/SimplePlayerAvalonia.csproj @@ -25,7 +25,7 @@ - - + + 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 index 2c923b2fbf..ee58a33c0c 100644 --- 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,6 +23,6 @@ None - + diff --git a/Media Blocks SDK/Console/RTSPView/RTSPView.csproj b/Media Blocks SDK/Console/RTSPView/RTSPView.csproj index e2db9f042d..1c97c3b579 100644 --- a/Media Blocks SDK/Console/RTSPView/RTSPView.csproj +++ b/Media Blocks SDK/Console/RTSPView/RTSPView.csproj @@ -9,7 +9,7 @@ com.visioforge.rtspviewcli - + diff --git a/Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj b/Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj index 2ba796ec98..3f32eca1c7 100644 --- a/Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj +++ b/Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj @@ -9,8 +9,8 @@ com.visioforge.rtspviewcvcli - - + + diff --git a/Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs b/Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs index 0356a637b5..ef4c8712b2 100644 --- a/Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs +++ b/Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs @@ -84,7 +84,7 @@ private async void MainPage_Loaded(object sender, EventArgs e) await RequestMicPermissionAsync(); #endif - _pipeline = new MediaBlocksPipeline(); + _pipeline = new MediaBlocksPipeline(live: true); _videoRenderer = new VideoRendererBlock(_pipeline, videoView); _pipeline.OnError += Core_OnError; @@ -159,6 +159,8 @@ private async void Window_Destroying(object sender, EventArgs e) _pipeline?.Dispose(); _pipeline = null; } + + VisioForgeX.DestroySDK(); } private void Core_OnError(object sender, VisioForge.Core.Types.Events.ErrorsEventArgs e) diff --git a/Media Blocks SDK/MAUI/SimpleCapture/Platforms/Android/AndroidManifest.xml b/Media Blocks SDK/MAUI/SimpleCapture/Platforms/Android/AndroidManifest.xml index 6112c7caca..913bc49325 100644 --- a/Media Blocks SDK/MAUI/SimpleCapture/Platforms/Android/AndroidManifest.xml +++ b/Media Blocks SDK/MAUI/SimpleCapture/Platforms/Android/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/Media Blocks SDK/MAUI/SimpleCapture/SimpleCaptureMB.csproj b/Media Blocks SDK/MAUI/SimpleCapture/SimpleCaptureMB.csproj index 074efb856e..dadbf4b50a 100644 --- a/Media Blocks SDK/MAUI/SimpleCapture/SimpleCaptureMB.csproj +++ b/Media Blocks SDK/MAUI/SimpleCapture/SimpleCaptureMB.csproj @@ -77,8 +77,8 @@ - - + + diff --git a/Media Blocks SDK/MAUI/SimplePlayer/App.xaml b/Media Blocks SDK/MAUI/SimplePlayer/App.xaml new file mode 100644 index 0000000000..12654ddbc3 --- /dev/null +++ b/Media Blocks SDK/MAUI/SimplePlayer/App.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/Media Blocks SDK/MAUI/SimplePlayer/App.xaml.cs b/Media Blocks SDK/MAUI/SimplePlayer/App.xaml.cs new file mode 100644 index 0000000000..7030230428 --- /dev/null +++ b/Media Blocks SDK/MAUI/SimplePlayer/App.xaml.cs @@ -0,0 +1,12 @@ +namespace Simple_Player_MB_MAUI +{ + public partial class App : Application + { + public App() + { + InitializeComponent(); + + MainPage = new AppShell(); + } + } +} \ No newline at end of file diff --git a/Media Blocks SDK/MAUI/SimplePlayer/AppShell.xaml b/Media Blocks SDK/MAUI/SimplePlayer/AppShell.xaml new file mode 100644 index 0000000000..31bd39d2ec --- /dev/null +++ b/Media Blocks SDK/MAUI/SimplePlayer/AppShell.xaml @@ -0,0 +1,15 @@ + + + + + + diff --git a/Media Blocks SDK/MAUI/SimplePlayer/AppShell.xaml.cs b/Media Blocks SDK/MAUI/SimplePlayer/AppShell.xaml.cs new file mode 100644 index 0000000000..294918be4d --- /dev/null +++ b/Media Blocks SDK/MAUI/SimplePlayer/AppShell.xaml.cs @@ -0,0 +1,10 @@ +namespace Simple_Player_MB_MAUI +{ + public partial class AppShell : Shell + { + public AppShell() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/Media Blocks SDK/MAUI/SimplePlayer/MainPage.xaml b/Media Blocks SDK/MAUI/SimplePlayer/MainPage.xaml new file mode 100644 index 0000000000..9920ec9791 --- /dev/null +++ b/Media Blocks SDK/MAUI/SimplePlayer/MainPage.xaml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + +