NVDEC (H264): Use separate contexts per channel and decode frames in DTS order (#2671)

* Use separate NVDEC contexts per channel (for FFMPEG)

* Remove NVDEC -> VIC frame override hack

* Add missing bottom_field_pic_order_in_frame_present_flag

* Make FFMPEG logging static

* nit: Remove empty lines

* New FFMPEG decoding approach -- call h264_decode_frame directly, trim surface cache to reduce memory usage

* Fix case

* Silence warnings

* PR feedback

* Per-decoder rather than per-codec ownership of surfaces on the cache

1 files changed, 9 insertions, 12 deletions

diff --git a/Ryujinx.Graphics.Nvdec/H264Decoder.cs b/Ryujinx.Graphics.Nvdec/H264Decoder.cs
index 57ce12d0..1ee3997b 100644
--- a/Ryujinx.Graphics.Nvdec/H264Decoder.cs
+++ b/Ryujinx.Graphics.Nvdec/H264Decoder.cs
@@ -10,9 +10,7 @@ namespace Ryujinx.Graphics.Nvdec
     {
         private const int MbSizeInPixels = 16;
 
-        private static readonly Decoder _decoder = new Decoder();
-
-        public unsafe static void Decode(NvdecDevice device, ResourceManager rm, ref NvdecRegisters state)
+        public unsafe static void Decode(NvdecDecoderContext context, ResourceManager rm, ref NvdecRegisters state)
         {
             PictureInfo pictureInfo = rm.Gmm.DeviceRead<PictureInfo>(state.SetPictureInfoOffset);
             H264PictureInfo info = pictureInfo.Convert();
@@ -22,19 +20,18 @@ namespace Ryujinx.Graphics.Nvdec
             int width  = (int)pictureInfo.PicWidthInMbs * MbSizeInPixels;
             int height = (int)pictureInfo.PicHeightInMbs * MbSizeInPixels;
 
-            ISurface outputSurface = rm.Cache.Get(_decoder, CodecId.H264, 0, 0, width, height);
+            int surfaceIndex = (int)pictureInfo.OutputSurfaceIndex;
 
-            if (_decoder.Decode(ref info, outputSurface, bitstream))
-            {
-                int li = (int)pictureInfo.LumaOutputSurfaceIndex;
-                int ci = (int)pictureInfo.ChromaOutputSurfaceIndex;
+            uint lumaOffset   = state.SetSurfaceLumaOffset[surfaceIndex];
+            uint chromaOffset = state.SetSurfaceChromaOffset[surfaceIndex];
 
-                uint lumaOffset   = state.SetSurfaceLumaOffset[li];
-                uint chromaOffset = state.SetSurfaceChromaOffset[ci];
+            Decoder decoder = context.GetDecoder();
 
-                SurfaceWriter.Write(rm.Gmm, outputSurface, lumaOffset, chromaOffset);
+            ISurface outputSurface = rm.Cache.Get(decoder, 0, 0, width, height);
 
-                device.OnFrameDecoded(CodecId.H264, lumaOffset, chromaOffset);
+            if (decoder.Decode(ref info, outputSurface, bitstream))
+            {
+                SurfaceWriter.Write(rm.Gmm, outputSurface, lumaOffset, chromaOffset);
             }
 
             rm.Cache.Put(outputSurface);