Skip to content

Commit dc7462e

Browse files
committed
Updates to v3.5.7 / v1.1.26
* Overall: UI update improvements * VideoView: Fixes an issue with WindowsFormsHost and Front Window within a Scroll Viewer * Renderer: Introduces Player.renderer.GetBitmap which can be used in parallel with rendering to retrieve (and resize if required) a gpu texture * TakeSnapshot: Improvements and adds resize on gpu support * Languages: Better handling of audio, subtitles and online subtitles languages (using windows cultures) * Config: Introduces Config.Video.ClearScreenOnOpen to allow the last frame to be presented until the new open has been completed * Config: Introduces Config.Video.Swap10Bit to use 10-bit instead of 8-bit swap chain * Config: Introduces Config.Video.SwapBuffers to manually set render's swap chain buffers * Controls.WPF: Fixes UIConfig to properly save for subtitles FontWeight, FontStyle and FontStretch
1 parent 644bb74 commit dc7462e

3 files changed

Lines changed: 14 additions & 17 deletions

File tree

FlyleafLib.Controls.WPF/FlyleafLib.Controls.WPF.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net6.0-windows;net5.0-windows;net472</TargetFrameworks>
55
<UseWindowsForms>true</UseWindowsForms>
66
<UseWPF>true</UseWPF>
7-
<Version>1.1.25</Version>
7+
<Version>1.1.26</Version>
88
<Authors>SuRGeoNix</Authors>
99
<Copyright>SuRGeoNix © 2022</Copyright>
1010
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
@@ -14,8 +14,7 @@
1414
<PackageTags>flyleaf flyleaflib video audio media player element control</PackageTags>
1515
<Description>WPF Media Player Control/Element (based on FlyleafLib)</Description>
1616
<PackageReleaseNotes>
17-
* Fixes an issue with Custom Aspect Ratio
18-
* Fixes Subtitles Fonts to respect FontFamily configuration
17+
* Fixes UIConfig to properly save for subtitles FontWeight, FontStyle and FontStretch
1918
* Updates FlyleafLib
2019
</PackageReleaseNotes>
2120
</PropertyGroup>

FlyleafLib/FlyleafLib.csproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageIconUrl />
99
<RepositoryUrl></RepositoryUrl>
1010
<Description>Media Player .NET Library for WPF/WinForms (based on FFmpeg/DirectX)</Description>
11-
<Version>3.5.6</Version>
11+
<Version>3.5.7</Version>
1212
<Authors>SuRGeoNix</Authors>
1313
<Copyright>SuRGeoNix © 2022</Copyright>
1414
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
@@ -17,13 +17,14 @@
1717
<IncludeSymbols>true</IncludeSymbols>
1818
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1919
<PackageReleaseNotes>
20-
* Config: Fixes clone implementation
21-
* Demuxer/Screamer: Improves EOF without raising errors in some cases
22-
* M3UPlaylist: Fixes an issue with Tags
23-
* Mouse: Fixes an issue with WinMoveOnDrag (sometimes it was moving the window when it should not)
24-
* Remuxer: Fixes a possible issue with TS extension by adding it manually on the demuxer
25-
* Renderer: Allows D3D11 to play HDR videos (even if does not support it yet) when forced as VP
26-
* VideoView: Binds VideoViews visibility with the Foreground Window
20+
* Overall: UI update improvements
21+
* VideoView: Fixes an issue with WindowsFormsHost and Front Window within a Scroll Viewer
22+
* Renderer: Introduces Player.renderer.GetBitmap which can be used in parallel with rendering to retrieve (and resize if required) a gpu texture
23+
* TakeSnapshot: Improvements and adds resize on gpu support
24+
* Languages: Better handling of audio, subtitles and online subtitles languages (using windows cultures)
25+
* Config: Introduces Config.Video.ClearScreenOnOpen to allow the last frame to be presented until the new open has been completed
26+
* Config: Introduces Config.Video.Swap10Bit to use 10-bit instead of 8-bit swap chain
27+
* Config: Introduces Config.Video.SwapBuffers to manually set render's swap chain buffers
2728
</PackageReleaseNotes>
2829
</PropertyGroup>
2930

FlyleafLib/MediaFramework/MediaRenderer/Renderer.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -949,19 +949,16 @@ public Bitmap GetBitmap(VideoFrame frame = null, int height = -1, int width = -1
949949
{
950950
try
951951
{
952-
if (Disposed || VideoDecoder == null || VideoDecoder.VideoStream == null)
953-
return null;
954-
955952
if (frame == null)
956953
frame = LastFrame;
957954

958-
if (frame == null)
955+
if (Disposed || frame == null || (frame.textures == null && LastFrame.bufRef == null))
959956
return null;
960957

961958
if (width == -1 && height == -1)
962959
{
963-
width = VideoDecoder.VideoStream.Width;
964-
height = VideoDecoder.VideoStream.Height;
960+
width = VideoRect.Right;
961+
height = VideoRect.Bottom;
965962
}
966963
else if (width != -1 && height == -1)
967964
height = (int) (width / curRatio);

0 commit comments

Comments
 (0)