Skip to content

Commit

Permalink
Update to SDK version 15.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-miniailov committed Apr 5, 2024
1 parent 63d8511 commit 51928dd
Show file tree
Hide file tree
Showing 899 changed files with 5,037 additions and 4,444 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.54" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.0" />
<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.54" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.0" />
<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.54" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.0" />
<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.54" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.VideoCapture" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.0" />
<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.54" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.0" />
<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.54" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Android" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<AvaloniaVersion>11.0.5</AvaloniaVersion>
<AvaloniaVersion>11.0.10</AvaloniaVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.9.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ private void Pipeline_OnStop(object sender, StopEventArgs e)

private async void tbTimeline_Scroll()
{
if (_tbTimelineApplyingValue)
if (_tbTimelineApplyingValue && _pipeline != null)
{
await _pipeline.Position_SetAsync(TimeSpan.FromSeconds(tbTimeline.Value));
}
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.54" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.UI.Avalonia" Version="15.9.0" />
</ItemGroup>
</Project>
7 changes: 3 additions & 4 deletions Media Blocks SDK/Console/HLS Streamer/HLSStreamer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.9.0" />
</ItemGroup>
<ItemGroup>
<NativeLibs Remove="app.manifest" />
Expand Down
7 changes: 3 additions & 4 deletions Media Blocks SDK/Console/Media Info CLI/Media Info CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
<AOTMode>None</AOTMode>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.0" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.9.0" />
</ItemGroup>
</Project>
7 changes: 3 additions & 4 deletions Media Blocks SDK/Console/RTSPView/RTSPView.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@
<ApplicationId>com.visioforge.rtspviewcli</ApplicationId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.0" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.9.0" />
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<EnableCodeSigning>false</EnableCodeSigning>
Expand Down
9 changes: 4 additions & 5 deletions Media Blocks SDK/Console/RTSPViewCV/RTSPViewCV.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
<ApplicationId>com.visioforge.rtspviewcvcli</ApplicationId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.Core.CVD" Version="15.8.54" />
<PackageReference Include="VisioForge.DotNet.MediaBlocks" Version="15.9.0" />
<PackageReference Include="VisioForge.DotNet.Core.CVD" Version="15.9.0" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Codecs.Windows.x64" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.8.0" />
<PackageReference Include="VisioForge.CrossPlatform.Core.Windows.x64" Version="15.9.0" />
<PackageReference Include="VisioForge.CrossPlatform.Libav.Windows.x64.UPX" Version="15.9.0" />
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<EnableCodeSigning>false</EnableCodeSigning>
Expand Down
4 changes: 2 additions & 2 deletions Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
x:Class="SimpleCapture.MainPage"
xmlns:my="clr-namespace:VisioForge.Core.UI.MAUI;assembly=VisioForge.Core.UI.MAUI">

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

Expand Down Expand Up @@ -67,6 +67,6 @@
</StackLayout>
</StackLayout>
</Grid>
</ScrollView>
</Grid>

</ContentPage>
12 changes: 9 additions & 3 deletions Media Blocks SDK/MAUI/SimpleCapture/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private async void Window_Destroying(object sender, EventArgs e)
_pipeline.OnError -= Core_OnError;
await _pipeline.StopAsync();

_pipeline?.Dispose();
_pipeline.Dispose();
_pipeline = null;
}

Expand Down Expand Up @@ -265,6 +265,8 @@ private void AddVideoToPhotosLibrary(string filePath)

private async void btStop_Clicked(object sender, EventArgs e)
{
_pipeline.Debug_SavePipeline("main");

#if __IOS__ && !__MACCATALYST__
bool capture = _mp4Sink != null;
string filename = null;
Expand Down Expand Up @@ -353,15 +355,15 @@ private async Task ConfigurePreviewAsync(bool connect)
var device = (await DeviceEnumerator.Shared.VideoSourcesAsync()).FirstOrDefault(x => x.DisplayName == deviceName);
if (device != null)
{
var formatItem = device.GetHDOrAnyVideoFormatAndFrameRate(out var frameRate);
var formatItem = device.VideoFormats.Find(x => (x.Width == 1920 && x.Height == 1080)); //device.GetHDOrAnyVideoFormatAndFrameRate(out var frameRate);
if (formatItem != null)
{
videoSourceSettings = new VideoCaptureDeviceSourceSettings(device)
{
Format = formatItem.ToFormat()
};

videoSourceSettings.Format.FrameRate = frameRate;
videoSourceSettings.Format.FrameRate = new VideoFrameRate(120); //frameRate;
}
}
}
Expand All @@ -371,6 +373,10 @@ 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
Expand Down
Loading

0 comments on commit 51928dd

Please sign in to comment.