Updates to v3.9.6 (FlyleafLib) / v1.5.6 (FlyleafME) / v1.2.6 (FlyleafHost.WinUI)

- Player: Fixes an issue with TaskSnapshot
- Renderer.VideoProcessor: Prioritize user's VP selection instead of supported features by VPs
- VideoDecoder: Reimplementation of the main decoding loop which now respects MaxVideoFrames/ExtraFrames
 * It could cause unexpected results with FFmpeg's HW surface pool
- VideoDecoder: Handles internally the key frame validation instead of Config.Decoder.KeyFrameValidation
 * To be able to support both cases dynamically. Might restore config with Auto if required/requested
- Samples.FlyleafPlayer: Fixes an issue with key bindings restore during Image/Video views

[Breaking Changes]
- Config.Decoder: Deprecates KeyFrameValidation (will be handled automatically from the decoder)
- Config.Decoder: MaxErrors will be reset on the first successful decoding (instead on each Start of the decoder)
 * Might add MaxTotalErrors if required/requested

Author: SuRGeoNix

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

@@ -4,7 +4,7 @@
     <TargetFrameworks>net8.0-windows;net10.0-windows</TargetFrameworks>
 	<UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <Version>1.5.5</Version>
+    <Version>1.5.6</Version>
     <Authors>SuRGeoNix</Authors>
     <Copyright>SuRGeoNix © 2025</Copyright>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>

FlyleafLib.Controls.WinUI/FlyleafLib.Controls.WinUI.csproj

@@ -5,7 +5,7 @@
 		<UseWinUI>true</UseWinUI>
 		<Nullable>enable</Nullable>
 		<Authors>SuRGeoNix</Authors>
-		<Version>1.2.5</Version>
+		<Version>1.2.6</Version>
 		<Copyright>SuRGeoNix © 2025</Copyright>
 		<PackageProjectUrl>https://github.com/SuRGeoNix/Flyleaf</PackageProjectUrl>
 		<PackageIcon>Flyleaf.png</PackageIcon>

FlyleafLib/Engine/Config.cs

@@ -565,12 +565,6 @@ public DecoderConfig Clone()
         public bool             ShowCorrupted       { get => _ShowCorrupted;        set => SetUI(ref _ShowCorrupted, value); }
         bool _ShowCorrupted;
 
-        /// <summary>
-        /// Ensures that after a key packet receives a also key frame (can create artifacts on some broken formats when disabled and seek issues when enabled)
-        /// </summary>
-        public bool             KeyFrameValidation  { get => _KeyFrameValidation;   set => SetUI(ref _KeyFrameValidation, value); }
-        internal bool _KeyFrameValidation;
-
         /// <summary>
         /// Forces low delay (Parses AV_CODEC_FLAG2_FAST or AV_CODEC_FLAG_LOW_DELAY -based on DropFrames- to AVCodecContext) (auto-enabled with MaxLatency)
         /// </summary>

FlyleafLib/Engine/Globals.cs

@@ -68,9 +68,9 @@ public enum VideoProcessors
 public enum Cropping
 {
     None,
-    Stream,
-    Codec,
-    Texture
+    Stream  = 1 << 0,
+    Codec   = 1 << 1,
+    Texture = 1 << 2
 }
 public enum ColorSpace : int
 {

FlyleafLib/FlyleafLib.csproj

@@ -8,7 +8,7 @@
 	<PackageIconUrl />
 	<RepositoryUrl></RepositoryUrl>
 	<Description>Media Player .NET Library for WinUI 3/WPF/WinForms (based on FFmpeg/DirectX)</Description>
-	<Version>3.9.5</Version>
+	<Version>3.9.6</Version>
 	<Authors>SuRGeoNix</Authors>
 	<Copyright>SuRGeoNix © 2025</Copyright>
 	<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
@@ -17,17 +17,14 @@
 	<IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PackageReleaseNotes>
-		- Engine.Logger: Adds File Rolling support
-		- Engine.Config: Introduces LogRollMaxFileSize and LogRollMaxFiles for the new File Rolling impelementation
-		- Demuxer: Fixes an issue with Data streams that would be falsely included as Misc/Invalid streams instead
-		- VideoDecoder: Stability and Performance improvements for Open/Setup implementation
-		- Renderer.VideoProcessor: Fixes an issue with cropping not refreshing the layout
-		- Player: Introduces OpeningVideoStream event which fires during VideoDecoder's codec open
-		- Player.Video: Codec now returns the actual codec's name in use by the decoder
-		- FlyleafHost.Wpf: Fixes an issue with MouseWheel event for attached hosts would fire twice causing Zoom and Rotation to not work properly
+		- Player: Fixes an issue with TaskSnapshot
+		- Renderer.VideoProcessor: Prioritize user's VP selection instead of supported features by VPs
+		- VideoDecoder: Reimplementation of the main decoding loop which now respects MaxVideoFrames/ExtraFrames
+		- VideoDecoder: Handles internally the key frame validation instead of Config.Decoder.KeyFrameValidation
 
 		[Breaking Changes]
-		- Config.Decoder: Defaults AllowProfileMismatch back to false as it seems that it causes more issues than it resolves
+		- Config.Decoder: Deprecates KeyFrameValidation (will be handled automatically from the decoder)
+		- Config.Decoder: MaxErrors will be reset on the first successful decoding (instead on each Start of the decoder)
 	</PackageReleaseNotes>
   </PropertyGroup>
 

FlyleafLib/MediaFramework/MediaContext/DecoderContext.cs

@@ -487,8 +487,7 @@ public void Flush()
         DataDecoder.Flush();
     }
 
