Skip to content

Commit

Permalink
Update to SDK version 15.10.25
Browse files Browse the repository at this point in the history
  • Loading branch information
@roman-miniailov
roman-miniailov committed Oct 11, 2024
1 parent 1087c89 commit 3a51030
Show file tree
Hide file tree
Showing 1,116 changed files with 3,867 additions and 3,804 deletions.
6 changes: 3 additions & 3 deletions Media Blocks SDK/Android/MediaPlayer/MediaPlayer net7.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<RootNamespace>MediaPlayer</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.25" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Media Blocks SDK/Android/MediaPlayer/MediaPlayer net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<RootNamespace>MediaPlayer</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.25" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Media Blocks SDK/Android/RTSP Client/RTSP Client net7.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.25" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Media Blocks SDK/Android/RTSP Client/RTSP Client net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.25" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Media Blocks SDK/Android/Simple Video Capture/Simple Video Capture net7.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Media Blocks SDK/Android/Simple Video Capture/Simple Video Capture net8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/Avalonia/Simple Player/SimplePlayerAMB.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<PackageReference Include="System.Reactive" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.10.25" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Media Blocks SDK/Avalonia/Simple Video Capture/SimpleVideoCaptureAMB.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.10.25" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Media Blocks SDK/Console/HLS Streamer/HLSStreamer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.10.24" />
Expand Down
2 changes: 1 addition & 1 deletion Media Blocks SDK/Console/Media Info CLI/Media Info CLI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<AOTMode>None</AOTMode>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.10.24" />
Expand Down
2 changes: 1 addition & 1 deletion Media Blocks SDK/Console/RTSPView/RTSPView.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ApplicationId>com.visioforge.rtspviewcli</ApplicationId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.10.24" />
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ApplicationId>com.visioforge.rtspviewcvcli</ApplicationId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.CV" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.CV" Version="15.10.25" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.10.24" />
Expand Down
9 changes: 5 additions & 4 deletions Media Blocks SDK/MAUI/MobileStreamer/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,14 @@ private void CreateEngine()
{
_pipeline = new MediaBlocksPipeline();

#if __IOS__ && !__MACCATALYST__ || __ANDROID__
var vv = videoView.Handler.PlatformView;
_videoRenderer = new VideoRendererBlock(_pipeline, (IVideoView)vv) { IsSync = false };
IVideoView vv;
#if __MACCATALYST__
vv = videoView;
#else
_videoRenderer = new VideoRendererBlock(_pipeline, videoView) { IsSync = false };
vv = videoView.GetVideoView();
#endif

_videoRenderer = new VideoRendererBlock(_pipeline, vv) { IsSync = false };
_videoRenderer.IsSync = false;

_pipeline.OnError += Core_OnError;
Expand Down
6 changes: 3 additions & 3 deletions Media Blocks SDK/MAUI/MobileStreamer/MobileStreamerMB8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64" Version="15.10.24" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<ProjectReference Include="..\..\..\AndroidDependency\VisioForge.Core.Android.X8.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
Expand All @@ -54,8 +54,8 @@
<PackageReference Include="VisioForge.CrossPlatform.Core.iOS" Version="15.9.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.25" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
Expand Down
8 changes: 4 additions & 4 deletions Media Blocks SDK/MAUI/RTSPViewer/RTSPViewerMB.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.25" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.10.24" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64" Version="15.10.24" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<ProjectReference Include="..\..\..\AndroidDependency\VisioForge.Core.Android.X7.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.iOS" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Apple" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Apple" Version="15.10.25" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<!-- Required - WinUI does not yet have buildTransitive for everything -->
Expand Down
8 changes: 4 additions & 4 deletions Media Blocks SDK/MAUI/RTSPViewer/RTSPViewerMB8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.25" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.10.24" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64" Version="15.10.24" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<ProjectReference Include="..\..\..\AndroidDependency\VisioForge.Core.Android.X8.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.iOS" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Apple" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Apple" Version="15.10.25" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<!-- Required - WinUI does not yet have buildTransitive for everything -->
Expand Down
10 changes: 6 additions & 4 deletions Media Blocks SDK/MAUI/ScreenCaptureMB/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,15 @@ private async Task CreateEngineAsync()
_mp4Sink = new MP4SinkBlock(new MP4SinkSettings(filename));
_h264Encoder = new H264EncoderBlock();

#if __IOS__ && !__MACCATALYST__ || __ANDROID__
var vv = videoView.Handler.PlatformView;
_videoRenderer = new VideoRendererBlock(_pipeline, (IVideoView)vv) { IsSync = false };
IVideoView vv;
#if __MACCATALYST__
vv = videoView;
#else
_videoRenderer = new VideoRendererBlock(_pipeline, videoView) { IsSync = false };
vv = videoView.GetVideoView();
#endif

_videoRenderer = new VideoRendererBlock(_pipeline, vv) { IsSync = false };

_pipeline.Connect(_source.Output, _videoTee.Input);

_pipeline.Connect(_videoTee.Outputs[0], _videoRenderer.Input);
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/MAUI/ScreenCaptureMB/ScreenCaptureMB.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<PackageReference Include="VisioForge.CrossPlatform.Core.iOS" Version="15.9.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.25" />
</ItemGroup>
<!-- Custom NuGet package and target code for maccatalyst to copy NuGet redist files to app file -->
<ItemGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/MAUI/ScreenCaptureMB/ScreenCaptureMB8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
<PackageReference Include="VisioForge.CrossPlatform.Core.iOS" Version="15.9.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.25" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
Expand Down
10 changes: 6 additions & 4 deletions Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,15 @@ private void CreateEngine()
{
_pipeline = new MediaBlocksPipeline();

#if __IOS__ && !__MACCATALYST__ || __ANDROID__
var vv = videoView.Handler.PlatformView;
_videoRenderer = new VideoRendererBlock(_pipeline, (IVideoView)vv) { IsSync = false };
IVideoView vv;
#if __MACCATALYST__
vv = videoView;
#else
_videoRenderer = new VideoRendererBlock(_pipeline, videoView) { IsSync = false };
vv = videoView.GetVideoView();
#endif

_videoRenderer = new VideoRendererBlock(_pipeline, vv) { IsSync = false };

_pipeline.OnError += Core_OnError;
}

Expand Down
8 changes: 4 additions & 4 deletions Media Blocks SDK/MAUI/SimpleCapture/SimpleCaptureMB.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64" Version="15.10.24" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<ProjectReference Include="..\..\..\AndroidDependency\VisioForge.Core.Android.X7.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.iOS" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Apple" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Apple" Version="15.10.25" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<!-- Required - WinUI does not yet have buildTransitive for everything -->
Expand All @@ -83,8 +83,8 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.25" />
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
Expand Down
6 changes: 3 additions & 3 deletions Media Blocks SDK/MAUI/SimpleCapture/SimpleCaptureMB8.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64" Version="15.10.24" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<ProjectReference Include="..\..\..\AndroidDependency\VisioForge.Core.Android.X8.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
Expand All @@ -91,8 +91,8 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.25" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
</ItemGroup>
Expand Down
9 changes: 5 additions & 4 deletions Media Blocks SDK/MAUI/SimplePlayer/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,14 @@ private async Task CreateEngineAsync()

_source = new UniversalSourceBlock(await UniversalSourceSettings.CreateAsync(_filename));

#if __IOS__ && !__MACCATALYST__ || __ANDROID__
var vv = videoView.Handler.PlatformView;
_videoRenderer = new VideoRendererBlock(_pipeline, (IVideoView)vv);
IVideoView vv;
#if __MACCATALYST__
vv = videoView;
#else
_videoRenderer = new VideoRendererBlock(_pipeline, videoView);
vv = videoView.GetVideoView();
#endif

_videoRenderer = new VideoRendererBlock(_pipeline, vv);
_audioRenderer = new AudioRendererBlock();

_pipeline.Connect(_source.VideoOutput, _videoRenderer.Input);
Expand Down
6 changes: 3 additions & 3 deletions Media Blocks SDK/MAUI/SimplePlayer/SimplePlayerMB.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64" Version="15.10.24" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.9.45" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="15.10.24" />
<ProjectReference Include="..\..\..\AndroidDependency\VisioForge.Core.Android.X7.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
Expand All @@ -82,8 +82,8 @@
</AndroidNativeLibrary>
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.24" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.10.25" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.10.25" />
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
Expand Down
Loading

0 comments on commit 3a51030

Please sign in to comment.