Merge branch 'reduce_memcopy'

Core/RenderManager.cs

@@ -83,8 +83,16 @@ namespace ADOFAIRenderer.Core
             }
         }
 
+        internal struct CapturedFrame
+        {
+            public IntPtr NativePointer;
+            public int Length;
+            public byte[]? ManagedBuffer; // Non-null if it's a managed buffer (e.g. black frame)
+            public ReadbackRequestState? ReadbackState; // Associated state to recycle
+        }
+
         // Thread and Queue State
-        public SortedList<long, byte[]> ImageQueue = new SortedList<long, byte[]>();
+        internal SortedList<long, CapturedFrame> ImageQueue = new SortedList<long, CapturedFrame>();
         public Thread? RenderThread;
         public long passCount;
         public bool endRequested;
@@ -251,7 +259,11 @@ namespace ADOFAIRenderer.Core
                     
                     lock (ImageQueue)
                     {
-                        ImageQueue[videoFrameIndex] = blackFrame;
+                        ImageQueue[videoFrameIndex] = new CapturedFrame
+                        {
+                            ManagedBuffer = blackFrame,
+                            Length = byteSize
+                        };
                     }
                 }
                 
@@ -470,7 +482,8 @@ namespace ADOFAIRenderer.Core
 
                     while (true)
                     {
-                        byte[]? buffer = null;
+                        CapturedFrame frame = default;
+                        bool hasFrame = false;
                         lock (ImageQueue)
                         {
                             if (ImageQueue.Count > 0)
@@ -484,20 +497,32 @@ namespace ADOFAIRenderer.Core
 
                                 if (firstKey == passCount)
                                 {
-                                    buffer = ImageQueue[firstKey];
+                                    frame = ImageQueue[firstKey];
                                     ImageQueue.RemoveAt(0);
                                     passCount++;
+                                    hasFrame = true;
                                 }
                             }
                         }
 
-                        if (buffer != null)
+                        if (hasFrame)
                         {
-                            if (buffer.Length > 0)
+                            if (frame.ManagedBuffer != null)
                             {
-                                var bufferSize = Configuration.RenderWidth * Configuration.RenderHeight * 4;
-                                videoFFmpeg.SendDataFromBuffer(buffer, bufferSize);
-                                ArrayPool<byte>.Shared.Return(buffer);
+                                if (frame.ManagedBuffer.Length > 0)
+                                {
+                                    videoFFmpeg.SendDataFromBuffer(frame.ManagedBuffer, frame.Length);
+                                    ArrayPool<byte>.Shared.Return(frame.ManagedBuffer);
+                                }
+                            }
+                            else if (frame.NativePointer != IntPtr.Zero && frame.Length > 0)
+                            {
+                                videoFFmpeg.SendDataFromNativeBuffer(frame.NativePointer, frame.Length);
+
+                                if (frame.ReadbackState != null)
+                                {
+                                    _frameReader?.RecycleState(frame.ReadbackState);
+                                }
                             }
                             continue;
                         }
@@ -583,11 +608,15 @@ namespace ADOFAIRenderer.Core
                 // 1. 메모리 누수 방지: 큐에 렌트된 임시 프레임 버퍼 풀 반환 및 클리어
                 lock (ImageQueue)
                 {
-                    foreach (var kvp in ImageQueue)
+                    foreach (var kvp in ImageQueue.Values)
                     {
-                        if (kvp.Value != null && kvp.Value.Length > 0)
+                        if (kvp.ManagedBuffer != null && kvp.ManagedBuffer.Length > 0)
                         {
-                            ArrayPool<byte>.Shared.Return(kvp.Value);
+                            ArrayPool<byte>.Shared.Return(kvp.ManagedBuffer);
+                        }
+                        if (kvp.ReadbackState != null)
+                        {
+                            _frameReader?.RecycleState(kvp.ReadbackState);
                         }
                     }
                     ImageQueue.Clear();
@@ -664,6 +693,22 @@ namespace ADOFAIRenderer.Core
             GCS.customLevelPaths = null;
             GCS.customLevelId = null;
             
+            lock (ImageQueue)
+            {
+                foreach (var kvp in ImageQueue.Values)
+                {
+                    if (kvp.ManagedBuffer != null && kvp.ManagedBuffer.Length > 0)
+                    {
+                        ArrayPool<byte>.Shared.Return(kvp.ManagedBuffer);
+                    }
+                    if (kvp.ReadbackState != null)
+                    {
+                        _frameReader?.RecycleState(kvp.ReadbackState);
+                    }
+                }
+                ImageQueue.Clear();
+            }
+
             _frameReader?.Dispose();
             ADOBase.loader.LoadSceneWithTransition(WipeDirection.StartsFromRight, "scnEditor");
         }