-    // !!! NEEDS RECODING
-    public long GetVideoFrame(long timestamp = -1)
+    public void GetVideoFrame(long timestamp = -1)
     {
         // TBR: Between seek and GetVideoFrame lockCodecCtx is lost and if VideoDecoder is running will already have decoded some frames (Currently ensure you pause VideDecoder before seek)
 
@@ -508,11 +507,11 @@ public long GetVideoFrame(long timestamp = -1)
                 if (ret != 0)
                 {
                     av_packet_free(&packet);
-                    return -1;
+                    return;
                 }
             }
             else
-                packet = VideoDemuxer.VideoPackets.Dequeue();
+                packet = VideoDemuxer.VideoPackets.Dequeue(); // TBR: This comes after seek, we shouldn't have packets here?*
 
             if (!VideoDemuxer.EnabledStreams.Contains(packet->stream_index)) { av_packet_free(&packet); continue; }
 
@@ -526,21 +525,6 @@ public long GetVideoFrame(long timestamp = -1)
 
             var codecType = VideoDemuxer.FormatContext->streams[packet->stream_index]->codecpar->codec_type;
 
-            if (codecType == AVMediaType.Video && VideoDecoder.keyPacketRequired)
-            {
-                if (packet->flags.HasFlag(PktFlags.Key) || packet->pts == VideoDecoder.startPts)
-                {
-                    VideoDecoder.keyPacketRequired = false;
-                    VideoDecoder.keyFrameRequired  = Config.Decoder._KeyFrameValidation;
-                }
-                else
-                {
-                    if (CanWarn) Log.Warn("Ignoring non-key packet");
-                    av_packet_free(&packet);
-                    continue;
-                }
-            }
-
             if (VideoDemuxer.IsHLSLive)
                 VideoDemuxer.UpdateHLSTime();
 
@@ -571,102 +555,45 @@ public long GetVideoFrame(long timestamp = -1)
                     continue;
 
                 case AVMediaType.Video:
-                    ret = avcodec_send_packet(VideoDecoder.CodecCtx, packet);
-
-                    if (VideoDecoder.swFallback)
-                    {
-                        VideoDecoder.SWFallback();
-                        ret = avcodec_send_packet(VideoDecoder.CodecCtx, packet);
-                    }
-
-                    av_packet_free(&packet);
 
+                    ret = VideoDecoder.SendAVPacket(packet);
                     if (ret != 0)
                     {
-                        allowedErrors--;
-                        if (CanWarn) Log.Warn($"{FFmpegEngine.ErrorCodeToMsg(ret)} ({ret})");
-
-                        if (allowedErrors == 0) { Log.Error("Too many errors!");  return -1; }
+                        if (ret == AVERROR_EAGAIN)
+                            continue;
 
-                        continue;
+                        return; // Critical
                     }
