Skip to content

Commit

Permalink
Update to SDK version 15.8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-miniailov committed Jan 30, 2024
1 parent d20e6a1 commit 5be7eb0
Show file tree
Hide file tree
Showing 805 changed files with 3,060 additions and 3,020 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.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.3" />
<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.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.3" />
<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.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.3" />
<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.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.3" />
<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.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<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.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<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.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.8.3" />
</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.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
</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.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
</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.2" />
<PackageReference Include="VisioForge.DotNet.Core.CVD" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.CVD" Version="15.8.3" />
</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/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.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.MAUI" Version="15.8.3" />
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<None Remove="visioforge_main_icon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.7.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<None Remove="visioforge_main_icon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.7.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<None Remove="visioforge_main_icon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.7.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<None Remove="visioforge_main_icon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.7.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<None Remove="visioforge_main_icon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.7.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<None Remove="visioforge_main_icon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.2" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WinForms" Version="15.8.3" />
<PackageReference Include="VisioForge.DotNet.Core.UI.WPF" Version="15.8.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.7.0" />
Expand Down
28 changes: 16 additions & 12 deletions Media Blocks SDK/WPF/CSharp/Decklink Demo/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,32 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Decklink_MB_Demo" xmlns:wpf="clr-namespace:VisioForge.Core.UI.WPF;assembly=VisioForge.Core.UI.WPF"
mc:Ignorable="d"
Title="Media Blocks SDK .Net - Decklink Demo" Height="600" Width="800" Loaded="Window_Loaded" Closing="Window_Closing" Icon="visioforge_main_icon.ico">
Title="Media Blocks SDK .Net - Decklink Demo" Height="410" Width="820" Loaded="Window_Loaded" Closing="Window_Closing" Icon="visioforge_main_icon.ico">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<wpf:VideoView Grid.Column="1" x:Name="VideoView1" HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="300" Margin="10,10,10,0" Width="400"/>
<wpf:VideoView Grid.Column="1" x:Name="VideoView1" Margin="10,10,10,45" />

<TabControl Grid.Column="0" Margin="10,10,0,10" VerticalAlignment="Stretch">
<TabItem Header="Source">
<StackPanel Orientation="Vertical" Margin="10,10,0,0">
<RadioButton x:Name="rbCaptureDeviceSource" Content="Use capture device" IsChecked="True" Margin="0,0,0,10"/>

<Label Content="Video input device" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<ComboBox x:Name="cbVideoInput" HorizontalAlignment="Left" VerticalAlignment="Top" Width="360" />
<Label Content="Mode (we are strongly recommend to set for recording)" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,0,0,0"/>
<ComboBox x:Name="cbVideoMode" HorizontalAlignment="Left" VerticalAlignment="Top" Width="350" Margin="10,0,0,0" />

<Label Content="Audio input device" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,10,0,0"/>
<ComboBox x:Name="cbAudioInput" HorizontalAlignment="Left" VerticalAlignment="Top" Width="360" />

<RadioButton x:Name="rbFileSource" Content="Use file source (be sure that file is compatible)" IsChecked="True" Margin="0,20,0,0"/>
<StackPanel Orientation="Horizontal" Margin="10,10,0,0">
<TextBox x:Name="edSourceFilename" Width="320" Text="c:\Samples\!video.mp4"/>
<Button x:Name="btSelectSourceFile" Content="..." Margin="10,0,0,0" Width="20" Click="btSelectSourceFile_Click"/>
</StackPanel>
</StackPanel>
</TabItem>

Expand All @@ -43,7 +50,7 @@
<Slider x:Name="tbVolume" HorizontalAlignment="Left" VerticalAlignment="Top" Width="360" Minimum="0" Maximum="100" Value="80" ValueChanged="tbVolume_ValueChanged" />
</StackPanel>
</TabItem>

<TabItem Header="File output">
<StackPanel Orientation="Vertical" Margin="10,10,0,0">
<Label Content="Format" HorizontalAlignment="Left" VerticalAlignment="Top"/>
Expand All @@ -64,7 +71,7 @@

<Label Content="Filename" HorizontalAlignment="Left" VerticalAlignment="Top" />
<StackPanel Orientation="Horizontal">
<TextBox x:Name="edFilename" Width="330" Text="c:\capture.avi"/>
<TextBox x:Name="edFilename" Width="330" Text="c:\capture.mp4"/>
<Button x:Name="btSelectFile" Content="..." Margin="10,0,0,0" Width="20" Click="btSelectFile_Click"/>
</StackPanel>
</StackPanel>
Expand Down Expand Up @@ -92,13 +99,10 @@
</TabItem>
</TabControl>

<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,320,0,0">
<Button x:Name="btStart" Content="Start" Width="60" Click="btStart_Click"/>
<Button x:Name="btStop" Content="Stop" Width="60" Margin="10,0,0,0" Click="btStop_Click"/>
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="10,0,0,10">
<Button x:Name="btStart" Content="Start" Width="60" Click="btStart_Click" VerticalAlignment="Center" />
<Button x:Name="btStop" Content="Stop" Width="60" Margin="10,0,0,0" Click="btStop_Click" VerticalAlignment="Center" />
<TextBlock Margin="10,0,0,0" Text="00:00:00" x:Name="lbTime" VerticalAlignment="Center" />
</StackPanel>

<TextBlock Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,320,10,0" Text="00:00:00" x:Name="lbTime"/>
</Grid>


</Window>
Loading

0 comments on commit 5be7eb0

Please sign in to comment.