optimize: capture log and code

Author: nidbCN

StreamingCaptureBot.Core/Services/CaptureService.cs

@@ -126,18 +126,12 @@ public void Dispose()
     /// 解码下一关键帧（非线程安全）
     /// </summary>
     /// <returns></returns>
-    public AvFrameWrapper DecodeNextFrameUnsafe()
+    public void DecodeNextFrameUnsafe()
     {
-        var frame = _frame;
-
         var timeoutTokenSource = new CancellationTokenSource(_streamOption.Value.CodecTimeout);
-
-        IDisposable? scope = null;
-
         do
         {
-            // clear scope
-            scope?.Dispose();
+            IDisposable? scope = null;
 
             try
             {
@@ -160,47 +154,49 @@ public AvFrameWrapper DecodeNextFrameUnsafe()
 
                 readResult.ThrowExceptionIfError();
 
+                scope = _logger.BeginScope(_packet.ToString());
+
                 // drop stream mis-matched packet
                 if (_packet.StreamIndex != _streamOption.Value.StreamIndex)
                 {
-                    _logger.LogInformation("Packet in stream[{id}] found, require stream[{req id}], igonre.",
+                    _logger.LogInformation("Received packet from stream[{id}], require stream[{req id}], drop.",
                         _packet.StreamIndex, _streamOption.Value.StreamIndex);
-                    _packet.Reset();
+
                     continue;
                 }
 
                 unsafe
                 {
                     _logger.LogInformation(
-                        "Packet in stream[{index}] with size:{size}, pts(display):{pts:c}, dts(decode):{dts:c}.",
+                        "Received packet from stream[{index}] with size:{size}, pts(display):{pts:c}, dts(decode):{dts:c}.",
                         _packet.StreamIndex,
                         string.Format(_formatter, "{0}", _packet.Size),
                         _packet.GetPresentationTimeSpan(_decoder.Context.TimeBase),
                         _packet.GetDecodingTimeSpan(_decoder.Context.TimeBase)
                     );
                 }
 
-                // drop packet with invalid size
-                if (_packet.Size <= 0)
-                {
-                    _logger.LogWarning("Packet with invalid size {size}, drop.",
-                        string.Format(_formatter, "{0}", _packet.Size));
-
-                    continue;
-                }
-
                 // drop packet without key frame
                 unsafe
                 {
                     if ((_packet.UnmanagedPointer->flags & ffmpeg.AV_PKT_FLAG_KEY) == 0x00)
                     {
-                        _logger.LogInformation("Packet flag {flag:x8} not contains KEY frame, drop.",
+                        _logger.LogInformation("Packet flag 0x{flag:x8} not contains KEY frame, drop.",
                             _packet.UnmanagedPointer->flags);
 
                         continue;
                     }
                 }
 
+                // drop packet with invalid size
+                if (_packet.Size <= 0)
+                {
+                    _logger.LogWarning("Packet with invalid size {size}, drop.",
+                        string.Format(_formatter, "{0}", _packet.Size));
+
+                    continue;
+                }
+
                 // drop packet with invalid pts
                 if (_packet.PresentationTimeStamp < 0)
                 {
@@ -211,6 +207,7 @@ public AvFrameWrapper DecodeNextFrameUnsafe()
                 }
 
                 // decode
+                var frame = _frame;
                 _decoder.Decode(_packet, ref frame);
 
                 scope?.Dispose();
@@ -254,8 +251,6 @@ public AvFrameWrapper DecodeNextFrameUnsafe()
                 // ffmpeg.av_hwframe_transfer_data(frame, frame, 0).ThrowExceptionIfError();
             }
         }
-
-        return frame;
     }
 
     /// <summary>
@@ -331,7 +326,9 @@ private void FlushDecoderBufferUnsafe(CancellationToken cancellationToken)
 
                 OpenInput();
 
-                var decodedFrame = DecodeNextFrameUnsafe();
+                DecodeNextFrameUnsafe();
+                var decodedFrame = _frame;
+
                 using (_logger.BeginScope(decodedFrame.ToString()))
                 {
                     var queue = _encoder.Encode(decodedFrame);
@@ -361,6 +358,7 @@ private void FlushDecoderBufferUnsafe(CancellationToken cancellationToken)
             finally
             {
                 CloseInput();
+                _frame.Reset();
                 _semaphore.Release();
             }
         }, cancellationToken);