From 4d02a2d2c0451b4de1f6de3bbce54c457cacebe2 Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Sun, 12 Jul 2020 00:07:01 -0300
Subject: New NVDEC and VIC implementation (#1384)

* Initial NVDEC and VIC implementation

* Update FFmpeg.AutoGen to 4.3.0

* Add nvdec dependencies for Windows

* Unify some VP9 structures

* Rename VP9 structure fields

* Improvements to Video API

* XML docs for Common.Memory

* Remove now unused or redundant overloads from MemoryAccessor

* NVDEC UV surface read/write scalar paths

* Add FIXME comments about hacky things/stuff that will need to be fixed in the future

* Cleaned up VP9 memory allocation

* Remove some debug logs

* Rename some VP9 structs

* Remove unused struct

* No need to compile Ryujinx.Graphics.Host1x with unsafe anymore

* Name AsyncWorkQueue threads to make debugging easier

* Make Vp9PictureInfo a ref struct

* LayoutConverter no longer needs the depth argument (broken by rebase)

* Pooling of VP9 buffers, plus fix a memory leak on VP9

* Really wish VS could rename projects properly...

* Address feedback

* Remove using

* Catch OperationCanceledException

* Add licensing informations

* Add THIRDPARTY.md to release too

Co-authored-by: Thog <me@thog.eu>
---
 Ryujinx.Memory/MemoryBlock.cs         | 20 ++++++++++++++---
 Ryujinx.Memory/NativeMemoryManager.cs | 42 +++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 Ryujinx.Memory/NativeMemoryManager.cs

(limited to 'Ryujinx.Memory')

diff --git a/Ryujinx.Memory/MemoryBlock.cs b/Ryujinx.Memory/MemoryBlock.cs
index 850fb115..37439a8a 100644
--- a/Ryujinx.Memory/MemoryBlock.cs
+++ b/Ryujinx.Memory/MemoryBlock.cs
@@ -135,13 +135,13 @@ namespace Ryujinx.Memory
         public void Copy(ulong srcOffset, ulong dstOffset, ulong size)
         {
             const int MaxChunkSize = 1 << 30;
-            
+
             for (ulong offset = 0; offset < size; offset += MaxChunkSize)
             {
                 int copySize = (int)Math.Min(MaxChunkSize, size - offset);
 
                 Write(dstOffset + offset, GetSpan(srcOffset + offset, copySize));
-            }   
+            }
         }
 
         /// <summary>
@@ -225,7 +225,7 @@ namespace Ryujinx.Memory
         }
 
         /// <summary>
-        /// Gets the span of a given memory block region.
+        /// Gets the <see cref="System.Span{T}"/> of a given memory block region.
         /// </summary>
         /// <param name="offset">Start offset of the memory region</param>
         /// <param name="size">Size in bytes of the region</param>
@@ -238,6 +238,20 @@ namespace Ryujinx.Memory
             return new Span<byte>((void*)GetPointer(offset, size), size);
         }
 
+        /// <summary>
+        /// Gets the <see cref="System.Memory{T}"/> of a given memory block region.
+        /// </summary>
+        /// <param name="offset">Start offset of the memory region</param>
+        /// <param name="size">Size in bytes of the region</param>
+        /// <returns>Memory of the memory region</returns>
+        /// <exception cref="ObjectDisposedException">Throw when the memory block has already been disposed</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Throw when either <paramref name="offset"/> or <paramref name="size"/> are out of range</exception>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public unsafe Memory<byte> GetMemory(ulong offset, int size)
+        {
+            return new NativeMemoryManager<byte>((byte*)GetPointer(offset, size), size).Memory;
+        }
+
         /// <summary>
         /// Adds a 64-bits offset to a native pointer.
         /// </summary>
diff --git a/Ryujinx.Memory/NativeMemoryManager.cs b/Ryujinx.Memory/NativeMemoryManager.cs
new file mode 100644
index 00000000..ef599dd4
--- /dev/null
+++ b/Ryujinx.Memory/NativeMemoryManager.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Buffers;
+
+namespace Ryujinx.Memory
+{
+    unsafe class NativeMemoryManager<T> : MemoryManager<T> where T : unmanaged
+    {
+        private readonly T* _pointer;
+        private readonly int _length;
+
+        public NativeMemoryManager(T* pointer, int length)
+        {
+            _pointer = pointer;
+            _length = length;
+        }
+
+        public override Span<T> GetSpan()
+        {
+            return new Span<T>((void*)_pointer, _length);
+        }
+
+        public override MemoryHandle Pin(int elementIndex = 0)
+        {
+            if ((uint)elementIndex >= _length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(elementIndex));
+            }
+
+            return new MemoryHandle((void*)(_pointer + elementIndex));
+        }
+
+        public override void Unpin()
+        {
+            // No need to do anything as pointer already points no native memory, not GC tracked.
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            // Nothing to dispose, MemoryBlock still owns the memory.
+        }
+    }
+}
-- 
cgit v1.2.3