-
-                    //VideoDemuxer.UpdateCurTime();
-
-                    var frame = av_frame_alloc();
+                   
                     while (VideoDemuxer.VideoStream != null && !Interrupt)
                     {
-                        ret = avcodec_receive_frame(VideoDecoder.CodecCtx, frame);
-                        if (ret != 0) { av_frame_unref(frame); break; }
-
-                        if (VideoDecoder.keyFrameRequired)
-                        {
-                            if (!frame->flags.HasFlag(FrameFlags.Key)) { av_frame_unref(frame); continue; }
-                            VideoDecoder.keyFrameRequired = false;
-                        }
-
-                        if (frame->best_effort_timestamp != AV_NOPTS_VALUE)
-                            frame->pts = frame->best_effort_timestamp;
-                        else if (frame->pts == AV_NOPTS_VALUE)
-                        {
-                            if (!VideoStream.FixTimestamps)
-                            {
-                                av_frame_unref(frame);
-                                continue;
-                            }
-
-                            frame->pts = VideoDecoder.lastFixedPts + VideoStream.StartTimePts;
-                            VideoDecoder.lastFixedPts += av_rescale_q(VideoStream.FrameDuration / 10, Engine.FFmpeg.AV_TIMEBASE_Q, VideoStream.AVStream->time_base);
-                        }
-
-                        if (!VideoDecoder.filledFromCodec)
+                        ret = VideoDecoder.RecvAVFrame();
+                        if (ret != 0)
                         {
-                            ret = VideoDecoder.FillFromCodec(frame);
+                            if (ret == AVERROR_EAGAIN)
+                                break;
 
-                            if (ret == -1234)
-                            {
-                                av_frame_free(&frame);
-                                return -1;
-                            }
+                            return; // EOF | Critical
                         }
 
                         // Accurate seek with +- half frame distance
                         // TBR: Live streams should never been seeked at first place (maybe allow HLSLive?) * can cause infinite loop
-                        if (timestamp != -1 && !VideoDemuxer.IsLive && (long)(frame->pts * VideoStream.Timebase) - VideoDemuxer.StartTime + (VideoStream.FrameDuration / 2) < timestamp)
+                        if (timestamp != -1 && !VideoDemuxer.IsLive && (long)(VideoDecoder.frame->pts * VideoStream.Timebase) - VideoDemuxer.StartTime + (VideoStream.FrameDuration / 2) < timestamp)
                         {
-                            av_frame_unref(frame);
+                            av_frame_unref(VideoDecoder.frame);
                             continue;
                         }
 
-                        //if (CanInfo) Info($"Asked for {TicksToTime(timestamp)} and got {TicksToTime((long)(frame->pts * VideoStream.Timebase) - VideoDemuxer.StartTime)} | Diff {TicksToTime(timestamp - ((long)(frame->pts * VideoStream.Timebase) - VideoDemuxer.StartTime))}");
-                        VideoDecoder.StartTime = (long)(frame->pts * VideoStream.Timebase) - VideoDemuxer.StartTime;
+                        ret = VideoDecoder.FillAVFrame();
+                        if (ret == 0)
+                            return; // Success
 
-                        var mFrame = VideoDecoder.Renderer.FillPlanes(frame);
-                        if (mFrame != null)
-                            VideoDecoder.Frames.Enqueue(mFrame);
-                        else if (VideoDecoder.handleDeviceReset)
-                        {
-                            VideoDecoder.HandleDeviceReset();
-                            continue;
-                        }
+                        if (ret == -1234)
+                            return; // Critical
 
-                        do
-                        {
-                            ret = avcodec_receive_frame(VideoDecoder.CodecCtx, frame);
-                            if (ret != 0) break;
-                            mFrame = VideoDecoder.Renderer.FillPlanes(frame);
-                            if (mFrame != null)
-                                VideoDecoder.Frames.Enqueue(mFrame);
-                            else if (VideoDecoder.handleDeviceReset)
-                                VideoDecoder.HandleDeviceReset();
-                        } while (!VideoDemuxer.Disposed && !Interrupt);
-
-                        av_frame_free(&frame);
-                        return mFrame.timestamp;
+                        continue;
                     }
 
-                    av_frame_free(&frame);
-
                     break; // Switch break
 
                 default:
@@ -677,7 +604,7 @@ public long GetVideoFrame(long timestamp = -1)
 
         } // While
 
-        return -1;
+        return;
     }
     public new void Dispose()
     {

FlyleafLib/MediaFramework/MediaDecoder/DecoderBase.cs

@@ -19,7 +19,7 @@ protected virtual void OnSpeedChanged(double value) { }
 
     internal bool               codecChanged;
     internal bool               filledFromCodec;
-    protected AVFrame*          frame;
+    internal AVFrame*           frame;
     protected AVCodecContext*   codecCtx;
     internal  object            lockCodecCtx    = new();