From 7ffe7f8442eb70980da55832a293fab52ff58cf1 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Sun, 25 Jun 2023 19:03:48 +0200
Subject: [Ryujinx.Graphics.Nvdec.FFmpeg] Address dotnet-format issues (#5370)

* dotnet format style --severity info

Some changes were manually reverted.

* Address or silence dotnet format CA1806 and a few CA1854 warnings

* Address most dotnet format whitespace warnings

* Apply dotnet format whitespace formatting

A few of them have been manually reverted and the corresponding warning was silenced

* Add comments to disabled warnings

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Address IDE0251 warnings

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* First dotnet format pass
---
 src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/Decoder.cs                 | 4 ++--
 src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/H264BitStreamWriter.cs     | 6 +++---
 src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/SpsAndPpsReconstruction.cs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/Ryujinx.Graphics.Nvdec.FFmpeg/H264')

diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/Decoder.cs b/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/Decoder.cs
index d8b213e5..7dd643ce 100644
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/Decoder.cs
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/Decoder.cs
@@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
 
         private readonly byte[] _workBuffer = new byte[WorkBufferSize];
 
-        private FFmpegContext _context = new FFmpegContext(AVCodecID.AV_CODEC_ID_H264);
+        private FFmpegContext _context = new(AVCodecID.AV_CODEC_ID_H264);
 
         private int _oldOutputWidth;
         private int _oldOutputHeight;
@@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
             byte[] output = new byte[data.Length + prep.Length];
 
             prep.CopyTo(output);
-            data.CopyTo(new Span<byte>(output).Slice(prep.Length));
+            data.CopyTo(new Span<byte>(output)[prep.Length..]);
 
             return output;
         }
diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/H264BitStreamWriter.cs b/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/H264BitStreamWriter.cs
index 3d3b3293..57ab9fb5 100644
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/H264BitStreamWriter.cs
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/H264BitStreamWriter.cs
@@ -84,9 +84,9 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
             Flush();
         }
 
-        public Span<byte> AsSpan()
+        public readonly Span<byte> AsSpan()
         {
-            return new Span<byte>(_workBuffer).Slice(0, _offset);
+            return new Span<byte>(_workBuffer)[.._offset];
         }
 
         public void WriteU(uint value, int valueSize) => WriteBits((int)value, valueSize);
@@ -118,4 +118,4 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
             WriteBits((int)value, size - 1);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/SpsAndPpsReconstruction.cs b/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/SpsAndPpsReconstruction.cs
index 57fb65d5..d8bf6f74 100644
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/SpsAndPpsReconstruction.cs
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/SpsAndPpsReconstruction.cs
@@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
     {
         public static Span<byte> Reconstruct(ref H264PictureInfo pictureInfo, byte[] workBuffer)
         {
-            H264BitStreamWriter writer = new H264BitStreamWriter(workBuffer);
+            H264BitStreamWriter writer = new(workBuffer);
 
             // Sequence Parameter Set.
             writer.WriteU(1, 24);
-- 
cgit v1.2.3