Skip to content

Commit

Permalink
Update to SDK version 15.8.9
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-miniailov committed Feb 6, 2024
1 parent 0274746 commit dc3e631
Show file tree
Hide file tree
Showing 846 changed files with 4,323 additions and 2,984 deletions.
4 changes: 2 additions & 2 deletions Media Blocks SDK/Android/MediaPlayer/MediaPlayer net7.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/Android/MediaPlayer/MediaPlayer net8.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/Android/RTSP Client/RTSP Client net7.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/Android/RTSP Client/RTSP Client net8.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.7" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.7" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.8.9" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
<AOTMode>None</AOTMode>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.9" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Media Blocks SDK/Console/RTSPView/RTSPView.csproj
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.8.7" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.9" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.7.0" />
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj
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.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.CVD" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.Core.CVD" Version="15.8.9" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.7.0" />
Expand Down
4 changes: 3 additions & 1 deletion Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.companyname.simplecapture">
<application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/MAUI/SimpleCapture/SimpleCaptureMB.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
<PackageReference Include="VisioForge.CrossPlatform.Core.Android" Version="1.22.5.10" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.8.7" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.9" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.8.9" />
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
Expand Down
14 changes: 14 additions & 0 deletions Media Blocks SDK/MAUI/SimplePlayer/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version = "1.0" encoding = "UTF-8" ?>
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Simple_Player_MB_MAUI"
x:Class="Simple_Player_MB_MAUI.App">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
12 changes: 12 additions & 0 deletions Media Blocks SDK/MAUI/SimplePlayer/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace Simple_Player_MB_MAUI
{
public partial class App : Application
{
public App()
{
InitializeComponent();

MainPage = new AppShell();
}
}
}
15 changes: 15 additions & 0 deletions Media Blocks SDK/MAUI/SimplePlayer/AppShell.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Shell
x:Class="Simple_Player_MB_MAUI.AppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Simple_Player_MB_MAUI"
Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False">

<ShellContent
Title="Media Player SDK .Net Simple Player Demo"
ContentTemplate="{DataTemplate local:MainPage}"
Route="MainPage" />

</Shell>
10 changes: 10 additions & 0 deletions Media Blocks SDK/MAUI/SimplePlayer/AppShell.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace Simple_Player_MB_MAUI
{
public partial class AppShell : Shell
{
public AppShell()
{
InitializeComponent();
}
}
}
120 changes: 120 additions & 0 deletions Media Blocks SDK/MAUI/SimplePlayer/MainPage.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Simple_Player_MB_MAUI.MainPage"
xmlns:my="clr-namespace:VisioForge.Core.UI.MAUI;assembly=VisioForge.Core.UI.MAUI"
xmlns:skins="clr-namespace:VisioForge.Core.UI.MAUI.Skins;assembly=VisioForge.Core.UI.MAUI" >

<ScrollView>
<!--WidthRequest="1280" HeightRequest="720"-->
<Grid RowSpacing="0" RowDefinitions="*,Auto" >

<my:VideoView Grid.Row="0"
HorizontalOptions="FillAndExpand"
VerticalOptions="FillAndExpand"
x:Name="videoView"
Background="Black"/>

<StackLayout Grid.Row="1" x:Name="pnMain" Orientation="Vertical" HorizontalOptions="Fill" Background="#1e1e1e">
<Slider
x:Name="slSeeking"
HorizontalOptions="Fill"
Margin="16, 16, 16, 0"
VerticalOptions="Center"
ValueChanged="slSeeking_ValueChanged" />

<Grid Margin="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>

<Label
Grid.Column="0"
Text="00:00:00"
x:Name="lbPosition"
VerticalOptions="Center"
HorizontalOptions="Start"
TextColor="White"
Margin="5, 0, 5, 0" />

<Label
Grid.Column="1"
Text="FILENAME"
x:Name="lbFilename"
VerticalOptions="Center"
HorizontalOptions="Center"
TextColor="White"
Margin="0"
IsVisible="false" />

<Label
Grid.Column="2"
Text="00:00:00"
x:Name="lbDuration"
VerticalOptions="Center"
HorizontalOptions="End"
TextColor="White"
Margin="5, 0, 5, 0" />
</Grid>

<StackLayout
Grid.Column="1"
Orientation="Horizontal"
HorizontalOptions="Center"
Margin="16, 0, 5, 0">

<Button
x:Name="btOpen"
Text="OPEN FILE"
Margin="5"
VerticalOptions="Center"
Clicked="btOpen_Clicked" />

<Button
x:Name="btPlayPause"
Text="PLAY"
Margin="5"
Clicked="btPlayPause_Clicked" />

<Button
x:Name="btStop"
Text="STOP"
Margin="5"
Clicked="btStop_Clicked" />

</StackLayout>

<StackLayout
Grid.Column="0"
Orientation="Horizontal"
HorizontalOptions="Start"
Margin="16, 0, 5, 5" >

<Label
Text="Volume"
TextColor="White"
VerticalOptions="Center" />

<Slider
x:Name="slVolume"
HorizontalOptions="Fill"
Margin="15, 0, 5, 0"
Minimum="0"
Maximum="100"
Value="25"
WidthRequest="150"
VerticalOptions="Center"
ValueChanged="slVolume_ValueChanged" />

<Button
x:Name="btSpeed"
Margin="5,5,5,5"
Text="SPEED: 1X"
Clicked="btSpeed_Clicked" />
</StackLayout>
</StackLayout>
</Grid>
</ScrollView>
</ContentPage>
Loading

0 comments on commit dc3e631

Please sign in to comment.