diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 1554b8f6b..fbd76a2d8 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -29,7 +29,7 @@ env: jobs: tag: name: Create tag - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Get version info id: version_info @@ -202,7 +202,7 @@ jobs: macos_release: name: Release MacOS universal - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 072c6bf2f..d4292162a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ env: jobs: tag: name: Create tag - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Get version info id: version_info @@ -183,7 +183,7 @@ jobs: macos_release: name: Release MacOS universal - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/docs/compatibility.csv b/docs/compatibility.csv index 0fd8eadca..4cad8e8db 100644 --- a/docs/compatibility.csv +++ b/docs/compatibility.csv @@ -969,6 +969,7 @@ 0100751007ADA000,"Don't Starve: Nintendo Switch Edition",nvdec,playable,2022-02-05 20:43:34 010088B010DD2000,"Dongo Adventure",,playable,2022-10-04 16:22:26 0100C1F0051B6000,"Donkey Kong Country™: Tropical Freeze",,playable,2024-08-05 16:46:10 +01009D901BC56000,"Donkey Kong Country™: Returns HD",gpu,ingame,2025-02-16 13:44:12 0100F2C00F060000,"Doodle Derby",,boots,2020-12-04 22:51:48 0100416004C00000,"DOOM",gpu;slow;nvdec;online-broken,ingame,2024-09-23 15:40:07 010018900DD00000,"DOOM (1993)",nvdec;online-broken,menus,2022-09-06 13:32:19 @@ -1158,7 +1159,7 @@ 010095600AA36000,"Fill-a-Pix: Phil's Epic Adventure",,playable,2020-12-22 13:48:22 0100C3A00BB76000,"Fimbul",nvdec,playable,2022-07-26 13:31:47 0100C8200E942000,"Fin and the Ancient Mystery",nvdec,playable,2020-12-17 16:40:39 -01000EA014150000,"FINAL FANTASY",crash,nothing,2024-09-05 20:55:30 +01000EA014150000,"FINAL FANTASY",,playable,2025-02-16 21:27:30 01006B7014156000,"FINAL FANTASY II",crash,nothing,2024-04-13 19:18:04 01006F000B056000,"FINAL FANTASY IX",audout;nvdec,playable,2021-06-05 11:35:00 0100AA201415C000,"FINAL FANTASY V",,playable,2023-04-26 01:11:55 @@ -1249,7 +1250,7 @@ 0100A6B00D4EC000,"Furwind",,playable,2021-02-19 19:44:08 0100ECE00C0C4000,"Fury Unleashed",crash;services,ingame,2020-10-18 11:52:40 010070000ED9E000,"Fury Unleashed Demo",,playable,2020-10-08 20:09:21 -0100E1F013674000,"FUSER™",nvdec;UE4,playable,2022-10-17 20:58:32 +0100E1F013674000,"FUSER™",nvdec;UE4;slow;gpu,ingame,2025-02-12 16:03:00 0100A7A015E4C000,"Fushigi no Gensokyo Lotus Labyrinth",Needs Update;audio;gpu;nvdec,ingame,2021-01-20 15:30:02 01003C300B274000,"Futari de! Nyanko Daisensou",,playable,2024-01-05 22:26:52 010055801134E000,"FUZE Player",online-broken;vulkan-backend-bug,ingame,2022-10-18 12:23:53 @@ -2063,7 +2064,7 @@ 010002700C34C000,"Numbala",,playable,2020-05-11 12:01:07 010020500C8C8000,"Number Place 10000",gpu,menus,2021-11-24 09:14:23 010003701002C000,"Nurse Love Syndrome",,playable,2022-10-13 10:05:22 -0000000000000000,"nx-hbmenu",Needs Update;homebrew,boots,2024-04-06 22:05:32 +,"nx-hbmenu",Needs Update;homebrew,boots,2024-04-06 22:05:32 ,"nxquake2",services;crash;homebrew,nothing,2022-08-04 23:14:04 010049F00EC30000,"Nyan Cat: Lost in Space",online,playable,2021-06-12 13:22:03 01002E6014FC4000,"O---O",,playable,2022-10-29 12:12:14 @@ -2471,7 +2472,7 @@ 0100AFE00DDAC000,"Royal Roads",,playable,2020-11-17 12:54:38 0100E2C00B414000,"RPG Maker MV",nvdec,playable,2021-01-05 20:12:01 01005CD015986000,"rRootage Reloaded",,playable,2022-08-05 23:20:18 -0000000000000000,"RSDKv5u",homebrew,ingame,2024-04-01 16:25:34 +,"RSDKv5u",homebrew,ingame,2024-04-01 16:25:34 010009B00D33C000,"Rugby Challenge 4",slow;online-broken;UE4,playable,2022-10-06 12:45:53 01006EC00F2CC000,"RUINER",UE4,playable,2022-10-03 14:11:33 010074F00DE4A000,"Run the Fan",,playable,2021-02-27 13:36:28 @@ -2480,6 +2481,7 @@ 010081C0191D8000,"Rune Factory 3 Special",,playable,2023-10-15 08:32:49 010051D00E3A4000,"Rune Factory 4 Special",32-bit;crash;nvdec,ingame,2023-05-06 08:49:17 010014D01216E000,"Rune Factory 5 (JP)",gpu,ingame,2021-06-01 12:00:36 +010071E0145F8000,"Rustler",,playable,2025-02-10 20:17:12 0100E21013908000,"RWBY: Grimm Eclipse - Definitive Edition",online-broken,playable,2022-11-03 10:44:01 010012C0060F0000,"RXN -Raijin-",nvdec,playable,2021-01-10 16:05:43 0100B8B012ECA000,"S.N.I.P.E.R. - Hunter Scope",,playable,2021-04-19 15:58:09 @@ -2673,10 +2675,10 @@ 01004F401BEBE000,"Song of Nunu: A League of Legends Story",,ingame,2024-07-12 18:53:44 0100E5400BF94000,"Songbird Symphony",,playable,2021-02-27 02:44:04 010031D00A604000,"Songbringer",,playable,2020-06-22 10:42:02 -0000000000000000,"Sonic 1 (2013)",crash;homebrew,ingame,2024-04-06 18:31:20 -0000000000000000,"Sonic 2 (2013)",crash;homebrew,ingame,2024-04-01 16:25:30 -0000000000000000,"Sonic A.I.R",homebrew,ingame,2024-04-01 16:25:32 -0000000000000000,"Sonic CD",crash;homebrew,ingame,2024-04-01 16:25:31 +,"Sonic 1 (2013)",crash;homebrew,ingame,2024-04-06 18:31:20 +,"Sonic 2 (2013)",crash;homebrew,ingame,2024-04-01 16:25:30 +,"Sonic A.I.R",homebrew,ingame,2024-04-01 16:25:32 +,"Sonic CD",crash;homebrew,ingame,2024-04-01 16:25:31 010040E0116B8000,"Sonic Colors: Ultimate",,playable,2022-11-12 21:24:26 01001270012B6000,"SONIC FORCES™",,playable,2024-07-28 13:11:21 01004AD014BF0000,"Sonic Frontiers",gpu;deadlock;amd-vendor-bug;intel-vendor-bug,ingame,2024-09-05 09:18:53 @@ -2693,7 +2695,7 @@ 0100707011722000,"Space Elite Force",,playable,2020-11-27 15:21:05 010047B010260000,"Space Pioneer",,playable,2022-10-20 12:24:37 010010A009830000,"Space Ribbon",,playable,2022-08-15 17:17:10 -0000000000000000,"SpaceCadetPinball",homebrew,ingame,2024-04-18 19:30:04 +,"SpaceCadetPinball",homebrew,ingame,2024-04-18 19:30:04 0100D9B0041CE000,"Spacecats with Lasers",,playable,2022-08-15 17:22:44 010034800FB60000,"Spaceland",,playable,2020-11-01 14:31:56 010028D0045CE000,"Sparkle 2",,playable,2020-10-19 11:51:39 @@ -2837,8 +2839,9 @@ 01009B90006DC000,"Super Mario Maker™ 2",online-broken;ldn-broken,playable,2024-08-25 11:05:19 0100000000010000,"Super Mario Odyssey™",nvdec;intel-vendor-bug;mac-bug,playable,2024-08-25 01:32:34 010036B0034E4000,"Super Mario Party™",gpu;Needs Update;ldn-works,ingame,2024-06-21 05:10:16 +0100965017338000,"Super Mario Party Jamboree",mac-bug;gpu,ingame,2025-02-17 02:09:20 0100BC0018138000,"Super Mario RPG™",gpu;audio;nvdec,ingame,2024-06-19 17:43:42 -0000000000000000,"Super Mario World",homebrew,boots,2024-06-13 01:40:31 +,"Super Mario World",homebrew,boots,2024-06-13 01:40:31 010049900F546000,"Super Mario™ 3D All-Stars",services-horizon;slow;vulkan;amd-vendor-bug,ingame,2024-05-07 02:38:16 010028600EBDA000,"Super Mario™ 3D World + Bowser’s Fury",ldn-works,playable,2024-07-31 10:45:37 01004F8006A78000,"Super Meat Boy",services,playable,2020-04-02 23:10:07 @@ -2987,8 +2990,8 @@ 010015D003EE4000,"The Jackbox Party Pack 2",online-working,playable,2022-08-22 18:23:40 0100CC80013D6000,"The Jackbox Party Pack 3",slow;online-working,playable,2022-08-22 18:41:06 0100E1F003EE8000,"The Jackbox Party Pack 4",online-working,playable,2022-08-22 18:56:34 -01006fe0096ac000,"The Jackbox Party Pack 5",ldn-untested,boots,2025-02-03 22:32:00 -01005a400db52000,"The Jackbox Party Pack 6",ldn-untested,boots,2025-02-03 22:32:00 +01006fe0096ac000,"The Jackbox Party Pack 5",slow;online-working,ingame,2025-02-14 05:32:00 +01005a400db52000,"The Jackbox Party Pack 6",slow;online-working,ingame,2025-02-14 05:26:00 010052C00B184000,"The Journey Down: Chapter One",nvdec,playable,2021-02-24 13:32:41 01006BC00B188000,"The Journey Down: Chapter Three",nvdec,playable,2021-02-24 13:45:27 01009AB00B186000,"The Journey Down: Chapter Two",nvdec,playable,2021-02-24 13:32:13 diff --git a/src/ARMeilleure/Translation/Cache/JitCache.cs b/src/ARMeilleure/Translation/Cache/JitCache.cs index bc75e7d3f..7b5f2ca81 100644 --- a/src/ARMeilleure/Translation/Cache/JitCache.cs +++ b/src/ARMeilleure/Translation/Cache/JitCache.cs @@ -31,7 +31,7 @@ namespace ARMeilleure.Translation.Cache private static readonly Lock _lock = new(); private static bool _initialized; - private static readonly List _jitRegions = new(); + private static readonly List _jitRegions = []; private static int _activeRegionIndex = 0; [SupportedOSPlatform("windows")] @@ -180,13 +180,13 @@ namespace ARMeilleure.Translation.Cache } int exhaustedRegion = _activeRegionIndex; - var newRegion = new ReservedRegion(_jitRegions[0].Allocator, CacheSize); + ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize); _jitRegions.Add(newRegion); _activeRegionIndex = _jitRegions.Count - 1; int newRegionNumber = _activeRegionIndex; - Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation)."); + Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation)."); _cacheAllocator = new CacheMemoryAllocator(CacheSize); diff --git a/src/Ryujinx.Common/TitleIDs.cs b/src/Ryujinx.Common/TitleIDs.cs index 28d332a61..1bf788c96 100644 --- a/src/Ryujinx.Common/TitleIDs.cs +++ b/src/Ryujinx.Common/TitleIDs.cs @@ -53,10 +53,9 @@ namespace Ryujinx.Common "0100000000010000", // Super Mario Odyssey // Further testing is appreciated, I did not test the entire game: - "01007300020fa000", // Astral Chain - "010076f0049a2000", // Bayonetta - "0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon - "0100f4300bf2c000", // New Pokemon Snap + //"010076f0049a2000", // Bayonetta + //"0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon + //"0100f4300bf2c000", // New Pokemon Snap ]; public static string GetDiscordGameAsset(string titleId) @@ -219,6 +218,7 @@ namespace Ryujinx.Common //Misc Games "010056e00853a000", // A Hat in Time "0100fd1014726000", // Baldurs Gate: Dark Alliance + "01008c2019598000", // Bluey: The Video Game "0100c6800b934000", // Brawlhalla "0100dbf01000a000", // Burnout Paradise Remastered "0100744001588000", // Cars 3: Driven to Win @@ -229,6 +229,7 @@ namespace Ryujinx.Common "01008c8012920000", // Dying Light Platinum Edition "01001cc01b2d4000", // Goat Simulator 3 "01003620068ea000", // Hand of Fate 2 + "0100f7e00c70e000", // Hogwarts Legacy "010085500130a000", // Lego City: Undercover "010073c01af34000", // LEGO Horizon Adventures "0100d71004694000", // Minecraft diff --git a/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs b/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs index ccf8ad964..96bb05819 100644 --- a/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs +++ b/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs @@ -27,7 +27,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache private static readonly Lock _lock = new(); private static bool _initialized; - private static readonly List _jitRegions = new(); + private static readonly List _jitRegions = []; private static int _activeRegionIndex = 0; [SupportedOSPlatform("windows")] @@ -166,7 +166,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache int newRegionNumber = _activeRegionIndex; - Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation)."); + Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation)."); _cacheAllocator = new CacheMemoryAllocator(CacheSize); diff --git a/src/Ryujinx.Graphics.Gpu/Engine/Threed/DrawManager.cs b/src/Ryujinx.Graphics.Gpu/Engine/Threed/DrawManager.cs index a2f391f25..e3b981f40 100644 --- a/src/Ryujinx.Graphics.Gpu/Engine/Threed/DrawManager.cs +++ b/src/Ryujinx.Graphics.Gpu/Engine/Threed/DrawManager.cs @@ -913,7 +913,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed Span> scissors = [ - new Rectangle(scissorX, scissorY, scissorW, scissorH) + new(scissorX, scissorY, scissorW, scissorH) ]; _context.Renderer.Pipeline.SetScissors(scissors); diff --git a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs index acd93e09e..f8cb6c56b 100644 --- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs +++ b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs @@ -729,7 +729,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache ShaderProgram program = translatorContext.Translate(); - CachedShaderStage[] shaders = [new CachedShaderStage(program.Info, shader.Code, shader.Cb1Data)]; + CachedShaderStage[] shaders = [new(program.Info, shader.Code, shader.Cb1Data)]; _compilationQueue.Enqueue(new ProgramCompilation([program], shaders, newSpecState, programIndex, isCompute: true)); } diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/BitDepth.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/BitDepth.cs index fdf0aff9c..1f0c65c7b 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/BitDepth.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/BitDepth.cs @@ -6,4 +6,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 Bits10 = 10, // < 10 bits Bits12 = 12, // < 12 bits } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/CodecErr.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/CodecErr.cs index 3bd149df4..9bcf4ac01 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/CodecErr.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/CodecErr.cs @@ -1,56 +1,75 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9 +namespace Ryujinx.Graphics.Nvdec.Vp9 { internal enum CodecErr { - /*!\brief Operation completed without error */ - CodecOk, + /// + /// Operation completed without error + /// + Ok, - /*!\brief Unspecified error */ - CodecError, + /// + /// Unspecified error + /// + Error, - /*!\brief Memory operation failed */ - CodecMemError, + /// + /// Memory operation failed + /// + MemError, - /*!\brief ABI version mismatch */ - CodecAbiMismatch, + /// + /// ABI version mismatch + /// + AbiMismatch, - /*!\brief Algorithm does not have required capability */ - CodecIncapable, + /// + /// Algorithm does not have required capability + /// + Incapable, - /*!\brief The given bitstream is not supported. - * - * The bitstream was unable to be parsed at the highest level. The decoder - * is unable to proceed. This error \ref SHOULD be treated as fatal to the - * stream. */ - CodecUnsupBitstream, + /// + /// The given bitstream is not supported. + /// + /// + /// The bitstream was unable to be parsed at the highest level.
+ /// The decoder is unable to proceed.
+ /// This error SHOULD be treated as fatal to the stream. + /// + UnsupBitstream, - /*!\brief Encoded bitstream uses an unsupported feature - * - * The decoder does not implement a feature required by the encoder. This - * return code should only be used for features that prevent future - * pictures from being properly decoded. This error \ref MAY be treated as - * fatal to the stream or \ref MAY be treated as fatal to the current GOP. - */ - CodecUnsupFeature, + /// + /// Encoded bitstream uses an unsupported feature + /// + /// + /// The decoder does not implement a feature required by the encoder.
+ /// This return code should only be used for features that prevent future + /// pictures from being properly decoded.
+ ///
+ /// This error MAY be treated as fatal to the stream or MAY be treated as fatal to the current GOP. + /// + UnsupFeature, - /*!\brief The coded data for this stream is corrupt or incomplete - * - * There was a problem decoding the current frame. This return code - * should only be used for failures that prevent future pictures from - * being properly decoded. This error \ref MAY be treated as fatal to the - * stream or \ref MAY be treated as fatal to the current GOP. If decoding - * is continued for the current GOP, artifacts may be present. - */ - CodecCorruptFrame, + /// + /// The coded data for this stream is corrupt or incomplete. + /// + /// + /// There was a problem decoding the current frame.
+ /// This return code should only be used + /// for failures that prevent future pictures from being properly decoded.
+ ///
+ /// This error MAY be treated as fatal to the stream or MAY be treated as fatal to the current GOP.
+ /// If decoding is continued for the current GOP, artifacts may be present. + /// + CorruptFrame, - /*!\brief An application-supplied parameter is not valid. - * - */ - CodecInvalidParam, + /// + /// An application-supplied parameter is not valid. + /// + InvalidParam, - /*!\brief An iterator reached the end of list. - * - */ - CodecListEnd, + /// + /// An iterator reached the end of list. + /// + ListEnd } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Common/BitUtils.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Common/BitUtils.cs index 807f1293e..900b9d1c1 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Common/BitUtils.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Common/BitUtils.cs @@ -10,7 +10,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Common [MethodImpl(MethodImplOptions.AggressiveInlining)] public static byte ClipPixel(int val) { - return (byte)((val > 255) ? 255 : (val < 0) ? 0 : val); + return (byte)(val > 255 ? 255 : val < 0 ? 0 : val); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -56,4 +56,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Common return numValues > 0 ? GetMsb(numValues) + 1 : 0; } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Common/MemoryAllocator.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Common/MemoryAllocator.cs index 18ed172f8..6d108d86e 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Common/MemoryAllocator.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Common/MemoryAllocator.cs @@ -51,6 +51,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Common { Marshal.FreeHGlobal(item.Pointer); } + item.Pointer = ptr; item.Length = lengthInBytes; break; @@ -58,7 +59,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Common } } - return new ArrayPtr(ptr, length); + ArrayPtr allocation = new(ptr, length); + + allocation.AsSpan().Fill(default); + + return allocation; } public unsafe void Free(ArrayPtr arr) where T : unmanaged diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Common/MemoryUtil.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Common/MemoryUtil.cs index afdc6b0b2..66c41f8cc 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Common/MemoryUtil.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Common/MemoryUtil.cs @@ -20,4 +20,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Common new Span(ptr, length).Fill(value); } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Constants.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Constants.cs index 17efb203b..4d7f919e5 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Constants.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Constants.cs @@ -1,8 +1,10 @@ +using Ryujinx.Graphics.Nvdec.Vp9.Types; + namespace Ryujinx.Graphics.Nvdec.Vp9 { internal static class Constants { - public const int Vp9InterpExtend = 4; + public const int InterpExtend = 4; public const int MaxMbPlane = 3; @@ -25,6 +27,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 /* Segment Feature Masks */ public const int MaxMvRefCandidates = 2; + public const int IntraInterContexts = 4; public const int CompInterContexts = 5; public const int RefContexts = 5; @@ -32,12 +35,26 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 public const int EightTapSmooth = 1; public const int EightTapSharp = 2; public const int SwitchableFilters = 3; /* Number of switchable filters */ + public const int Bilinear = 3; - public const int Switchable = 4; /* should be the last one */ + + // The codec can operate in four possible inter prediction filter mode: + // 8-tap, 8-tap-smooth, 8-tap-sharp, and switching between the three. + public const int SwitchableFilterContexts = SwitchableFilters + 1; + public const int Switchable = 4; /* Should be the last one */ // Frame public const int RefsPerFrame = 3; + public const int RefFramesLog2 = 3; + public const int RefFrames = 1 << RefFramesLog2; + + // 1 scratch frame for the new frame, 3 for scaled references on the encoder. + public const int FrameBuffers = RefFrames + 4; + + public const int FrameContextsLog2 = 2; + public const int FrameContexts = 1 << FrameContextsLog2; + public const int NumPingPongBuffers = 2; public const int Class0Bits = 1; /* bits at integer precision for class 0 */ @@ -48,9 +65,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 public const int MvLow = -(1 << MvInUseBits); // Coefficient token alphabet - public const int ZeroToken = 0; // 0 Extra Bits 0+0 - public const int OneToken = 1; // 1 Extra Bits 0+1 - public const int TwoToken = 2; // 2 Extra Bits 0+1 + public const int ZeroToken = 0; // 0 Extra Bits 0+0 + public const int OneToken = 1; // 1 Extra Bits 0+1 + public const int TwoToken = 2; // 2 Extra Bits 0+1 public const int PivotNode = 2; @@ -65,5 +82,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 public const int SegmentAbsData = 1; public const int MaxSegments = 8; + + public const int PartitionTypes = (int)PartitionType.PartitionTypes; + + public const int PartitionPlOffset = 4; // Number of probability models per block size + public const int PartitionContexts = 4 * PartitionPlOffset; + + public const int PlaneTypes = (int)PlaneType.PlaneTypes; + + public const int IntraModes = (int)PredictionMode.TmPred + 1; + + public const int InterModes = 1 + (int)PredictionMode.NewMv - (int)PredictionMode.NearestMv; + + public const int SkipContexts = 3; + public const int InterModeContexts = 7; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/DSubExp.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/DSubExp.cs new file mode 100644 index 000000000..72cfba8f3 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/DSubExp.cs @@ -0,0 +1,47 @@ +using System.Diagnostics; + +namespace Ryujinx.Graphics.Nvdec.Vp9 +{ + internal static class DSubExp + { + public static int InvRecenterNonneg(int v, int m) + { + if (v > 2 * m) + { + return v; + } + + return (v & 1) != 0 ? m - ((v + 1) >> 1) : m + (v >> 1); + } + + private static readonly byte[] _invMapTable = + [ + 7, 20, 33, 46, 59, 72, 85, 98, 111, 124, 137, 150, 163, 176, 189, 202, 215, 228, 241, 254, 1, 2, 3, 4, + 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 97, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 203, 204, 205, + 206, 207, 208, 209, 210, 211, 212, 213, 214, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, + 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 242, 243, 244, 245, 246, 247, 248, 249, 250, + 251, 252, 253, 253 + ]; + + public static int InvRemapProb(int v, int m) + { + Debug.Assert(v < _invMapTable.Length / sizeof(byte)); + + v = _invMapTable[v]; + m--; + if (m << 1 <= Prob.MaxProb) + { + return 1 + InvRecenterNonneg(v, m); + } + + return Prob.MaxProb - InvRecenterNonneg(v, Prob.MaxProb - 1 - m); + } + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/DecodeFrame.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/DecodeFrame.cs index 5f03e1afc..3e7d6b030 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/DecodeFrame.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/DecodeFrame.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Common; using Ryujinx.Graphics.Nvdec.Vp9.Dsp; using Ryujinx.Graphics.Nvdec.Vp9.Types; @@ -12,14 +12,96 @@ using System.Threading.Tasks; namespace Ryujinx.Graphics.Nvdec.Vp9 { - static class DecodeFrame + internal static class DecodeFrame { private static bool ReadIsValid(ArrayPtr start, int len) { return len != 0 && len <= start.Length; } - private static void InverseTransformBlockInter(ref MacroBlockD xd, int plane, TxSize txSize, Span dst, int stride, int eob) + private static void ReadTxModeProbs(ref Vp9EntropyProbs txProbs, ref Reader r) + { + for (int i = 0; i < EntropyMode.TxSizeContexts; ++i) + { + for (int j = 0; j < (int)TxSize.TxSizes - 3; ++j) + { + r.DiffUpdateProb(ref txProbs.Tx8x8Prob[i][j]); + } + } + + for (int i = 0; i < EntropyMode.TxSizeContexts; ++i) + { + for (int j = 0; j < (int)TxSize.TxSizes - 2; ++j) + { + r.DiffUpdateProb(ref txProbs.Tx16x16Prob[i][j]); + } + } + + for (int i = 0; i < EntropyMode.TxSizeContexts; ++i) + { + for (int j = 0; j < (int)TxSize.TxSizes - 1; ++j) + { + r.DiffUpdateProb(ref txProbs.Tx32x32Prob[i][j]); + } + } + } + + private static void ReadSwitchableInterpProbs(ref Vp9EntropyProbs fc, ref Reader r) + { + for (int j = 0; j < Constants.SwitchableFilterContexts; ++j) + { + for (int i = 0; i < Constants.SwitchableFilters - 1; ++i) + { + r.DiffUpdateProb(ref fc.SwitchableInterpProb[j][i]); + } + } + } + + private static void ReadInterModeProbs(ref Vp9EntropyProbs fc, ref Reader r) + { + for (int i = 0; i < Constants.InterModeContexts; ++i) + { + for (int j = 0; j < Constants.InterModes - 1; ++j) + { + r.DiffUpdateProb( ref fc.InterModeProb[i][j]); + } + } + } + + private static void ReadMvProbs(ref Vp9EntropyProbs ctx, bool allowHp, ref Reader r) + { + r.UpdateMvProbs(ctx.Joints.AsSpan(), EntropyMv.Joints - 1); + + for (int i = 0; i < 2; ++i) + { + r.UpdateMvProbs(MemoryMarshal.CreateSpan(ref ctx.Sign[i], 1), 1); + r.UpdateMvProbs(ctx.Classes[i].AsSpan(), EntropyMv.Classes - 1); + r.UpdateMvProbs(ctx.Class0[i].AsSpan(), EntropyMv.Class0Size - 1); + r.UpdateMvProbs(ctx.Bits[i].AsSpan(), EntropyMv.OffsetBits); + } + + for (int i = 0; i < 2; ++i) + { + for (int j = 0; j < EntropyMv.Class0Size; ++j) + { + r.UpdateMvProbs(ctx.Class0Fp[i][j].AsSpan(), EntropyMv.FpSize - 1); + } + + r.UpdateMvProbs(ctx.Fp[i].AsSpan(), 3); + } + + if (allowHp) + { + for (int i = 0; i < 2; ++i) + { + r.UpdateMvProbs(MemoryMarshal.CreateSpan(ref ctx.Class0Hp[i], 1), 1); + r.UpdateMvProbs(MemoryMarshal.CreateSpan(ref ctx.Hp[i], 1), 1); + } + } + } + + private static void InverseTransformBlockInter(ref MacroBlockD xd, int plane, TxSize txSize, Span dst, + int stride, int eob) { ref MacroBlockDPlane pd = ref xd.Plane[plane]; ArrayPtr dqcoeff = pd.DqCoeff; @@ -29,23 +111,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 Span dst16 = MemoryMarshal.Cast(dst); if (xd.Lossless) { - Idct.HighbdIwht4x4Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + Idct.HighbdIwht4X4Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); } else { switch (txSize) { - case TxSize.Tx4x4: - Idct.HighbdIdct4x4Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + case TxSize.Tx4X4: + Idct.HighbdIdct4X4Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); break; - case TxSize.Tx8x8: - Idct.HighbdIdct8x8Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + case TxSize.Tx8X8: + Idct.HighbdIdct8X8Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); break; - case TxSize.Tx16x16: - Idct.HighbdIdct16x16Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + case TxSize.Tx16X16: + Idct.HighbdIdct16X16Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); break; - case TxSize.Tx32x32: - Idct.HighbdIdct32x32Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + case TxSize.Tx32X32: + Idct.HighbdIdct32X32Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); break; default: Debug.Assert(false, "Invalid transform size"); @@ -57,23 +139,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { if (xd.Lossless) { - Idct.Iwht4x4Add(dqcoeff.AsSpan(), dst, stride, eob); + Idct.Iwht4X4Add(dqcoeff.AsSpan(), dst, stride, eob); } else { switch (txSize) { - case TxSize.Tx4x4: - Idct.Idct4x4Add(dqcoeff.AsSpan(), dst, stride, eob); + case TxSize.Tx4X4: + Idct.Idct4X4Add(dqcoeff.AsSpan(), dst, stride, eob); break; - case TxSize.Tx8x8: - Idct.Idct8x8Add(dqcoeff.AsSpan(), dst, stride, eob); + case TxSize.Tx8X8: + Idct.Idct8X8Add(dqcoeff.AsSpan(), dst, stride, eob); break; - case TxSize.Tx16x16: - Idct.Idct16x16Add(dqcoeff.AsSpan(), dst, stride, eob); + case TxSize.Tx16X16: + Idct.Idct16X16Add(dqcoeff.AsSpan(), dst, stride, eob); break; - case TxSize.Tx32x32: - Idct.Idct32x32Add(dqcoeff.AsSpan(), dst, stride, eob); + case TxSize.Tx32X32: + Idct.Idct32X32Add(dqcoeff.AsSpan(), dst, stride, eob); break; default: Debug.Assert(false, "Invalid transform size"); @@ -88,17 +170,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } else { - if (txSize <= TxSize.Tx16x16 && eob <= 10) + if (txSize <= TxSize.Tx16X16 && eob <= 10) { - dqcoeff.AsSpan()[..(4 * (4 << (int)txSize))].Clear(); + dqcoeff.AsSpan().Slice(0, 4 * (4 << (int)txSize)).Clear(); } - else if (txSize == TxSize.Tx32x32 && eob <= 34) + else if (txSize == TxSize.Tx32X32 && eob <= 34) { - dqcoeff.AsSpan()[..256].Clear(); + dqcoeff.AsSpan().Slice(0, 256).Clear(); } else { - dqcoeff.AsSpan()[..(16 << ((int)txSize << 1))].Clear(); + dqcoeff.AsSpan().Slice(0, 16 << ((int)txSize << 1)).Clear(); } } } @@ -120,23 +202,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 Span dst16 = MemoryMarshal.Cast(dst); if (xd.Lossless) { - Idct.HighbdIwht4x4Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + Idct.HighbdIwht4X4Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); } else { switch (txSize) { - case TxSize.Tx4x4: - Idct.HighbdIht4x4Add(txType, dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + case TxSize.Tx4X4: + Idct.HighbdIht4X4Add(txType, dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); break; - case TxSize.Tx8x8: - Idct.HighbdIht8x8Add(txType, dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + case TxSize.Tx8X8: + Idct.HighbdIht8X8Add(txType, dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); break; - case TxSize.Tx16x16: - Idct.HighbdIht16x16Add(txType, dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + case TxSize.Tx16X16: + Idct.HighbdIht16X16Add(txType, dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); break; - case TxSize.Tx32x32: - Idct.HighbdIdct32x32Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); + case TxSize.Tx32X32: + Idct.HighbdIdct32X32Add(dqcoeff.AsSpan(), dst16, stride, eob, xd.Bd); break; default: Debug.Assert(false, "Invalid transform size"); @@ -148,23 +230,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { if (xd.Lossless) { - Idct.Iwht4x4Add(dqcoeff.AsSpan(), dst, stride, eob); + Idct.Iwht4X4Add(dqcoeff.AsSpan(), dst, stride, eob); } else { switch (txSize) { - case TxSize.Tx4x4: - Idct.Iht4x4Add(txType, dqcoeff.AsSpan(), dst, stride, eob); + case TxSize.Tx4X4: + Idct.Iht4X4Add(txType, dqcoeff.AsSpan(), dst, stride, eob); break; - case TxSize.Tx8x8: - Idct.Iht8x8Add(txType, dqcoeff.AsSpan(), dst, stride, eob); + case TxSize.Tx8X8: + Idct.Iht8X8Add(txType, dqcoeff.AsSpan(), dst, stride, eob); break; - case TxSize.Tx16x16: - Idct.Iht16x16Add(txType, dqcoeff.AsSpan(), dst, stride, eob); + case TxSize.Tx16X16: + Idct.Iht16X16Add(txType, dqcoeff.AsSpan(), dst, stride, eob); break; - case TxSize.Tx32x32: - Idct.Idct32x32Add(dqcoeff.AsSpan(), dst, stride, eob); + case TxSize.Tx32X32: + Idct.Idct32X32Add(dqcoeff.AsSpan(), dst, stride, eob); break; default: Debug.Assert(false, "Invalid transform size"); @@ -179,17 +261,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } else { - if (txType == TxType.DctDct && txSize <= TxSize.Tx16x16 && eob <= 10) + if (txType == TxType.DctDct && txSize <= TxSize.Tx16X16 && eob <= 10) { - dqcoeff.AsSpan()[..(4 * (4 << (int)txSize))].Clear(); + dqcoeff.AsSpan().Slice(0, 4 * (4 << (int)txSize)).Clear(); } - else if (txSize == TxSize.Tx32x32 && eob <= 34) + else if (txSize == TxSize.Tx32X32 && eob <= 34) { - dqcoeff.AsSpan()[..256].Clear(); + dqcoeff.AsSpan().Slice(0, 256).Clear(); } else { - dqcoeff.AsSpan()[..(16 << ((int)txSize << 1))].Clear(); + dqcoeff.AsSpan().Slice(0, 16 << ((int)txSize << 1)).Clear(); } } } @@ -204,12 +286,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { ref MacroBlockD xd = ref twd.Xd; ref MacroBlockDPlane pd = ref xd.Plane[plane]; - PredictionMode mode = (plane == 0) ? mi.Mode : mi.UvMode; - int dstOffset = 4 * row * pd.Dst.Stride + 4 * col; + PredictionMode mode = plane == 0 ? mi.Mode : mi.UvMode; + int dstOffset = (4 * row * pd.Dst.Stride) + (4 * col); byte* dst = &pd.Dst.Buf.ToPointer()[dstOffset]; - Span dstSpan = pd.Dst.Buf.AsSpan()[dstOffset..]; + Span dstSpan = pd.Dst.Buf.AsSpan().Slice(dstOffset); - if (mi.SbType < BlockSize.Block8x8) + if (mi.SbType < BlockSize.Block8X8) { if (plane == 0) { @@ -217,15 +299,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } - ReconIntra.PredictIntraBlock(ref xd, pd.N4Wl, txSize, mode, dst, pd.Dst.Stride, dst, pd.Dst.Stride, col, row, plane); + ReconIntra.PredictIntraBlock(ref xd, pd.N4Wl, txSize, mode, dst, pd.Dst.Stride, dst, pd.Dst.Stride, col, + row, plane); if (mi.Skip == 0) { TxType txType = - (plane != 0 || xd.Lossless) ? TxType.DctDct : ReconIntra.IntraModeToTxTypeLookup[(int)mode]; - var sc = (plane != 0 || xd.Lossless) - ? Luts.Vp9DefaultScanOrders[(int)txSize] - : Luts.Vp9ScanOrders[(int)txSize][(int)txType]; + plane != 0 || xd.Lossless ? TxType.DctDct : ReconIntra.IntraModeToTxTypeLookup[(int)mode]; + Luts.ScanOrder sc = plane != 0 || xd.Lossless + ? Luts.DefaultScanOrders[(int)txSize] + : Luts.ScanOrders[(int)txSize][(int)txType]; int eob = Detokenize.DecodeBlockTokens(ref twd, plane, sc, col, row, txSize, mi.SegmentId); if (eob > 0) { @@ -244,14 +327,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { ref MacroBlockD xd = ref twd.Xd; ref MacroBlockDPlane pd = ref xd.Plane[plane]; - var sc = Luts.Vp9DefaultScanOrders[(int)txSize]; + Luts.ScanOrder sc = Luts.DefaultScanOrders[(int)txSize]; int eob = Detokenize.DecodeBlockTokens(ref twd, plane, sc, col, row, txSize, mi.SegmentId); - Span dst = pd.Dst.Buf.AsSpan()[(4 * row * pd.Dst.Stride + 4 * col)..]; + Span dst = pd.Dst.Buf.AsSpan().Slice((4 * row * pd.Dst.Stride) + (4 * col)); if (eob > 0) { InverseTransformBlockInter(ref xd, plane, txSize, dst, pd.Dst.Stride, eob); } + return eob; } @@ -268,7 +352,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int h) { // Get a pointer to the start of the real data for this row. - byte* refRow = src - x - y * srcStride; + byte* refRow = src - x - (y * srcStride); if (y >= h) { @@ -340,7 +424,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { // Get a pointer to the start of the real data for this row. ushort* src = (ushort*)src8; - ushort* refRow = src - x - y * srcStride; + ushort* refRow = src - x - (y * srcStride); if (y >= h) { @@ -483,9 +567,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int refr) { ref MacroBlockDPlane pd = ref xd.Plane[plane]; - byte* dst = dstBuf.Buf.ToPointer() + dstBuf.Stride * y + x; + byte* dst = dstBuf.Buf.ToPointer() + (dstBuf.Stride * y) + x; Mv32 scaledMv; - int xs, ys, x0, y0, x0_16, y0_16, frameWidth, frameHeight, bufStride, subpelX, subpelY; + int xs, ys, x0, y0, x016, y016, frameWidth, frameHeight, bufStride, subpelX, subpelY; byte* refFrame; byte* bufPtr; @@ -507,16 +591,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { Mv mvQ4 = ReconInter.ClampMvToUmvBorderSb(ref xd, ref mv, bw, bh, pd.SubsamplingX, pd.SubsamplingY); // Co-ordinate of containing block to pixel precision. - int xStart = (-xd.MbToLeftEdge >> (3 + pd.SubsamplingX)); - int yStart = (-xd.MbToTopEdge >> (3 + pd.SubsamplingY)); + int xStart = -xd.MbToLeftEdge >> (3 + pd.SubsamplingX); + int yStart = -xd.MbToTopEdge >> (3 + pd.SubsamplingY); // Co-ordinate of the block to 1/16th pixel precision. - x0_16 = (xStart + x) << Filter.SubpelBits; - y0_16 = (yStart + y) << Filter.SubpelBits; + x016 = (xStart + x) << Filter.SubpelBits; + y016 = (yStart + y) << Filter.SubpelBits; // Co-ordinate of current block in reference frame // to 1/16th pixel precision. - x0_16 = sf.ScaleValueX(x0_16); - y0_16 = sf.ScaleValueY(y0_16); + x016 = sf.ScaleValueX(x016); + y016 = sf.ScaleValueY(y016); // Map the top left corner of the block into the reference frame. x0 = sf.ScaleValueX(xStart + x); @@ -535,13 +619,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 y0 = (-xd.MbToTopEdge >> (3 + pd.SubsamplingY)) + y; // Co-ordinate of the block to 1/16th pixel precision. - x0_16 = x0 << Filter.SubpelBits; - y0_16 = y0 << Filter.SubpelBits; + x016 = x0 << Filter.SubpelBits; + y016 = y0 << Filter.SubpelBits; scaledMv.Row = mv.Row * (1 << (1 - pd.SubsamplingY)); scaledMv.Col = mv.Col * (1 << (1 - pd.SubsamplingX)); xs = ys = 16; } + subpelX = scaledMv.Col & Filter.SubpelMask; subpelY = scaledMv.Row & Filter.SubpelMask; @@ -549,34 +634,35 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // reference frame. x0 += scaledMv.Col >> Filter.SubpelBits; y0 += scaledMv.Row >> Filter.SubpelBits; - x0_16 += scaledMv.Col; - y0_16 += scaledMv.Row; + x016 += scaledMv.Col; + y016 += scaledMv.Row; // Get reference block pointer. - bufPtr = refFrame + y0 * preBuf.Stride + x0; + bufPtr = refFrame + (y0 * preBuf.Stride) + x0; bufStride = preBuf.Stride; // Do border extension if there is motion or the // width/height is not a multiple of 8 pixels. - if (isScaled || scaledMv.Col != 0 || scaledMv.Row != 0 || (frameWidth & 0x7) != 0 || (frameHeight & 0x7) != 0) + if (isScaled || scaledMv.Col != 0 || scaledMv.Row != 0 || (frameWidth & 0x7) != 0 || + (frameHeight & 0x7) != 0) { - int y1 = ((y0_16 + (h - 1) * ys) >> Filter.SubpelBits) + 1; + int y1 = ((y016 + ((h - 1) * ys)) >> Filter.SubpelBits) + 1; // Get reference block bottom right horizontal coordinate. - int x1 = ((x0_16 + (w - 1) * xs) >> Filter.SubpelBits) + 1; + int x1 = ((x016 + ((w - 1) * xs)) >> Filter.SubpelBits) + 1; int xPad = 0, yPad = 0; - if (subpelX != 0 || (sf.XStepQ4 != Filter.SubpelShifts)) + if (subpelX != 0 || sf.XStepQ4 != Filter.SubpelShifts) { - x0 -= Constants.Vp9InterpExtend - 1; - x1 += Constants.Vp9InterpExtend; + x0 -= Constants.InterpExtend - 1; + x1 += Constants.InterpExtend; xPad = 1; } - if (subpelY != 0 || (sf.YStepQ4 != Filter.SubpelShifts)) + if (subpelY != 0 || sf.YStepQ4 != Filter.SubpelShifts) { - y0 -= Constants.Vp9InterpExtend - 1; - y1 += Constants.Vp9InterpExtend; + y0 -= Constants.InterpExtend - 1; + y1 += Constants.InterpExtend; yPad = 1; } @@ -585,10 +671,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 y0 < 0 || y0 > frameHeight - 1 || y1 < 0 || y1 > frameHeight - 1) { // Extend the border. - byte* bufPtr1 = refFrame + y0 * bufStride + x0; + byte* bufPtr1 = refFrame + (y0 * bufStride) + x0; int bW = x1 - x0 + 1; int bH = y1 - y0 + 1; - int borderOffset = yPad * 3 * bW + xPad * 3; + int borderOffset = (yPad * 3 * bW) + (xPad * 3); ExtendAndPredict( bufPtr1, @@ -612,7 +698,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 refr, xs, ys); - return; } } @@ -660,7 +745,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int miX = miCol * Constants.MiSize; int miY = miRow * Constants.MiSize; ref ModeInfo mi = ref xd.Mi[0].Value; - Array8[] kernel = Luts.Vp9FilterKernels[mi.InterpFilter]; + Array8[] kernel = Luts.FilterKernels[mi.InterpFilter]; BlockSize sbType = mi.SbType; int isCompound = mi.HasSecondRef() ? 1 : 0; int refr; @@ -675,28 +760,30 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (!sf.IsValidScale()) { - xd.ErrorInfo.Value.InternalError(CodecErr.CodecUnsupBitstream, "Reference frame has invalid dimensions"); + xd.ErrorInfo.Value.InternalError(CodecErr.UnsupBitstream, + "Reference frame has invalid dimensions"); } isScaled = sf.IsScaled(); - ReconInter.SetupPrePlanes(ref xd, refr, ref refFrameBuf, miRow, miCol, isScaled ? new Ptr(ref sf) : Ptr.Null); + ReconInter.SetupPrePlanes(ref xd, refr, ref refFrameBuf, miRow, miCol, + isScaled ? new Ptr(ref sf) : Ptr.Null); xd.BlockRefs[refr] = new Ptr(ref refBuf); - if (sbType < BlockSize.Block8x8) + if (sbType < BlockSize.Block8X8) { for (plane = 0; plane < Constants.MaxMbPlane; ++plane) { ref MacroBlockDPlane pd = ref xd.Plane[plane]; ref Buf2D dstBuf = ref pd.Dst; - int num4x4W = pd.N4W; - int num4x4H = pd.N4H; - int n4Wx4 = 4 * num4x4W; - int n4Hx4 = 4 * num4x4H; + int num4X4W = pd.N4W; + int num4X4H = pd.N4H; + int n4Wx4 = 4 * num4X4W; + int n4Hx4 = 4 * num4X4H; ref Buf2D preBuf = ref pd.Pre[refr]; - int i = 0, x, y; - for (y = 0; y < num4x4H; ++y) + int i = 0; + for (int y = 0; y < num4X4H; ++y) { - for (x = 0; x < num4x4W; ++x) + for (int x = 0; x < num4X4W; ++x) { Mv mv = ReconInter.AverageSplitMvs(ref pd, ref mi, refr, i++); DecBuildInterPredictors( @@ -729,10 +816,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { ref MacroBlockDPlane pd = ref xd.Plane[plane]; ref Buf2D dstBuf = ref pd.Dst; - int num4x4W = pd.N4W; - int num4x4H = pd.N4H; - int n4Wx4 = 4 * num4x4W; - int n4Hx4 = 4 * num4x4H; + int num4X4W = pd.N4W; + int num4X4H = pd.N4H; + int n4Wx4 = 4 * num4X4W; + int n4Hx4 = 4 * num4X4H; ref Buf2D preBuf = ref pd.Pre[refr]; DecBuildInterPredictors( ref xd, @@ -758,21 +845,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } - private static unsafe void DecResetSkipContext(ref MacroBlockD xd) - { - int i; - for (i = 0; i < Constants.MaxMbPlane; i++) - { - ref MacroBlockDPlane pd = ref xd.Plane[i]; - MemoryUtil.Fill(pd.AboveContext.ToPointer(), (sbyte)0, pd.N4W); - MemoryUtil.Fill(pd.LeftContext.ToPointer(), (sbyte)0, pd.N4H); - } - } - private static void SetPlaneN4(ref MacroBlockD xd, int bw, int bh, int bwl, int bhl) { - int i; - for (i = 0; i < Constants.MaxMbPlane; i++) + for (int i = 0; i < Constants.MaxMbPlane; i++) { xd.Plane[i].N4W = (ushort)((bw << 1) >> xd.Plane[i].SubsamplingX); xd.Plane[i].N4H = (ushort)((bh << 1) >> xd.Plane[i].SubsamplingY); @@ -794,18 +869,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int bwl, int bhl) { - int offset = miRow * cm.MiStride + miCol; - int x, y; + int offset = (miRow * cm.MiStride) + miCol; + ref TileInfo tile = ref xd.Tile; xd.Mi = cm.MiGridVisible.Slice(offset); xd.Mi[0] = new Ptr(ref cm.Mi[offset]); xd.Mi[0].Value.SbType = bsize; - for (y = 0; y < yMis; ++y) + for (int y = 0; y < yMis; ++y) { - for (x = y == 0 ? 1 : 0; x < xMis; ++x) + for (int x = y == 0 ? 1 : 0; x < xMis; ++x) { - xd.Mi[y * cm.MiStride + x] = xd.Mi[0]; + xd.Mi[(y * cm.MiStride) + x] = xd.Mi[0]; } } @@ -818,7 +893,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 xd.SetMiRowCol(ref tile, miRow, bh, miCol, bw, cm.MiRows, cm.MiCols); ReconInter.SetupDstPlanes(ref xd.Plane, ref xd.CurBuf, miRow, miCol); - return ref xd.Mi[0].Value; } @@ -831,7 +905,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int bwl, int bhl) { - bool less8x8 = bsize < BlockSize.Block8x8; + bool less8X8 = bsize < BlockSize.Block8X8; int bw = 1 << (bwl - 1); int bh = 1 << (bhl - 1); int xMis = Math.Min(bw, cm.MiCols - miCol); @@ -841,12 +915,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref ModeInfo mi = ref SetOffsets(ref cm, ref xd, bsize, miRow, miCol, bw, bh, xMis, yMis, bwl, bhl); - if (bsize >= BlockSize.Block8x8 && (cm.SubsamplingX != 0 || cm.SubsamplingY != 0)) + if (bsize >= BlockSize.Block8X8 && (cm.SubsamplingX != 0 || cm.SubsamplingY != 0)) { BlockSize uvSubsize = Luts.SsSizeLookup[(int)bsize][cm.SubsamplingX][cm.SubsamplingY]; if (uvSubsize == BlockSize.BlockInvalid) { - xd.ErrorInfo.Value.InternalError(CodecErr.CodecCorruptFrame, "Invalid block size."); + xd.ErrorInfo.Value.InternalError(CodecErr.CorruptFrame, "Invalid block size."); } } @@ -854,7 +928,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (mi.Skip != 0) { - DecResetSkipContext(ref xd); + xd.DecResetSkipContext(); } if (!mi.IsInterBlock()) @@ -864,12 +938,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { ref MacroBlockDPlane pd = ref xd.Plane[plane]; TxSize txSize = plane != 0 ? mi.GetUvTxSize(ref pd) : mi.TxSize; - int num4x4W = pd.N4W; - int num4x4H = pd.N4H; + int num4X4W = pd.N4W; + int num4X4H = pd.N4H; int step = 1 << (int)txSize; int row, col; - int maxBlocksWide = num4x4W + (xd.MbToRightEdge >= 0 ? 0 : xd.MbToRightEdge >> (5 + pd.SubsamplingX)); - int maxBlocksHigh = num4x4H + (xd.MbToBottomEdge >= 0 ? 0 : xd.MbToBottomEdge >> (5 + pd.SubsamplingY)); + int maxBlocksWide = + num4X4W + (xd.MbToRightEdge >= 0 ? 0 : xd.MbToRightEdge >> (5 + pd.SubsamplingX)); + int maxBlocksHigh = + num4X4H + (xd.MbToBottomEdge >= 0 ? 0 : xd.MbToBottomEdge >> (5 + pd.SubsamplingY)); xd.MaxBlocksWide = (uint)(xd.MbToRightEdge >= 0 ? 0 : maxBlocksWide); xd.MaxBlocksHigh = (uint)(xd.MbToBottomEdge >= 0 ? 0 : maxBlocksHigh); @@ -898,12 +974,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { ref MacroBlockDPlane pd = ref xd.Plane[plane]; TxSize txSize = plane != 0 ? mi.GetUvTxSize(ref pd) : mi.TxSize; - int num4x4W = pd.N4W; - int num4x4H = pd.N4H; + int num4X4W = pd.N4W; + int num4X4H = pd.N4H; int step = 1 << (int)txSize; int row, col; - int maxBlocksWide = num4x4W + (xd.MbToRightEdge >= 0 ? 0 : xd.MbToRightEdge >> (5 + pd.SubsamplingX)); - int maxBlocksHigh = num4x4H + (xd.MbToBottomEdge >= 0 ? 0 : xd.MbToBottomEdge >> (5 + pd.SubsamplingY)); + int maxBlocksWide = + num4X4W + (xd.MbToRightEdge >= 0 ? 0 : xd.MbToRightEdge >> (5 + pd.SubsamplingX)); + int maxBlocksHigh = num4X4H + + (xd.MbToBottomEdge >= 0 ? 0 : xd.MbToBottomEdge >> (5 + pd.SubsamplingY)); xd.MaxBlocksWide = (uint)(xd.MbToRightEdge >= 0 ? 0 : maxBlocksWide); xd.MaxBlocksHigh = (uint)(xd.MbToBottomEdge >= 0 ? 0 : maxBlocksHigh); @@ -917,7 +995,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } - if (!less8x8 && eobtotal == 0) + if (!less8X8 && eobtotal == 0) { mi.Skip = 1; // Skip loopfilter } @@ -932,15 +1010,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } - private static int DecPartitionPlaneContext(ref TileWorkerData twd, int miRow, int miCol, int bsl) - { - ref sbyte aboveCtx = ref twd.Xd.AboveSegContext[miCol]; - ref sbyte leftCtx = ref twd.Xd.LeftSegContext[miRow & Constants.MiMask]; - int above = (aboveCtx >> bsl) & 1, left = (leftCtx >> bsl) & 1; - - return (left * 2 + above) + bsl * Constants.PartitionPloffset; - } - private static void DecUpdatePartitionContext( ref TileWorkerData twd, int miRow, @@ -949,13 +1018,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int bw) { Span aboveCtx = twd.Xd.AboveSegContext.Slice(miCol).AsSpan(); - Span leftCtx = MemoryMarshal.CreateSpan(ref twd.Xd.LeftSegContext[miRow & Constants.MiMask], 8 - (miRow & Constants.MiMask)); + Span leftCtx = MemoryMarshal.CreateSpan(ref twd.Xd.LeftSegContext[miRow & Constants.MiMask], + 8 - (miRow & Constants.MiMask)); // Update the partition context at the end notes. Set partition bits // of block sizes larger than the current one to be one, and partition // bits of smaller block sizes to be zero. - aboveCtx[..bw].Fill(Luts.PartitionContextLookup[(int)subsize].Above); - leftCtx[..bw].Fill(Luts.PartitionContextLookup[(int)subsize].Left); + aboveCtx.Slice(0, bw).Fill(Luts.PartitionContextLookup[(int)subsize].Above); + leftCtx.Slice(0, bw).Fill(Luts.PartitionContextLookup[(int)subsize].Left); } private static PartitionType ReadPartition( @@ -966,14 +1036,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int hasCols, int bsl) { - int ctx = DecPartitionPlaneContext(ref twd, miRow, miCol, bsl); + int ctx = twd.DecPartitionPlaneContext(miRow, miCol, bsl); ReadOnlySpan probs = MemoryMarshal.CreateReadOnlySpan(ref twd.Xd.PartitionProbs[ctx][0], 3); PartitionType p; ref Reader r = ref twd.BitReader; if (hasRows != 0 && hasCols != 0) { - p = (PartitionType)r.ReadTree(Luts.Vp9PartitionTree, probs); + p = (PartitionType)r.ReadTree(Luts.PartitionTree, probs); } else if (hasRows == 0 && hasCols != 0) { @@ -1002,15 +1072,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int miRow, int miCol, BlockSize bsize, - int n4x4L2) + int n4X4L2) { - int n8x8L2 = n4x4L2 - 1; - int num8x8Wh = 1 << n8x8L2; - int hbs = num8x8Wh >> 1; + int n8X8L2 = n4X4L2 - 1; + int num8X8Wh = 1 << n8X8L2; + int hbs = num8X8Wh >> 1; PartitionType partition; BlockSize subsize; - bool hasRows = (miRow + hbs) < cm.MiRows; - bool hasCols = (miCol + hbs) < cm.MiCols; + bool hasRows = miRow + hbs < cm.MiRows; + bool hasCols = miCol + hbs < cm.MiCols; ref MacroBlockD xd = ref twd.Xd; if (miRow >= cm.MiRows || miCol >= cm.MiCols) @@ -1018,7 +1088,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 return; } - partition = ReadPartition(ref twd, miRow, miCol, hasRows ? 1 : 0, hasCols ? 1 : 0, n8x8L2); + partition = ReadPartition(ref twd, miRow, miCol, hasRows ? 1 : 0, hasCols ? 1 : 0, n8X8L2); subsize = Luts.SubsizeLookup[(int)partition][(int)bsize]; if (hbs == 0) { @@ -1032,29 +1102,29 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 switch (partition) { case PartitionType.PartitionNone: - DecodeBlock(ref twd, ref cm, miRow, miCol, subsize, n4x4L2, n4x4L2); + DecodeBlock(ref twd, ref cm, miRow, miCol, subsize, n4X4L2, n4X4L2); break; case PartitionType.PartitionHorz: - DecodeBlock(ref twd, ref cm, miRow, miCol, subsize, n4x4L2, n8x8L2); + DecodeBlock(ref twd, ref cm, miRow, miCol, subsize, n4X4L2, n8X8L2); if (hasRows) { - DecodeBlock(ref twd, ref cm, miRow + hbs, miCol, subsize, n4x4L2, n8x8L2); + DecodeBlock(ref twd, ref cm, miRow + hbs, miCol, subsize, n4X4L2, n8X8L2); } break; case PartitionType.PartitionVert: - DecodeBlock(ref twd, ref cm, miRow, miCol, subsize, n8x8L2, n4x4L2); + DecodeBlock(ref twd, ref cm, miRow, miCol, subsize, n8X8L2, n4X4L2); if (hasCols) { - DecodeBlock(ref twd, ref cm, miRow, miCol + hbs, subsize, n8x8L2, n4x4L2); + DecodeBlock(ref twd, ref cm, miRow, miCol + hbs, subsize, n8X8L2, n4X4L2); } break; case PartitionType.PartitionSplit: - DecodePartition(ref twd, ref cm, miRow, miCol, subsize, n8x8L2); - DecodePartition(ref twd, ref cm, miRow, miCol + hbs, subsize, n8x8L2); - DecodePartition(ref twd, ref cm, miRow + hbs, miCol, subsize, n8x8L2); - DecodePartition(ref twd, ref cm, miRow + hbs, miCol + hbs, subsize, n8x8L2); + DecodePartition(ref twd, ref cm, miRow, miCol, subsize, n8X8L2); + DecodePartition(ref twd, ref cm, miRow, miCol + hbs, subsize, n8X8L2); + DecodePartition(ref twd, ref cm, miRow + hbs, miCol, subsize, n8X8L2); + DecodePartition(ref twd, ref cm, miRow + hbs, miCol + hbs, subsize, n8X8L2); break; default: Debug.Assert(false, "Invalid partition type"); @@ -1063,9 +1133,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } // Update partition context - if (bsize >= BlockSize.Block8x8 && (bsize == BlockSize.Block8x8 || partition != PartitionType.PartitionSplit)) + if (bsize >= BlockSize.Block8X8 && + (bsize == BlockSize.Block8X8 || partition != PartitionType.PartitionSplit)) { - DecUpdatePartitionContext(ref twd, miRow, miCol, subsize, num8x8Wh); + DecUpdatePartitionContext(ref twd, miRow, miCol, subsize, num8X8Wh); } } @@ -1079,15 +1150,257 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // partition can't be fully read then throw an error. if (!ReadIsValid(data, readSize)) { - errorInfo.InternalError(CodecErr.CodecCorruptFrame, "Truncated packet or corrupt tile length"); + errorInfo.InternalError(CodecErr.CorruptFrame, "Truncated packet or corrupt tile length"); } if (r.Init(data, readSize)) { - errorInfo.InternalError(CodecErr.CodecMemError, "Failed to allocate bool decoder 1"); + errorInfo.InternalError(CodecErr.MemError, "Failed to allocate bool decoder 1"); } } + private static void ReadCoefProbsCommon(ref Array2>>>> coefProbs, + ref Reader r, int txSize) + { + if (r.ReadBit() != 0) + { + for (int i = 0; i < Constants.PlaneTypes; ++i) + { + for (int j = 0; j < Entropy.RefTypes; ++j) + { + for (int k = 0; k < Entropy.CoefBands; ++k) + { + for (int l = 0; l < Entropy.BAND_COEFF_CONTEXTS(k); ++l) + { + for (int m = 0; m < Entropy.UnconstrainedNodes; ++m) + { + r.DiffUpdateProb( ref coefProbs[i][j][k][l][m]); + } + } + } + } + } + } + } + + private static void ReadCoefProbs(ref Vp9EntropyProbs fc, TxMode txMode, ref Reader r) + { + int maxTxSize = (int)Luts.TxModeToBiggestTxSize[(int)txMode]; + for (int txSize = (int)TxSize.Tx4X4; txSize <= maxTxSize; ++txSize) + { + ReadCoefProbsCommon(ref fc.CoefProbs[txSize], ref r, txSize); + } + } + + private static void SetupLoopfilter(ref Types.LoopFilter lf, ref ReadBitBuffer rb) + { + lf.FilterLevel = rb.ReadLiteral(6); + lf.SharpnessLevel = rb.ReadLiteral(3); + + // Read in loop filter deltas applied at the MB level based on mode or ref + // frame. + lf.ModeRefDeltaUpdate = false; + + lf.ModeRefDeltaEnabled = rb.ReadBit() != 0; + if (lf.ModeRefDeltaEnabled) + { + lf.ModeRefDeltaUpdate = rb.ReadBit() != 0; + if (lf.ModeRefDeltaUpdate) + { + for (int i = 0; i < LoopFilter.MaxRefLfDeltas; i++) + { + if (rb.ReadBit() != 0) + { + lf.RefDeltas[i] = (sbyte)rb.ReadSignedLiteral(6); + } + } + + for (int i = 0; i < LoopFilter.MaxModeLfDeltas; i++) + { + if (rb.ReadBit() != 0) + { + lf.ModeDeltas[i] = (sbyte)rb.ReadSignedLiteral(6); + } + } + } + } + } + + private static void SetupQuantization(ref Vp9Common cm, ref MacroBlockD xd, ref ReadBitBuffer rb) + { + cm.BaseQindex = rb.ReadLiteral(QuantCommon.QindexBits); + cm.YDcDeltaQ = rb.ReadDeltaQ(); + cm.UvDcDeltaQ = rb.ReadDeltaQ(); + cm.UvAcDeltaQ = rb.ReadDeltaQ(); + cm.DequantBitDepth = cm.BitDepth; + xd.Lossless = cm.BaseQindex == 0 && cm.YDcDeltaQ == 0 && cm.UvDcDeltaQ == 0 && cm.UvAcDeltaQ == 0; + + xd.Bd = (int)cm.BitDepth; + } + + private static readonly byte[] _literalToFilter = + [ + Constants.EightTapSmooth, Constants.EightTap, Constants.EightTapSharp, Constants.Bilinear + ]; + + private static byte ReadInterpFilter(ref ReadBitBuffer rb) + { + return rb.ReadBit() != 0 + ? (byte)Constants.Switchable + : _literalToFilter[rb.ReadLiteral(2)]; + } + + private static void SetupRenderSize(ref Vp9Common cm, ref ReadBitBuffer rb) + { + cm.RenderWidth = cm.Width; + cm.RenderHeight = cm.Height; + if (rb.ReadBit() != 0) + { + rb.ReadFrameSize(out cm.RenderWidth, out cm.RenderHeight); + } + } + + private static void SetupFrameSize(MemoryAllocator allocator, ref Vp9Common cm, ref ReadBitBuffer rb) + { + int width = 0, height = 0; + ref BufferPool pool = ref cm.BufferPool.Value; + rb.ReadFrameSize(out width, out height); + cm.ResizeContextBuffers(allocator, width, height); + SetupRenderSize(ref cm, ref rb); + + if (cm.GetFrameNewBuffer().ReallocFrameBuffer( + allocator, + cm.Width, + cm.Height, + cm.SubsamplingX, + cm.SubsamplingY, + cm.UseHighBitDepth, + Surface.DecBorderInPixels, + cm.ByteAlignment, + new Ptr(ref pool.FrameBufs[cm.NewFbIdx].RawFrameBuffer), + FrameBuffers.GetFrameBuffer, + pool.CbPriv) != 0) + { + cm.Error.InternalError(CodecErr.MemError, "Failed to allocate frame buffer"); + } + + pool.FrameBufs[cm.NewFbIdx].Released = 0; + pool.FrameBufs[cm.NewFbIdx].Buf.SubsamplingX = cm.SubsamplingX; + pool.FrameBufs[cm.NewFbIdx].Buf.SubsamplingY = cm.SubsamplingY; + pool.FrameBufs[cm.NewFbIdx].Buf.BitDepth = (uint)cm.BitDepth; + pool.FrameBufs[cm.NewFbIdx].Buf.ColorSpace = cm.ColorSpace; + pool.FrameBufs[cm.NewFbIdx].Buf.ColorRange = cm.ColorRange; + pool.FrameBufs[cm.NewFbIdx].Buf.RenderWidth = cm.RenderWidth; + pool.FrameBufs[cm.NewFbIdx].Buf.RenderHeight = cm.RenderHeight; + } + + private static bool ValidRefFrameImgFmt( + BitDepth refBitDepth, + int refXss, int refYss, + BitDepth thisBitDepth, + int thisXss, + int thisYss) + { + return refBitDepth == thisBitDepth && refXss == thisXss && refYss == thisYss; + } + + private static void SetupFrameSizeWithRefs(MemoryAllocator allocator, ref Vp9Common cm, + ref ReadBitBuffer rb) + { + int width = 0, height = 0; + bool found = false; + + bool hasValidRefFrame = false; + ref BufferPool pool = ref cm.BufferPool.Value; + for (int i = 0; i < Constants.RefsPerFrame; ++i) + { + if (rb.ReadBit() != 0) + { + if (cm.FrameRefs[i].Idx != RefBuffer.InvalidIdx) + { + ref Surface buf = ref cm.FrameRefs[i].Buf; + width = buf.YCropWidth; + height = buf.YCropHeight; + found = true; + break; + } + + cm.Error.InternalError(CodecErr.CorruptFrame, "Failed to decode frame size"); + } + } + + if (!found) + { + rb.ReadFrameSize(out width, out height); + } + + if (width <= 0 || height <= 0) + { + cm.Error.InternalError(CodecErr.CorruptFrame, "Invalid frame size"); + } + + // Check to make sure at least one of frames that this frame references + // has valid dimensions. + for (int i = 0; i < Constants.RefsPerFrame; ++i) + { + ref RefBuffer refFrame = ref cm.FrameRefs[i]; + hasValidRefFrame |= + refFrame.Idx != RefBuffer.InvalidIdx && + ScaleFactors.ValidRefFrameSize(refFrame.Buf.YCropWidth, refFrame.Buf.YCropHeight, width, + height); + } + + if (!hasValidRefFrame) + { + cm.Error.InternalError(CodecErr.CorruptFrame, "Referenced frame has invalid size"); + } + + for (int i = 0; i < Constants.RefsPerFrame; ++i) + { + ref RefBuffer refFrame = ref cm.FrameRefs[i]; + if (refFrame.Idx == RefBuffer.InvalidIdx || + !ValidRefFrameImgFmt( + (BitDepth)refFrame.Buf.BitDepth, + refFrame.Buf.SubsamplingX, + refFrame.Buf.SubsamplingY, + cm.BitDepth, + cm.SubsamplingX, + cm.SubsamplingY)) + { + cm.Error.InternalError(CodecErr.CorruptFrame, + "Referenced frame has incompatible color format"); + } + } + + cm.ResizeContextBuffers(allocator, width, height); + SetupRenderSize(ref cm, ref rb); + + if (cm.GetFrameNewBuffer().ReallocFrameBuffer( + allocator, + cm.Width, + cm.Height, + cm.SubsamplingX, + cm.SubsamplingY, + cm.UseHighBitDepth, + Surface.DecBorderInPixels, + cm.ByteAlignment, + new Ptr(ref pool.FrameBufs[cm.NewFbIdx].RawFrameBuffer), + FrameBuffers.GetFrameBuffer, + pool.CbPriv) != 0) + { + cm.Error.InternalError(CodecErr.MemError, "Failed to allocate frame buffer"); + } + + pool.FrameBufs[cm.NewFbIdx].Released = 0; + pool.FrameBufs[cm.NewFbIdx].Buf.SubsamplingX = cm.SubsamplingX; + pool.FrameBufs[cm.NewFbIdx].Buf.SubsamplingY = cm.SubsamplingY; + pool.FrameBufs[cm.NewFbIdx].Buf.BitDepth = (uint)cm.BitDepth; + pool.FrameBufs[cm.NewFbIdx].Buf.ColorSpace = cm.ColorSpace; + pool.FrameBufs[cm.NewFbIdx].Buf.ColorRange = cm.ColorRange; + pool.FrameBufs[cm.NewFbIdx].Buf.RenderWidth = cm.RenderWidth; + pool.FrameBufs[cm.NewFbIdx].Buf.RenderHeight = cm.RenderHeight; + } + // Reads the next tile returning its size and adjusting '*data' accordingly // based on 'isLast'. private static void GetTileBuffer( @@ -1102,7 +1415,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { if (!ReadIsValid(data, 4)) { - errorInfo.InternalError(CodecErr.CodecCorruptFrame, "Truncated packet or corrupt tile length"); + errorInfo.InternalError(CodecErr.CorruptFrame, "Truncated packet or corrupt tile length"); } size = BinaryPrimitives.ReadInt32BigEndian(data.AsSpan()); @@ -1110,7 +1423,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (size > data.Length) { - errorInfo.InternalError(CodecErr.CodecCorruptFrame, "Truncated packet or corrupt tile size"); + errorInfo.InternalError(CodecErr.CorruptFrame, "Truncated packet or corrupt tile size"); } } else @@ -1124,11 +1437,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 data = data.Slice(size); } - private static void GetTileBuffers(ref Vp9Common cm, ArrayPtr data, int tileCols, ref Array64 tileBuffers) + private static void GetTileBuffers(ref Vp9Common cm, ArrayPtr data, int tileCols, + ref Array64 tileBuffers) { - int c; - - for (c = 0; c < tileCols; ++c) + for (int c = 0; c < tileCols; ++c) { bool isLast = c == tileCols - 1; ref TileBuffer buf = ref tileBuffers[c]; @@ -1144,13 +1456,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int tileRows, ref Array4> tileBuffers) { - int r, c; - - for (r = 0; r < tileRows; ++r) + for (int r = 0; r < tileRows; ++r) { - for (c = 0; c < tileCols; ++c) + for (int c = 0; c < tileCols; ++c) { - bool isLast = (r == tileRows - 1) && (c == tileCols - 1); + bool isLast = r == tileRows - 1 && c == tileCols - 1; ref TileBuffer buf = ref tileBuffers[r][c]; GetTileBuffer(isLast, ref cm.Error, ref data, ref buf); } @@ -1167,7 +1477,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int miRow, miCol; Debug.Assert(tileRows <= 4); - Debug.Assert(tileCols <= (1 << 6)); + Debug.Assert(tileCols <= 1 << 6); // Note: this memset assumes above_context[0], [1] and [2] // are allocated as part of the same buffer. @@ -1183,7 +1493,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 for (tileCol = 0; tileCol < tileCols; ++tileCol) { ref TileBuffer buf = ref tileBuffers[tileRow][tileCol]; - ref TileWorkerData tileData = ref cm.TileWorkerData[tileCols * tileRow + tileCol]; + ref TileWorkerData tileData = ref cm.TileWorkerData[(tileCols * tileRow) + tileCol]; tileData.Xd = cm.Mb; tileData.Xd.Corrupted = false; tileData.Xd.Counts = cm.Counts; @@ -1203,28 +1513,30 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 for (tileCol = 0; tileCol < tileCols; ++tileCol) { int col = tileCol; - ref TileWorkerData tileData = ref cm.TileWorkerData[tileCols * tileRow + col]; + ref TileWorkerData tileData = ref cm.TileWorkerData[(tileCols * tileRow) + col]; tile.SetCol(ref cm, col); tileData.Xd.LeftContext = new Array3>(); tileData.Xd.LeftSegContext = new Array8(); for (miCol = tile.MiColStart; miCol < tile.MiColEnd; miCol += Constants.MiBlockSize) { - DecodePartition(ref tileData, ref cm, miRow, miCol, BlockSize.Block64x64, 4); + DecodePartition(ref tileData, ref cm, miRow, miCol, BlockSize.Block64X64, 4); } + cm.Mb.Corrupted |= tileData.Xd.Corrupted; if (cm.Mb.Corrupted) { - cm.Error.InternalError(CodecErr.CodecCorruptFrame, "Failed to decode tile data"); + cm.Error.InternalError(CodecErr.CorruptFrame, "Failed to decode tile data"); } } } } // Get last tile data. - return cm.TileWorkerData[tileCols * tileRows - 1].BitReader.FindEnd(); + return cm.TileWorkerData[(tileCols * tileRows) - 1].BitReader.FindEnd(); } - private static bool DecodeTileCol(ref TileWorkerData tileData, ref Vp9Common cm, ref Array64 tileBuffers) + private static bool DecodeTileCol(ref TileWorkerData tileData, ref Vp9Common cm, + ref Array64 tileBuffers) { ref TileInfo tile = ref tileData.Xd.Tile; int finalCol = (1 << cm.Log2TileCols) - 1; @@ -1251,7 +1563,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 tileData.Xd.LeftSegContext = new Array8(); for (int miCol = tile.MiColStart; miCol < tile.MiColEnd; miCol += Constants.MiBlockSize) { - DecodePartition(ref tileData, ref cm, miRow, miCol, BlockSize.Block64x64, 4); + DecodePartition(ref tileData, ref cm, miRow, miCol, BlockSize.Block64X64, 4); } } @@ -1262,7 +1574,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } while (!tileData.Xd.Corrupted && ++n <= tileData.BufEnd); tileData.DataEnd = bitReaderEnd; - return !tileData.Xd.Corrupted; } @@ -1276,9 +1587,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int numWorkers = Math.Min(maxThreads, tileCols); int n; - Debug.Assert(tileCols <= (1 << 6)); + Debug.Assert(tileCols <= 1 << 6); Debug.Assert(tileRows == 1); + LoopFilter.ResetLfm(ref cm); + cm.AboveContext.AsSpan().Clear(); cm.AboveSegContext.AsSpan().Clear(); @@ -1295,13 +1608,13 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 GetTileBuffers(ref cm, data, tileCols, ref tileBuffers); - tileBuffers.AsSpan()[..tileCols].Sort(CompareTileBuffers); + tileBuffers.AsSpan().Slice(0, tileCols).Sort(CompareTileBuffers); if (numWorkers == tileCols) { TileBuffer largest = tileBuffers[0]; Span buffers = tileBuffers.AsSpan(); - buffers[1..].CopyTo(buffers[..(tileBuffers.Length - 1)]); + buffers.Slice(1).CopyTo(buffers.Slice(0, tileBuffers.Length - 1)); tileBuffers[tileCols - 1] = largest; } else @@ -1327,7 +1640,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 for (n = 0; n < numWorkers; ++n) { - int count = baseVal + (remain + n) / numWorkers; + int count = baseVal + ((remain + n) / numWorkers); ref TileWorkerData tileData = ref cm.TileWorkerData[n + totalTiles]; tileData.BufStart = bufStart; @@ -1364,7 +1677,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } Debug.Assert(!bitReaderEnd.IsNull || cm.Mb.Corrupted); - return bitReaderEnd; } @@ -1383,5 +1695,477 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 a[i] += c[i]; } } + + private static void ErrorHandler(Ptr data) + { + ref Vp9Common cm = ref data.Value; + cm.Error.InternalError(CodecErr.CorruptFrame, "Truncated packet"); + } + + private static void FlushAllFbOnKey(ref Vp9Common cm) + { + if (cm.FrameType == FrameType.KeyFrame && cm.CurrentVideoFrame > 0) + { + ref Array12 frameBufs = ref cm.BufferPool.Value.FrameBufs; + ref BufferPool pool = ref cm.BufferPool.Value; + + for (int i = 0; i < Constants.FrameBuffers; ++i) + { + if (i == cm.NewFbIdx) + { + continue; + } + + frameBufs[i].RefCount = 0; + if (frameBufs[i].Released == 0) + { + FrameBuffers.ReleaseFrameBuffer(pool.CbPriv, ref frameBufs[i].RawFrameBuffer); + frameBufs[i].Released = 1; + } + } + } + } + + private const int SyncCode0 = 0x49; + private const int SyncCode1 = 0x83; + private const int SyncCode2 = 0x42; + + private const int FrameMarker = 0x2; + + private static bool ReadSyncCode(ref ReadBitBuffer rb) + { + return rb.ReadLiteral(8) == SyncCode0 && + rb.ReadLiteral(8) == SyncCode1 && + rb.ReadLiteral(8) == SyncCode2; + } + + private static void RefCntFb(ref Array12 bufs, ref int idx, int newIdx) + { + int refIndex = idx; + + if (refIndex >= 0 && bufs[refIndex].RefCount > 0) + { + bufs[refIndex].RefCount--; + } + + idx = newIdx; + + bufs[newIdx].RefCount++; + } + + private static ulong ReadUncompressedHeader(MemoryAllocator allocator, ref Vp9Decoder pbi, + ref ReadBitBuffer rb) + { + ref Vp9Common cm = ref pbi.Common; + ref BufferPool pool = ref cm.BufferPool.Value; + ref Array12 frameBufs = ref pool.FrameBufs; + int mask, refIndex = 0; + ulong sz; + + cm.LastFrameType = cm.FrameType; + cm.LastIntraOnly = cm.IntraOnly; + + if (rb.ReadLiteral(2) != FrameMarker) + { + cm.Error.InternalError(CodecErr.UnsupBitstream, "Invalid frame marker"); + } + + cm.Profile = rb.ReadProfile(); + if (cm.Profile >= BitstreamProfile.MaxProfiles) + { + cm.Error.InternalError(CodecErr.UnsupBitstream, "Unsupported bitstream profile"); + } + + cm.ShowExistingFrame = rb.ReadBit(); + if (cm.ShowExistingFrame != 0) + { + // Show an existing frame directly. + int frameToShow = cm.RefFrameMap[rb.ReadLiteral(3)]; + if (frameToShow < 0 || frameBufs[frameToShow].RefCount < 1) + { + cm.Error.InternalError(CodecErr.UnsupBitstream, + $"Buffer {frameToShow} does not contain a decoded frame"); + } + + RefCntFb(ref frameBufs, ref cm.NewFbIdx, frameToShow); + pbi.RefreshFrameFlags = 0; + cm.Lf.FilterLevel = 0; + cm.ShowFrame = 1; + + return 0; + } + + cm.FrameType = (FrameType)rb.ReadBit(); + cm.ShowFrame = rb.ReadBit(); + cm.ErrorResilientMode = rb.ReadBit(); + + if (cm.FrameType == FrameType.KeyFrame) + { + if (!ReadSyncCode(ref rb)) + { + cm.Error.InternalError(CodecErr.UnsupBitstream, "Invalid frame sync code"); + } + + cm.ReadBitdepthColorspaceSampling(ref rb); + pbi.RefreshFrameFlags = (1 << Constants.RefFrames) - 1; + + for (int i = 0; i < Constants.RefsPerFrame; ++i) + { + cm.FrameRefs[i].Idx = RefBuffer.InvalidIdx; + cm.FrameRefs[i].Buf = default; + } + + SetupFrameSize(allocator, ref cm, ref rb); + if (pbi.NeedResync != 0) + { + cm.RefFrameMap.AsSpan().Fill(-1); + FlushAllFbOnKey(ref cm); + pbi.NeedResync = 0; + } + } + else + { + cm.IntraOnly = (cm.ShowFrame != 0 ? 0 : rb.ReadBit()) != 0; + + cm.ResetFrameContext = cm.ErrorResilientMode != 0 ? 0 : rb.ReadLiteral(2); + + if (cm.IntraOnly) + { + if (!ReadSyncCode(ref rb)) + { + cm.Error.InternalError(CodecErr.UnsupBitstream, "Invalid frame sync code"); + } + + if (cm.Profile > BitstreamProfile.Profile0) + { + cm.ReadBitdepthColorspaceSampling(ref rb); + } + else + { + // NOTE: The intra-only frame header does not include the specification + // of either the color format or color sub-sampling in profile 0. VP9 + // specifies that the default color format should be YUV 4:2:0 in this + // case (normative). + cm.ColorSpace = VpxColorSpace.Bt601; + cm.ColorRange = VpxColorRange.Studio; + cm.SubsamplingY = cm.SubsamplingX = 1; + cm.BitDepth = BitDepth.Bits8; + cm.UseHighBitDepth = false; + } + + pbi.RefreshFrameFlags = rb.ReadLiteral(Constants.RefFrames); + SetupFrameSize(allocator, ref cm, ref rb); + if (pbi.NeedResync != 0) + { + cm.RefFrameMap.AsSpan().Fill(-1); + pbi.NeedResync = 0; + } + } + else if (pbi.NeedResync != 1) + { + /* Skip if need resync */ + pbi.RefreshFrameFlags = rb.ReadLiteral(Constants.RefFrames); + for (int i = 0; i < Constants.RefsPerFrame; ++i) + { + int refr = rb.ReadLiteral(Constants.RefFramesLog2); + int idx = cm.RefFrameMap[refr]; + ref RefBuffer refFrame = ref cm.FrameRefs[i]; + refFrame.Idx = idx; + refFrame.Buf = frameBufs[idx].Buf; + cm.RefFrameSignBias[Constants.LastFrame + i] = (sbyte)rb.ReadBit(); + } + + SetupFrameSizeWithRefs(allocator, ref cm, ref rb); + + cm.AllowHighPrecisionMv = rb.ReadBit() != 0; + cm.InterpFilter = ReadInterpFilter(ref rb); + + for (int i = 0; i < Constants.RefsPerFrame; ++i) + { + ref RefBuffer refBuf = ref cm.FrameRefs[i]; + refBuf.Sf.SetupScaleFactorsForFrame( + refBuf.Buf.YCropWidth, + refBuf.Buf.YCropHeight, + cm.Width, + cm.Height); + } + } + } + + cm.GetFrameNewBuffer().BitDepth = (uint)cm.BitDepth; + cm.GetFrameNewBuffer().ColorSpace = cm.ColorSpace; + cm.GetFrameNewBuffer().ColorRange = cm.ColorRange; + cm.GetFrameNewBuffer().RenderWidth = cm.RenderWidth; + cm.GetFrameNewBuffer().RenderHeight = cm.RenderHeight; + + if (pbi.NeedResync != 0) + { + cm.Error.InternalError(CodecErr.CorruptFrame, + "Keyframe / intra-only frame required to reset decoder state"); + } + + if (cm.ErrorResilientMode == 0) + { + cm.RefreshFrameContext = rb.ReadBit(); + cm.FrameParallelDecodingMode = rb.ReadBit(); + if (cm.FrameParallelDecodingMode == 0) + { + cm.Counts.Value = new Vp9BackwardUpdates(); + } + } + else + { + cm.RefreshFrameContext = 0; + cm.FrameParallelDecodingMode = 1; + } + + // This flag will be overridden by the call to SetupPastIndependence + // below, forcing the use of context 0 for those frame types. + cm.FrameContextIdx = (uint)rb.ReadLiteral(Constants.FrameContextsLog2); + + // Generate next_ref_frame_map. + for (mask = pbi.RefreshFrameFlags; mask != 0; mask >>= 1) + { + if ((mask & 1) != 0) + { + cm.NextRefFrameMap[refIndex] = cm.NewFbIdx; + ++frameBufs[cm.NewFbIdx].RefCount; + } + else + { + cm.NextRefFrameMap[refIndex] = cm.RefFrameMap[refIndex]; + } + + // Current thread holds the reference frame. + if (cm.RefFrameMap[refIndex] >= 0) + { + ++frameBufs[cm.RefFrameMap[refIndex]].RefCount; + } + + ++refIndex; + } + + for (; refIndex < Constants.RefFrames; ++refIndex) + { + cm.NextRefFrameMap[refIndex] = cm.RefFrameMap[refIndex]; + // Current thread holds the reference frame. + if (cm.RefFrameMap[refIndex] >= 0) + { + ++frameBufs[cm.RefFrameMap[refIndex]].RefCount; + } + } + + pbi.HoldRefBuf = 1; + + if (cm.FrameIsIntraOnly() || cm.ErrorResilientMode != 0) + { + EntropyMode.SetupPastIndependence(ref cm); + } + + SetupLoopfilter(ref cm.Lf, ref rb); + SetupQuantization(ref cm, ref cm.Mb, ref rb); + cm.Seg.SetupSegmentation(ref cm.Fc.Value, ref rb); + cm.SetupSegmentationDequant(); + + cm.SetupTileInfo(ref rb); + sz = (ulong)rb.ReadLiteral(16); + + if (sz == 0) + { + cm.Error.InternalError(CodecErr.CorruptFrame, "Invalid header size"); + } + + return sz; + } + + private static bool ReadCompressedHeader(ref Vp9Decoder pbi, ArrayPtr data, ulong partitionSize) + { + ref Vp9Common cm = ref pbi.Common; + ref MacroBlockD xd = ref cm.Mb; + ref Vp9EntropyProbs fc = ref cm.Fc.Value; + Reader r = new(); + + if (r.Init(data, (int)partitionSize)) + { + cm.Error.InternalError(CodecErr.MemError, "Failed to allocate bool decoder 0"); + } + + cm.TxMode = xd.Lossless ? TxMode.Only4X4 : r.ReadTxMode(); + if (cm.TxMode == TxMode.TxModeSelect) + { + ReadTxModeProbs(ref fc, ref r); + } + + ReadCoefProbs(ref fc, cm.TxMode, ref r); + + for (int k = 0; k < Constants.SkipContexts; ++k) + { + r.DiffUpdateProb(ref fc.SkipProb[k]); + } + + if (!cm.FrameIsIntraOnly()) + { + ReadInterModeProbs(ref fc, ref r); + + if (cm.InterpFilter == Constants.Switchable) + { + ReadSwitchableInterpProbs(ref fc, ref r); + } + + for (int i = 0; i < Constants.IntraInterContexts; i++) + { + r.DiffUpdateProb( ref fc.IntraInterProb[i]); + } + + cm.ReferenceMode = cm.ReadFrameReferenceMode(ref r); + if (cm.ReferenceMode != ReferenceMode.Single) + { + cm.SetupCompoundReferenceMode(); + } + + cm.ReadFrameReferenceModeProbs(ref r); + + for (int j = 0; j < EntropyMode.BlockSizeGroups; j++) + { + for (int i = 0; i < Constants.IntraModes - 1; ++i) + { + r.DiffUpdateProb( ref fc.YModeProb[j][i]); + } + } + + for (int j = 0; j < Constants.PartitionContexts; ++j) + { + for (int i = 0; i < Constants.PartitionTypes - 1; ++i) + { + r.DiffUpdateProb( ref fc.PartitionProb[j][i]); + } + } + + ReadMvProbs(ref fc, cm.AllowHighPrecisionMv, ref r); + } + + return r.HasError(); + } + + private static ref ReadBitBuffer InitReadBitBuffer(ref ReadBitBuffer rb, ReadOnlySpan data) + { + rb.BitOffset = 0; + rb.BitBuffer = data; + return ref rb; + } + + public static unsafe void Decode(MemoryAllocator allocator, + ref Vp9Decoder pbi, + ArrayPtr data, + out ArrayPtr pDataEnd, + bool multithreaded = true) + { + ref Vp9Common cm = ref pbi.Common; + ref MacroBlockD xd = ref cm.Mb; + ReadBitBuffer rb = new(); + int contextUpdated = 0; + Span clearData = stackalloc byte[80]; + ulong firstPartitionSize = + ReadUncompressedHeader(allocator, ref pbi, ref InitReadBitBuffer(ref rb, data.AsSpan())); + int tileRows = 1 << cm.Log2TileRows; + int tileCols = 1 << cm.Log2TileCols; + ref Surface newFb = ref cm.GetFrameNewBuffer(); + xd.CurBuf = newFb; + + if (firstPartitionSize == 0) + { + // showing a frame directly + pDataEnd = data.Slice(cm.Profile <= BitstreamProfile.Profile2 ? 1 : 2); + return; + } + + data = data.Slice((int)rb.BytesRead()); + if (!ReadIsValid(data, (int)firstPartitionSize)) + { + cm.Error.InternalError(CodecErr.CorruptFrame, "Truncated packet or corrupt header length"); + } + + cm.UsePrevFrameMvs = + cm.ErrorResilientMode == 0 && + cm.Width == cm.LastWidth && + cm.Height == cm.LastHeight && + !cm.LastIntraOnly && + cm.LastShowFrame != 0 && + cm.LastFrameType != FrameType.KeyFrame; + + xd.SetupBlockPlanes(cm.SubsamplingX, cm.SubsamplingY); + + cm.Fc = new Ptr(ref cm.FrameContexts[(int)cm.FrameContextIdx]); + + xd.Corrupted = false; + newFb.Corrupted = ReadCompressedHeader(ref pbi, data, firstPartitionSize) ? 1 : 0; + if (newFb.Corrupted != 0) + { + cm.Error.InternalError(CodecErr.CorruptFrame, "Decode failed. Frame data header is corrupted."); + } + + if (cm.Lf.FilterLevel != 0 && cm.SkipLoopFilter == 0) + { + LoopFilter.LoopFilterFrameInit(ref cm, cm.Lf.FilterLevel); + } + + int threadCount = multithreaded ? Math.Max(1, Environment.ProcessorCount / 2) : 0; + + if (cm.TileWorkerData.IsNull || tileCols * tileRows != cm.TotalTiles) + { + int numTileWorkers = (tileCols * tileRows) + threadCount; + if (!cm.TileWorkerData.IsNull) + { + allocator.Free(cm.TileWorkerData); + } + + cm.CheckMemError( ref cm.TileWorkerData, allocator.Allocate(numTileWorkers)); + cm.TotalTiles = tileRows * tileCols; + } + + if (multithreaded) + { + pDataEnd = DecodeTilesMt(ref pbi.Common, data.Slice((int)firstPartitionSize), threadCount); + + LoopFilter.LoopFilterFrameMt( + ref cm.Mb.CurBuf, + ref cm, + ref cm.Mb, + cm.Lf.FilterLevel, + false, + false, + threadCount); + } + else + { + pDataEnd = DecodeTiles(ref pbi.Common, data.Slice((int)firstPartitionSize)); + + LoopFilter.LoopFilterFrame(ref cm.Mb.CurBuf, ref cm, ref cm.Mb, cm.Lf.FilterLevel, false, false); + } + + if (!xd.Corrupted) + { + if (cm.ErrorResilientMode == 0 && cm.FrameParallelDecodingMode == 0) + { + cm.AdaptCoefProbs(); + + if (!cm.FrameIsIntraOnly()) + { + cm.AdaptModeProbs(); + cm.AdaptMvProbs(cm.AllowHighPrecisionMv); + } + } + } + else + { + cm.Error.InternalError(CodecErr.CorruptFrame, "Decode failed. Frame data is corrupted."); + } + + // Non frame parallel update frame context here. + if (cm.RefreshFrameContext != 0 && contextUpdated == 0) + { + cm.FrameContexts[(int)cm.FrameContextIdx] = cm.Fc.Value; + } + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/DecodeMv.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/DecodeMv.cs index 091490bfa..8b7ad4de1 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/DecodeMv.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/DecodeMv.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Dsp; using Ryujinx.Graphics.Nvdec.Vp9.Types; using Ryujinx.Graphics.Video; @@ -10,11 +10,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { internal static class DecodeMv { - private const int MvrefNeighbours = 8; + private const int RefNeighbours = 8; private static PredictionMode ReadIntraMode(ref Reader r, ReadOnlySpan p) { - return (PredictionMode)r.ReadTree(Luts.Vp9IntraModeTree, p); + return (PredictionMode)r.ReadTree(Luts.IntraModeTree, p); } private static PredictionMode ReadIntraModeY(ref Vp9Common cm, ref MacroBlockD xd, ref Reader r, int sizeGroup) @@ -41,7 +41,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 private static PredictionMode ReadInterMode(ref Vp9Common cm, ref MacroBlockD xd, ref Reader r, int ctx) { - int mode = r.ReadTree(Luts.Vp9InterModeTree, cm.Fc.Value.InterModeProb[ctx].AsSpan()); + int mode = r.ReadTree(Luts.InterModeTree, cm.Fc.Value.InterModeProb[ctx].AsSpan()); if (!xd.Counts.IsNull) { ++xd.Counts.Value.InterMode[ctx][mode]; @@ -52,22 +52,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 private static int ReadSegmentId(ref Reader r, ref Array7 segTreeProbs) { - return r.ReadTree(Luts.Vp9SegmentTree, segTreeProbs.AsSpan()); + return r.ReadTree(Luts.SegmentTree, segTreeProbs.AsSpan()); } private static ReadOnlySpan GetTxProbs(ref Vp9EntropyProbs fc, TxSize maxTxSize, int ctx) { switch (maxTxSize) { - case TxSize.Tx8x8: - return fc.Tx8x8Prob[ctx].AsSpan(); - case TxSize.Tx16x16: - return fc.Tx16x16Prob[ctx].AsSpan(); - case TxSize.Tx32x32: - return fc.Tx32x32Prob[ctx].AsSpan(); + case TxSize.Tx8X8: return fc.Tx8x8Prob[ctx].AsSpan(); + case TxSize.Tx16X16: return fc.Tx16x16Prob[ctx].AsSpan(); + case TxSize.Tx32X32: return fc.Tx32x32Prob[ctx].AsSpan(); default: Debug.Assert(false, "Invalid maxTxSize."); - return ReadOnlySpan.Empty; } } @@ -76,15 +72,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { switch (maxTxSize) { - case TxSize.Tx8x8: - return counts.Tx8x8[ctx].AsSpan(); - case TxSize.Tx16x16: - return counts.Tx16x16[ctx].AsSpan(); - case TxSize.Tx32x32: - return counts.Tx32x32[ctx].AsSpan(); + case TxSize.Tx8X8: return counts.Tx8x8[ctx].AsSpan(); + case TxSize.Tx16X16: return counts.Tx16x16[ctx].AsSpan(); + case TxSize.Tx32X32: return counts.Tx32x32[ctx].AsSpan(); default: Debug.Assert(false, "Invalid maxTxSize."); - return Span.Empty; } } @@ -94,10 +86,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int ctx = xd.GetTxSizeContext(); ReadOnlySpan txProbs = GetTxProbs(ref cm.Fc.Value, maxTxSize, ctx); TxSize txSize = (TxSize)r.Read(txProbs[0]); - if (txSize != TxSize.Tx4x4 && maxTxSize >= TxSize.Tx16x16) + if (txSize != TxSize.Tx4X4 && maxTxSize >= TxSize.Tx16X16) { txSize += r.Read(txProbs[1]); - if (txSize != TxSize.Tx8x8 && maxTxSize >= TxSize.Tx32x32) + if (txSize != TxSize.Tx8X8 && maxTxSize >= TxSize.Tx32X32) { txSize += r.Read(txProbs[2]); } @@ -116,7 +108,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 TxMode txMode = cm.TxMode; BlockSize bsize = xd.Mi[0].Value.SbType; TxSize maxTxSize = Luts.MaxTxSizeLookup[(int)bsize]; - if (allowSelect && txMode == TxMode.TxModeSelect && bsize >= BlockSize.Block8x8) + if (allowSelect && txMode == TxMode.TxModeSelect && bsize >= BlockSize.Block8X8) { return ReadSelectedTxSize(ref cm, ref xd, maxTxSize, ref r); } @@ -124,34 +116,32 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 return (TxSize)Math.Min((int)maxTxSize, (int)Luts.TxModeToBiggestTxSize[(int)txMode]); } - private static int DecGetSegmentId(ref Vp9Common cm, ArrayPtr segmentIds, int miOffset, int xMis, int yMis) + private static int DecGetSegmentId(ref Vp9Common cm, ArrayPtr segmentIds, int miOffset, int xMis, + int yMis) { - int x, y, segmentId = int.MaxValue; + int segmentId = int.MaxValue; - for (y = 0; y < yMis; y++) + for (int y = 0; y < yMis; y++) { - for (x = 0; x < xMis; x++) + for (int x = 0; x < xMis; x++) { - segmentId = Math.Min(segmentId, segmentIds[miOffset + y * cm.MiCols + x]); + segmentId = Math.Min(segmentId, segmentIds[miOffset + (y * cm.MiCols) + x]); } } Debug.Assert(segmentId >= 0 && segmentId < Constants.MaxSegments); - return segmentId; } private static void SetSegmentId(ref Vp9Common cm, int miOffset, int xMis, int yMis, int segmentId) { - int x, y; - Debug.Assert(segmentId >= 0 && segmentId < Constants.MaxSegments); - for (y = 0; y < yMis; y++) + for (int y = 0; y < yMis; y++) { - for (x = 0; x < xMis; x++) + for (int x = 0; x < xMis; x++) { - cm.CurrentFrameSegMap[miOffset + y * cm.MiCols + x] = (byte)segmentId; + cm.CurrentFrameSegMap[miOffset + (y * cm.MiCols) + x] = (byte)segmentId; } } } @@ -164,13 +154,13 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int xMis, int yMis) { - int x, y; - - for (y = 0; y < yMis; y++) + for (int y = 0; y < yMis; y++) { - for (x = 0; x < xMis; x++) + for (int x = 0; x < xMis; x++) { - currentSegmentIds[miOffset + y * cm.MiCols + x] = (byte)(!lastSegmentIds.IsNull ? lastSegmentIds[miOffset + y * cm.MiCols + x] : 0); + currentSegmentIds[miOffset + (y * cm.MiCols) + x] = (byte)(!lastSegmentIds.IsNull + ? lastSegmentIds[miOffset + (y * cm.MiCols) + x] + : 0); } } } @@ -188,13 +178,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (!seg.UpdateMap) { CopySegmentId(ref cm, cm.LastFrameSegMap, cm.CurrentFrameSegMap, miOffset, xMis, yMis); - return 0; } segmentId = ReadSegmentId(ref r, ref cm.Fc.Value.SegTreeProb); SetSegmentId(ref cm, miOffset, xMis, yMis, segmentId); - return segmentId; } @@ -210,7 +198,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref Segmentation seg = ref cm.Seg; ref ModeInfo mi = ref xd.Mi[0].Value; int predictedSegmentId, segmentId; - int miOffset = miRow * cm.MiCols + miCol; + int miOffset = (miRow * cm.MiCols) + miCol; if (!seg.Enabled) { @@ -224,7 +212,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (!seg.UpdateMap) { CopySegmentId(ref cm, cm.LastFrameSegMap, cm.CurrentFrameSegMap, miOffset, xMis, yMis); - return predictedSegmentId; } @@ -232,20 +219,22 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { byte predProb = Segmentation.GetPredProbSegId(ref cm.Fc.Value.SegPredProb, ref xd); mi.SegIdPredicted = (sbyte)r.Read(predProb); - segmentId = mi.SegIdPredicted != 0 ? predictedSegmentId : ReadSegmentId(ref r, ref cm.Fc.Value.SegTreeProb); + segmentId = mi.SegIdPredicted != 0 + ? predictedSegmentId + : ReadSegmentId(ref r, ref cm.Fc.Value.SegTreeProb); } else { segmentId = ReadSegmentId(ref r, ref cm.Fc.Value.SegTreeProb); } - SetSegmentId(ref cm, miOffset, xMis, yMis, segmentId); + SetSegmentId(ref cm, miOffset, xMis, yMis, segmentId); return segmentId; } private static int ReadSkip(ref Vp9Common cm, ref MacroBlockD xd, int segmentId, ref Reader r) { - if (cm.Seg.IsSegFeatureActive(segmentId, SegLvlFeatures.SegLvlSkip) != 0) + if (cm.Seg.IsSegFeatureActive(segmentId, SegLvlFeatures.Skip) != 0) { return 1; } @@ -260,12 +249,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 return skip; } - private static int ReadMvComponent(ref Reader r, ref Vp9EntropyProbs fc, int mvcomp, bool usehp) + private static int ReadComponent(ref Reader r, ref Vp9EntropyProbs fc, int mvcomp, bool usehp) { int mag, d, fr, hp; bool sign = r.Read(fc.Sign[mvcomp]) != 0; - MvClassType mvClass = (MvClassType)r.ReadTree(Luts.Vp9MvClassTree, fc.Classes[mvcomp].AsSpan()); - bool class0 = mvClass == MvClassType.MvClass0; + MvClassType mvClass = (MvClassType)r.ReadTree(Luts.MvClassTree, fc.Classes[mvcomp].AsSpan()); + bool class0 = mvClass == MvClassType.Class0; // Integer part if (class0) @@ -275,11 +264,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } else { - int i; int n = (int)mvClass + Constants.Class0Bits - 1; // Number of bits d = 0; - for (i = 0; i < n; ++i) + for (int i = 0; i < n; ++i) { d |= r.Read(fc.Bits[mvcomp][i]) << i; } @@ -288,40 +276,39 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } // Fractional part - fr = r.ReadTree(Luts.Vp9MvFPTree, class0 ? fc.Class0Fp[mvcomp][d].AsSpan() : fc.Fp[mvcomp].AsSpan()); + fr = r.ReadTree(Luts.MvFpTree, class0 ? fc.Class0Fp[mvcomp][d].AsSpan() : fc.Fp[mvcomp].AsSpan()); // High precision part (if hp is not used, the default value of the hp is 1) hp = usehp ? r.Read(class0 ? fc.Class0Hp[mvcomp] : fc.Hp[mvcomp]) : 1; // Result mag += ((d << 3) | (fr << 1) | hp) + 1; - return sign ? -mag : mag; } - private static void ReadMv( + private static void Read( ref Reader r, ref Mv mv, ref Mv refr, ref Vp9EntropyProbs fc, Ptr counts, - bool allowHP) + bool allowHp) { - MvJointType jointType = (MvJointType)r.ReadTree(Luts.Vp9MvJointTree, fc.Joints.AsSpan()); - bool useHP = allowHP && refr.UseMvHp(); + MvJointType jointType = (MvJointType)r.ReadTree(Luts.MvJointTree, fc.Joints.AsSpan()); + bool useHp = allowHp && refr.UseHp(); Mv diff = new(); - if (Mv.MvJointVertical(jointType)) + if (Mv.JointVertical(jointType)) { - diff.Row = (short)ReadMvComponent(ref r, ref fc, 0, useHP); + diff.Row = (short)ReadComponent(ref r, ref fc, 0, useHp); } - if (Mv.MvJointHorizontal(jointType)) + if (Mv.JointHorizontal(jointType)) { - diff.Col = (short)ReadMvComponent(ref r, ref fc, 1, useHP); + diff.Col = (short)ReadComponent(ref r, ref fc, 1, useHp); } - diff.IncMv(counts); + diff.Inc(counts); mv.Row = (short)(refr.Row + diff.Row); mv.Col = (short)(refr.Col + diff.Col); @@ -329,7 +316,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 private static ReferenceMode ReadBlockReferenceMode(ref Vp9Common cm, ref MacroBlockD xd, ref Reader r) { - if (cm.ReferenceMode == ReferenceMode.ReferenceModeSelect) + if (cm.ReferenceMode == ReferenceMode.Select) { int ctx = PredCommon.GetReferenceModeContext(ref cm, ref xd); ReferenceMode mode = (ReferenceMode)r.Read(cm.Fc.Value.CompInterProb[ctx]); @@ -354,15 +341,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { ref Vp9EntropyProbs fc = ref cm.Fc.Value; - if (cm.Seg.IsSegFeatureActive(segmentId, SegLvlFeatures.SegLvlRefFrame) != 0) + if (cm.Seg.IsSegFeatureActive(segmentId, SegLvlFeatures.RefFrame) != 0) { - refFrame[0] = (sbyte)cm.Seg.GetSegData(segmentId, SegLvlFeatures.SegLvlRefFrame); + refFrame[0] = (sbyte)cm.Seg.GetSegData(segmentId, SegLvlFeatures.RefFrame); refFrame[1] = Constants.None; } else { ReferenceMode mode = ReadBlockReferenceMode(ref cm, ref xd, ref r); - if (mode == ReferenceMode.CompoundReference) + if (mode == ReferenceMode.Compound) { int idx = cm.RefFrameSignBias[cm.CompFixedRef]; int ctx = PredCommon.GetPredContextCompRefP(ref cm, ref xd); @@ -375,7 +362,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 refFrame[idx] = cm.CompFixedRef; refFrame[idx == 0 ? 1 : 0] = cm.CompVarRef[bit]; } - else if (mode == ReferenceMode.SingleReference) + else if (mode == ReferenceMode.Single) { int ctx0 = PredCommon.GetPredContextSingleRefP1(ref xd); int bit0 = r.Read(fc.SingleRefProb[ctx0][0]); @@ -412,7 +399,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 private static byte ReadSwitchableInterpFilter(ref Vp9Common cm, ref MacroBlockD xd, ref Reader r) { int ctx = xd.GetPredContextSwitchableInterp(); - byte type = (byte)r.ReadTree(Luts.Vp9SwitchableInterpTree, cm.Fc.Value.SwitchableInterpProb[ctx].AsSpan()); + byte type = (byte)r.ReadTree(Luts.SwitchableInterpTree, cm.Fc.Value.SwitchableInterpProb[ctx].AsSpan()); if (!xd.Counts.IsNull) { ++xd.Counts.Value.SwitchableInterp[ctx][type]; @@ -424,23 +411,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 private static void ReadIntraBlockModeInfo(ref Vp9Common cm, ref MacroBlockD xd, ref ModeInfo mi, ref Reader r) { BlockSize bsize = mi.SbType; - int i; + switch (bsize) { - case BlockSize.Block4x4: - for (i = 0; i < 4; ++i) + case BlockSize.Block4X4: + for (int i = 0; i < 4; ++i) { mi.Bmi[i].Mode = ReadIntraModeY(ref cm, ref xd, ref r, 0); } mi.Mode = mi.Bmi[3].Mode; break; - case BlockSize.Block4x8: + case BlockSize.Block4X8: mi.Bmi[0].Mode = mi.Bmi[2].Mode = ReadIntraModeY(ref cm, ref xd, ref r, 0); mi.Bmi[1].Mode = mi.Bmi[3].Mode = mi.Mode = ReadIntraModeY(ref cm, ref xd, ref r, 0); break; - case BlockSize.Block8x4: + case BlockSize.Block8X4: mi.Bmi[0].Mode = mi.Bmi[1].Mode = ReadIntraModeY(ref cm, ref xd, ref r, 0); mi.Bmi[2].Mode = mi.Bmi[3].Mode = mi.Mode = ReadIntraModeY(ref cm, ref xd, ref r, 0); break; @@ -459,27 +446,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 mi.RefFrame[1] = Constants.None; } - private static bool IsMvValid(ref Mv mv) - { - return mv.Row > Constants.MvLow && - mv.Row < Constants.MvUpp && - mv.Col > Constants.MvLow && - mv.Col < Constants.MvUpp; - } - - private static void CopyMvPair(ref Array2 dst, ref Array2 src) + private static void CopyPair(ref Array2 dst, ref Array2 src) { dst[0] = src[0]; dst[1] = src[1]; } - private static void ZeroMvPair(ref Array2 dst) + private static void ZeroPair(ref Array2 dst) { dst[0] = new Mv(); dst[1] = new Mv(); } - private static bool AssignMv( + private static bool Assign( ref Vp9Common cm, ref MacroBlockD xd, PredictionMode mode, @@ -487,45 +466,45 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref Array2 refMv, ref Array2 nearNearestMv, int isCompound, - bool allowHP, + bool allowHp, ref Reader r) { - int i; bool ret = true; switch (mode) { case PredictionMode.NewMv: { - for (i = 0; i < 1 + isCompound; ++i) + for (int i = 0; i < 1 + isCompound; ++i) { - ReadMv(ref r, ref mv[i], ref refMv[i], ref cm.Fc.Value, xd.Counts, allowHP); - ret = ret && IsMvValid(ref mv[i]); + Read(ref r, ref mv[i], ref refMv[i], ref cm.Fc.Value, xd.Counts, allowHp); + ret = ret && mv[i].IsValid(); } + break; } case PredictionMode.NearMv: case PredictionMode.NearestMv: { - CopyMvPair(ref mv, ref nearNearestMv); + CopyPair(ref mv, ref nearNearestMv); break; } case PredictionMode.ZeroMv: { - ZeroMvPair(ref mv); + ZeroPair(ref mv); break; } - default: - return false; + default: return false; } + return ret; } private static bool ReadIsInterBlock(ref Vp9Common cm, ref MacroBlockD xd, int segmentId, ref Reader r) { - if (cm.Seg.IsSegFeatureActive(segmentId, SegLvlFeatures.SegLvlRefFrame) != 0) + if (cm.Seg.IsSegFeatureActive(segmentId, SegLvlFeatures.RefFrame) != 0) { - return cm.Seg.GetSegData(segmentId, SegLvlFeatures.SegLvlRefFrame) != Constants.IntraFrame; + return cm.Seg.GetSegData(segmentId, SegLvlFeatures.RefFrame) != Constants.IntraFrame; } int ctx = xd.GetIntraInterContext(); @@ -538,33 +517,30 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 return isInter; } - private static void DecFindBestRefMvs(bool allowHP, Span mvlist, ref Mv bestMv, int refmvCount) + private static void DecFindBestRefs(bool allowHp, Span mvlist, ref Mv bestMv, int refmvCount) { - int i; - // Make sure all the candidates are properly clamped etc - for (i = 0; i < refmvCount; ++i) + for (int i = 0; i < refmvCount; ++i) { - mvlist[i].LowerMvPrecision(allowHP); + mvlist[i].LowerPrecision(allowHp); bestMv = mvlist[i]; } } - private static bool AddMvRefListEb(Mv mv, ref int refMvCount, Span mvRefList, bool earlyBreak) + private static bool AddRefListEb(Mv mv, ref int refCount, Span mvRefList, bool earlyBreak) { - if (refMvCount != 0) + if (refCount != 0) { if (Unsafe.As(ref mv) != Unsafe.As(ref mvRefList[0])) { - mvRefList[refMvCount] = mv; - refMvCount++; - + mvRefList[refCount] = mv; + refCount++; return true; } } else { - mvRefList[refMvCount++] = mv; + mvRefList[refCount++] = mv; if (earlyBreak) { return true; @@ -574,19 +550,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 return false; } - // Performs mv sign inversion if indicated by the reference frame combination. - private static Mv ScaleMv(ref ModeInfo mi, int refr, sbyte thisRefFrame, ref Array4 refSignBias) - { - Mv mv = mi.Mv[refr]; - if (refSignBias[mi.RefFrame[refr]] != refSignBias[thisRefFrame]) - { - mv.Row *= -1; - mv.Col *= -1; - } - return mv; - } - - private static bool IsDiffRefFrameAddMvEb( + private static bool IsDiffRefFrameAddEb( ref ModeInfo mbmi, sbyte refFrame, ref Array4 refSignBias, @@ -598,26 +562,30 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { if (mbmi.RefFrame[0] != refFrame) { - if (AddMvRefListEb(ScaleMv(ref mbmi, 0, refFrame, ref refSignBias), ref refmvCount, mvRefList, earlyBreak)) - { - return true; - } - } - if (mbmi.HasSecondRef() && mbmi.RefFrame[1] != refFrame && Unsafe.As(ref mbmi.Mv[1]) != Unsafe.As(ref mbmi.Mv[0])) - { - if (AddMvRefListEb(ScaleMv(ref mbmi, 1, refFrame, ref refSignBias), ref refmvCount, mvRefList, earlyBreak)) + if (AddRefListEb(mbmi.ScaleMv(0, refFrame, ref refSignBias), ref refmvCount, mvRefList, + earlyBreak)) { return true; } } + if (mbmi.HasSecondRef() && mbmi.RefFrame[1] != refFrame && + Unsafe.As(ref mbmi.Mv[1]) != Unsafe.As(ref mbmi.Mv[0])) + { + if (AddRefListEb(mbmi.ScaleMv(1, refFrame, ref refSignBias), ref refmvCount, mvRefList, + earlyBreak)) + { + return true; + } + } } + return false; } // This function searches the neighborhood of a given MB/SB // to try and find candidate reference vectors. - private static int DecFindMvRefs( + private static int DecFindRefs( ref Vp9Common cm, ref MacroBlockD xd, PredictionMode mode, @@ -632,14 +600,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref Array4 refSignBias = ref cm.RefFrameSignBias; int i, refmvCount = 0; bool differentRefFound = false; - Ptr prevFrameMvs = cm.UsePrevFrameMvs ? new Ptr(ref cm.PrevFrameMvs[miRow * cm.MiCols + miCol]) : Ptr.Null; + Ptr prevFrameMvs = cm.UsePrevFrameMvs + ? new Ptr(ref cm.PrevFrameMvs[(miRow * cm.MiCols) + miCol]) + : Ptr.Null; ref TileInfo tile = ref xd.Tile; // If mode is nearestmv or newmv (uses nearestmv as a reference) then stop // searching after the first mv is found. bool earlyBreak = mode != PredictionMode.NearMv; // Blank the reference vector list - mvRefList[..Constants.MaxMvRefCandidates].Clear(); + mvRefList.Slice(0, Constants.MaxMvRefCandidates).Fill(new Mv()); i = 0; if (isSub8X8 != 0) @@ -651,19 +621,21 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref Position mvRef = ref mvRefSearch[i]; if (tile.IsInside(miCol, miRow, cm.MiRows, ref mvRef)) { - ref ModeInfo candidateMi = ref xd.Mi[mvRef.Col + mvRef.Row * xd.MiStride].Value; + ref ModeInfo candidateMi = ref xd.Mi[mvRef.Col + (mvRef.Row * xd.MiStride)].Value; differentRefFound = true; if (candidateMi.RefFrame[0] == refFrame) { - if (AddMvRefListEb(candidateMi.GetSubBlockMv(0, mvRef.Col, block), ref refmvCount, mvRefList, earlyBreak)) + if (AddRefListEb(candidateMi.GetSubBlockMv(0, mvRef.Col, block), ref refmvCount, + mvRefList, earlyBreak)) { goto Done; } } else if (candidateMi.RefFrame[1] == refFrame) { - if (AddMvRefListEb(candidateMi.GetSubBlockMv(1, mvRef.Col, block), ref refmvCount, mvRefList, earlyBreak)) + if (AddRefListEb(candidateMi.GetSubBlockMv(1, mvRef.Col, block), ref refmvCount, + mvRefList, earlyBreak)) { goto Done; } @@ -675,24 +647,24 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // Check the rest of the neighbors in much the same way // as before except we don't need to keep track of sub blocks or // mode counts. - for (; i < MvrefNeighbours; ++i) + for (; i < RefNeighbours; ++i) { ref Position mvRef = ref mvRefSearch[i]; if (tile.IsInside(miCol, miRow, cm.MiRows, ref mvRef)) { - ref ModeInfo candidate = ref xd.Mi[mvRef.Col + mvRef.Row * xd.MiStride].Value; + ref ModeInfo candidate = ref xd.Mi[mvRef.Col + (mvRef.Row * xd.MiStride)].Value; differentRefFound = true; if (candidate.RefFrame[0] == refFrame) { - if (AddMvRefListEb(candidate.Mv[0], ref refmvCount, mvRefList, earlyBreak)) + if (AddRefListEb(candidate.Mv[0], ref refmvCount, mvRefList, earlyBreak)) { goto Done; } } else if (candidate.RefFrame[1] == refFrame) { - if (AddMvRefListEb(candidate.Mv[1], ref refmvCount, mvRefList, earlyBreak)) + if (AddRefListEb(candidate.Mv[1], ref refmvCount, mvRefList, earlyBreak)) { goto Done; } @@ -705,14 +677,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { if (prevFrameMvs.Value.RefFrame[0] == refFrame) { - if (AddMvRefListEb(prevFrameMvs.Value.Mv[0], ref refmvCount, mvRefList, earlyBreak)) + if (AddRefListEb(prevFrameMvs.Value.Mv[0], ref refmvCount, mvRefList, earlyBreak)) { goto Done; } } else if (prevFrameMvs.Value.RefFrame[1] == refFrame) { - if (AddMvRefListEb(prevFrameMvs.Value.Mv[1], ref refmvCount, mvRefList, earlyBreak)) + if (AddRefListEb(prevFrameMvs.Value.Mv[1], ref refmvCount, mvRefList, earlyBreak)) { goto Done; } @@ -724,15 +696,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // different reference frames. if (differentRefFound) { - for (i = 0; i < MvrefNeighbours; ++i) + for (i = 0; i < RefNeighbours; ++i) { ref Position mvRef = ref mvRefSearch[i]; if (tile.IsInside(miCol, miRow, cm.MiRows, ref mvRef)) { - ref ModeInfo candidate = ref xd.Mi[mvRef.Col + mvRef.Row * xd.MiStride].Value; + ref ModeInfo candidate = ref xd.Mi[mvRef.Col + (mvRef.Row * xd.MiStride)].Value; // If the candidate is Intra we don't want to consider its mv. - if (IsDiffRefFrameAddMvEb(ref candidate, refFrame, ref refSignBias, ref refmvCount, mvRefList, earlyBreak)) + if (IsDiffRefFrameAddEb(ref candidate, refFrame, ref refSignBias, ref refmvCount, mvRefList, + earlyBreak)) { goto Done; } @@ -751,7 +724,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 mv.Row *= -1; mv.Col *= -1; } - if (AddMvRefListEb(mv, ref refmvCount, mvRefList, earlyBreak)) + + if (AddRefListEb(mv, ref refmvCount, mvRefList, earlyBreak)) { goto Done; } @@ -759,7 +733,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (prevFrameMvs.Value.RefFrame[1] > Constants.IntraFrame && prevFrameMvs.Value.RefFrame[1] != refFrame && - Unsafe.As(ref prevFrameMvs.Value.Mv[1]) != Unsafe.As(ref prevFrameMvs.Value.Mv[0])) + Unsafe.As(ref prevFrameMvs.Value.Mv[1]) != + Unsafe.As(ref prevFrameMvs.Value.Mv[0])) { Mv mv = prevFrameMvs.Value.Mv[1]; if (refSignBias[prevFrameMvs.Value.RefFrame[1]] != refSignBias[refFrame]) @@ -767,7 +742,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 mv.Row *= -1; mv.Col *= -1; } - if (AddMvRefListEb(mv, ref refmvCount, mvRefList, earlyBreak)) + + if (AddRefListEb(mv, ref refmvCount, mvRefList, earlyBreak)) { goto Done; } @@ -784,17 +760,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 refmvCount = 1; } - Done: + Done: // Clamp vectors for (i = 0; i < refmvCount; ++i) { - mvRefList[i].ClampMvRef(ref xd); + mvRefList[i].ClampRef(ref xd); } return refmvCount; } - private static void AppendSub8x8MvsForIdx( + private static void AppendSub8X8ForIdx( ref Vp9Common cm, ref MacroBlockD xd, Span mvRefSearch, @@ -803,46 +779,47 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int refr, int miRow, int miCol, - ref Mv bestSub8x8) + ref Mv bestSub8X8) { Span mvList = stackalloc Mv[Constants.MaxMvRefCandidates]; ref ModeInfo mi = ref xd.Mi[0].Value; ref Array4 bmi = ref mi.Bmi; - int n; int refmvCount; Debug.Assert(Constants.MaxMvRefCandidates == 2); - refmvCount = DecFindMvRefs(ref cm, ref xd, bMode, mi.RefFrame[refr], mvRefSearch, mvList, miRow, miCol, block, 1); + refmvCount = DecFindRefs(ref cm, ref xd, bMode, mi.RefFrame[refr], mvRefSearch, mvList, miRow, miCol, + block, 1); switch (block) { case 0: - bestSub8x8 = mvList[refmvCount - 1]; + bestSub8X8 = mvList[refmvCount - 1]; break; case 1: case 2: if (bMode == PredictionMode.NearestMv) { - bestSub8x8 = bmi[0].Mv[refr]; + bestSub8X8 = bmi[0].Mv[refr]; } else { - bestSub8x8 = new Mv(); - for (n = 0; n < refmvCount; ++n) + bestSub8X8 = new Mv(); + for (int n = 0; n < refmvCount; ++n) { if (Unsafe.As(ref bmi[0].Mv[refr]) != Unsafe.As(ref mvList[n])) { - bestSub8x8 = mvList[n]; + bestSub8X8 = mvList[n]; break; } } } + break; case 3: if (bMode == PredictionMode.NearestMv) { - bestSub8x8 = bmi[2].Mv[refr]; + bestSub8X8 = bmi[2].Mv[refr]; } else { @@ -851,16 +828,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 candidates[1] = bmi[0].Mv[refr]; candidates[2] = mvList[0]; candidates[3] = mvList[1]; - bestSub8x8 = new Mv(); - for (n = 0; n < 2 + Constants.MaxMvRefCandidates; ++n) + bestSub8X8 = new Mv(); + for (int n = 0; n < 2 + Constants.MaxMvRefCandidates; ++n) { if (Unsafe.As(ref bmi[2].Mv[refr]) != Unsafe.As(ref candidates[n])) { - bestSub8x8 = candidates[n]; + bestSub8X8 = candidates[n]; break; } } } + break; default: Debug.Assert(false, "Invalid block index."); @@ -868,19 +846,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } - private static byte GetModeContext(ref Vp9Common cm, ref MacroBlockD xd, Span mvRefSearch, int miRow, int miCol) + private static byte GetModeContext(ref Vp9Common cm, ref MacroBlockD xd, Span mvRefSearch, int miRow, + int miCol) { - int i; int contextCounter = 0; ref TileInfo tile = ref xd.Tile; // Get mode count from nearest 2 blocks - for (i = 0; i < 2; ++i) + for (int i = 0; i < 2; ++i) { ref Position mvRef = ref mvRefSearch[i]; if (tile.IsInside(miCol, miRow, cm.MiRows, ref mvRef)) { - ref ModeInfo candidate = ref xd.Mi[mvRef.Col + mvRef.Row * xd.MiStride].Value; + ref ModeInfo candidate = ref xd.Mi[mvRef.Col + (mvRef.Row * xd.MiStride)].Value; // Keep counts for entropy encoding. contextCounter += Luts.Mode2Counter[(int)candidate.Mode]; } @@ -898,7 +876,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref Reader r) { BlockSize bsize = mi.SbType; - bool allowHP = cm.AllowHighPrecisionMv; + bool allowHp = cm.AllowHighPrecisionMv; Array2 bestRefMvs = new(); int refr, isCompound; byte interModeCtx; @@ -908,19 +886,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 isCompound = mi.HasSecondRef() ? 1 : 0; interModeCtx = GetModeContext(ref cm, ref xd, mvRefSearch, miRow, miCol); - if (cm.Seg.IsSegFeatureActive(mi.SegmentId, SegLvlFeatures.SegLvlSkip) != 0) + if (cm.Seg.IsSegFeatureActive(mi.SegmentId, SegLvlFeatures.Skip) != 0) { mi.Mode = PredictionMode.ZeroMv; - if (bsize < BlockSize.Block8x8) + if (bsize < BlockSize.Block8X8) { - xd.ErrorInfo.Value.InternalError(CodecErr.CodecUnsupBitstream, "Invalid usage of segement feature on small blocks"); - + xd.ErrorInfo.Value.InternalError(CodecErr.UnsupBitstream, + "Invalid usage of segement feature on small blocks"); return; } } else { - if (bsize >= BlockSize.Block8x8) + if (bsize >= BlockSize.Block8X8) { mi.Mode = ReadInterMode(ref cm, ref xd, ref r, interModeCtx); } @@ -942,42 +920,47 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 sbyte frame = mi.RefFrame[refr]; int refmvCount; - refmvCount = DecFindMvRefs(ref cm, ref xd, mi.Mode, frame, mvRefSearch, tmpMvs, miRow, miCol, -1, 0); + refmvCount = DecFindRefs(ref cm, ref xd, mi.Mode, frame, mvRefSearch, tmpMvs, miRow, miCol, + -1, 0); - DecFindBestRefMvs(allowHP, tmpMvs, ref bestRefMvs[refr], refmvCount); + DecFindBestRefs(allowHp, tmpMvs, ref bestRefMvs[refr], refmvCount); } } } - mi.InterpFilter = (cm.InterpFilter == Constants.Switchable) ? ReadSwitchableInterpFilter(ref cm, ref xd, ref r) : cm.InterpFilter; + mi.InterpFilter = cm.InterpFilter == Constants.Switchable + ? ReadSwitchableInterpFilter(ref cm, ref xd, ref r) + : cm.InterpFilter; - if (bsize < BlockSize.Block8x8) + if (bsize < BlockSize.Block8X8) { int num4X4W = 1 << xd.BmodeBlocksWl; int num4X4H = 1 << xd.BmodeBlocksHl; int idx, idy; PredictionMode bMode = 0; - Array2 bestSub8x8 = new(); + Array2 bestSub8X8 = new(); const uint InvalidMv = 0x80008000; // Initialize the 2nd element as even though it won't be used meaningfully // if isCompound is false. - Unsafe.As(ref bestSub8x8[1]) = InvalidMv; + Unsafe.As(ref bestSub8X8[1]) = InvalidMv; for (idy = 0; idy < 2; idy += num4X4H) { for (idx = 0; idx < 2; idx += num4X4W) { - int j = idy * 2 + idx; + int j = (idy * 2) + idx; bMode = ReadInterMode(ref cm, ref xd, ref r, interModeCtx); if (bMode == PredictionMode.NearestMv || bMode == PredictionMode.NearMv) { for (refr = 0; refr < 1 + isCompound; ++refr) { - AppendSub8x8MvsForIdx(ref cm, ref xd, mvRefSearch, bMode, j, refr, miRow, miCol, ref bestSub8x8[refr]); + AppendSub8X8ForIdx(ref cm, ref xd, mvRefSearch, bMode, j, refr, miRow, miCol, + ref bestSub8X8[refr]); } } - if (!AssignMv(ref cm, ref xd, bMode, ref mi.Bmi[j].Mv, ref bestRefMvs, ref bestSub8x8, isCompound, allowHP, ref r)) + if (!Assign(ref cm, ref xd, bMode, ref mi.Bmi[j].Mv, ref bestRefMvs, ref bestSub8X8, + isCompound, allowHp, ref r)) { xd.Corrupted |= true; break; @@ -997,11 +980,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 mi.Mode = bMode; - CopyMvPair(ref mi.Mv, ref mi.Bmi[3].Mv); + CopyPair(ref mi.Mv, ref mi.Bmi[3].Mv); } else { - xd.Corrupted |= !AssignMv(ref cm, ref xd, mi.Mode, ref mi.Mv, ref bestRefMvs, ref bestRefMvs, isCompound, allowHP, ref r); + xd.Corrupted |= !Assign(ref cm, ref xd, mi.Mode, ref mi.Mv, ref bestRefMvs, ref bestRefMvs, + isCompound, allowHp, ref r); } } @@ -1045,7 +1029,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } Debug.Assert(b == 1 || b == 3); - return curMi.Value.Bmi[b - 1].Mode; } @@ -1062,7 +1045,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } Debug.Assert(b == 2 || b == 3); - return curMi.Value.Bmi[b - 2].Mode; } @@ -1075,7 +1057,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { PredictionMode above = AboveBlockMode(mi, aboveMi, block); PredictionMode left = LeftBlockMode(mi, leftMi, block); - return fc.KfYModeProb[(int)above][(int)left].AsSpan(); } @@ -1092,8 +1073,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 Ptr aboveMi = xd.AboveMi; Ptr leftMi = xd.LeftMi; BlockSize bsize = mi.Value.SbType; - int i; - int miOffset = miRow * cm.MiCols + miCol; + + int miOffset = (miRow * cm.MiCols) + miCol; mi.Value.SegmentId = (sbyte)ReadIntraSegmentId(ref cm, miOffset, xMis, yMis, ref r); mi.Value.Skip = (sbyte)ReadSkip(ref cm, ref xd, mi.Value.SegmentId, ref r); @@ -1103,8 +1084,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 switch (bsize) { - case BlockSize.Block4x4: - for (i = 0; i < 4; ++i) + case BlockSize.Block4X4: + for (int i = 0; i < 4; ++i) { mi.Value.Bmi[i].Mode = ReadIntraMode(ref r, GetYModeProbs(ref cm.Fc.Value, mi, aboveMi, leftMi, i)); @@ -1112,13 +1093,13 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 mi.Value.Mode = mi.Value.Bmi[3].Mode; break; - case BlockSize.Block4x8: + case BlockSize.Block4X8: mi.Value.Bmi[0].Mode = mi.Value.Bmi[2].Mode = ReadIntraMode(ref r, GetYModeProbs(ref cm.Fc.Value, mi, aboveMi, leftMi, 0)); mi.Value.Bmi[1].Mode = mi.Value.Bmi[3].Mode = mi.Value.Mode = ReadIntraMode(ref r, GetYModeProbs(ref cm.Fc.Value, mi, aboveMi, leftMi, 1)); break; - case BlockSize.Block8x4: + case BlockSize.Block8X4: mi.Value.Bmi[0].Mode = mi.Value.Bmi[1].Mode = ReadIntraMode(ref r, GetYModeProbs(ref cm.Fc.Value, mi, aboveMi, leftMi, 0)); mi.Value.Bmi[2].Mode = mi.Value.Bmi[3].Mode = mi.Value.Mode = @@ -1149,8 +1130,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref Reader r = ref twd.BitReader; ref MacroBlockD xd = ref twd.Xd; ref ModeInfo mi = ref xd.Mi[0].Value; - ArrayPtr frameMvs = cm.CurFrameMvs.Slice(miRow * cm.MiCols + miCol); - int w, h; + ArrayPtr frameMvs = cm.CurFrameMvs.Slice((miRow * cm.MiCols) + miCol); if (cm.FrameIsIntraOnly()) { @@ -1160,17 +1140,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { ReadInterFrameModeInfo(ref cm, ref xd, miRow, miCol, ref r, xMis, yMis); - for (h = 0; h < yMis; ++h) + for (int h = 0; h < yMis; ++h) { - for (w = 0; w < xMis; ++w) + for (int w = 0; w < xMis; ++w) { ref MvRef mv = ref frameMvs[w]; CopyRefFramePair(ref mv.RefFrame, ref mi.RefFrame); - CopyMvPair(ref mv.Mv, ref mi.Mv); + CopyPair(ref mv.Mv, ref mi.Mv); } + frameMvs = frameMvs.Slice(cm.MiCols); } } } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Decoder.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Decoder.cs index 57057d5f9..009611b27 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Decoder.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Decoder.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Common; using Ryujinx.Graphics.Nvdec.Vp9.Types; using Ryujinx.Graphics.Video; @@ -12,15 +12,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 private readonly MemoryAllocator _allocator = new(); - public ISurface CreateSurface(int width, int height) => new Surface(width, height); - - private static ReadOnlySpan LiteralToFilter => new byte[] + public ISurface CreateSurface(int width, int height) { - Constants.EightTapSmooth, - Constants.EightTap, - Constants.EightTapSharp, - Constants.Bilinear, - }; + return new Surface(width, height); + } + + private static ReadOnlySpan LiteralToFilter => + [ + Constants.EightTapSmooth, Constants.EightTap, Constants.EightTapSharp, Constants.Bilinear + ]; public unsafe bool Decode( ref Vp9PictureInfo pictureInfo, @@ -29,25 +29,24 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ReadOnlySpan mvsIn, Span mvsOut) { - Vp9Common cm = new() - { - FrameType = pictureInfo.IsKeyFrame ? FrameType.KeyFrame : FrameType.InterFrame, - IntraOnly = pictureInfo.IntraOnly, + Vp9Common cm = new(); - Width = output.Width, - Height = output.Height, - SubsamplingX = 1, - SubsamplingY = 1, + cm.FrameType = pictureInfo.IsKeyFrame ? FrameType.KeyFrame : FrameType.InterFrame; + cm.IntraOnly = pictureInfo.IntraOnly; - UsePrevFrameMvs = pictureInfo.UsePrevInFindMvRefs, + cm.Width = output.Width; + cm.Height = output.Height; + cm.SubsamplingX = 1; + cm.SubsamplingY = 1; - RefFrameSignBias = pictureInfo.RefFrameSignBias, + cm.UsePrevFrameMvs = pictureInfo.UsePrevInFindMvRefs; - BaseQindex = pictureInfo.BaseQIndex, - YDcDeltaQ = pictureInfo.YDcDeltaQ, - UvAcDeltaQ = pictureInfo.UvAcDeltaQ, - UvDcDeltaQ = pictureInfo.UvDcDeltaQ, - }; + cm.RefFrameSignBias = pictureInfo.RefFrameSignBias; + + cm.BaseQindex = pictureInfo.BaseQIndex; + cm.YDcDeltaQ = pictureInfo.YDcDeltaQ; + cm.UvAcDeltaQ = pictureInfo.UvAcDeltaQ; + cm.UvDcDeltaQ = pictureInfo.UvDcDeltaQ; cm.Mb.Lossless = pictureInfo.Lossless; cm.Mb.Bd = 8; @@ -68,6 +67,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 cm.CompFixedRef = pictureInfo.CompFixedRef; cm.CompVarRef = pictureInfo.CompVarRef; + cm.BitDepth = BitDepth.Bits8; + cm.Log2TileCols = pictureInfo.Log2TileCols; cm.Log2TileRows = pictureInfo.Log2TileRows; @@ -78,6 +79,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 cm.Seg.FeatureMask = pictureInfo.SegmentFeatureEnable; cm.Seg.FeatureData = pictureInfo.SegmentFeatureData; + cm.Lf.FilterLevel = pictureInfo.LoopFilterLevel; + cm.Lf.SharpnessLevel = pictureInfo.LoopFilterSharpnessLevel; cm.Lf.ModeRefDeltaEnabled = pictureInfo.ModeRefDeltaEnabled; cm.Lf.RefDeltas = pictureInfo.RefDeltas; cm.Lf.ModeDeltas = pictureInfo.ModeDeltas; @@ -105,7 +108,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 cm.SetupSegmentationDequant(); cm.SetupScaleFactors(); - SetMvs(ref cm, mvsIn); + cm.SetMvs(mvsIn); + + if (cm.Lf.FilterLevel != 0 && cm.SkipLoopFilter == 0) + { + LoopFilter.LoopFilterFrameInit(ref cm, cm.Lf.FilterLevel); + } fixed (byte* dataPtr = bitstream) { @@ -114,10 +122,27 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (maxThreads > 1 && tileRows == 1 && tileCols > 1) { DecodeFrame.DecodeTilesMt(ref cm, new ArrayPtr(dataPtr, bitstream.Length), maxThreads); + + LoopFilter.LoopFilterFrameMt( + ref cm.Mb.CurBuf, + ref cm, + ref cm.Mb, + cm.Lf.FilterLevel, + false, + false, + maxThreads); } else { DecodeFrame.DecodeTiles(ref cm, new ArrayPtr(dataPtr, bitstream.Length)); + + LoopFilter.LoopFilterFrame( + ref cm.Mb.CurBuf, + ref cm, + ref cm.Mb, + cm.Lf.FilterLevel, + false, + false); } } catch (InternalErrorException) @@ -126,7 +151,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } - GetMvs(ref cm, mvsOut); + cm.GetMvs(mvsOut); cm.FreeTileWorkerData(_allocator); cm.FreeContextBuffers(_allocator); @@ -134,48 +159,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 return true; } - private static void SetMvs(ref Vp9Common cm, ReadOnlySpan mvs) + public void Dispose() { - if (mvs.Length > cm.PrevFrameMvs.Length) - { - throw new ArgumentException($"Size mismatch, expected: {cm.PrevFrameMvs.Length}, but got: {mvs.Length}."); - } - - for (int i = 0; i < mvs.Length; i++) - { - ref var mv = ref cm.PrevFrameMvs[i]; - - mv.Mv[0].Row = mvs[i].Mvs[0].Row; - mv.Mv[0].Col = mvs[i].Mvs[0].Col; - mv.Mv[1].Row = mvs[i].Mvs[1].Row; - mv.Mv[1].Col = mvs[i].Mvs[1].Col; - - mv.RefFrame[0] = (sbyte)mvs[i].RefFrames[0]; - mv.RefFrame[1] = (sbyte)mvs[i].RefFrames[1]; - } + _allocator.Dispose(); } - - private static void GetMvs(ref Vp9Common cm, Span mvs) - { - if (mvs.Length > cm.CurFrameMvs.Length) - { - throw new ArgumentException($"Size mismatch, expected: {cm.CurFrameMvs.Length}, but got: {mvs.Length}."); - } - - for (int i = 0; i < mvs.Length; i++) - { - ref var mv = ref cm.CurFrameMvs[i]; - - mvs[i].Mvs[0].Row = mv.Mv[0].Row; - mvs[i].Mvs[0].Col = mv.Mv[0].Col; - mvs[i].Mvs[1].Row = mv.Mv[1].Row; - mvs[i].Mvs[1].Col = mv.Mv[1].Col; - - mvs[i].RefFrames[0] = mv.RefFrame[0]; - mvs[i].RefFrames[1] = mv.RefFrame[1]; - } - } - - public void Dispose() => _allocator.Dispose(); } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Detokenize.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Detokenize.cs index c255f7486..092d298dc 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Detokenize.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Detokenize.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Dsp; using Ryujinx.Graphics.Nvdec.Vp9.Types; using Ryujinx.Graphics.Video; @@ -19,24 +19,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { const int MaxNeighbors = 2; - return (1 + tokenCache[neighbors[MaxNeighbors * c + 0]] + tokenCache[neighbors[MaxNeighbors * c + 1]]) >> 1; - } - - private static int ReadCoeff( - ref Reader r, - ReadOnlySpan probs, - int n, - ref ulong value, - ref int count, - ref uint range) - { - int i, val = 0; - for (i = 0; i < n; ++i) - { - val = (val << 1) | r.ReadBool(probs[i], ref value, ref count, ref range); - } - - return val; + return (1 + tokenCache[neighbors[(MaxNeighbors * c) + 0]] + + tokenCache[neighbors[(MaxNeighbors * c) + 1]]) >> 1; } private static int DecodeCoefs( @@ -58,13 +42,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref Array6>> coefProbs = ref fc.CoefProbs[(int)txSize][(int)type][refr]; Span tokenCache = stackalloc byte[32 * 32]; ReadOnlySpan bandTranslate = Luts.GetBandTranslate(txSize); - int dqShift = (txSize == TxSize.Tx32x32) ? 1 : 0; + int dqShift = txSize == TxSize.Tx32X32 ? 1 : 0; int v; short dqv = dq[0]; - ReadOnlySpan cat6Prob = (xd.Bd == 12) - ? Luts.Vp9Cat6ProbHigh12 - : (xd.Bd == 10) ? Luts.Vp9Cat6ProbHigh12[2..] : Luts.Vp9Cat6Prob; - int cat6Bits = (xd.Bd == 12) ? 18 : (xd.Bd == 10) ? 16 : 14; + ReadOnlySpan cat6Prob = xd.Bd == 12 + ? Luts.Cat6ProbHigh12 + : xd.Bd == 10 + ? Luts.Cat6ProbHigh12.Slice(2) + : Luts.Cat6Prob; + int cat6Bits = xd.Bd == 12 ? 18 : xd.Bd == 10 ? 16 : 14; // Keep value, range, and count as locals. The compiler produces better // results with the locals than using r directly. ulong value = r.Value; @@ -75,7 +61,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { int val = -1; band = bandTranslate[0]; - bandTranslate = bandTranslate[1..]; + bandTranslate = bandTranslate.Slice(1); ref Array3 prob = ref coefProbs[band][ctx]; if (!xd.Counts.IsNull) { @@ -107,18 +93,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 r.Value = value; r.Range = range; r.Count = count; - return c; // Zero tokens at the end (no eob token) } + ctx = GetCoefContext(nb, tokenCache, c); band = bandTranslate[0]; - bandTranslate = bandTranslate[1..]; + bandTranslate = bandTranslate.Slice(1); prob = ref coefProbs[band][ctx]; } if (r.ReadBool(prob[OneContextNode], ref value, ref count, ref range) != 0) { - ReadOnlySpan p = Luts.Vp9Pareto8Full[prob[Constants.PivotNode] - 1]; + ReadOnlySpan p = Luts.Pareto8Full[prob[Constants.PivotNode] - 1]; if (!xd.Counts.IsNull) { ++counts.Coef[(int)txSize][(int)type][refr][band][ctx][Constants.TwoToken]; @@ -133,20 +119,24 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { if (r.ReadBool(p[7], ref value, ref count, ref range) != 0) { - val = Constants.Cat6MinVal + ReadCoeff(ref r, cat6Prob, cat6Bits, ref value, ref count, ref range); + val = Constants.Cat6MinVal + r.ReadCoeff(cat6Prob, cat6Bits, ref value, + ref count, ref range); } else { - val = Constants.Cat5MinVal + ReadCoeff(ref r, Luts.Vp9Cat5Prob, 5, ref value, ref count, ref range); + val = Constants.Cat5MinVal + r.ReadCoeff(Luts.Cat5Prob, 5, ref value, + ref count, ref range); } } else if (r.ReadBool(p[6], ref value, ref count, ref range) != 0) { - val = Constants.Cat4MinVal + ReadCoeff(ref r, Luts.Vp9Cat4Prob, 4, ref value, ref count, ref range); + val = Constants.Cat4MinVal + r.ReadCoeff(Luts.Cat4Prob, 4, ref value, ref count, + ref range); } else { - val = Constants.Cat3MinVal + ReadCoeff(ref r, Luts.Vp9Cat3Prob, 3, ref value, ref count, ref range); + val = Constants.Cat3MinVal + r.ReadCoeff(Luts.Cat3Prob, 3, ref value, ref count, + ref range); } } else @@ -154,13 +144,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 tokenCache[scan[c]] = 4; if (r.ReadBool(p[4], ref value, ref count, ref range) != 0) { - val = Constants.Cat2MinVal + ReadCoeff(ref r, Luts.Vp9Cat2Prob, 2, ref value, ref count, ref range); + val = Constants.Cat2MinVal + r.ReadCoeff(Luts.Cat2Prob, 2, ref value, ref count, + ref range); } else { - val = Constants.Cat1MinVal + ReadCoeff(ref r, Luts.Vp9Cat1Prob, 1, ref value, ref count, ref range); + val = Constants.Cat1MinVal + r.ReadCoeff(Luts.Cat1Prob, 1, ref value, ref count, + ref range); } } + // Val may use 18-bits v = (int)(((long)val * dqv) >> dqShift); } @@ -188,7 +181,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 tokenCache[scan[c]] = 1; v = dqv >> dqShift; } - dqcoeff[scan[c]] = (int)HighbdCheckRange(r.ReadBool(128, ref value, ref count, ref range) != 0 ? -v : v, xd.Bd); + + dqcoeff[scan[c]] = (int)HighbdCheckRange(r.ReadBool(128, ref value, ref count, ref range) != 0 ? -v : v, + xd.Bd); ++c; ctx = GetCoefContext(nb, tokenCache, c); dqv = dq[1]; @@ -197,11 +192,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 r.Value = value; r.Range = range; r.Count = count; - return c; } - private static void GetCtxShift(ref MacroBlockD xd, ref int ctxShiftA, ref int ctxShiftL, int x, int y, uint txSizeInBlocks) + private static void GetCtxShift(ref MacroBlockD xd, ref int ctxShiftA, ref int ctxShiftL, int x, int y, + uint txSizeInBlocks) { if (xd.MaxBlocksWide != 0) { @@ -210,6 +205,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ctxShiftA = (int)(txSizeInBlocks - (xd.MaxBlocksWide - x)) * 8; } } + if (xd.MaxBlocksHigh != 0) { if (txSizeInBlocks + y > xd.MaxBlocksHigh) @@ -238,15 +234,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref MacroBlockDPlane pd = ref xd.Plane[plane]; ref Array2 dequant = ref pd.SegDequant[segId]; int eob; - Span a = pd.AboveContext.AsSpan()[x..]; - Span l = pd.LeftContext.AsSpan()[y..]; + Span a = pd.AboveContext.AsSpan().Slice(x); + Span l = pd.LeftContext.AsSpan().Slice(y); int ctx; int ctxShiftA = 0; int ctxShiftL = 0; switch (txSize) { - case TxSize.Tx4x4: + case TxSize.Tx4X4: ctx = a[0] != 0 ? 1 : 0; ctx += l[0] != 0 ? 1 : 0; eob = DecodeCoefs( @@ -261,8 +257,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref r); a[0] = l[0] = (sbyte)(eob > 0 ? 1 : 0); break; - case TxSize.Tx8x8: - GetCtxShift(ref xd, ref ctxShiftA, ref ctxShiftL, x, y, 1 << (int)TxSize.Tx8x8); + case TxSize.Tx8X8: + GetCtxShift(ref xd, ref ctxShiftA, ref ctxShiftL, x, y, 1 << (int)TxSize.Tx8X8); ctx = MemoryMarshal.Cast(a)[0] != 0 ? 1 : 0; ctx += MemoryMarshal.Cast(l)[0] != 0 ? 1 : 0; eob = DecodeCoefs( @@ -278,8 +274,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 MemoryMarshal.Cast(a)[0] = (ushort)((eob > 0 ? 0x0101 : 0) >> ctxShiftA); MemoryMarshal.Cast(l)[0] = (ushort)((eob > 0 ? 0x0101 : 0) >> ctxShiftL); break; - case TxSize.Tx16x16: - GetCtxShift(ref xd, ref ctxShiftA, ref ctxShiftL, x, y, 1 << (int)TxSize.Tx16x16); + case TxSize.Tx16X16: + GetCtxShift(ref xd, ref ctxShiftA, ref ctxShiftL, x, y, 1 << (int)TxSize.Tx16X16); ctx = MemoryMarshal.Cast(a)[0] != 0 ? 1 : 0; ctx += MemoryMarshal.Cast(l)[0] != 0 ? 1 : 0; eob = DecodeCoefs( @@ -295,8 +291,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 MemoryMarshal.Cast(a)[0] = (uint)((eob > 0 ? 0x01010101 : 0) >> ctxShiftA); MemoryMarshal.Cast(l)[0] = (uint)((eob > 0 ? 0x01010101 : 0) >> ctxShiftL); break; - case TxSize.Tx32x32: - GetCtxShift(ref xd, ref ctxShiftA, ref ctxShiftL, x, y, 1 << (int)TxSize.Tx32x32); + case TxSize.Tx32X32: + GetCtxShift(ref xd, ref ctxShiftA, ref ctxShiftL, x, y, 1 << (int)TxSize.Tx32X32); // NOTE: Casting to ulong here is safe because the default memory // alignment is at least 8 bytes and the Tx32x32 is aligned on 8 byte // boundaries. @@ -324,4 +320,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 return eob; } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Convolve.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Convolve.cs index 9e279dd21..8cea09aec 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Convolve.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Convolve.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Common; using System.Diagnostics; using System.Runtime.CompilerServices; @@ -75,17 +75,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Vector128 zero = Vector128.Zero; Vector128 const64 = Vector128.Create(64); - ulong x, y; - src -= SubpelTaps / 2 - 1; + src -= (SubpelTaps / 2) - 1; fixed (Array8* xFilter = xFilters) { - Vector128 vfilter = Sse2.LoadVector128((short*)xFilter + (uint)(x0Q4 & SubpelMask) * 8); + Vector128 vfilter = Sse2.LoadVector128((short*)xFilter + ((uint)(x0Q4 & SubpelMask) * 8)); - for (y = 0; y < (uint)h; ++y) + for (ulong y = 0; y < (uint)h; ++y) { ulong srcOffset = (uint)x0Q4 >> SubpelBits; - for (x = 0; x < (uint)w; x += 4) + for (ulong x = 0; x < (uint)w; x += 4) { Vector128 vsrc0 = Sse41.ConvertToVector128Int16(&src[srcOffset + x]); Vector128 vsrc1 = Sse41.ConvertToVector128Int16(&src[srcOffset + x + 1]); @@ -94,8 +93,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Vector128 sum0123 = MultiplyAddAdjacent(vsrc0, vsrc1, vsrc2, vsrc3, vfilter, zero); - Sse.StoreScalar((float*)&dst[x], PackUnsignedSaturate(RoundShift(sum0123, const64), zero).AsSingle()); + Sse.StoreScalar((float*)&dst[x], + PackUnsignedSaturate(RoundShift(sum0123, const64), zero).AsSingle()); } + src += srcStride; dst += dstStride; } @@ -117,22 +118,20 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (Sse41.IsSupported && UseIntrinsics && xStepQ4 == 1 << SubpelBits) { ConvolveHorizSse41(src, srcStride, dst, dstStride, xFilters, x0Q4, w, h); - return; } - int x, y; - src -= SubpelTaps / 2 - 1; + src -= (SubpelTaps / 2) - 1; - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { int xQ4 = x0Q4; - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { byte* srcX = &src[xQ4 >> SubpelBits]; ref Array8 xFilter = ref xFilters[xQ4 & SubpelMask]; - int k, sum = 0; - for (k = 0; k < SubpelTaps; ++k) + int sum = 0; + for (int k = 0; k < SubpelTaps; ++k) { sum += srcX[k] * xFilter[k]; } @@ -140,6 +139,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst[x] = BitUtils.ClipPixel(BitUtils.RoundPowerOfTwo(sum, FilterBits)); xQ4 += xStepQ4; } + src += srcStride; dst += dstStride; } @@ -156,25 +156,26 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int w, int h) { - int x, y; - src -= SubpelTaps / 2 - 1; + src -= (SubpelTaps / 2) - 1; - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { int xQ4 = x0Q4; - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { byte* srcX = &src[xQ4 >> SubpelBits]; ref Array8 xFilter = ref xFilters[xQ4 & SubpelMask]; - int k, sum = 0; - for (k = 0; k < SubpelTaps; ++k) + int sum = 0; + for (int k = 0; k < SubpelTaps; ++k) { sum += srcX[k] * xFilter[k]; } - dst[x] = (byte)BitUtils.RoundPowerOfTwo(dst[x] + BitUtils.ClipPixel(BitUtils.RoundPowerOfTwo(sum, FilterBits)), 1); + dst[x] = (byte)BitUtils.RoundPowerOfTwo( + dst[x] + BitUtils.ClipPixel(BitUtils.RoundPowerOfTwo(sum, FilterBits)), 1); xQ4 += xStepQ4; } + src += srcStride; dst += dstStride; } @@ -203,18 +204,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp srcStride * 6, srcStride * 7); - ulong x, y; - src -= srcStride * (SubpelTaps / 2 - 1); + src -= srcStride * ((SubpelTaps / 2) - 1); fixed (Array8* yFilter = yFilters) { - Vector128 vfilter = Sse2.LoadVector128((short*)yFilter + (uint)(y0Q4 & SubpelMask) * 8); + Vector128 vfilter = Sse2.LoadVector128((short*)yFilter + ((uint)(y0Q4 & SubpelMask) * 8)); ulong srcBaseY = (uint)y0Q4 >> SubpelBits; - for (y = 0; y < (uint)h; ++y) + for (ulong y = 0; y < (uint)h; ++y) { ulong srcOffset = (srcBaseY + y) * (uint)srcStride; - for (x = 0; x < (uint)w; x += 4) + for (ulong x = 0; x < (uint)w; x += 4) { Vector256 vsrc = Avx2.GatherVector256((uint*)&src[srcOffset + x], indices, 1).AsInt32(); @@ -240,8 +240,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Vector128 sum0123 = MultiplyAddAdjacent(vsrc0, vsrc1, vsrc2, vsrc3, vfilter, zero); - Sse.StoreScalar((float*)&dst[x], PackUnsignedSaturate(RoundShift(sum0123, const64), zero).AsSingle()); + Sse.StoreScalar((float*)&dst[x], + PackUnsignedSaturate(RoundShift(sum0123, const64), zero).AsSingle()); } + dst += dstStride; } } @@ -262,22 +264,20 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (Avx2.IsSupported && UseIntrinsics && yStepQ4 == 1 << SubpelBits) { ConvolveVertAvx2(src, srcStride, dst, dstStride, yFilters, y0Q4, w, h); - return; } - int x, y; - src -= srcStride * (SubpelTaps / 2 - 1); + src -= srcStride * ((SubpelTaps / 2) - 1); - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { int yQ4 = y0Q4; - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { byte* srcY = &src[(yQ4 >> SubpelBits) * srcStride]; ref Array8 yFilter = ref yFilters[yQ4 & SubpelMask]; - int k, sum = 0; - for (k = 0; k < SubpelTaps; ++k) + int sum = 0; + for (int k = 0; k < SubpelTaps; ++k) { sum += srcY[k * srcStride] * yFilter[k]; } @@ -285,6 +285,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst[y * dstStride] = BitUtils.ClipPixel(BitUtils.RoundPowerOfTwo(sum, FilterBits)); yQ4 += yStepQ4; } + ++src; ++dst; } @@ -301,18 +302,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int w, int h) { - int x, y; - src -= srcStride * (SubpelTaps / 2 - 1); + src -= srcStride * ((SubpelTaps / 2) - 1); - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { int yQ4 = y0Q4; - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { byte* srcY = &src[(yQ4 >> SubpelBits) * srcStride]; ref Array8 yFilter = ref yFilters[yQ4 & SubpelMask]; - int k, sum = 0; - for (k = 0; k < SubpelTaps; ++k) + int sum = 0; + for (int k = 0; k < SubpelTaps; ++k) { sum += srcY[k * srcStride] * yFilter[k]; } @@ -321,6 +321,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst[y * dstStride] + BitUtils.ClipPixel(BitUtils.RoundPowerOfTwo(sum, FilterBits)), 1); yQ4 += yStepQ4; } + ++src; ++dst; } @@ -420,15 +421,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // ==> yStepQ4 = 64. Since w and h are at most 16, the temp buffer is still // big enough. byte* temp = stackalloc byte[64 * 135]; - int intermediateHeight = (((h - 1) * yStepQ4 + y0Q4) >> SubpelBits) + SubpelTaps; + int intermediateHeight = ((((h - 1) * yStepQ4) + y0Q4) >> SubpelBits) + SubpelTaps; Debug.Assert(w <= 64); Debug.Assert(h <= 64); Debug.Assert(yStepQ4 <= 32 || (yStepQ4 <= 64 && h <= 32)); Debug.Assert(xStepQ4 <= 64); - ConvolveHoriz(src - srcStride * (SubpelTaps / 2 - 1), srcStride, temp, 64, filter, x0Q4, xStepQ4, w, intermediateHeight); - ConvolveVert(temp + 64 * (SubpelTaps / 2 - 1), 64, dst, dstStride, filter, y0Q4, yStepQ4, w, h); + ConvolveHoriz(src - (srcStride * ((SubpelTaps / 2) - 1)), srcStride, temp, 64, filter, x0Q4, xStepQ4, w, + intermediateHeight); + ConvolveVert(temp + (64 * ((SubpelTaps / 2) - 1)), 64, dst, dstStride, filter, y0Q4, yStepQ4, w, h); } public static unsafe void Convolve8Avg( @@ -489,11 +491,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int w, int h) { - int x, y; - - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { dst[x] = (byte)BitUtils.RoundPowerOfTwo(dst[x] + src[x], 1); } @@ -611,18 +611,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int h, int bd) { - int x, y; - src -= SubpelTaps / 2 - 1; + src -= (SubpelTaps / 2) - 1; - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { int xQ4 = x0Q4; - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { ushort* srcX = &src[xQ4 >> SubpelBits]; ref Array8 xFilter = ref xFilters[xQ4 & SubpelMask]; - int k, sum = 0; - for (k = 0; k < SubpelTaps; ++k) + int sum = 0; + for (int k = 0; k < SubpelTaps; ++k) { sum += srcX[k] * xFilter[k]; } @@ -630,6 +629,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst[x] = BitUtils.ClipPixelHighbd(BitUtils.RoundPowerOfTwo(sum, FilterBits), bd); xQ4 += xStepQ4; } + src += srcStride; dst += dstStride; } @@ -647,25 +647,26 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int h, int bd) { - int x, y; - src -= SubpelTaps / 2 - 1; + src -= (SubpelTaps / 2) - 1; - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { int xQ4 = x0Q4; - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { ushort* srcX = &src[xQ4 >> SubpelBits]; ref Array8 xFilter = ref xFilters[xQ4 & SubpelMask]; - int k, sum = 0; - for (k = 0; k < SubpelTaps; ++k) + int sum = 0; + for (int k = 0; k < SubpelTaps; ++k) { sum += srcX[k] * xFilter[k]; } - dst[x] = (ushort)BitUtils.RoundPowerOfTwo(dst[x] + BitUtils.ClipPixelHighbd(BitUtils.RoundPowerOfTwo(sum, FilterBits), bd), 1); + dst[x] = (ushort)BitUtils.RoundPowerOfTwo( + dst[x] + BitUtils.ClipPixelHighbd(BitUtils.RoundPowerOfTwo(sum, FilterBits), bd), 1); xQ4 += xStepQ4; } + src += srcStride; dst += dstStride; } @@ -683,18 +684,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int h, int bd) { - int x, y; - src -= srcStride * (SubpelTaps / 2 - 1); + src -= srcStride * ((SubpelTaps / 2) - 1); - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { int yQ4 = y0Q4; - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { ushort* srcY = &src[(yQ4 >> SubpelBits) * srcStride]; ref Array8 yFilter = ref yFilters[yQ4 & SubpelMask]; - int k, sum = 0; - for (k = 0; k < SubpelTaps; ++k) + int sum = 0; + for (int k = 0; k < SubpelTaps; ++k) { sum += srcY[k * srcStride] * yFilter[k]; } @@ -702,6 +702,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst[y * dstStride] = BitUtils.ClipPixelHighbd(BitUtils.RoundPowerOfTwo(sum, FilterBits), bd); yQ4 += yStepQ4; } + ++src; ++dst; } @@ -719,26 +720,27 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int h, int bd) { - int x, y; - src -= srcStride * (SubpelTaps / 2 - 1); + src -= srcStride * ((SubpelTaps / 2) - 1); - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { int yQ4 = y0Q4; - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { ushort* srcY = &src[(yQ4 >> SubpelBits) * srcStride]; ref Array8 yFilter = ref yFilters[yQ4 & SubpelMask]; - int k, sum = 0; - for (k = 0; k < SubpelTaps; ++k) + int sum = 0; + for (int k = 0; k < SubpelTaps; ++k) { sum += srcY[k * srcStride] * yFilter[k]; } dst[y * dstStride] = (ushort)BitUtils.RoundPowerOfTwo( - dst[y * dstStride] + BitUtils.ClipPixelHighbd(BitUtils.RoundPowerOfTwo(sum, FilterBits), bd), 1); + dst[y * dstStride] + BitUtils.ClipPixelHighbd(BitUtils.RoundPowerOfTwo(sum, FilterBits), bd), + 1); yQ4 += yStepQ4; } + ++src; ++dst; } @@ -771,15 +773,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // --Require an additional SubpelTaps rows for the 8-tap filter tails. // --((64 - 1) * 32 + 15) >> 4 + 8 = 135. ushort* temp = stackalloc ushort[64 * 135]; - int intermediateHeight = (((h - 1) * yStepQ4 + y0Q4) >> SubpelBits) + SubpelTaps; + int intermediateHeight = ((((h - 1) * yStepQ4) + y0Q4) >> SubpelBits) + SubpelTaps; Debug.Assert(w <= 64); Debug.Assert(h <= 64); Debug.Assert(yStepQ4 <= 32); Debug.Assert(xStepQ4 <= 32); - HighbdConvolveHoriz(src - srcStride * (SubpelTaps / 2 - 1), srcStride, temp, 64, filter, x0Q4, xStepQ4, w, intermediateHeight, bd); - HighbdConvolveVert(temp + 64 * (SubpelTaps / 2 - 1), 64, dst, dstStride, filter, y0Q4, yStepQ4, w, h, bd); + HighbdConvolveHoriz(src - (srcStride * ((SubpelTaps / 2) - 1)), srcStride, temp, 64, filter, x0Q4, xStepQ4, + w, intermediateHeight, bd); + HighbdConvolveVert(temp + (64 * ((SubpelTaps / 2) - 1)), 64, dst, dstStride, filter, y0Q4, yStepQ4, w, h, + bd); } public static unsafe void HighbdConvolve8Horiz( @@ -928,11 +932,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int h, int bd) { - int x, y; - - for (y = 0; y < h; ++y) + for (int y = 0; y < h; ++y) { - for (x = 0; x < w; ++x) + for (int x = 0; x < w; ++x) { dst[x] = (ushort)BitUtils.RoundPowerOfTwo(dst[x] + src[x], 1); } @@ -942,4 +944,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Filter.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Filter.cs index a32221e09..1dbbc8de5 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Filter.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Filter.cs @@ -9,4 +9,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp public const int SubpelShifts = 1 << SubpelBits; public const int SubpelTaps = 8; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/IntraPred.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/IntraPred.cs index 8a570ed59..df72e160d 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/IntraPred.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/IntraPred.cs @@ -1,4 +1,4 @@ -using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Common; namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { @@ -6,22 +6,22 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { private static unsafe ref byte Dst(byte* dst, int stride, int x, int y) { - return ref dst[x + y * stride]; + return ref dst[x + (y * stride)]; } private static unsafe ref ushort Dst(ushort* dst, int stride, int x, int y) { - return ref dst[x + y * stride]; + return ref dst[x + (y * stride)]; } private static byte Avg3(byte a, byte b, byte c) { - return (byte)((a + 2 * b + c + 2) >> 2); + return (byte)((a + (2 * b) + c + 2) >> 2); } private static ushort Avg3(ushort a, ushort b, ushort c) { - return (ushort)((a + 2 * b + c + 2) >> 2); + return (ushort)((a + (2 * b) + c + 2) >> 2); } private static byte Avg2(byte a, byte b) @@ -34,26 +34,25 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp return (ushort)((a + b + 1) >> 1); } - public static unsafe void D207Predictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D207Predictor8X8(byte* dst, int stride, byte* above, byte* left) { D207Predictor(dst, stride, 8, above, left); } - public static unsafe void D207Predictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D207Predictor16X16(byte* dst, int stride, byte* above, byte* left) { D207Predictor(dst, stride, 16, above, left); } - public static unsafe void D207Predictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D207Predictor32X32(byte* dst, int stride, byte* above, byte* left) { D207Predictor(dst, stride, 32, above, left); } private static unsafe void D207Predictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int r, c; // First column - for (r = 0; r < bs - 1; ++r) + for (int r = 0; r < bs - 1; ++r) { dst[r * stride] = Avg2(left[r], left[r + 1]); } @@ -62,7 +61,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst++; // Second column - for (r = 0; r < bs - 2; ++r) + for (int r = 0; r < bs - 2; ++r) { dst[r * stride] = Avg3(left[r], left[r + 1], left[r + 2]); } @@ -72,64 +71,63 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst++; // Rest of last row - for (c = 0; c < bs - 2; ++c) + for (int c = 0; c < bs - 2; ++c) { - dst[(bs - 1) * stride + c] = left[bs - 1]; + dst[((bs - 1) * stride) + c] = left[bs - 1]; } - for (r = bs - 2; r >= 0; --r) + for (int r = bs - 2; r >= 0; --r) { - for (c = 0; c < bs - 2; ++c) + for (int c = 0; c < bs - 2; ++c) { - dst[r * stride + c] = dst[(r + 1) * stride + c - 2]; + dst[(r * stride) + c] = dst[((r + 1) * stride) + c - 2]; } } } - public static unsafe void D63Predictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D63Predictor8X8(byte* dst, int stride, byte* above, byte* left) { D63Predictor(dst, stride, 8, above, left); } - public static unsafe void D63Predictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D63Predictor16X16(byte* dst, int stride, byte* above, byte* left) { D63Predictor(dst, stride, 16, above, left); } - public static unsafe void D63Predictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D63Predictor32X32(byte* dst, int stride, byte* above, byte* left) { D63Predictor(dst, stride, 32, above, left); } private static unsafe void D63Predictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int r, c; - int size; - for (c = 0; c < bs; ++c) + for (int c = 0; c < bs; ++c) { dst[c] = Avg2(above[c], above[c + 1]); dst[stride + c] = Avg3(above[c], above[c + 1], above[c + 2]); } - for (r = 2, size = bs - 2; r < bs; r += 2, --size) + + for (int r = 2, size = bs - 2; r < bs; r += 2, --size) { - MemoryUtil.Copy(dst + (r + 0) * stride, dst + (r >> 1), size); - MemoryUtil.Fill(dst + (r + 0) * stride + size, above[bs - 1], bs - size); - MemoryUtil.Copy(dst + (r + 1) * stride, dst + stride + (r >> 1), size); - MemoryUtil.Fill(dst + (r + 1) * stride + size, above[bs - 1], bs - size); + MemoryUtil.Copy(dst + ((r + 0) * stride), dst + (r >> 1), size); + MemoryUtil.Fill(dst + ((r + 0) * stride) + size, above[bs - 1], bs - size); + MemoryUtil.Copy(dst + ((r + 1) * stride), dst + stride + (r >> 1), size); + MemoryUtil.Fill(dst + ((r + 1) * stride) + size, above[bs - 1], bs - size); } } - public static unsafe void D45Predictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D45Predictor8X8(byte* dst, int stride, byte* above, byte* left) { D45Predictor(dst, stride, 8, above, left); } - public static unsafe void D45Predictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D45Predictor16X16(byte* dst, int stride, byte* above, byte* left) { D45Predictor(dst, stride, 16, above, left); } - public static unsafe void D45Predictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D45Predictor32X32(byte* dst, int stride, byte* above, byte* left) { D45Predictor(dst, stride, 32, above, left); } @@ -138,15 +136,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { byte aboveRight = above[bs - 1]; byte* dstRow0 = dst; - int x, size; - for (x = 0; x < bs - 1; ++x) + for (int x = 0; x < bs - 1; ++x) { dst[x] = Avg3(above[x], above[x + 1], above[x + 2]); } + dst[bs - 1] = aboveRight; dst += stride; - for (x = 1, size = bs - 2; x < bs; ++x, --size) + for (int x = 1, size = bs - 2; x < bs; ++x, --size) { MemoryUtil.Copy(dst, dstRow0 + x, size); MemoryUtil.Fill(dst + size, aboveRight, x + 1); @@ -154,27 +152,25 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } } - public static unsafe void D117Predictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D117Predictor8X8(byte* dst, int stride, byte* above, byte* left) { D117Predictor(dst, stride, 8, above, left); } - public static unsafe void D117Predictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D117Predictor16X16(byte* dst, int stride, byte* above, byte* left) { D117Predictor(dst, stride, 16, above, left); } - public static unsafe void D117Predictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D117Predictor32X32(byte* dst, int stride, byte* above, byte* left) { D117Predictor(dst, stride, 32, above, left); } private static unsafe void D117Predictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int r, c; - // First row - for (c = 0; c < bs; c++) + for (int c = 0; c < bs; c++) { dst[c] = Avg2(above[c - 1], above[c]); } @@ -183,7 +179,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // Second row dst[0] = Avg3(left[0], above[-1], above[0]); - for (c = 1; c < bs; c++) + for (int c = 1; c < bs; c++) { dst[c] = Avg3(above[c - 2], above[c - 1], above[c]); } @@ -192,83 +188,82 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // The rest of first col dst[0] = Avg3(above[-1], left[0], left[1]); - for (r = 3; r < bs; ++r) + for (int r = 3; r < bs; ++r) { dst[(r - 2) * stride] = Avg3(left[r - 3], left[r - 2], left[r - 1]); } // The rest of the block - for (r = 2; r < bs; ++r) + for (int r = 2; r < bs; ++r) { - for (c = 1; c < bs; c++) + for (int c = 1; c < bs; c++) { - dst[c] = dst[-2 * stride + c - 1]; + dst[c] = dst[(-2 * stride) + c - 1]; } dst += stride; } } - public static unsafe void D135Predictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D135Predictor8X8(byte* dst, int stride, byte* above, byte* left) { D135Predictor(dst, stride, 8, above, left); } - public static unsafe void D135Predictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D135Predictor16X16(byte* dst, int stride, byte* above, byte* left) { D135Predictor(dst, stride, 16, above, left); } - public static unsafe void D135Predictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D135Predictor32X32(byte* dst, int stride, byte* above, byte* left) { D135Predictor(dst, stride, 32, above, left); } private static unsafe void D135Predictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int i; byte* border = stackalloc byte[32 + 32 - 1]; // outer border from bottom-left to top-right // Dst(dst, stride, bs, bs - 2)[0], i.e., border starting at bottom-left - for (i = 0; i < bs - 2; ++i) + for (int i = 0; i < bs - 2; ++i) { border[i] = Avg3(left[bs - 3 - i], left[bs - 2 - i], left[bs - 1 - i]); } + border[bs - 2] = Avg3(above[-1], left[0], left[1]); border[bs - 1] = Avg3(left[0], above[-1], above[0]); border[bs - 0] = Avg3(above[-1], above[0], above[1]); // dst[0][2, size), i.e., remaining top border ascending - for (i = 0; i < bs - 2; ++i) + for (int i = 0; i < bs - 2; ++i) { border[bs + 1 + i] = Avg3(above[i], above[i + 1], above[i + 2]); } - for (i = 0; i < bs; ++i) + for (int i = 0; i < bs; ++i) { - MemoryUtil.Copy(dst + i * stride, border + bs - 1 - i, bs); + MemoryUtil.Copy(dst + (i * stride), border + bs - 1 - i, bs); } } - public static unsafe void D153Predictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D153Predictor8X8(byte* dst, int stride, byte* above, byte* left) { D153Predictor(dst, stride, 8, above, left); } - public static unsafe void D153Predictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D153Predictor16X16(byte* dst, int stride, byte* above, byte* left) { D153Predictor(dst, stride, 16, above, left); } - public static unsafe void D153Predictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D153Predictor32X32(byte* dst, int stride, byte* above, byte* left) { D153Predictor(dst, stride, 32, above, left); } private static unsafe void D153Predictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int r, c; dst[0] = Avg2(above[-1], left[0]); - for (r = 1; r < bs; r++) + for (int r = 1; r < bs; r++) { dst[r * stride] = Avg2(left[r - 1], left[r]); } @@ -277,23 +272,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst[0] = Avg3(left[0], above[-1], above[0]); dst[stride] = Avg3(above[-1], left[0], left[1]); - for (r = 2; r < bs; r++) + for (int r = 2; r < bs; r++) { dst[r * stride] = Avg3(left[r - 2], left[r - 1], left[r]); } dst++; - for (c = 0; c < bs - 2; c++) + for (int c = 0; c < bs - 2; c++) { dst[c] = Avg3(above[c - 1], above[c], above[c + 1]); } dst += stride; - for (r = 1; r < bs; ++r) + for (int r = 1; r < bs; ++r) { - for (c = 0; c < bs - 2; c++) + for (int c = 0; c < bs - 2; c++) { dst[c] = dst[-stride + c - 2]; } @@ -302,96 +297,91 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } } - public static unsafe void VPredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void VPredictor4X4(byte* dst, int stride, byte* above, byte* left) { VPredictor(dst, stride, 4, above, left); } - public static unsafe void VPredictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void VPredictor8X8(byte* dst, int stride, byte* above, byte* left) { VPredictor(dst, stride, 8, above, left); } - public static unsafe void VPredictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void VPredictor16X16(byte* dst, int stride, byte* above, byte* left) { VPredictor(dst, stride, 16, above, left); } - public static unsafe void VPredictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void VPredictor32X32(byte* dst, int stride, byte* above, byte* left) { VPredictor(dst, stride, 32, above, left); } private static unsafe void VPredictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int r; - - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Copy(dst, above, bs); dst += stride; } } - public static unsafe void HPredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void HPredictor4X4(byte* dst, int stride, byte* above, byte* left) { HPredictor(dst, stride, 4, above, left); } - public static unsafe void HPredictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void HPredictor8X8(byte* dst, int stride, byte* above, byte* left) { HPredictor(dst, stride, 8, above, left); } - public static unsafe void HPredictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void HPredictor16X16(byte* dst, int stride, byte* above, byte* left) { HPredictor(dst, stride, 16, above, left); } - public static unsafe void HPredictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void HPredictor32X32(byte* dst, int stride, byte* above, byte* left) { HPredictor(dst, stride, 32, above, left); } private static unsafe void HPredictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int r; - - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, left[r], bs); dst += stride; } } - public static unsafe void TMPredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void TmPredictor4X4(byte* dst, int stride, byte* above, byte* left) { - TMPredictor(dst, stride, 4, above, left); + TmPredictor(dst, stride, 4, above, left); } - public static unsafe void TMPredictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void TmPredictor8X8(byte* dst, int stride, byte* above, byte* left) { - TMPredictor(dst, stride, 8, above, left); + TmPredictor(dst, stride, 8, above, left); } - public static unsafe void TMPredictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void TmPredictor16X16(byte* dst, int stride, byte* above, byte* left) { - TMPredictor(dst, stride, 16, above, left); + TmPredictor(dst, stride, 16, above, left); } - public static unsafe void TMPredictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void TmPredictor32X32(byte* dst, int stride, byte* above, byte* left) { - TMPredictor(dst, stride, 32, above, left); + TmPredictor(dst, stride, 32, above, left); } - private static unsafe void TMPredictor(byte* dst, int stride, int bs, byte* above, byte* left) + private static unsafe void TmPredictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int r, c; int yTopLeft = above[-1]; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { - for (c = 0; c < bs; c++) + for (int c = 0; c < bs; c++) { dst[c] = BitUtils.ClipPixel(left[r] + above[c] - yTopLeft); } @@ -400,201 +390,200 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } } - public static unsafe void Dc128Predictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void Dc128Predictor4X4(byte* dst, int stride, byte* above, byte* left) { Dc128Predictor(dst, stride, 4, above, left); } - public static unsafe void Dc128Predictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void Dc128Predictor8X8(byte* dst, int stride, byte* above, byte* left) { Dc128Predictor(dst, stride, 8, above, left); } - public static unsafe void Dc128Predictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void Dc128Predictor16X16(byte* dst, int stride, byte* above, byte* left) { Dc128Predictor(dst, stride, 16, above, left); } - public static unsafe void Dc128Predictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void Dc128Predictor32X32(byte* dst, int stride, byte* above, byte* left) { Dc128Predictor(dst, stride, 32, above, left); } private static unsafe void Dc128Predictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int r; - - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, (byte)128, bs); dst += stride; } } - public static unsafe void DcLeftPredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcLeftPredictor4X4(byte* dst, int stride, byte* above, byte* left) { DcLeftPredictor(dst, stride, 4, above, left); } - public static unsafe void DcLeftPredictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcLeftPredictor8X8(byte* dst, int stride, byte* above, byte* left) { DcLeftPredictor(dst, stride, 8, above, left); } - public static unsafe void DcLeftPredictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcLeftPredictor16X16(byte* dst, int stride, byte* above, byte* left) { DcLeftPredictor(dst, stride, 16, above, left); } - public static unsafe void DcLeftPredictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcLeftPredictor32X32(byte* dst, int stride, byte* above, byte* left) { DcLeftPredictor(dst, stride, 32, above, left); } private static unsafe void DcLeftPredictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int i, r, expectedDc, sum = 0; + int sum = 0; - for (i = 0; i < bs; i++) + for (int i = 0; i < bs; i++) { sum += left[i]; } - expectedDc = (sum + (bs >> 1)) / bs; + int expectedDc = (sum + (bs >> 1)) / bs; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, (byte)expectedDc, bs); dst += stride; } } - public static unsafe void DcTopPredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcTopPredictor4X4(byte* dst, int stride, byte* above, byte* left) { DcTopPredictor(dst, stride, 4, above, left); } - public static unsafe void DcTopPredictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcTopPredictor8X8(byte* dst, int stride, byte* above, byte* left) { DcTopPredictor(dst, stride, 8, above, left); } - public static unsafe void DcTopPredictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcTopPredictor16X16(byte* dst, int stride, byte* above, byte* left) { DcTopPredictor(dst, stride, 16, above, left); } - public static unsafe void DcTopPredictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcTopPredictor32X32(byte* dst, int stride, byte* above, byte* left) { DcTopPredictor(dst, stride, 32, above, left); } private static unsafe void DcTopPredictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int i, r, expectedDc, sum = 0; + int sum = 0; - for (i = 0; i < bs; i++) + for (int i = 0; i < bs; i++) { sum += above[i]; } - expectedDc = (sum + (bs >> 1)) / bs; + int expectedDc = (sum + (bs >> 1)) / bs; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, (byte)expectedDc, bs); dst += stride; } } - public static unsafe void DcPredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcPredictor4X4(byte* dst, int stride, byte* above, byte* left) { DcPredictor(dst, stride, 4, above, left); } - public static unsafe void DcPredictor8x8(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcPredictor8X8(byte* dst, int stride, byte* above, byte* left) { DcPredictor(dst, stride, 8, above, left); } - public static unsafe void DcPredictor16x16(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcPredictor16X16(byte* dst, int stride, byte* above, byte* left) { DcPredictor(dst, stride, 16, above, left); } - public static unsafe void DcPredictor32x32(byte* dst, int stride, byte* above, byte* left) + public static unsafe void DcPredictor32X32(byte* dst, int stride, byte* above, byte* left) { DcPredictor(dst, stride, 32, above, left); } private static unsafe void DcPredictor(byte* dst, int stride, int bs, byte* above, byte* left) { - int i, r, expectedDc, sum = 0; + int sum = 0; int count = 2 * bs; - for (i = 0; i < bs; i++) + for (int i = 0; i < bs; i++) { sum += above[i]; sum += left[i]; } - expectedDc = (sum + (count >> 1)) / count; + int expectedDc = (sum + (count >> 1)) / count; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, (byte)expectedDc, bs); dst += stride; } } - public static unsafe void HePredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void HePredictor4X4(byte* dst, int stride, byte* above, byte* left) { byte h = above[-1]; - byte I = left[0]; + byte i = left[0]; byte j = left[1]; byte k = left[2]; byte l = left[3]; - MemoryUtil.Fill(dst + stride * 0, Avg3(h, I, j), 4); - MemoryUtil.Fill(dst + stride * 1, Avg3(I, j, k), 4); - MemoryUtil.Fill(dst + stride * 2, Avg3(j, k, l), 4); - MemoryUtil.Fill(dst + stride * 3, Avg3(k, l, l), 4); + MemoryUtil.Fill(dst + (stride * 0), Avg3(h, i, j), 4); + MemoryUtil.Fill(dst + (stride * 1), Avg3(i, j, k), 4); + MemoryUtil.Fill(dst + (stride * 2), Avg3(j, k, l), 4); + MemoryUtil.Fill(dst + (stride * 3), Avg3(k, l, l), 4); } - public static unsafe void VePredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void VePredictor4X4(byte* dst, int stride, byte* above, byte* left) { byte h = above[-1]; - byte I = above[0]; + byte i = above[0]; byte j = above[1]; byte k = above[2]; byte l = above[3]; byte m = above[4]; - dst[0] = Avg3(h, I, j); - dst[1] = Avg3(I, j, k); + dst[0] = Avg3(h, i, j); + dst[1] = Avg3(i, j, k); dst[2] = Avg3(j, k, l); dst[3] = Avg3(k, l, m); - MemoryUtil.Copy(dst + stride * 1, dst, 4); - MemoryUtil.Copy(dst + stride * 2, dst, 4); - MemoryUtil.Copy(dst + stride * 3, dst, 4); + MemoryUtil.Copy(dst + (stride * 1), dst, 4); + MemoryUtil.Copy(dst + (stride * 2), dst, 4); + MemoryUtil.Copy(dst + (stride * 3), dst, 4); } - public static unsafe void D207Predictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D207Predictor4X4(byte* dst, int stride, byte* above, byte* left) { - byte I = left[0]; + byte i = left[0]; byte j = left[1]; byte k = left[2]; byte l = left[3]; - Dst(dst, stride, 0, 0) = Avg2(I, j); + Dst(dst, stride, 0, 0) = Avg2(i, j); Dst(dst, stride, 2, 0) = Dst(dst, stride, 0, 1) = Avg2(j, k); Dst(dst, stride, 2, 1) = Dst(dst, stride, 0, 2) = Avg2(k, l); - Dst(dst, stride, 1, 0) = Avg3(I, j, k); + Dst(dst, stride, 1, 0) = Avg3(i, j, k); Dst(dst, stride, 3, 0) = Dst(dst, stride, 1, 1) = Avg3(j, k, l); Dst(dst, stride, 3, 1) = Dst(dst, stride, 1, 2) = Avg3(k, l, l); - Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 0, 3) = Dst(dst, stride, 1, 3) = Dst(dst, stride, 2, 3) = Dst(dst, stride, 3, 3) = l; + Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 0, 3) = + Dst(dst, stride, 1, 3) = Dst(dst, stride, 2, 3) = Dst(dst, stride, 3, 3) = l; } - public static unsafe void D63Predictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D63Predictor4X4(byte* dst, int stride, byte* above, byte* left) { byte a = above[0]; byte b = above[1]; @@ -616,7 +605,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Dst(dst, stride, 3, 3) = Avg3(e, f, g); // Differs from vp8 } - public static unsafe void D63ePredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D63EPredictor4X4(byte* dst, int stride, byte* above, byte* left) { byte a = above[0]; byte b = above[1]; @@ -639,7 +628,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Dst(dst, stride, 3, 3) = Avg3(f, g, h); } - public static unsafe void D45Predictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D45Predictor4X4(byte* dst, int stride, byte* above, byte* left) { byte a = above[0]; byte b = above[1]; @@ -652,13 +641,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Dst(dst, stride, 0, 0) = Avg3(a, b, c); Dst(dst, stride, 1, 0) = Dst(dst, stride, 0, 1) = Avg3(b, c, d); Dst(dst, stride, 2, 0) = Dst(dst, stride, 1, 1) = Dst(dst, stride, 0, 2) = Avg3(c, d, e); - Dst(dst, stride, 3, 0) = Dst(dst, stride, 2, 1) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 3) = Avg3(d, e, f); + Dst(dst, stride, 3, 0) = + Dst(dst, stride, 2, 1) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 3) = Avg3(d, e, f); Dst(dst, stride, 3, 1) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 1, 3) = Avg3(e, f, g); Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 3) = Avg3(f, g, h); Dst(dst, stride, 3, 3) = h; // differs from vp8 } - public static unsafe void D45ePredictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D45EPredictor4X4(byte* dst, int stride, byte* above, byte* left) { byte a = above[0]; byte b = above[1]; @@ -671,15 +661,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Dst(dst, stride, 0, 0) = Avg3(a, b, c); Dst(dst, stride, 1, 0) = Dst(dst, stride, 0, 1) = Avg3(b, c, d); Dst(dst, stride, 2, 0) = Dst(dst, stride, 1, 1) = Dst(dst, stride, 0, 2) = Avg3(c, d, e); - Dst(dst, stride, 3, 0) = Dst(dst, stride, 2, 1) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 3) = Avg3(d, e, f); + Dst(dst, stride, 3, 0) = + Dst(dst, stride, 2, 1) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 3) = Avg3(d, e, f); Dst(dst, stride, 3, 1) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 1, 3) = Avg3(e, f, g); Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 3) = Avg3(f, g, h); Dst(dst, stride, 3, 3) = Avg3(g, h, h); } - public static unsafe void D117Predictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D117Predictor4X4(byte* dst, int stride, byte* above, byte* left) { - byte I = left[0]; + byte i = left[0]; byte j = left[1]; byte k = left[2]; byte x = above[-1]; @@ -692,17 +683,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Dst(dst, stride, 2, 0) = Dst(dst, stride, 3, 2) = Avg2(b, c); Dst(dst, stride, 3, 0) = Avg2(c, d); - Dst(dst, stride, 0, 3) = Avg3(k, j, I); - Dst(dst, stride, 0, 2) = Avg3(j, I, x); - Dst(dst, stride, 0, 1) = Dst(dst, stride, 1, 3) = Avg3(I, x, a); + Dst(dst, stride, 0, 3) = Avg3(k, j, i); + Dst(dst, stride, 0, 2) = Avg3(j, i, x); + Dst(dst, stride, 0, 1) = Dst(dst, stride, 1, 3) = Avg3(i, x, a); Dst(dst, stride, 1, 1) = Dst(dst, stride, 2, 3) = Avg3(x, a, b); Dst(dst, stride, 2, 1) = Dst(dst, stride, 3, 3) = Avg3(a, b, c); Dst(dst, stride, 3, 1) = Avg3(b, c, d); } - public static unsafe void D135Predictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D135Predictor4X4(byte* dst, int stride, byte* above, byte* left) { - byte I = left[0]; + byte i = left[0]; byte j = left[1]; byte k = left[2]; byte l = left[3]; @@ -712,17 +703,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp byte c = above[2]; byte d = above[3]; Dst(dst, stride, 0, 3) = Avg3(j, k, l); - Dst(dst, stride, 1, 3) = Dst(dst, stride, 0, 2) = Avg3(I, j, k); - Dst(dst, stride, 2, 3) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 1) = Avg3(x, I, j); - Dst(dst, stride, 3, 3) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 1, 1) = Dst(dst, stride, 0, 0) = Avg3(a, x, I); + Dst(dst, stride, 1, 3) = Dst(dst, stride, 0, 2) = Avg3(i, j, k); + Dst(dst, stride, 2, 3) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 1) = Avg3(x, i, j); + Dst(dst, stride, 3, 3) = + Dst(dst, stride, 2, 2) = Dst(dst, stride, 1, 1) = Dst(dst, stride, 0, 0) = Avg3(a, x, i); Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 1) = Dst(dst, stride, 1, 0) = Avg3(b, a, x); Dst(dst, stride, 3, 1) = Dst(dst, stride, 2, 0) = Avg3(c, b, a); Dst(dst, stride, 3, 0) = Avg3(d, c, b); } - public static unsafe void D153Predictor4x4(byte* dst, int stride, byte* above, byte* left) + public static unsafe void D153Predictor4X4(byte* dst, int stride, byte* above, byte* left) { - byte I = left[0]; + byte i = left[0]; byte j = left[1]; byte k = left[2]; byte l = left[3]; @@ -730,131 +722,133 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp byte a = above[0]; byte b = above[1]; byte c = above[2]; - Dst(dst, stride, 0, 0) = Dst(dst, stride, 2, 1) = Avg2(I, x); - Dst(dst, stride, 0, 1) = Dst(dst, stride, 2, 2) = Avg2(j, I); + Dst(dst, stride, 0, 0) = Dst(dst, stride, 2, 1) = Avg2(i, x); + Dst(dst, stride, 0, 1) = Dst(dst, stride, 2, 2) = Avg2(j, i); Dst(dst, stride, 0, 2) = Dst(dst, stride, 2, 3) = Avg2(k, j); Dst(dst, stride, 0, 3) = Avg2(l, k); Dst(dst, stride, 3, 0) = Avg3(a, b, c); Dst(dst, stride, 2, 0) = Avg3(x, a, b); - Dst(dst, stride, 1, 0) = Dst(dst, stride, 3, 1) = Avg3(I, x, a); - Dst(dst, stride, 1, 1) = Dst(dst, stride, 3, 2) = Avg3(j, I, x); - Dst(dst, stride, 1, 2) = Dst(dst, stride, 3, 3) = Avg3(k, j, I); + Dst(dst, stride, 1, 0) = Dst(dst, stride, 3, 1) = Avg3(i, x, a); + Dst(dst, stride, 1, 1) = Dst(dst, stride, 3, 2) = Avg3(j, i, x); + Dst(dst, stride, 1, 2) = Dst(dst, stride, 3, 3) = Avg3(k, j, i); Dst(dst, stride, 1, 3) = Avg3(l, k, j); } - public static unsafe void HighbdD207Predictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD207Predictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD207Predictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdD207Predictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD207Predictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD207Predictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdD207Predictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD207Predictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD207Predictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdD207Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdD207Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int r, c; - // First column. - for (r = 0; r < bs - 1; ++r) + for (int r = 0; r < bs - 1; ++r) { dst[r * stride] = Avg2(left[r], left[r + 1]); } + dst[(bs - 1) * stride] = left[bs - 1]; dst++; // Second column. - for (r = 0; r < bs - 2; ++r) + for (int r = 0; r < bs - 2; ++r) { dst[r * stride] = Avg3(left[r], left[r + 1], left[r + 2]); } + dst[(bs - 2) * stride] = Avg3(left[bs - 2], left[bs - 1], left[bs - 1]); dst[(bs - 1) * stride] = left[bs - 1]; dst++; // Rest of last row. - for (c = 0; c < bs - 2; ++c) + for (int c = 0; c < bs - 2; ++c) { - dst[(bs - 1) * stride + c] = left[bs - 1]; + dst[((bs - 1) * stride) + c] = left[bs - 1]; } - for (r = bs - 2; r >= 0; --r) + for (int r = bs - 2; r >= 0; --r) { - for (c = 0; c < bs - 2; ++c) + for (int c = 0; c < bs - 2; ++c) { - dst[r * stride + c] = dst[(r + 1) * stride + c - 2]; + dst[(r * stride) + c] = dst[((r + 1) * stride) + c - 2]; } } } - public static unsafe void HighbdD63Predictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD63Predictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD63Predictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdD63Predictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD63Predictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD63Predictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdD63Predictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD63Predictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD63Predictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdD63Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdD63Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int r, c; - int size; - for (c = 0; c < bs; ++c) + for (int c = 0; c < bs; ++c) { dst[c] = Avg2(above[c], above[c + 1]); dst[stride + c] = Avg3(above[c], above[c + 1], above[c + 2]); } - for (r = 2, size = bs - 2; r < bs; r += 2, --size) + + for (int r = 2, size = bs - 2; r < bs; r += 2, --size) { - MemoryUtil.Copy(dst + (r + 0) * stride, dst + (r >> 1), size); - MemoryUtil.Fill(dst + (r + 0) * stride + size, above[bs - 1], bs - size); - MemoryUtil.Copy(dst + (r + 1) * stride, dst + stride + (r >> 1), size); - MemoryUtil.Fill(dst + (r + 1) * stride + size, above[bs - 1], bs - size); + MemoryUtil.Copy(dst + ((r + 0) * stride), dst + (r >> 1), size); + MemoryUtil.Fill(dst + ((r + 0) * stride) + size, above[bs - 1], bs - size); + MemoryUtil.Copy(dst + ((r + 1) * stride), dst + stride + (r >> 1), size); + MemoryUtil.Fill(dst + ((r + 1) * stride) + size, above[bs - 1], bs - size); } } - public static unsafe void HighbdD45Predictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD45Predictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD45Predictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdD45Predictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD45Predictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD45Predictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdD45Predictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD45Predictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD45Predictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdD45Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdD45Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { ushort aboveRight = above[bs - 1]; ushort* dstRow0 = dst; - int x, size; - for (x = 0; x < bs - 1; ++x) + for (int x = 0; x < bs - 1; ++x) { dst[x] = Avg3(above[x], above[x + 1], above[x + 2]); } + dst[bs - 1] = aboveRight; dst += stride; - for (x = 1, size = bs - 2; x < bs; ++x, --size) + for (int x = 1, size = bs - 2; x < bs; ++x, --size) { MemoryUtil.Copy(dst, dstRow0 + x, size); MemoryUtil.Fill(dst + size, aboveRight, x + 1); @@ -862,27 +856,26 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } } - public static unsafe void HighbdD117Predictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD117Predictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD117Predictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdD117Predictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD117Predictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD117Predictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdD117Predictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD117Predictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD117Predictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdD117Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdD117Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int r, c; - // First row - for (c = 0; c < bs; c++) + for (int c = 0; c < bs; c++) { dst[c] = Avg2(above[c - 1], above[c]); } @@ -891,7 +884,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // Second row dst[0] = Avg3(left[0], above[-1], above[0]); - for (c = 1; c < bs; c++) + for (int c = 1; c < bs; c++) { dst[c] = Avg3(above[c - 2], above[c - 1], above[c]); } @@ -900,83 +893,84 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // The rest of first col dst[0] = Avg3(above[-1], left[0], left[1]); - for (r = 3; r < bs; ++r) + for (int r = 3; r < bs; ++r) { dst[(r - 2) * stride] = Avg3(left[r - 3], left[r - 2], left[r - 1]); } // The rest of the block - for (r = 2; r < bs; ++r) + for (int r = 2; r < bs; ++r) { - for (c = 1; c < bs; c++) + for (int c = 1; c < bs; c++) { - dst[c] = dst[-2 * stride + c - 1]; + dst[c] = dst[(-2 * stride) + c - 1]; } dst += stride; } } - public static unsafe void HighbdD135Predictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD135Predictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD135Predictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdD135Predictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD135Predictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD135Predictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdD135Predictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD135Predictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD135Predictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdD135Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdD135Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int i; ushort* border = stackalloc ushort[32 + 32 - 1]; // Outer border from bottom-left to top-right // Dst(dst, stride, bs, bs - 2)[0], i.e., border starting at bottom-left - for (i = 0; i < bs - 2; ++i) + for (int i = 0; i < bs - 2; ++i) { border[i] = Avg3(left[bs - 3 - i], left[bs - 2 - i], left[bs - 1 - i]); } + border[bs - 2] = Avg3(above[-1], left[0], left[1]); border[bs - 1] = Avg3(left[0], above[-1], above[0]); border[bs - 0] = Avg3(above[-1], above[0], above[1]); // dst[0][2, size), i.e., remaining top border ascending - for (i = 0; i < bs - 2; ++i) + for (int i = 0; i < bs - 2; ++i) { border[bs + 1 + i] = Avg3(above[i], above[i + 1], above[i + 2]); } - for (i = 0; i < bs; ++i) + for (int i = 0; i < bs; ++i) { - MemoryUtil.Copy(dst + i * stride, border + bs - 1 - i, bs); + MemoryUtil.Copy(dst + (i * stride), border + bs - 1 - i, bs); } } - public static unsafe void HighbdD153Predictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD153Predictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD153Predictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdD153Predictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD153Predictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD153Predictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdD153Predictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD153Predictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdD153Predictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdD153Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdD153Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int r, c; dst[0] = Avg2(above[-1], left[0]); - for (r = 1; r < bs; r++) + for (int r = 1; r < bs; r++) { dst[r * stride] = Avg2(left[r - 1], left[r]); } @@ -985,23 +979,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dst[0] = Avg3(left[0], above[-1], above[0]); dst[stride] = Avg3(above[-1], left[0], left[1]); - for (r = 2; r < bs; r++) + for (int r = 2; r < bs; r++) { dst[r * stride] = Avg3(left[r - 2], left[r - 1], left[r]); } dst++; - for (c = 0; c < bs - 2; c++) + for (int c = 0; c < bs - 2; c++) { dst[c] = Avg3(above[c - 1], above[c], above[c + 1]); } dst += stride; - for (r = 1; r < bs; ++r) + for (int r = 1; r < bs; ++r) { - for (c = 0; c < bs - 2; c++) + for (int c = 0; c < bs - 2; c++) { dst[c] = dst[-stride + c - 2]; } @@ -1010,94 +1004,94 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } } - public static unsafe void HighbdVPredictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdVPredictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdVPredictor(dst, stride, 4, above, left, bd); } - public static unsafe void HighbdVPredictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdVPredictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdVPredictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdVPredictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdVPredictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdVPredictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdVPredictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdVPredictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdVPredictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdVPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdVPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int r; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Copy(dst, above, bs); dst += stride; } } - public static unsafe void HighbdHPredictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdHPredictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdHPredictor(dst, stride, 4, above, left, bd); } - public static unsafe void HighbdHPredictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdHPredictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdHPredictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdHPredictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdHPredictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdHPredictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdHPredictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdHPredictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdHPredictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdHPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdHPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int r; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, left[r], bs); dst += stride; } } - public static unsafe void HighbdTMPredictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdTmPredictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { - HighbdTMPredictor(dst, stride, 4, above, left, bd); + HighbdTmPredictor(dst, stride, 4, above, left, bd); } - public static unsafe void HighbdTMPredictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdTmPredictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { - HighbdTMPredictor(dst, stride, 8, above, left, bd); + HighbdTmPredictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdTMPredictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdTmPredictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { - HighbdTMPredictor(dst, stride, 16, above, left, bd); + HighbdTmPredictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdTMPredictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdTmPredictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { - HighbdTMPredictor(dst, stride, 32, above, left, bd); + HighbdTmPredictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdTMPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdTmPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int r, c; int yTopLeft = above[-1]; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { - for (c = 0; c < bs; c++) + for (int c = 0; c < bs; c++) { dst[c] = BitUtils.ClipPixelHighbd(left[r] + above[c] - yTopLeft, bd); } @@ -1106,169 +1100,178 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } } - public static unsafe void HighbdDc128Predictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDc128Predictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDc128Predictor(dst, stride, 4, above, left, bd); } - public static unsafe void HighbdDc128Predictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDc128Predictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDc128Predictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdDc128Predictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDc128Predictor16X16(ushort* dst, int stride, ushort* above, ushort* left, + int bd) { HighbdDc128Predictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdDc128Predictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDc128Predictor32X32(ushort* dst, int stride, ushort* above, ushort* left, + int bd) { HighbdDc128Predictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdDc128Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdDc128Predictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int r; - - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, (ushort)(128 << (bd - 8)), bs); dst += stride; } } - public static unsafe void HighbdDcLeftPredictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcLeftPredictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDcLeftPredictor(dst, stride, 4, above, left, bd); } - public static unsafe void HighbdDcLeftPredictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcLeftPredictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDcLeftPredictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdDcLeftPredictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcLeftPredictor16X16(ushort* dst, int stride, ushort* above, ushort* left, + int bd) { HighbdDcLeftPredictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdDcLeftPredictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcLeftPredictor32X32(ushort* dst, int stride, ushort* above, ushort* left, + int bd) { HighbdDcLeftPredictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdDcLeftPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdDcLeftPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int i, r, expectedDc, sum = 0; + int sum = 0; - for (i = 0; i < bs; i++) + for (int i = 0; i < bs; i++) { sum += left[i]; } - expectedDc = (sum + (bs >> 1)) / bs; + int expectedDc = (sum + (bs >> 1)) / bs; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, (ushort)expectedDc, bs); dst += stride; } } - public static unsafe void HighbdDcTopPredictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcTopPredictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDcTopPredictor(dst, stride, 4, above, left, bd); } - public static unsafe void HighbdDcTopPredictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcTopPredictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDcTopPredictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdDcTopPredictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcTopPredictor16X16(ushort* dst, int stride, ushort* above, ushort* left, + int bd) { HighbdDcTopPredictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdDcTopPredictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcTopPredictor32X32(ushort* dst, int stride, ushort* above, ushort* left, + int bd) { HighbdDcTopPredictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdDcTopPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdDcTopPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int i, r, expectedDc, sum = 0; + int sum = 0; - for (i = 0; i < bs; i++) + for (int i = 0; i < bs; i++) { sum += above[i]; } - expectedDc = (sum + (bs >> 1)) / bs; + int expectedDc = (sum + (bs >> 1)) / bs; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, (ushort)expectedDc, bs); dst += stride; } } - public static unsafe void HighbdDcPredictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcPredictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDcPredictor(dst, stride, 4, above, left, bd); } - public static unsafe void HighbdDcPredictor8x8(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcPredictor8X8(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDcPredictor(dst, stride, 8, above, left, bd); } - public static unsafe void HighbdDcPredictor16x16(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcPredictor16X16(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDcPredictor(dst, stride, 16, above, left, bd); } - public static unsafe void HighbdDcPredictor32x32(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdDcPredictor32X32(ushort* dst, int stride, ushort* above, ushort* left, int bd) { HighbdDcPredictor(dst, stride, 32, above, left, bd); } - private static unsafe void HighbdDcPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, int bd) + private static unsafe void HighbdDcPredictor(ushort* dst, int stride, int bs, ushort* above, ushort* left, + int bd) { - int i, r, expectedDc, sum = 0; + int sum = 0; int count = 2 * bs; - for (i = 0; i < bs; i++) + for (int i = 0; i < bs; i++) { sum += above[i]; sum += left[i]; } - expectedDc = (sum + (count >> 1)) / count; + int expectedDc = (sum + (count >> 1)) / count; - for (r = 0; r < bs; r++) + for (int r = 0; r < bs; r++) { MemoryUtil.Fill(dst, (ushort)expectedDc, bs); dst += stride; } } - public static unsafe void HighbdD207Predictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD207Predictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { - ushort I = left[0]; + ushort i = left[0]; ushort j = left[1]; ushort k = left[2]; ushort l = left[3]; - Dst(dst, stride, 0, 0) = Avg2(I, j); + Dst(dst, stride, 0, 0) = Avg2(i, j); Dst(dst, stride, 2, 0) = Dst(dst, stride, 0, 1) = Avg2(j, k); Dst(dst, stride, 2, 1) = Dst(dst, stride, 0, 2) = Avg2(k, l); - Dst(dst, stride, 1, 0) = Avg3(I, j, k); + Dst(dst, stride, 1, 0) = Avg3(i, j, k); Dst(dst, stride, 3, 0) = Dst(dst, stride, 1, 1) = Avg3(j, k, l); Dst(dst, stride, 3, 1) = Dst(dst, stride, 1, 2) = Avg3(k, l, l); - Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 0, 3) = Dst(dst, stride, 1, 3) = Dst(dst, stride, 2, 3) = Dst(dst, stride, 3, 3) = l; + Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 0, 3) = + Dst(dst, stride, 1, 3) = Dst(dst, stride, 2, 3) = Dst(dst, stride, 3, 3) = l; } - public static unsafe void HighbdD63Predictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD63Predictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { ushort a = above[0]; ushort b = above[1]; @@ -1290,7 +1293,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Dst(dst, stride, 3, 3) = Avg3(e, f, g); // Differs from vp8 } - public static unsafe void HighbdD45Predictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD45Predictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { ushort a = above[0]; ushort b = above[1]; @@ -1303,15 +1306,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Dst(dst, stride, 0, 0) = Avg3(a, b, c); Dst(dst, stride, 1, 0) = Dst(dst, stride, 0, 1) = Avg3(b, c, d); Dst(dst, stride, 2, 0) = Dst(dst, stride, 1, 1) = Dst(dst, stride, 0, 2) = Avg3(c, d, e); - Dst(dst, stride, 3, 0) = Dst(dst, stride, 2, 1) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 3) = Avg3(d, e, f); + Dst(dst, stride, 3, 0) = + Dst(dst, stride, 2, 1) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 3) = Avg3(d, e, f); Dst(dst, stride, 3, 1) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 1, 3) = Avg3(e, f, g); Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 3) = Avg3(f, g, h); Dst(dst, stride, 3, 3) = h; // Differs from vp8 } - public static unsafe void HighbdD117Predictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD117Predictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { - ushort I = left[0]; + ushort i = left[0]; ushort j = left[1]; ushort k = left[2]; ushort x = above[-1]; @@ -1324,17 +1328,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Dst(dst, stride, 2, 0) = Dst(dst, stride, 3, 2) = Avg2(b, c); Dst(dst, stride, 3, 0) = Avg2(c, d); - Dst(dst, stride, 0, 3) = Avg3(k, j, I); - Dst(dst, stride, 0, 2) = Avg3(j, I, x); - Dst(dst, stride, 0, 1) = Dst(dst, stride, 1, 3) = Avg3(I, x, a); + Dst(dst, stride, 0, 3) = Avg3(k, j, i); + Dst(dst, stride, 0, 2) = Avg3(j, i, x); + Dst(dst, stride, 0, 1) = Dst(dst, stride, 1, 3) = Avg3(i, x, a); Dst(dst, stride, 1, 1) = Dst(dst, stride, 2, 3) = Avg3(x, a, b); Dst(dst, stride, 2, 1) = Dst(dst, stride, 3, 3) = Avg3(a, b, c); Dst(dst, stride, 3, 1) = Avg3(b, c, d); } - public static unsafe void HighbdD135Predictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD135Predictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { - ushort I = left[0]; + ushort i = left[0]; ushort j = left[1]; ushort k = left[2]; ushort l = left[3]; @@ -1344,17 +1348,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp ushort c = above[2]; ushort d = above[3]; Dst(dst, stride, 0, 3) = Avg3(j, k, l); - Dst(dst, stride, 1, 3) = Dst(dst, stride, 0, 2) = Avg3(I, j, k); - Dst(dst, stride, 2, 3) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 1) = Avg3(x, I, j); - Dst(dst, stride, 3, 3) = Dst(dst, stride, 2, 2) = Dst(dst, stride, 1, 1) = Dst(dst, stride, 0, 0) = Avg3(a, x, I); + Dst(dst, stride, 1, 3) = Dst(dst, stride, 0, 2) = Avg3(i, j, k); + Dst(dst, stride, 2, 3) = Dst(dst, stride, 1, 2) = Dst(dst, stride, 0, 1) = Avg3(x, i, j); + Dst(dst, stride, 3, 3) = + Dst(dst, stride, 2, 2) = Dst(dst, stride, 1, 1) = Dst(dst, stride, 0, 0) = Avg3(a, x, i); Dst(dst, stride, 3, 2) = Dst(dst, stride, 2, 1) = Dst(dst, stride, 1, 0) = Avg3(b, a, x); Dst(dst, stride, 3, 1) = Dst(dst, stride, 2, 0) = Avg3(c, b, a); Dst(dst, stride, 3, 0) = Avg3(d, c, b); } - public static unsafe void HighbdD153Predictor4x4(ushort* dst, int stride, ushort* above, ushort* left, int bd) + public static unsafe void HighbdD153Predictor4X4(ushort* dst, int stride, ushort* above, ushort* left, int bd) { - ushort I = left[0]; + ushort i = left[0]; ushort j = left[1]; ushort k = left[2]; ushort l = left[3]; @@ -1363,16 +1368,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp ushort b = above[1]; ushort c = above[2]; - Dst(dst, stride, 0, 0) = Dst(dst, stride, 2, 1) = Avg2(I, x); - Dst(dst, stride, 0, 1) = Dst(dst, stride, 2, 2) = Avg2(j, I); + Dst(dst, stride, 0, 0) = Dst(dst, stride, 2, 1) = Avg2(i, x); + Dst(dst, stride, 0, 1) = Dst(dst, stride, 2, 2) = Avg2(j, i); Dst(dst, stride, 0, 2) = Dst(dst, stride, 2, 3) = Avg2(k, j); Dst(dst, stride, 0, 3) = Avg2(l, k); Dst(dst, stride, 3, 0) = Avg3(a, b, c); Dst(dst, stride, 2, 0) = Avg3(x, a, b); - Dst(dst, stride, 1, 0) = Dst(dst, stride, 3, 1) = Avg3(I, x, a); - Dst(dst, stride, 1, 1) = Dst(dst, stride, 3, 2) = Avg3(j, I, x); - Dst(dst, stride, 1, 2) = Dst(dst, stride, 3, 3) = Avg3(k, j, I); + Dst(dst, stride, 1, 0) = Dst(dst, stride, 3, 1) = Avg3(i, x, a); + Dst(dst, stride, 1, 1) = Dst(dst, stride, 3, 2) = Avg3(j, i, x); + Dst(dst, stride, 1, 2) = Dst(dst, stride, 3, 3) = Avg3(k, j, i); Dst(dst, stride, 1, 3) = Avg3(l, k, j); } } diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs index c4f45bfda..a36ea2dcf 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs @@ -1,4 +1,4 @@ -using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Common; using System; using System.Diagnostics; using System.Runtime.CompilerServices; @@ -10,13 +10,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { // 12 signal input bits + 7 2D forward transform amplify bits + 5 1D inverse // transform amplify bits + 1 bit for contingency in rounding and quantizing - private const int HighbdValidTxfmMagnitudeRange = (1 << 25); + private const int HighbdValidTxfmMagnitudeRange = 1 << 25; [MethodImpl(MethodImplOptions.AggressiveInlining)] private static int DetectInvalidHighbdInput(ReadOnlySpan input, int size) { - int i; - for (i = 0; i < size; ++i) + for (int i = 0; i < size; ++i) { if (Math.Abs(input[i]) >= HighbdValidTxfmMagnitudeRange) { @@ -35,7 +34,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // of this range for invalid/corrupt VP9 streams. Debug.Assert(short.MinValue <= input); Debug.Assert(input <= short.MaxValue); - return input; } @@ -71,7 +69,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp public static byte ClipPixelAdd(byte dest, long trans) { trans = WrapLow(trans); - return BitUtils.ClipPixel(dest + (int)trans); } @@ -79,7 +76,6 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp public static ushort HighbdClipPixelAdd(ushort dest, long trans, int bd) { trans = HighbdWrapLow(trans, bd); - return BitUtils.ClipPixelHighbd(dest + (int)trans, bd); } @@ -87,22 +83,21 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp private static long DctConstRoundShift(long input) { long rv = BitUtils.RoundPowerOfTwo(input, DctConstBits); - return rv; } [SkipLocalsInit] - public static void Iwht4x416Add(ReadOnlySpan input, Span dest, int stride) + public static void Iwht4X416Add(ReadOnlySpan input, Span dest, int stride) { /* 4-point reversible, orthonormal inverse Walsh-Hadamard in 3.5 adds, 0.5 shifts per pixel. */ - int i; + Span output = stackalloc int[16]; long a1, b1, c1, d1, e1; ReadOnlySpan ip = input; Span op = output; - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { a1 = ip[0] >> UnitQuantShift; c1 = ip[1] >> UnitQuantShift; @@ -119,12 +114,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp op[1] = WrapLow(b1); op[2] = WrapLow(c1); op[3] = WrapLow(d1); - ip = ip[4..]; - op = op[4..]; + ip = ip.Slice(4); + op = op.Slice(4); } Span ip2 = output; - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { a1 = ip2[4 * 0]; c1 = ip2[4 * 1]; @@ -142,15 +137,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dest[stride * 2] = ClipPixelAdd(dest[stride * 2], WrapLow(c1)); dest[stride * 3] = ClipPixelAdd(dest[stride * 3], WrapLow(d1)); - ip2 = ip2[1..]; - dest = dest[1..]; + ip2 = ip2.Slice(1); + dest = dest.Slice(1); } } [SkipLocalsInit] - public static void Iwht4x41Add(ReadOnlySpan input, Span dest, int stride) + public static void Iwht4X41Add(ReadOnlySpan input, Span dest, int stride) { - int i; long a1, e1; Span tmp = stackalloc int[4]; ReadOnlySpan ip = input; @@ -163,7 +157,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp op[1] = op[2] = op[3] = WrapLow(e1); Span ip2 = tmp; - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { e1 = ip2[0] >> 1; a1 = ip2[0] - e1; @@ -171,8 +165,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dest[stride * 1] = ClipPixelAdd(dest[stride * 1], e1); dest[stride * 2] = ClipPixelAdd(dest[stride * 2], e1); dest[stride * 3] = ClipPixelAdd(dest[stride * 3], e1); - ip2 = ip2[1..]; - dest = dest[1..]; + ip2 = ip2.Slice(1); + dest = dest.Slice(1); } } @@ -186,25 +180,24 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if ((x0 | x1 | x2 | x3) == 0) { - output[..4].Clear(); - + output.Slice(0, 4).Clear(); return; } // 32-bit result is enough for the following multiplications. - s0 = SinPi1_9 * x0; - s1 = SinPi2_9 * x0; - s2 = SinPi3_9 * x1; - s3 = SinPi4_9 * x2; - s4 = SinPi1_9 * x2; - s5 = SinPi2_9 * x3; - s6 = SinPi4_9 * x3; + s0 = SinPi19 * x0; + s1 = SinPi29 * x0; + s2 = SinPi39 * x1; + s3 = SinPi49 * x2; + s4 = SinPi19 * x2; + s5 = SinPi29 * x3; + s6 = SinPi49 * x3; s7 = WrapLow(x0 - x2 + x3); s0 = s0 + s3 + s5; s1 = s1 - s4 - s6; s3 = s2; - s2 = SinPi3_9 * s7; + s2 = SinPi39 * s7; // 1-D transform scaling factor is sqrt(2). // The overall dynamic range is 14b (input) + 14b (multiplication scaling) @@ -223,12 +216,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp long temp1, temp2; // stage 1 - temp1 = ((short)input[0] + (short)input[2]) * CosPi16_64; - temp2 = ((short)input[0] - (short)input[2]) * CosPi16_64; + temp1 = ((short)input[0] + (short)input[2]) * CosPi1664; + temp2 = ((short)input[0] - (short)input[2]) * CosPi1664; step[0] = (short)WrapLow(DctConstRoundShift(temp1)); step[1] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[1] * CosPi24_64 - (short)input[3] * CosPi8_64; - temp2 = (short)input[1] * CosPi8_64 + (short)input[3] * CosPi24_64; + temp1 = ((short)input[1] * CosPi2464) - ((short)input[3] * CosPi864); + temp2 = ((short)input[1] * CosPi864) + ((short)input[3] * CosPi2464); step[2] = (short)WrapLow(DctConstRoundShift(temp1)); step[3] = (short)WrapLow(DctConstRoundShift(temp2)); @@ -240,54 +233,53 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } [SkipLocalsInit] - public static void Idct4x416Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct4X416Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[4 * 4]; Span outptr = output; Span tempIn = stackalloc int[4]; Span tempOut = stackalloc int[4]; // Rows - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { Idct4(input, outptr); - input = input[4..]; - outptr = outptr[4..]; + input = input.Slice(4); + outptr = outptr.Slice(4); } // Columns - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { - for (j = 0; j < 4; ++j) + for (int j = 0; j < 4; ++j) { - tempIn[j] = output[j * 4 + i]; + tempIn[j] = output[(j * 4) + i]; } Idct4(tempIn, tempOut); - for (j = 0; j < 4; ++j) + for (int j = 0; j < 4; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 4)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 4)); } } } - public static void Idct4x41Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct4X41Add(ReadOnlySpan input, Span dest, int stride) { - int i; long a1; - int output = WrapLow(DctConstRoundShift((short)input[0] * CosPi16_64)); + int output = WrapLow(DctConstRoundShift((short)input[0] * CosPi1664)); - output = WrapLow(DctConstRoundShift(output * CosPi16_64)); + output = WrapLow(DctConstRoundShift(output * CosPi1664)); a1 = BitUtils.RoundPowerOfTwo(output, 4); - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { dest[0] = ClipPixelAdd(dest[0], a1); dest[1] = ClipPixelAdd(dest[1], a1); dest[2] = ClipPixelAdd(dest[2], a1); dest[3] = ClipPixelAdd(dest[3], a1); - dest = dest[stride..]; + dest = dest.Slice(stride); } } @@ -305,20 +297,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if ((x0 | x1 | x2 | x3 | x4 | x5 | x6 | x7) == 0) { - output[..8].Clear(); - + output.Slice(0, 8).Clear(); return; } // stage 1 - s0 = (int)(CosPi2_64 * x0 + CosPi30_64 * x1); - s1 = (int)(CosPi30_64 * x0 - CosPi2_64 * x1); - s2 = (int)(CosPi10_64 * x2 + CosPi22_64 * x3); - s3 = (int)(CosPi22_64 * x2 - CosPi10_64 * x3); - s4 = (int)(CosPi18_64 * x4 + CosPi14_64 * x5); - s5 = (int)(CosPi14_64 * x4 - CosPi18_64 * x5); - s6 = (int)(CosPi26_64 * x6 + CosPi6_64 * x7); - s7 = (int)(CosPi6_64 * x6 - CosPi26_64 * x7); + s0 = (int)((CosPi264 * x0) + (CosPi3064 * x1)); + s1 = (int)((CosPi3064 * x0) - (CosPi264 * x1)); + s2 = (int)((CosPi1064 * x2) + (CosPi2264 * x3)); + s3 = (int)((CosPi2264 * x2) - (CosPi1064 * x3)); + s4 = (int)((CosPi1864 * x4) + (CosPi1464 * x5)); + s5 = (int)((CosPi1464 * x4) - (CosPi1864 * x5)); + s6 = (int)((CosPi2664 * x6) + (CosPi664 * x7)); + s7 = (int)((CosPi664 * x6) - (CosPi2664 * x7)); x0 = WrapLow(DctConstRoundShift(s0 + s4)); x1 = WrapLow(DctConstRoundShift(s1 + s5)); @@ -334,10 +325,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp s1 = (int)x1; s2 = (int)x2; s3 = (int)x3; - s4 = (int)(CosPi8_64 * x4 + CosPi24_64 * x5); - s5 = (int)(CosPi24_64 * x4 - CosPi8_64 * x5); - s6 = (int)(-CosPi24_64 * x6 + CosPi8_64 * x7); - s7 = (int)(CosPi8_64 * x6 + CosPi24_64 * x7); + s4 = (int)((CosPi864 * x4) + (CosPi2464 * x5)); + s5 = (int)((CosPi2464 * x4) - (CosPi864 * x5)); + s6 = (int)((-CosPi2464 * x6) + (CosPi864 * x7)); + s7 = (int)((CosPi864 * x6) + (CosPi2464 * x7)); x0 = WrapLow(s0 + s2); x1 = WrapLow(s1 + s3); @@ -349,10 +340,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp x7 = WrapLow(DctConstRoundShift(s5 - s7)); // stage 3 - s2 = (int)(CosPi16_64 * (x2 + x3)); - s3 = (int)(CosPi16_64 * (x2 - x3)); - s6 = (int)(CosPi16_64 * (x6 + x7)); - s7 = (int)(CosPi16_64 * (x6 - x7)); + s2 = (int)(CosPi1664 * (x2 + x3)); + s3 = (int)(CosPi1664 * (x2 - x3)); + s6 = (int)(CosPi1664 * (x6 + x7)); + s7 = (int)(CosPi1664 * (x6 - x7)); x2 = WrapLow(DctConstRoundShift(s2)); x3 = WrapLow(DctConstRoundShift(s3)); @@ -381,22 +372,22 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = (short)input[4]; step1[1] = (short)input[2]; step1[3] = (short)input[6]; - temp1 = (short)input[1] * CosPi28_64 - (short)input[7] * CosPi4_64; - temp2 = (short)input[1] * CosPi4_64 + (short)input[7] * CosPi28_64; + temp1 = ((short)input[1] * CosPi2864) - ((short)input[7] * CosPi464); + temp2 = ((short)input[1] * CosPi464) + ((short)input[7] * CosPi2864); step1[4] = (short)WrapLow(DctConstRoundShift(temp1)); step1[7] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[5] * CosPi12_64 - (short)input[3] * CosPi20_64; - temp2 = (short)input[5] * CosPi20_64 + (short)input[3] * CosPi12_64; + temp1 = ((short)input[5] * CosPi1264) - ((short)input[3] * CosPi2064); + temp2 = ((short)input[5] * CosPi2064) + ((short)input[3] * CosPi1264); step1[5] = (short)WrapLow(DctConstRoundShift(temp1)); step1[6] = (short)WrapLow(DctConstRoundShift(temp2)); // stage 2 - temp1 = (step1[0] + step1[2]) * CosPi16_64; - temp2 = (step1[0] - step1[2]) * CosPi16_64; + temp1 = (step1[0] + step1[2]) * CosPi1664; + temp2 = (step1[0] - step1[2]) * CosPi1664; step2[0] = (short)WrapLow(DctConstRoundShift(temp1)); step2[1] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[1] * CosPi24_64 - step1[3] * CosPi8_64; - temp2 = step1[1] * CosPi8_64 + step1[3] * CosPi24_64; + temp1 = (step1[1] * CosPi2464) - (step1[3] * CosPi864); + temp2 = (step1[1] * CosPi864) + (step1[3] * CosPi2464); step2[2] = (short)WrapLow(DctConstRoundShift(temp1)); step2[3] = (short)WrapLow(DctConstRoundShift(temp2)); step2[4] = (short)WrapLow(step1[4] + step1[5]); @@ -410,8 +401,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = (short)WrapLow(step2[1] - step2[2]); step1[3] = (short)WrapLow(step2[0] - step2[3]); step1[4] = step2[4]; - temp1 = (step2[6] - step2[5]) * CosPi16_64; - temp2 = (step2[5] + step2[6]) * CosPi16_64; + temp1 = (step2[6] - step2[5]) * CosPi1664; + temp2 = (step2[5] + step2[6]) * CosPi1664; step1[5] = (short)WrapLow(DctConstRoundShift(temp1)); step1[6] = (short)WrapLow(DctConstRoundShift(temp2)); step1[7] = step2[7]; @@ -428,43 +419,41 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } [SkipLocalsInit] - public static void Idct8x864Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct8X864Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[8 * 8]; Span outptr = output; Span tempIn = stackalloc int[8]; Span tempOut = stackalloc int[8]; // First transform rows - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { Idct8(input, outptr); - input = input[8..]; - outptr = outptr[8..]; + input = input.Slice(8); + outptr = outptr.Slice(8); } // Then transform columns - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - tempIn[j] = output[j * 8 + i]; + tempIn[j] = output[(j * 8) + i]; } Idct8(tempIn, tempOut); - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], - BitUtils.RoundPowerOfTwo(tempOut[j], 5)); + dest[(j * stride) + i] = ClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 5)); } } } [SkipLocalsInit] - public static void Idct8x812Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct8X812Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[8 * 8]; Span outptr = output; Span tempIn = stackalloc int[8]; @@ -474,45 +463,45 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // First transform rows // Only first 4 row has non-zero coefs - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { Idct8(input, outptr); - input = input[8..]; - outptr = outptr[8..]; + input = input.Slice(8); + outptr = outptr.Slice(8); } // Then transform columns - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - tempIn[j] = output[j * 8 + i]; + tempIn[j] = output[(j * 8) + i]; } Idct8(tempIn, tempOut); - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 5)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 5)); } } } - public static void Idct8x81Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct8X81Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; long a1; - int output = WrapLow(DctConstRoundShift((short)input[0] * CosPi16_64)); + int output = WrapLow(DctConstRoundShift((short)input[0] * CosPi1664)); - output = WrapLow(DctConstRoundShift(output * CosPi16_64)); + output = WrapLow(DctConstRoundShift(output * CosPi1664)); a1 = BitUtils.RoundPowerOfTwo(output, 5); - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { dest[i] = ClipPixelAdd(dest[i], a1); } - dest = dest[stride..]; + dest = dest.Slice(stride); } } @@ -539,28 +528,27 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if ((x0 | x1 | x2 | x3 | x4 | x5 | x6 | x7 | x8 | x9 | x10 | x11 | x12 | x13 | x14 | x15) == 0) { - output[..16].Clear(); - + output.Slice(0, 16).Clear(); return; } // stage 1 - s0 = x0 * CosPi1_64 + x1 * CosPi31_64; - s1 = x0 * CosPi31_64 - x1 * CosPi1_64; - s2 = x2 * CosPi5_64 + x3 * CosPi27_64; - s3 = x2 * CosPi27_64 - x3 * CosPi5_64; - s4 = x4 * CosPi9_64 + x5 * CosPi23_64; - s5 = x4 * CosPi23_64 - x5 * CosPi9_64; - s6 = x6 * CosPi13_64 + x7 * CosPi19_64; - s7 = x6 * CosPi19_64 - x7 * CosPi13_64; - s8 = x8 * CosPi17_64 + x9 * CosPi15_64; - s9 = x8 * CosPi15_64 - x9 * CosPi17_64; - s10 = x10 * CosPi21_64 + x11 * CosPi11_64; - s11 = x10 * CosPi11_64 - x11 * CosPi21_64; - s12 = x12 * CosPi25_64 + x13 * CosPi7_64; - s13 = x12 * CosPi7_64 - x13 * CosPi25_64; - s14 = x14 * CosPi29_64 + x15 * CosPi3_64; - s15 = x14 * CosPi3_64 - x15 * CosPi29_64; + s0 = (x0 * CosPi164) + (x1 * CosPi3164); + s1 = (x0 * CosPi3164) - (x1 * CosPi164); + s2 = (x2 * CosPi564) + (x3 * CosPi2764); + s3 = (x2 * CosPi2764) - (x3 * CosPi564); + s4 = (x4 * CosPi964) + (x5 * CosPi2364); + s5 = (x4 * CosPi2364) - (x5 * CosPi964); + s6 = (x6 * CosPi1364) + (x7 * CosPi1964); + s7 = (x6 * CosPi1964) - (x7 * CosPi1364); + s8 = (x8 * CosPi1764) + (x9 * CosPi1564); + s9 = (x8 * CosPi1564) - (x9 * CosPi1764); + s10 = (x10 * CosPi2164) + (x11 * CosPi1164); + s11 = (x10 * CosPi1164) - (x11 * CosPi2164); + s12 = (x12 * CosPi2564) + (x13 * CosPi764); + s13 = (x12 * CosPi764) - (x13 * CosPi2564); + s14 = (x14 * CosPi2964) + (x15 * CosPi364); + s15 = (x14 * CosPi364) - (x15 * CosPi2964); x0 = WrapLow(DctConstRoundShift(s0 + s8)); x1 = WrapLow(DctConstRoundShift(s1 + s9)); @@ -588,14 +576,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp s5 = x5; s6 = x6; s7 = x7; - s8 = x8 * CosPi4_64 + x9 * CosPi28_64; - s9 = x8 * CosPi28_64 - x9 * CosPi4_64; - s10 = x10 * CosPi20_64 + x11 * CosPi12_64; - s11 = x10 * CosPi12_64 - x11 * CosPi20_64; - s12 = -x12 * CosPi28_64 + x13 * CosPi4_64; - s13 = x12 * CosPi4_64 + x13 * CosPi28_64; - s14 = -x14 * CosPi12_64 + x15 * CosPi20_64; - s15 = x14 * CosPi20_64 + x15 * CosPi12_64; + s8 = (x8 * CosPi464) + (x9 * CosPi2864); + s9 = (x8 * CosPi2864) - (x9 * CosPi464); + s10 = (x10 * CosPi2064) + (x11 * CosPi1264); + s11 = (x10 * CosPi1264) - (x11 * CosPi2064); + s12 = (-x12 * CosPi2864) + (x13 * CosPi464); + s13 = (x12 * CosPi464) + (x13 * CosPi2864); + s14 = (-x14 * CosPi1264) + (x15 * CosPi2064); + s15 = (x14 * CosPi2064) + (x15 * CosPi1264); x0 = WrapLow(s0 + s4); x1 = WrapLow(s1 + s5); @@ -619,18 +607,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp s1 = x1; s2 = x2; s3 = x3; - s4 = x4 * CosPi8_64 + x5 * CosPi24_64; - s5 = x4 * CosPi24_64 - x5 * CosPi8_64; - s6 = -x6 * CosPi24_64 + x7 * CosPi8_64; - s7 = x6 * CosPi8_64 + x7 * CosPi24_64; + s4 = (x4 * CosPi864) + (x5 * CosPi2464); + s5 = (x4 * CosPi2464) - (x5 * CosPi864); + s6 = (-x6 * CosPi2464) + (x7 * CosPi864); + s7 = (x6 * CosPi864) + (x7 * CosPi2464); s8 = x8; s9 = x9; s10 = x10; s11 = x11; - s12 = x12 * CosPi8_64 + x13 * CosPi24_64; - s13 = x12 * CosPi24_64 - x13 * CosPi8_64; - s14 = -x14 * CosPi24_64 + x15 * CosPi8_64; - s15 = x14 * CosPi8_64 + x15 * CosPi24_64; + s12 = (x12 * CosPi864) + (x13 * CosPi2464); + s13 = (x12 * CosPi2464) - (x13 * CosPi864); + s14 = (-x14 * CosPi2464) + (x15 * CosPi864); + s15 = (x14 * CosPi864) + (x15 * CosPi2464); x0 = WrapLow(s0 + s2); x1 = WrapLow(s1 + s3); @@ -650,14 +638,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp x15 = WrapLow(DctConstRoundShift(s13 - s15)); // stage 4 - s2 = (-CosPi16_64) * (x2 + x3); - s3 = CosPi16_64 * (x2 - x3); - s6 = CosPi16_64 * (x6 + x7); - s7 = CosPi16_64 * (-x6 + x7); - s10 = CosPi16_64 * (x10 + x11); - s11 = CosPi16_64 * (-x10 + x11); - s14 = (-CosPi16_64) * (x14 + x15); - s15 = CosPi16_64 * (x14 - x15); + s2 = -CosPi1664 * (x2 + x3); + s3 = CosPi1664 * (x2 - x3); + s6 = CosPi1664 * (x6 + x7); + s7 = CosPi1664 * (-x6 + x7); + s10 = CosPi1664 * (x10 + x11); + s11 = CosPi1664 * (-x10 + x11); + s14 = -CosPi1664 * (x14 + x15); + s15 = CosPi1664 * (x14 - x15); x2 = WrapLow(DctConstRoundShift(s2)); x3 = WrapLow(DctConstRoundShift(s3)); @@ -721,23 +709,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[6] = step1[6]; step2[7] = step1[7]; - temp1 = step1[8] * CosPi30_64 - step1[15] * CosPi2_64; - temp2 = step1[8] * CosPi2_64 + step1[15] * CosPi30_64; + temp1 = (step1[8] * CosPi3064) - (step1[15] * CosPi264); + temp2 = (step1[8] * CosPi264) + (step1[15] * CosPi3064); step2[8] = (short)WrapLow(DctConstRoundShift(temp1)); step2[15] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[9] * CosPi14_64 - step1[14] * CosPi18_64; - temp2 = step1[9] * CosPi18_64 + step1[14] * CosPi14_64; + temp1 = (step1[9] * CosPi1464) - (step1[14] * CosPi1864); + temp2 = (step1[9] * CosPi1864) + (step1[14] * CosPi1464); step2[9] = (short)WrapLow(DctConstRoundShift(temp1)); step2[14] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[10] * CosPi22_64 - step1[13] * CosPi10_64; - temp2 = step1[10] * CosPi10_64 + step1[13] * CosPi22_64; + temp1 = (step1[10] * CosPi2264) - (step1[13] * CosPi1064); + temp2 = (step1[10] * CosPi1064) + (step1[13] * CosPi2264); step2[10] = (short)WrapLow(DctConstRoundShift(temp1)); step2[13] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[11] * CosPi6_64 - step1[12] * CosPi26_64; - temp2 = step1[11] * CosPi26_64 + step1[12] * CosPi6_64; + temp1 = (step1[11] * CosPi664) - (step1[12] * CosPi2664); + temp2 = (step1[11] * CosPi2664) + (step1[12] * CosPi664); step2[11] = (short)WrapLow(DctConstRoundShift(temp1)); step2[12] = (short)WrapLow(DctConstRoundShift(temp2)); @@ -747,12 +735,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = step2[2]; step1[3] = step2[3]; - temp1 = step2[4] * CosPi28_64 - step2[7] * CosPi4_64; - temp2 = step2[4] * CosPi4_64 + step2[7] * CosPi28_64; + temp1 = (step2[4] * CosPi2864) - (step2[7] * CosPi464); + temp2 = (step2[4] * CosPi464) + (step2[7] * CosPi2864); step1[4] = (short)WrapLow(DctConstRoundShift(temp1)); step1[7] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step2[5] * CosPi12_64 - step2[6] * CosPi20_64; - temp2 = step2[5] * CosPi20_64 + step2[6] * CosPi12_64; + temp1 = (step2[5] * CosPi1264) - (step2[6] * CosPi2064); + temp2 = (step2[5] * CosPi2064) + (step2[6] * CosPi1264); step1[5] = (short)WrapLow(DctConstRoundShift(temp1)); step1[6] = (short)WrapLow(DctConstRoundShift(temp2)); @@ -766,12 +754,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[15] = (short)WrapLow(step2[14] + step2[15]); // stage 4 - temp1 = (step1[0] + step1[1]) * CosPi16_64; - temp2 = (step1[0] - step1[1]) * CosPi16_64; + temp1 = (step1[0] + step1[1]) * CosPi1664; + temp2 = (step1[0] - step1[1]) * CosPi1664; step2[0] = (short)WrapLow(DctConstRoundShift(temp1)); step2[1] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[2] * CosPi24_64 - step1[3] * CosPi8_64; - temp2 = step1[2] * CosPi8_64 + step1[3] * CosPi24_64; + temp1 = (step1[2] * CosPi2464) - (step1[3] * CosPi864); + temp2 = (step1[2] * CosPi864) + (step1[3] * CosPi2464); step2[2] = (short)WrapLow(DctConstRoundShift(temp1)); step2[3] = (short)WrapLow(DctConstRoundShift(temp2)); step2[4] = (short)WrapLow(step1[4] + step1[5]); @@ -781,12 +769,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[8] = step1[8]; step2[15] = step1[15]; - temp1 = -step1[9] * CosPi8_64 + step1[14] * CosPi24_64; - temp2 = step1[9] * CosPi24_64 + step1[14] * CosPi8_64; + temp1 = (-step1[9] * CosPi864) + (step1[14] * CosPi2464); + temp2 = (step1[9] * CosPi2464) + (step1[14] * CosPi864); step2[9] = (short)WrapLow(DctConstRoundShift(temp1)); step2[14] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = -step1[10] * CosPi24_64 - step1[13] * CosPi8_64; - temp2 = -step1[10] * CosPi8_64 + step1[13] * CosPi24_64; + temp1 = (-step1[10] * CosPi2464) - (step1[13] * CosPi864); + temp2 = (-step1[10] * CosPi864) + (step1[13] * CosPi2464); step2[10] = (short)WrapLow(DctConstRoundShift(temp1)); step2[13] = (short)WrapLow(DctConstRoundShift(temp2)); step2[11] = step1[11]; @@ -798,8 +786,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = (short)WrapLow(step2[1] - step2[2]); step1[3] = (short)WrapLow(step2[0] - step2[3]); step1[4] = step2[4]; - temp1 = (step2[6] - step2[5]) * CosPi16_64; - temp2 = (step2[5] + step2[6]) * CosPi16_64; + temp1 = (step2[6] - step2[5]) * CosPi1664; + temp2 = (step2[5] + step2[6]) * CosPi1664; step1[5] = (short)WrapLow(DctConstRoundShift(temp1)); step1[6] = (short)WrapLow(DctConstRoundShift(temp2)); step1[7] = step2[7]; @@ -824,12 +812,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[7] = (short)WrapLow(step1[0] - step1[7]); step2[8] = step1[8]; step2[9] = step1[9]; - temp1 = (-step1[10] + step1[13]) * CosPi16_64; - temp2 = (step1[10] + step1[13]) * CosPi16_64; + temp1 = (-step1[10] + step1[13]) * CosPi1664; + temp2 = (step1[10] + step1[13]) * CosPi1664; step2[10] = (short)WrapLow(DctConstRoundShift(temp1)); step2[13] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (-step1[11] + step1[12]) * CosPi16_64; - temp2 = (step1[11] + step1[12]) * CosPi16_64; + temp1 = (-step1[11] + step1[12]) * CosPi1664; + temp2 = (step1[11] + step1[12]) * CosPi1664; step2[11] = (short)WrapLow(DctConstRoundShift(temp1)); step2[12] = (short)WrapLow(DctConstRoundShift(temp2)); step2[14] = step1[14]; @@ -855,42 +843,41 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } [SkipLocalsInit] - public static void Idct16x16256Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct16X16256Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[16 * 16]; Span outptr = output; Span tempIn = stackalloc int[16]; Span tempOut = stackalloc int[16]; // First transform rows - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { Idct16(input, outptr); - input = input[16..]; - outptr = outptr[16..]; + input = input.Slice(16); + outptr = outptr.Slice(16); } // Then transform columns - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - tempIn[j] = output[j * 16 + i]; + tempIn[j] = output[(j * 16) + i]; } Idct16(tempIn, tempOut); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); } } } [SkipLocalsInit] - public static void Idct16x1638Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct16X1638Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[16 * 16]; Span outptr = output; Span tempIn = stackalloc int[16]; @@ -900,33 +887,33 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // First transform rows. Since all non-zero dct coefficients are in // upper-left 8x8 area, we only need to calculate first 8 rows here. - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { Idct16(input, outptr); - input = input[16..]; - outptr = outptr[16..]; + input = input.Slice(16); + outptr = outptr.Slice(16); } // Then transform columns - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - tempIn[j] = output[j * 16 + i]; + tempIn[j] = output[(j * 16) + i]; } Idct16(tempIn, tempOut); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); } } } [SkipLocalsInit] - public static void Idct16x1610Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct16X1610Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[16 * 16]; Span outptr = output; Span tempIn = stackalloc int[16]; @@ -936,45 +923,45 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // First transform rows. Since all non-zero dct coefficients are in // upper-left 4x4 area, we only need to calculate first 4 rows here. - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { Idct16(input, outptr); - input = input[16..]; - outptr = outptr[16..]; + input = input.Slice(16); + outptr = outptr.Slice(16); } // Then transform columns - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - tempIn[j] = output[j * 16 + i]; + tempIn[j] = output[(j * 16) + i]; } Idct16(tempIn, tempOut); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); } } } - public static void Idct16x161Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct16X161Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; long a1; - int output = WrapLow(DctConstRoundShift((short)input[0] * CosPi16_64)); + int output = WrapLow(DctConstRoundShift((short)input[0] * CosPi1664)); - output = WrapLow(DctConstRoundShift(output * CosPi16_64)); + output = WrapLow(DctConstRoundShift(output * CosPi1664)); a1 = BitUtils.RoundPowerOfTwo(output, 6); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { dest[i] = ClipPixelAdd(dest[i], a1); } - dest = dest[stride..]; + dest = dest.Slice(stride); } } @@ -1003,43 +990,43 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[14] = (short)input[14]; step1[15] = (short)input[30]; - temp1 = (short)input[1] * CosPi31_64 - (short)input[31] * CosPi1_64; - temp2 = (short)input[1] * CosPi1_64 + (short)input[31] * CosPi31_64; + temp1 = ((short)input[1] * CosPi3164) - ((short)input[31] * CosPi164); + temp2 = ((short)input[1] * CosPi164) + ((short)input[31] * CosPi3164); step1[16] = (short)WrapLow(DctConstRoundShift(temp1)); step1[31] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[17] * CosPi15_64 - (short)input[15] * CosPi17_64; - temp2 = (short)input[17] * CosPi17_64 + (short)input[15] * CosPi15_64; + temp1 = ((short)input[17] * CosPi1564) - ((short)input[15] * CosPi1764); + temp2 = ((short)input[17] * CosPi1764) + ((short)input[15] * CosPi1564); step1[17] = (short)WrapLow(DctConstRoundShift(temp1)); step1[30] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[9] * CosPi23_64 - (short)input[23] * CosPi9_64; - temp2 = (short)input[9] * CosPi9_64 + (short)input[23] * CosPi23_64; + temp1 = ((short)input[9] * CosPi2364) - ((short)input[23] * CosPi964); + temp2 = ((short)input[9] * CosPi964) + ((short)input[23] * CosPi2364); step1[18] = (short)WrapLow(DctConstRoundShift(temp1)); step1[29] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[25] * CosPi7_64 - (short)input[7] * CosPi25_64; - temp2 = (short)input[25] * CosPi25_64 + (short)input[7] * CosPi7_64; + temp1 = ((short)input[25] * CosPi764) - ((short)input[7] * CosPi2564); + temp2 = ((short)input[25] * CosPi2564) + ((short)input[7] * CosPi764); step1[19] = (short)WrapLow(DctConstRoundShift(temp1)); step1[28] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[5] * CosPi27_64 - (short)input[27] * CosPi5_64; - temp2 = (short)input[5] * CosPi5_64 + (short)input[27] * CosPi27_64; + temp1 = ((short)input[5] * CosPi2764) - ((short)input[27] * CosPi564); + temp2 = ((short)input[5] * CosPi564) + ((short)input[27] * CosPi2764); step1[20] = (short)WrapLow(DctConstRoundShift(temp1)); step1[27] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[21] * CosPi11_64 - (short)input[11] * CosPi21_64; - temp2 = (short)input[21] * CosPi21_64 + (short)input[11] * CosPi11_64; + temp1 = ((short)input[21] * CosPi1164) - ((short)input[11] * CosPi2164); + temp2 = ((short)input[21] * CosPi2164) + ((short)input[11] * CosPi1164); step1[21] = (short)WrapLow(DctConstRoundShift(temp1)); step1[26] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[13] * CosPi19_64 - (short)input[19] * CosPi13_64; - temp2 = (short)input[13] * CosPi13_64 + (short)input[19] * CosPi19_64; + temp1 = ((short)input[13] * CosPi1964) - ((short)input[19] * CosPi1364); + temp2 = ((short)input[13] * CosPi1364) + ((short)input[19] * CosPi1964); step1[22] = (short)WrapLow(DctConstRoundShift(temp1)); step1[25] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (short)input[29] * CosPi3_64 - (short)input[3] * CosPi29_64; - temp2 = (short)input[29] * CosPi29_64 + (short)input[3] * CosPi3_64; + temp1 = ((short)input[29] * CosPi364) - ((short)input[3] * CosPi2964); + temp2 = ((short)input[29] * CosPi2964) + ((short)input[3] * CosPi364); step1[23] = (short)WrapLow(DctConstRoundShift(temp1)); step1[24] = (short)WrapLow(DctConstRoundShift(temp2)); @@ -1053,23 +1040,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[6] = step1[6]; step2[7] = step1[7]; - temp1 = step1[8] * CosPi30_64 - step1[15] * CosPi2_64; - temp2 = step1[8] * CosPi2_64 + step1[15] * CosPi30_64; + temp1 = (step1[8] * CosPi3064) - (step1[15] * CosPi264); + temp2 = (step1[8] * CosPi264) + (step1[15] * CosPi3064); step2[8] = (short)WrapLow(DctConstRoundShift(temp1)); step2[15] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[9] * CosPi14_64 - step1[14] * CosPi18_64; - temp2 = step1[9] * CosPi18_64 + step1[14] * CosPi14_64; + temp1 = (step1[9] * CosPi1464) - (step1[14] * CosPi1864); + temp2 = (step1[9] * CosPi1864) + (step1[14] * CosPi1464); step2[9] = (short)WrapLow(DctConstRoundShift(temp1)); step2[14] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[10] * CosPi22_64 - step1[13] * CosPi10_64; - temp2 = step1[10] * CosPi10_64 + step1[13] * CosPi22_64; + temp1 = (step1[10] * CosPi2264) - (step1[13] * CosPi1064); + temp2 = (step1[10] * CosPi1064) + (step1[13] * CosPi2264); step2[10] = (short)WrapLow(DctConstRoundShift(temp1)); step2[13] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[11] * CosPi6_64 - step1[12] * CosPi26_64; - temp2 = step1[11] * CosPi26_64 + step1[12] * CosPi6_64; + temp1 = (step1[11] * CosPi664) - (step1[12] * CosPi2664); + temp2 = (step1[11] * CosPi2664) + (step1[12] * CosPi664); step2[11] = (short)WrapLow(DctConstRoundShift(temp1)); step2[12] = (short)WrapLow(DctConstRoundShift(temp2)); @@ -1096,12 +1083,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = step2[2]; step1[3] = step2[3]; - temp1 = step2[4] * CosPi28_64 - step2[7] * CosPi4_64; - temp2 = step2[4] * CosPi4_64 + step2[7] * CosPi28_64; + temp1 = (step2[4] * CosPi2864) - (step2[7] * CosPi464); + temp2 = (step2[4] * CosPi464) + (step2[7] * CosPi2864); step1[4] = (short)WrapLow(DctConstRoundShift(temp1)); step1[7] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step2[5] * CosPi12_64 - step2[6] * CosPi20_64; - temp2 = step2[5] * CosPi20_64 + step2[6] * CosPi12_64; + temp1 = (step2[5] * CosPi1264) - (step2[6] * CosPi2064); + temp2 = (step2[5] * CosPi2064) + (step2[6] * CosPi1264); step1[5] = (short)WrapLow(DctConstRoundShift(temp1)); step1[6] = (short)WrapLow(DctConstRoundShift(temp2)); @@ -1116,22 +1103,22 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[16] = step2[16]; step1[31] = step2[31]; - temp1 = -step2[17] * CosPi4_64 + step2[30] * CosPi28_64; - temp2 = step2[17] * CosPi28_64 + step2[30] * CosPi4_64; + temp1 = (-step2[17] * CosPi464) + (step2[30] * CosPi2864); + temp2 = (step2[17] * CosPi2864) + (step2[30] * CosPi464); step1[17] = (short)WrapLow(DctConstRoundShift(temp1)); step1[30] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = -step2[18] * CosPi28_64 - step2[29] * CosPi4_64; - temp2 = -step2[18] * CosPi4_64 + step2[29] * CosPi28_64; + temp1 = (-step2[18] * CosPi2864) - (step2[29] * CosPi464); + temp2 = (-step2[18] * CosPi464) + (step2[29] * CosPi2864); step1[18] = (short)WrapLow(DctConstRoundShift(temp1)); step1[29] = (short)WrapLow(DctConstRoundShift(temp2)); step1[19] = step2[19]; step1[20] = step2[20]; - temp1 = -step2[21] * CosPi20_64 + step2[26] * CosPi12_64; - temp2 = step2[21] * CosPi12_64 + step2[26] * CosPi20_64; + temp1 = (-step2[21] * CosPi2064) + (step2[26] * CosPi1264); + temp2 = (step2[21] * CosPi1264) + (step2[26] * CosPi2064); step1[21] = (short)WrapLow(DctConstRoundShift(temp1)); step1[26] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = -step2[22] * CosPi12_64 - step2[25] * CosPi20_64; - temp2 = -step2[22] * CosPi20_64 + step2[25] * CosPi12_64; + temp1 = (-step2[22] * CosPi1264) - (step2[25] * CosPi2064); + temp2 = (-step2[22] * CosPi2064) + (step2[25] * CosPi1264); step1[22] = (short)WrapLow(DctConstRoundShift(temp1)); step1[25] = (short)WrapLow(DctConstRoundShift(temp2)); step1[23] = step2[23]; @@ -1140,12 +1127,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[28] = step2[28]; // stage 4 - temp1 = (step1[0] + step1[1]) * CosPi16_64; - temp2 = (step1[0] - step1[1]) * CosPi16_64; + temp1 = (step1[0] + step1[1]) * CosPi1664; + temp2 = (step1[0] - step1[1]) * CosPi1664; step2[0] = (short)WrapLow(DctConstRoundShift(temp1)); step2[1] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = step1[2] * CosPi24_64 - step1[3] * CosPi8_64; - temp2 = step1[2] * CosPi8_64 + step1[3] * CosPi24_64; + temp1 = (step1[2] * CosPi2464) - (step1[3] * CosPi864); + temp2 = (step1[2] * CosPi864) + (step1[3] * CosPi2464); step2[2] = (short)WrapLow(DctConstRoundShift(temp1)); step2[3] = (short)WrapLow(DctConstRoundShift(temp2)); step2[4] = (short)WrapLow(step1[4] + step1[5]); @@ -1155,12 +1142,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[8] = step1[8]; step2[15] = step1[15]; - temp1 = -step1[9] * CosPi8_64 + step1[14] * CosPi24_64; - temp2 = step1[9] * CosPi24_64 + step1[14] * CosPi8_64; + temp1 = (-step1[9] * CosPi864) + (step1[14] * CosPi2464); + temp2 = (step1[9] * CosPi2464) + (step1[14] * CosPi864); step2[9] = (short)WrapLow(DctConstRoundShift(temp1)); step2[14] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = -step1[10] * CosPi24_64 - step1[13] * CosPi8_64; - temp2 = -step1[10] * CosPi8_64 + step1[13] * CosPi24_64; + temp1 = (-step1[10] * CosPi2464) - (step1[13] * CosPi864); + temp2 = (-step1[10] * CosPi864) + (step1[13] * CosPi2464); step2[10] = (short)WrapLow(DctConstRoundShift(temp1)); step2[13] = (short)WrapLow(DctConstRoundShift(temp2)); step2[11] = step1[11]; @@ -1190,8 +1177,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = (short)WrapLow(step2[1] - step2[2]); step1[3] = (short)WrapLow(step2[0] - step2[3]); step1[4] = step2[4]; - temp1 = (step2[6] - step2[5]) * CosPi16_64; - temp2 = (step2[5] + step2[6]) * CosPi16_64; + temp1 = (step2[6] - step2[5]) * CosPi1664; + temp2 = (step2[5] + step2[6]) * CosPi1664; step1[5] = (short)WrapLow(DctConstRoundShift(temp1)); step1[6] = (short)WrapLow(DctConstRoundShift(temp2)); step1[7] = step2[7]; @@ -1207,20 +1194,20 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[16] = step2[16]; step1[17] = step2[17]; - temp1 = -step2[18] * CosPi8_64 + step2[29] * CosPi24_64; - temp2 = step2[18] * CosPi24_64 + step2[29] * CosPi8_64; + temp1 = (-step2[18] * CosPi864) + (step2[29] * CosPi2464); + temp2 = (step2[18] * CosPi2464) + (step2[29] * CosPi864); step1[18] = (short)WrapLow(DctConstRoundShift(temp1)); step1[29] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = -step2[19] * CosPi8_64 + step2[28] * CosPi24_64; - temp2 = step2[19] * CosPi24_64 + step2[28] * CosPi8_64; + temp1 = (-step2[19] * CosPi864) + (step2[28] * CosPi2464); + temp2 = (step2[19] * CosPi2464) + (step2[28] * CosPi864); step1[19] = (short)WrapLow(DctConstRoundShift(temp1)); step1[28] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = -step2[20] * CosPi24_64 - step2[27] * CosPi8_64; - temp2 = -step2[20] * CosPi8_64 + step2[27] * CosPi24_64; + temp1 = (-step2[20] * CosPi2464) - (step2[27] * CosPi864); + temp2 = (-step2[20] * CosPi864) + (step2[27] * CosPi2464); step1[20] = (short)WrapLow(DctConstRoundShift(temp1)); step1[27] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = -step2[21] * CosPi24_64 - step2[26] * CosPi8_64; - temp2 = -step2[21] * CosPi8_64 + step2[26] * CosPi24_64; + temp1 = (-step2[21] * CosPi2464) - (step2[26] * CosPi864); + temp2 = (-step2[21] * CosPi864) + (step2[26] * CosPi2464); step1[21] = (short)WrapLow(DctConstRoundShift(temp1)); step1[26] = (short)WrapLow(DctConstRoundShift(temp2)); step1[22] = step2[22]; @@ -1241,12 +1228,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[7] = (short)WrapLow(step1[0] - step1[7]); step2[8] = step1[8]; step2[9] = step1[9]; - temp1 = (-step1[10] + step1[13]) * CosPi16_64; - temp2 = (step1[10] + step1[13]) * CosPi16_64; + temp1 = (-step1[10] + step1[13]) * CosPi1664; + temp2 = (step1[10] + step1[13]) * CosPi1664; step2[10] = (short)WrapLow(DctConstRoundShift(temp1)); step2[13] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (-step1[11] + step1[12]) * CosPi16_64; - temp2 = (step1[11] + step1[12]) * CosPi16_64; + temp1 = (-step1[11] + step1[12]) * CosPi1664; + temp2 = (step1[11] + step1[12]) * CosPi1664; step2[11] = (short)WrapLow(DctConstRoundShift(temp1)); step2[12] = (short)WrapLow(DctConstRoundShift(temp2)); step2[14] = step1[14]; @@ -1292,20 +1279,20 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[17] = step2[17]; step1[18] = step2[18]; step1[19] = step2[19]; - temp1 = (-step2[20] + step2[27]) * CosPi16_64; - temp2 = (step2[20] + step2[27]) * CosPi16_64; + temp1 = (-step2[20] + step2[27]) * CosPi1664; + temp2 = (step2[20] + step2[27]) * CosPi1664; step1[20] = (short)WrapLow(DctConstRoundShift(temp1)); step1[27] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (-step2[21] + step2[26]) * CosPi16_64; - temp2 = (step2[21] + step2[26]) * CosPi16_64; + temp1 = (-step2[21] + step2[26]) * CosPi1664; + temp2 = (step2[21] + step2[26]) * CosPi1664; step1[21] = (short)WrapLow(DctConstRoundShift(temp1)); step1[26] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (-step2[22] + step2[25]) * CosPi16_64; - temp2 = (step2[22] + step2[25]) * CosPi16_64; + temp1 = (-step2[22] + step2[25]) * CosPi1664; + temp2 = (step2[22] + step2[25]) * CosPi1664; step1[22] = (short)WrapLow(DctConstRoundShift(temp1)); step1[25] = (short)WrapLow(DctConstRoundShift(temp2)); - temp1 = (-step2[23] + step2[24]) * CosPi16_64; - temp2 = (step2[23] + step2[24]) * CosPi16_64; + temp1 = (-step2[23] + step2[24]) * CosPi1664; + temp2 = (step2[23] + step2[24]) * CosPi1664; step1[23] = (short)WrapLow(DctConstRoundShift(temp1)); step1[24] = (short)WrapLow(DctConstRoundShift(temp2)); step1[28] = step2[28]; @@ -1349,19 +1336,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } [SkipLocalsInit] - public static void Idct32x321024Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct32X321024Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[32 * 32]; Span outptr = output; Span tempIn = stackalloc int[32]; Span tempOut = stackalloc int[32]; // Rows - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { short zeroCoeff = 0; - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { zeroCoeff |= (short)input[j]; } @@ -1372,33 +1358,33 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } else { - outptr[..32].Clear(); + outptr.Slice(0, 32).Clear(); } - input = input[32..]; - outptr = outptr[32..]; + input = input.Slice(32); + outptr = outptr.Slice(32); } // Columns - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - tempIn[j] = output[j * 32 + i]; + tempIn[j] = output[(j * 32) + i]; } Idct32(tempIn, tempOut); - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); } } } [SkipLocalsInit] - public static void Idct32x32135Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct32X32135Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[32 * 32]; Span outptr = output; Span tempIn = stackalloc int[32]; @@ -1408,33 +1394,33 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // Rows // Only upper-left 16x16 has non-zero coeff - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { Idct32(input, outptr); - input = input[32..]; - outptr = outptr[32..]; + input = input.Slice(32); + outptr = outptr.Slice(32); } // Columns - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - tempIn[j] = output[j * 32 + i]; + tempIn[j] = output[(j * 32) + i]; } Idct32(tempIn, tempOut); - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); } } } [SkipLocalsInit] - public static void Idct32x3234Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct32X3234Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; Span output = stackalloc int[32 * 32]; Span outptr = output; Span tempIn = stackalloc int[32]; @@ -1444,61 +1430,61 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // Rows // Only upper-left 8x8 has non-zero coeff - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { Idct32(input, outptr); - input = input[32..]; - outptr = outptr[32..]; + input = input.Slice(32); + outptr = outptr.Slice(32); } // Columns - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - tempIn[j] = output[j * 32 + i]; + tempIn[j] = output[(j * 32) + i]; } Idct32(tempIn, tempOut); - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); } } } - public static void Idct32x321Add(ReadOnlySpan input, Span dest, int stride) + public static void Idct32X321Add(ReadOnlySpan input, Span dest, int stride) { - int i, j; long a1; - int output = WrapLow(DctConstRoundShift((short)input[0] * CosPi16_64)); + int output = WrapLow(DctConstRoundShift((short)input[0] * CosPi1664)); - output = WrapLow(DctConstRoundShift(output * CosPi16_64)); + output = WrapLow(DctConstRoundShift(output * CosPi1664)); a1 = BitUtils.RoundPowerOfTwo(output, 6); - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { dest[i] = ClipPixelAdd(dest[i], a1); } - dest = dest[stride..]; + dest = dest.Slice(stride); } } [SkipLocalsInit] - public static void HighbdIwht4x416Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIwht4X416Add(ReadOnlySpan input, Span dest, int stride, int bd) { /* 4-point reversible, orthonormal inverse Walsh-Hadamard in 3.5 adds, 0.5 shifts per pixel. */ - int i; + Span output = stackalloc int[16]; long a1, b1, c1, d1, e1; ReadOnlySpan ip = input; Span op = output; - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { a1 = ip[0] >> UnitQuantShift; c1 = ip[1] >> UnitQuantShift; @@ -1515,12 +1501,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp op[1] = HighbdWrapLow(b1, bd); op[2] = HighbdWrapLow(c1, bd); op[3] = HighbdWrapLow(d1, bd); - ip = ip[4..]; - op = op[4..]; + ip = ip.Slice(4); + op = op.Slice(4); } ReadOnlySpan ip2 = output; - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { a1 = ip2[4 * 0]; c1 = ip2[4 * 1]; @@ -1538,15 +1524,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dest[stride * 2] = HighbdClipPixelAdd(dest[stride * 2], HighbdWrapLow(c1, bd), bd); dest[stride * 3] = HighbdClipPixelAdd(dest[stride * 3], HighbdWrapLow(d1, bd), bd); - ip2 = ip2[1..]; - dest = dest[1..]; + ip2 = ip2.Slice(1); + dest = dest.Slice(1); } } [SkipLocalsInit] - public static void HighbdIwht4x41Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIwht4X41Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i; long a1, e1; Span tmp = stackalloc int[4]; ReadOnlySpan ip = input; @@ -1559,7 +1544,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp op[1] = op[2] = op[3] = HighbdWrapLow(e1, bd); ReadOnlySpan ip2 = tmp; - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { e1 = ip2[0] >> 1; a1 = ip2[0] - e1; @@ -1567,8 +1552,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp dest[stride * 1] = HighbdClipPixelAdd(dest[stride * 1], e1, bd); dest[stride * 2] = HighbdClipPixelAdd(dest[stride * 2], e1, bd); dest[stride * 3] = HighbdClipPixelAdd(dest[stride * 3], e1, bd); - ip2 = ip2[1..]; - dest = dest[1..]; + ip2 = ip2.Slice(1); + dest = dest.Slice(1); } } @@ -1583,31 +1568,29 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (DetectInvalidHighbdInput(input, 4) != 0) { Debug.Assert(false, "invalid highbd txfm input"); - output[..4].Clear(); - + output.Slice(0, 4).Clear(); return; } if ((x0 | x1 | x2 | x3) == 0) { - output[..4].Clear(); - + output.Slice(0, 4).Clear(); return; } - s0 = (long)SinPi1_9 * x0; - s1 = (long)SinPi2_9 * x0; - s2 = (long)SinPi3_9 * x1; - s3 = (long)SinPi4_9 * x2; - s4 = (long)SinPi1_9 * x2; - s5 = (long)SinPi2_9 * x3; - s6 = (long)SinPi4_9 * x3; + s0 = (long)SinPi19 * x0; + s1 = (long)SinPi29 * x0; + s2 = (long)SinPi39 * x1; + s3 = (long)SinPi49 * x2; + s4 = (long)SinPi19 * x2; + s5 = (long)SinPi29 * x3; + s6 = (long)SinPi49 * x3; s7 = HighbdWrapLow(x0 - x2 + x3, bd); s0 = s0 + s3 + s5; s1 = s1 - s4 - s6; s3 = s2; - s2 = SinPi3_9 * s7; + s2 = SinPi39 * s7; // 1-D transform scaling factor is sqrt(2). // The overall dynamic range is 14b (input) + 14b (multiplication scaling) @@ -1628,18 +1611,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (DetectInvalidHighbdInput(input, 4) != 0) { Debug.Assert(false, "invalid highbd txfm input"); - output[..4].Clear(); - + output.Slice(0, 4).Clear(); return; } // stage 1 - temp1 = (input[0] + input[2]) * (long)CosPi16_64; - temp2 = (input[0] - input[2]) * (long)CosPi16_64; + temp1 = (input[0] + input[2]) * (long)CosPi1664; + temp2 = (input[0] - input[2]) * (long)CosPi1664; step[0] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step[1] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[1] * (long)CosPi24_64 - input[3] * (long)CosPi8_64; - temp2 = input[1] * (long)CosPi8_64 + input[3] * (long)CosPi24_64; + temp1 = (input[1] * (long)CosPi2464) - (input[3] * (long)CosPi864); + temp2 = (input[1] * (long)CosPi864) + (input[3] * (long)CosPi2464); step[2] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step[3] = HighbdWrapLow(DctConstRoundShift(temp2), bd); @@ -1651,54 +1633,53 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } [SkipLocalsInit] - public static void HighbdIdct4x416Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct4X416Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[4 * 4]; Span outptr = output; Span tempIn = stackalloc int[4]; Span tempOut = stackalloc int[4]; // Rows - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { HighbdIdct4(input, outptr, bd); - input = input[4..]; - outptr = outptr[4..]; + input = input.Slice(4); + outptr = outptr.Slice(4); } // Columns - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { - for (j = 0; j < 4; ++j) + for (int j = 0; j < 4; ++j) { - tempIn[j] = output[j * 4 + i]; + tempIn[j] = output[(j * 4) + i]; } HighbdIdct4(tempIn, tempOut, bd); - for (j = 0; j < 4; ++j) + for (int j = 0; j < 4; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 4), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 4), bd); } } } - public static void HighbdIdct4x41Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct4X41Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i; long a1; - int output = HighbdWrapLow(DctConstRoundShift(input[0] * (long)CosPi16_64), bd); + int output = HighbdWrapLow(DctConstRoundShift(input[0] * (long)CosPi1664), bd); - output = HighbdWrapLow(DctConstRoundShift(output * (long)CosPi16_64), bd); + output = HighbdWrapLow(DctConstRoundShift(output * (long)CosPi1664), bd); a1 = BitUtils.RoundPowerOfTwo(output, 4); - for (i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) { dest[0] = HighbdClipPixelAdd(dest[0], a1, bd); dest[1] = HighbdClipPixelAdd(dest[1], a1, bd); dest[2] = HighbdClipPixelAdd(dest[2], a1, bd); dest[3] = HighbdClipPixelAdd(dest[3], a1, bd); - dest = dest[stride..]; + dest = dest.Slice(stride); } } @@ -1717,27 +1698,25 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (DetectInvalidHighbdInput(input, 8) != 0) { Debug.Assert(false, "invalid highbd txfm input"); - output[..8].Clear(); - + output.Slice(0, 8).Clear(); return; } if ((x0 | x1 | x2 | x3 | x4 | x5 | x6 | x7) == 0) { - output[..8].Clear(); - + output.Slice(0, 8).Clear(); return; } // stage 1 - s0 = (long)CosPi2_64 * x0 + (long)CosPi30_64 * x1; - s1 = (long)CosPi30_64 * x0 - (long)CosPi2_64 * x1; - s2 = (long)CosPi10_64 * x2 + (long)CosPi22_64 * x3; - s3 = (long)CosPi22_64 * x2 - (long)CosPi10_64 * x3; - s4 = (long)CosPi18_64 * x4 + (long)CosPi14_64 * x5; - s5 = (long)CosPi14_64 * x4 - (long)CosPi18_64 * x5; - s6 = (long)CosPi26_64 * x6 + (long)CosPi6_64 * x7; - s7 = (long)CosPi6_64 * x6 - (long)CosPi26_64 * x7; + s0 = ((long)CosPi264 * x0) + ((long)CosPi3064 * x1); + s1 = ((long)CosPi3064 * x0) - ((long)CosPi264 * x1); + s2 = ((long)CosPi1064 * x2) + ((long)CosPi2264 * x3); + s3 = ((long)CosPi2264 * x2) - ((long)CosPi1064 * x3); + s4 = ((long)CosPi1864 * x4) + ((long)CosPi1464 * x5); + s5 = ((long)CosPi1464 * x4) - ((long)CosPi1864 * x5); + s6 = ((long)CosPi2664 * x6) + ((long)CosPi664 * x7); + s7 = ((long)CosPi664 * x6) - ((long)CosPi2664 * x7); x0 = HighbdWrapLow(DctConstRoundShift(s0 + s4), bd); x1 = HighbdWrapLow(DctConstRoundShift(s1 + s5), bd); @@ -1753,10 +1732,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp s1 = x1; s2 = x2; s3 = x3; - s4 = (long)CosPi8_64 * x4 + (long)CosPi24_64 * x5; - s5 = (long)CosPi24_64 * x4 - (long)CosPi8_64 * x5; - s6 = (long)(-CosPi24_64) * x6 + (long)CosPi8_64 * x7; - s7 = (long)CosPi8_64 * x6 + (long)CosPi24_64 * x7; + s4 = ((long)CosPi864 * x4) + ((long)CosPi2464 * x5); + s5 = ((long)CosPi2464 * x4) - ((long)CosPi864 * x5); + s6 = ((long)-CosPi2464 * x6) + ((long)CosPi864 * x7); + s7 = ((long)CosPi864 * x6) + ((long)CosPi2464 * x7); x0 = HighbdWrapLow(s0 + s2, bd); x1 = HighbdWrapLow(s1 + s3, bd); @@ -1768,10 +1747,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp x7 = HighbdWrapLow(DctConstRoundShift(s5 - s7), bd); // stage 3 - s2 = (long)CosPi16_64 * (x2 + x3); - s3 = (long)CosPi16_64 * (x2 - x3); - s6 = (long)CosPi16_64 * (x6 + x7); - s7 = (long)CosPi16_64 * (x6 - x7); + s2 = (long)CosPi1664 * (x2 + x3); + s3 = (long)CosPi1664 * (x2 - x3); + s6 = (long)CosPi1664 * (x6 + x7); + s7 = (long)CosPi1664 * (x6 - x7); x2 = HighbdWrapLow(DctConstRoundShift(s2), bd); x3 = HighbdWrapLow(DctConstRoundShift(s3), bd); @@ -1798,8 +1777,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (DetectInvalidHighbdInput(input, 8) != 0) { Debug.Assert(false, "invalid highbd txfm input"); - output[..8].Clear(); - + output.Slice(0, 8).Clear(); return; } @@ -1808,12 +1786,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = input[4]; step1[1] = input[2]; step1[3] = input[6]; - temp1 = input[1] * (long)CosPi28_64 - input[7] * (long)CosPi4_64; - temp2 = input[1] * (long)CosPi4_64 + input[7] * (long)CosPi28_64; + temp1 = (input[1] * (long)CosPi2864) - (input[7] * (long)CosPi464); + temp2 = (input[1] * (long)CosPi464) + (input[7] * (long)CosPi2864); step1[4] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[7] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[5] * (long)CosPi12_64 - input[3] * (long)CosPi20_64; - temp2 = input[5] * (long)CosPi20_64 + input[3] * (long)CosPi12_64; + temp1 = (input[5] * (long)CosPi1264) - (input[3] * (long)CosPi2064); + temp2 = (input[5] * (long)CosPi2064) + (input[3] * (long)CosPi1264); step1[5] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[6] = HighbdWrapLow(DctConstRoundShift(temp2), bd); @@ -1828,8 +1806,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // stage 3 - odd half step1[4] = step2[4]; - temp1 = (step2[6] - step2[5]) * (long)CosPi16_64; - temp2 = (step2[5] + step2[6]) * (long)CosPi16_64; + temp1 = (step2[6] - step2[5]) * (long)CosPi1664; + temp2 = (step2[5] + step2[6]) * (long)CosPi1664; step1[5] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[6] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step1[7] = step2[7]; @@ -1846,42 +1824,41 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } [SkipLocalsInit] - public static void HighbdIdct8x864Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct8X864Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[8 * 8]; Span outptr = output; Span tempIn = stackalloc int[8]; Span tempOut = stackalloc int[8]; // First transform rows - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { HighbdIdct8(input, outptr, bd); - input = input[8..]; - outptr = outptr[8..]; + input = input.Slice(8); + outptr = outptr.Slice(8); } // Then transform columns - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - tempIn[j] = output[j * 8 + i]; + tempIn[j] = output[(j * 8) + i]; } HighbdIdct8(tempIn, tempOut, bd); - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 5), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 5), bd); } } } [SkipLocalsInit] - public static void HighbdIdct8x812Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct8X812Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[8 * 8]; Span outptr = output; Span tempIn = stackalloc int[8]; @@ -1891,45 +1868,45 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // First transform rows // Only first 4 row has non-zero coefs - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { HighbdIdct8(input, outptr, bd); - input = input[8..]; - outptr = outptr[8..]; + input = input.Slice(8); + outptr = outptr.Slice(8); } // Then transform columns - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - tempIn[j] = output[j * 8 + i]; + tempIn[j] = output[(j * 8) + i]; } HighbdIdct8(tempIn, tempOut, bd); - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 5), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 5), bd); } } } - public static void Vpx_Highbdidct8x8_1_add_c(ReadOnlySpan input, Span dest, int stride, int bd) + public static void VpxHighbdidct8X81AddC(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; long a1; - int output = HighbdWrapLow(DctConstRoundShift(input[0] * (long)CosPi16_64), bd); + int output = HighbdWrapLow(DctConstRoundShift(input[0] * (long)CosPi1664), bd); - output = HighbdWrapLow(DctConstRoundShift(output * (long)CosPi16_64), bd); + output = HighbdWrapLow(DctConstRoundShift(output * (long)CosPi1664), bd); a1 = BitUtils.RoundPowerOfTwo(output, 5); - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { dest[i] = HighbdClipPixelAdd(dest[i], a1, bd); } - dest = dest[stride..]; + dest = dest.Slice(stride); } } @@ -1953,39 +1930,36 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp int x13 = input[12]; int x14 = input[1]; int x15 = input[14]; - if (DetectInvalidHighbdInput(input, 16) != 0) { Debug.Assert(false, "invalid highbd txfm input"); - output[..16].Clear(); - + output.Slice(0, 16).Clear(); return; } if ((x0 | x1 | x2 | x3 | x4 | x5 | x6 | x7 | x8 | x9 | x10 | x11 | x12 | x13 | x14 | x15) == 0) { - output[..16].Clear(); - + output.Slice(0, 16).Clear(); return; } // stage 1 - s0 = x0 * (long)CosPi1_64 + x1 * (long)CosPi31_64; - s1 = x0 * (long)CosPi31_64 - x1 * (long)CosPi1_64; - s2 = x2 * (long)CosPi5_64 + x3 * (long)CosPi27_64; - s3 = x2 * (long)CosPi27_64 - x3 * (long)CosPi5_64; - s4 = x4 * (long)CosPi9_64 + x5 * (long)CosPi23_64; - s5 = x4 * (long)CosPi23_64 - x5 * (long)CosPi9_64; - s6 = x6 * (long)CosPi13_64 + x7 * (long)CosPi19_64; - s7 = x6 * (long)CosPi19_64 - x7 * (long)CosPi13_64; - s8 = x8 * (long)CosPi17_64 + x9 * (long)CosPi15_64; - s9 = x8 * (long)CosPi15_64 - x9 * (long)CosPi17_64; - s10 = x10 * (long)CosPi21_64 + x11 * (long)CosPi11_64; - s11 = x10 * (long)CosPi11_64 - x11 * (long)CosPi21_64; - s12 = x12 * (long)CosPi25_64 + x13 * (long)CosPi7_64; - s13 = x12 * (long)CosPi7_64 - x13 * (long)CosPi25_64; - s14 = x14 * (long)CosPi29_64 + x15 * (long)CosPi3_64; - s15 = x14 * (long)CosPi3_64 - x15 * (long)CosPi29_64; + s0 = (x0 * (long)CosPi164) + (x1 * (long)CosPi3164); + s1 = (x0 * (long)CosPi3164) - (x1 * (long)CosPi164); + s2 = (x2 * (long)CosPi564) + (x3 * (long)CosPi2764); + s3 = (x2 * (long)CosPi2764) - (x3 * (long)CosPi564); + s4 = (x4 * (long)CosPi964) + (x5 * (long)CosPi2364); + s5 = (x4 * (long)CosPi2364) - (x5 * (long)CosPi964); + s6 = (x6 * (long)CosPi1364) + (x7 * (long)CosPi1964); + s7 = (x6 * (long)CosPi1964) - (x7 * (long)CosPi1364); + s8 = (x8 * (long)CosPi1764) + (x9 * (long)CosPi1564); + s9 = (x8 * (long)CosPi1564) - (x9 * (long)CosPi1764); + s10 = (x10 * (long)CosPi2164) + (x11 * (long)CosPi1164); + s11 = (x10 * (long)CosPi1164) - (x11 * (long)CosPi2164); + s12 = (x12 * (long)CosPi2564) + (x13 * (long)CosPi764); + s13 = (x12 * (long)CosPi764) - (x13 * (long)CosPi2564); + s14 = (x14 * (long)CosPi2964) + (x15 * (long)CosPi364); + s15 = (x14 * (long)CosPi364) - (x15 * (long)CosPi2964); x0 = HighbdWrapLow(DctConstRoundShift(s0 + s8), bd); x1 = HighbdWrapLow(DctConstRoundShift(s1 + s9), bd); @@ -2013,14 +1987,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp s5 = x5; s6 = x6; s7 = x7; - s8 = x8 * (long)CosPi4_64 + x9 * (long)CosPi28_64; - s9 = x8 * (long)CosPi28_64 - x9 * (long)CosPi4_64; - s10 = x10 * (long)CosPi20_64 + x11 * (long)CosPi12_64; - s11 = x10 * (long)CosPi12_64 - x11 * (long)CosPi20_64; - s12 = -x12 * (long)CosPi28_64 + x13 * (long)CosPi4_64; - s13 = x12 * (long)CosPi4_64 + x13 * (long)CosPi28_64; - s14 = -x14 * (long)CosPi12_64 + x15 * (long)CosPi20_64; - s15 = x14 * (long)CosPi20_64 + x15 * (long)CosPi12_64; + s8 = (x8 * (long)CosPi464) + (x9 * (long)CosPi2864); + s9 = (x8 * (long)CosPi2864) - (x9 * (long)CosPi464); + s10 = (x10 * (long)CosPi2064) + (x11 * (long)CosPi1264); + s11 = (x10 * (long)CosPi1264) - (x11 * (long)CosPi2064); + s12 = (-x12 * (long)CosPi2864) + (x13 * (long)CosPi464); + s13 = (x12 * (long)CosPi464) + (x13 * (long)CosPi2864); + s14 = (-x14 * (long)CosPi1264) + (x15 * (long)CosPi2064); + s15 = (x14 * (long)CosPi2064) + (x15 * (long)CosPi1264); x0 = HighbdWrapLow(s0 + s4, bd); x1 = HighbdWrapLow(s1 + s5, bd); @@ -2044,18 +2018,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp s1 = x1; s2 = x2; s3 = x3; - s4 = x4 * (long)CosPi8_64 + x5 * (long)CosPi24_64; - s5 = x4 * (long)CosPi24_64 - x5 * (long)CosPi8_64; - s6 = -x6 * (long)CosPi24_64 + x7 * (long)CosPi8_64; - s7 = x6 * (long)CosPi8_64 + x7 * (long)CosPi24_64; + s4 = (x4 * (long)CosPi864) + (x5 * (long)CosPi2464); + s5 = (x4 * (long)CosPi2464) - (x5 * (long)CosPi864); + s6 = (-x6 * (long)CosPi2464) + (x7 * (long)CosPi864); + s7 = (x6 * (long)CosPi864) + (x7 * (long)CosPi2464); s8 = x8; s9 = x9; s10 = x10; s11 = x11; - s12 = x12 * (long)CosPi8_64 + x13 * (long)CosPi24_64; - s13 = x12 * (long)CosPi24_64 - x13 * (long)CosPi8_64; - s14 = -x14 * (long)CosPi24_64 + x15 * (long)CosPi8_64; - s15 = x14 * (long)CosPi8_64 + x15 * (long)CosPi24_64; + s12 = (x12 * (long)CosPi864) + (x13 * (long)CosPi2464); + s13 = (x12 * (long)CosPi2464) - (x13 * (long)CosPi864); + s14 = (-x14 * (long)CosPi2464) + (x15 * (long)CosPi864); + s15 = (x14 * (long)CosPi864) + (x15 * (long)CosPi2464); x0 = HighbdWrapLow(s0 + s2, bd); x1 = HighbdWrapLow(s1 + s3, bd); @@ -2075,14 +2049,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp x15 = HighbdWrapLow(DctConstRoundShift(s13 - s15), bd); // stage 4 - s2 = (long)(-CosPi16_64) * (x2 + x3); - s3 = (long)CosPi16_64 * (x2 - x3); - s6 = (long)CosPi16_64 * (x6 + x7); - s7 = (long)CosPi16_64 * (-x6 + x7); - s10 = (long)CosPi16_64 * (x10 + x11); - s11 = (long)CosPi16_64 * (-x10 + x11); - s14 = (long)(-CosPi16_64) * (x14 + x15); - s15 = (long)CosPi16_64 * (x14 - x15); + s2 = (long)-CosPi1664 * (x2 + x3); + s3 = (long)CosPi1664 * (x2 - x3); + s6 = (long)CosPi1664 * (x6 + x7); + s7 = (long)CosPi1664 * (-x6 + x7); + s10 = (long)CosPi1664 * (x10 + x11); + s11 = (long)CosPi1664 * (-x10 + x11); + s14 = (long)-CosPi1664 * (x14 + x15); + s15 = (long)CosPi1664 * (x14 - x15); x2 = HighbdWrapLow(DctConstRoundShift(s2), bd); x3 = HighbdWrapLow(DctConstRoundShift(s3), bd); @@ -2121,8 +2095,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (DetectInvalidHighbdInput(input, 16) != 0) { Debug.Assert(false, "invalid highbd txfm input"); - output[..16].Clear(); - + output.Slice(0, 16).Clear(); return; } @@ -2154,23 +2127,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[6] = step1[6]; step2[7] = step1[7]; - temp1 = step1[8] * (long)CosPi30_64 - step1[15] * (long)CosPi2_64; - temp2 = step1[8] * (long)CosPi2_64 + step1[15] * (long)CosPi30_64; + temp1 = (step1[8] * (long)CosPi3064) - (step1[15] * (long)CosPi264); + temp2 = (step1[8] * (long)CosPi264) + (step1[15] * (long)CosPi3064); step2[8] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[15] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step1[9] * (long)CosPi14_64 - step1[14] * (long)CosPi18_64; - temp2 = step1[9] * (long)CosPi18_64 + step1[14] * (long)CosPi14_64; + temp1 = (step1[9] * (long)CosPi1464) - (step1[14] * (long)CosPi1864); + temp2 = (step1[9] * (long)CosPi1864) + (step1[14] * (long)CosPi1464); step2[9] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[14] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step1[10] * (long)CosPi22_64 - step1[13] * (long)CosPi10_64; - temp2 = step1[10] * (long)CosPi10_64 + step1[13] * (long)CosPi22_64; + temp1 = (step1[10] * (long)CosPi2264) - (step1[13] * (long)CosPi1064); + temp2 = (step1[10] * (long)CosPi1064) + (step1[13] * (long)CosPi2264); step2[10] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[13] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step1[11] * (long)CosPi6_64 - step1[12] * (long)CosPi26_64; - temp2 = step1[11] * (long)CosPi26_64 + step1[12] * (long)CosPi6_64; + temp1 = (step1[11] * (long)CosPi664) - (step1[12] * (long)CosPi2664); + temp2 = (step1[11] * (long)CosPi2664) + (step1[12] * (long)CosPi664); step2[11] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[12] = HighbdWrapLow(DctConstRoundShift(temp2), bd); @@ -2180,12 +2153,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = step2[2]; step1[3] = step2[3]; - temp1 = step2[4] * (long)CosPi28_64 - step2[7] * (long)CosPi4_64; - temp2 = step2[4] * (long)CosPi4_64 + step2[7] * (long)CosPi28_64; + temp1 = (step2[4] * (long)CosPi2864) - (step2[7] * (long)CosPi464); + temp2 = (step2[4] * (long)CosPi464) + (step2[7] * (long)CosPi2864); step1[4] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[7] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step2[5] * (long)CosPi12_64 - step2[6] * (long)CosPi20_64; - temp2 = step2[5] * (long)CosPi20_64 + step2[6] * (long)CosPi12_64; + temp1 = (step2[5] * (long)CosPi1264) - (step2[6] * (long)CosPi2064); + temp2 = (step2[5] * (long)CosPi2064) + (step2[6] * (long)CosPi1264); step1[5] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[6] = HighbdWrapLow(DctConstRoundShift(temp2), bd); @@ -2199,12 +2172,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[15] = HighbdWrapLow(step2[14] + step2[15], bd); // stage 4 - temp1 = (step1[0] + step1[1]) * (long)CosPi16_64; - temp2 = (step1[0] - step1[1]) * (long)CosPi16_64; + temp1 = (step1[0] + step1[1]) * (long)CosPi1664; + temp2 = (step1[0] - step1[1]) * (long)CosPi1664; step2[0] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[1] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step1[2] * (long)CosPi24_64 - step1[3] * (long)CosPi8_64; - temp2 = step1[2] * (long)CosPi8_64 + step1[3] * (long)CosPi24_64; + temp1 = (step1[2] * (long)CosPi2464) - (step1[3] * (long)CosPi864); + temp2 = (step1[2] * (long)CosPi864) + (step1[3] * (long)CosPi2464); step2[2] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[3] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step2[4] = HighbdWrapLow(step1[4] + step1[5], bd); @@ -2214,12 +2187,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[8] = step1[8]; step2[15] = step1[15]; - temp1 = -step1[9] * (long)CosPi8_64 + step1[14] * (long)CosPi24_64; - temp2 = step1[9] * (long)CosPi24_64 + step1[14] * (long)CosPi8_64; + temp1 = (-step1[9] * (long)CosPi864) + (step1[14] * (long)CosPi2464); + temp2 = (step1[9] * (long)CosPi2464) + (step1[14] * (long)CosPi864); step2[9] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[14] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = -step1[10] * (long)CosPi24_64 - step1[13] * (long)CosPi8_64; - temp2 = -step1[10] * (long)CosPi8_64 + step1[13] * (long)CosPi24_64; + temp1 = (-step1[10] * (long)CosPi2464) - (step1[13] * (long)CosPi864); + temp2 = (-step1[10] * (long)CosPi864) + (step1[13] * (long)CosPi2464); step2[10] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[13] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step2[11] = step1[11]; @@ -2231,8 +2204,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = HighbdWrapLow(step2[1] - step2[2], bd); step1[3] = HighbdWrapLow(step2[0] - step2[3], bd); step1[4] = step2[4]; - temp1 = (step2[6] - step2[5]) * (long)CosPi16_64; - temp2 = (step2[5] + step2[6]) * (long)CosPi16_64; + temp1 = (step2[6] - step2[5]) * (long)CosPi1664; + temp2 = (step2[5] + step2[6]) * (long)CosPi1664; step1[5] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[6] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step1[7] = step2[7]; @@ -2257,12 +2230,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[7] = HighbdWrapLow(step1[0] - step1[7], bd); step2[8] = step1[8]; step2[9] = step1[9]; - temp1 = (-step1[10] + step1[13]) * (long)CosPi16_64; - temp2 = (step1[10] + step1[13]) * (long)CosPi16_64; + temp1 = (-step1[10] + step1[13]) * (long)CosPi1664; + temp2 = (step1[10] + step1[13]) * (long)CosPi1664; step2[10] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[13] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = (-step1[11] + step1[12]) * (long)CosPi16_64; - temp2 = (step1[11] + step1[12]) * (long)CosPi16_64; + temp1 = (-step1[11] + step1[12]) * (long)CosPi1664; + temp2 = (step1[11] + step1[12]) * (long)CosPi1664; step2[11] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[12] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step2[14] = step1[14]; @@ -2288,42 +2261,41 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } [SkipLocalsInit] - public static void HighbdIdct16x16256Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct16X16256Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[16 * 16]; Span outptr = output; Span tempIn = stackalloc int[16]; Span tempOut = stackalloc int[16]; // First transform rows - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { HighbdIdct16(input, outptr, bd); - input = input[16..]; - outptr = outptr[16..]; + input = input.Slice(16); + outptr = outptr.Slice(16); } // Then transform columns - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - tempIn[j] = output[j * 16 + i]; + tempIn[j] = output[(j * 16) + i]; } HighbdIdct16(tempIn, tempOut, bd); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); } } } [SkipLocalsInit] - public static void HighbdIdct16x1638Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct16X1638Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[16 * 16]; Span outptr = output; Span tempIn = stackalloc int[16]; @@ -2333,35 +2305,34 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // First transform rows. Since all non-zero dct coefficients are in // upper-left 8x8 area, we only need to calculate first 8 rows here. - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { HighbdIdct16(input, outptr, bd); - input = input[16..]; - outptr = outptr[16..]; + input = input.Slice(16); + outptr = outptr.Slice(16); } // Then transform columns - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { Span destT = dest; - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - tempIn[j] = output[j * 16 + i]; + tempIn[j] = output[(j * 16) + i]; } HighbdIdct16(tempIn, tempOut, bd); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { destT[i] = HighbdClipPixelAdd(destT[i], BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); - destT = destT[stride..]; + destT = destT.Slice(stride); } } } [SkipLocalsInit] - public static void HighbdIdct16x1610Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct16X1610Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[16 * 16]; Span outptr = output; Span tempIn = stackalloc int[16]; @@ -2371,45 +2342,45 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // First transform rows. Since all non-zero dct coefficients are in // upper-left 4x4 area, we only need to calculate first 4 rows here. - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { HighbdIdct16(input, outptr, bd); - input = input[16..]; - outptr = outptr[16..]; + input = input.Slice(16); + outptr = outptr.Slice(16); } // Then transform columns - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - tempIn[j] = output[j * 16 + i]; + tempIn[j] = output[(j * 16) + i]; } HighbdIdct16(tempIn, tempOut, bd); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); } } } - public static void HighbdIdct16x161Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct16X161Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; long a1; - int output = HighbdWrapLow(DctConstRoundShift(input[0] * (long)CosPi16_64), bd); + int output = HighbdWrapLow(DctConstRoundShift(input[0] * (long)CosPi1664), bd); - output = HighbdWrapLow(DctConstRoundShift(output * (long)CosPi16_64), bd); + output = HighbdWrapLow(DctConstRoundShift(output * (long)CosPi1664), bd); a1 = BitUtils.RoundPowerOfTwo(output, 6); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { dest[i] = HighbdClipPixelAdd(dest[i], a1, bd); } - dest = dest[stride..]; + dest = dest.Slice(stride); } } @@ -2423,8 +2394,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (DetectInvalidHighbdInput(input, 32) != 0) { Debug.Assert(false, "invalid highbd txfm input"); - output[..32].Clear(); - + output.Slice(0, 32).Clear(); return; } @@ -2446,43 +2416,43 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[14] = input[14]; step1[15] = input[30]; - temp1 = input[1] * (long)CosPi31_64 - input[31] * (long)CosPi1_64; - temp2 = input[1] * (long)CosPi1_64 + input[31] * (long)CosPi31_64; + temp1 = (input[1] * (long)CosPi3164) - (input[31] * (long)CosPi164); + temp2 = (input[1] * (long)CosPi164) + (input[31] * (long)CosPi3164); step1[16] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[31] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[17] * (long)CosPi15_64 - input[15] * (long)CosPi17_64; - temp2 = input[17] * (long)CosPi17_64 + input[15] * (long)CosPi15_64; + temp1 = (input[17] * (long)CosPi1564) - (input[15] * (long)CosPi1764); + temp2 = (input[17] * (long)CosPi1764) + (input[15] * (long)CosPi1564); step1[17] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[30] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[9] * (long)CosPi23_64 - input[23] * (long)CosPi9_64; - temp2 = input[9] * (long)CosPi9_64 + input[23] * (long)CosPi23_64; + temp1 = (input[9] * (long)CosPi2364) - (input[23] * (long)CosPi964); + temp2 = (input[9] * (long)CosPi964) + (input[23] * (long)CosPi2364); step1[18] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[29] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[25] * (long)CosPi7_64 - input[7] * (long)CosPi25_64; - temp2 = input[25] * (long)CosPi25_64 + input[7] * (long)CosPi7_64; + temp1 = (input[25] * (long)CosPi764) - (input[7] * (long)CosPi2564); + temp2 = (input[25] * (long)CosPi2564) + (input[7] * (long)CosPi764); step1[19] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[28] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[5] * (long)CosPi27_64 - input[27] * (long)CosPi5_64; - temp2 = input[5] * (long)CosPi5_64 + input[27] * (long)CosPi27_64; + temp1 = (input[5] * (long)CosPi2764) - (input[27] * (long)CosPi564); + temp2 = (input[5] * (long)CosPi564) + (input[27] * (long)CosPi2764); step1[20] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[27] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[21] * (long)CosPi11_64 - input[11] * (long)CosPi21_64; - temp2 = input[21] * (long)CosPi21_64 + input[11] * (long)CosPi11_64; + temp1 = (input[21] * (long)CosPi1164) - (input[11] * (long)CosPi2164); + temp2 = (input[21] * (long)CosPi2164) + (input[11] * (long)CosPi1164); step1[21] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[26] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[13] * (long)CosPi19_64 - input[19] * (long)CosPi13_64; - temp2 = input[13] * (long)CosPi13_64 + input[19] * (long)CosPi19_64; + temp1 = (input[13] * (long)CosPi1964) - (input[19] * (long)CosPi1364); + temp2 = (input[13] * (long)CosPi1364) + (input[19] * (long)CosPi1964); step1[22] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[25] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = input[29] * (long)CosPi3_64 - input[3] * (long)CosPi29_64; - temp2 = input[29] * (long)CosPi29_64 + input[3] * (long)CosPi3_64; + temp1 = (input[29] * (long)CosPi364) - (input[3] * (long)CosPi2964); + temp2 = (input[29] * (long)CosPi2964) + (input[3] * (long)CosPi364); step1[23] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[24] = HighbdWrapLow(DctConstRoundShift(temp2), bd); @@ -2496,23 +2466,23 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[6] = step1[6]; step2[7] = step1[7]; - temp1 = step1[8] * (long)CosPi30_64 - step1[15] * (long)CosPi2_64; - temp2 = step1[8] * (long)CosPi2_64 + step1[15] * (long)CosPi30_64; + temp1 = (step1[8] * (long)CosPi3064) - (step1[15] * (long)CosPi264); + temp2 = (step1[8] * (long)CosPi264) + (step1[15] * (long)CosPi3064); step2[8] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[15] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step1[9] * (long)CosPi14_64 - step1[14] * (long)CosPi18_64; - temp2 = step1[9] * (long)CosPi18_64 + step1[14] * (long)CosPi14_64; + temp1 = (step1[9] * (long)CosPi1464) - (step1[14] * (long)CosPi1864); + temp2 = (step1[9] * (long)CosPi1864) + (step1[14] * (long)CosPi1464); step2[9] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[14] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step1[10] * (long)CosPi22_64 - step1[13] * (long)CosPi10_64; - temp2 = step1[10] * (long)CosPi10_64 + step1[13] * (long)CosPi22_64; + temp1 = (step1[10] * (long)CosPi2264) - (step1[13] * (long)CosPi1064); + temp2 = (step1[10] * (long)CosPi1064) + (step1[13] * (long)CosPi2264); step2[10] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[13] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step1[11] * (long)CosPi6_64 - step1[12] * (long)CosPi26_64; - temp2 = step1[11] * (long)CosPi26_64 + step1[12] * (long)CosPi6_64; + temp1 = (step1[11] * (long)CosPi664) - (step1[12] * (long)CosPi2664); + temp2 = (step1[11] * (long)CosPi2664) + (step1[12] * (long)CosPi664); step2[11] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[12] = HighbdWrapLow(DctConstRoundShift(temp2), bd); @@ -2539,12 +2509,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = step2[2]; step1[3] = step2[3]; - temp1 = step2[4] * (long)CosPi28_64 - step2[7] * (long)CosPi4_64; - temp2 = step2[4] * (long)CosPi4_64 + step2[7] * (long)CosPi28_64; + temp1 = (step2[4] * (long)CosPi2864) - (step2[7] * (long)CosPi464); + temp2 = (step2[4] * (long)CosPi464) + (step2[7] * (long)CosPi2864); step1[4] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[7] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step2[5] * (long)CosPi12_64 - step2[6] * (long)CosPi20_64; - temp2 = step2[5] * (long)CosPi20_64 + step2[6] * (long)CosPi12_64; + temp1 = (step2[5] * (long)CosPi1264) - (step2[6] * (long)CosPi2064); + temp2 = (step2[5] * (long)CosPi2064) + (step2[6] * (long)CosPi1264); step1[5] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[6] = HighbdWrapLow(DctConstRoundShift(temp2), bd); @@ -2559,22 +2529,22 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[16] = step2[16]; step1[31] = step2[31]; - temp1 = -step2[17] * (long)CosPi4_64 + step2[30] * (long)CosPi28_64; - temp2 = step2[17] * (long)CosPi28_64 + step2[30] * (long)CosPi4_64; + temp1 = (-step2[17] * (long)CosPi464) + (step2[30] * (long)CosPi2864); + temp2 = (step2[17] * (long)CosPi2864) + (step2[30] * (long)CosPi464); step1[17] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[30] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = -step2[18] * (long)CosPi28_64 - step2[29] * (long)CosPi4_64; - temp2 = -step2[18] * (long)CosPi4_64 + step2[29] * (long)CosPi28_64; + temp1 = (-step2[18] * (long)CosPi2864) - (step2[29] * (long)CosPi464); + temp2 = (-step2[18] * (long)CosPi464) + (step2[29] * (long)CosPi2864); step1[18] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[29] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step1[19] = step2[19]; step1[20] = step2[20]; - temp1 = -step2[21] * (long)CosPi20_64 + step2[26] * (long)CosPi12_64; - temp2 = step2[21] * (long)CosPi12_64 + step2[26] * (long)CosPi20_64; + temp1 = (-step2[21] * (long)CosPi2064) + (step2[26] * (long)CosPi1264); + temp2 = (step2[21] * (long)CosPi1264) + (step2[26] * (long)CosPi2064); step1[21] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[26] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = -step2[22] * (long)CosPi12_64 - step2[25] * (long)CosPi20_64; - temp2 = -step2[22] * (long)CosPi20_64 + step2[25] * (long)CosPi12_64; + temp1 = (-step2[22] * (long)CosPi1264) - (step2[25] * (long)CosPi2064); + temp2 = (-step2[22] * (long)CosPi2064) + (step2[25] * (long)CosPi1264); step1[22] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[25] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step1[23] = step2[23]; @@ -2583,12 +2553,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[28] = step2[28]; // stage 4 - temp1 = (step1[0] + step1[1]) * (long)CosPi16_64; - temp2 = (step1[0] - step1[1]) * (long)CosPi16_64; + temp1 = (step1[0] + step1[1]) * (long)CosPi1664; + temp2 = (step1[0] - step1[1]) * (long)CosPi1664; step2[0] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[1] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = step1[2] * (long)CosPi24_64 - step1[3] * (long)CosPi8_64; - temp2 = step1[2] * (long)CosPi8_64 + step1[3] * (long)CosPi24_64; + temp1 = (step1[2] * (long)CosPi2464) - (step1[3] * (long)CosPi864); + temp2 = (step1[2] * (long)CosPi864) + (step1[3] * (long)CosPi2464); step2[2] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[3] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step2[4] = HighbdWrapLow(step1[4] + step1[5], bd); @@ -2598,12 +2568,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[8] = step1[8]; step2[15] = step1[15]; - temp1 = -step1[9] * (long)CosPi8_64 + step1[14] * (long)CosPi24_64; - temp2 = step1[9] * (long)CosPi24_64 + step1[14] * (long)CosPi8_64; + temp1 = (-step1[9] * (long)CosPi864) + (step1[14] * (long)CosPi2464); + temp2 = (step1[9] * (long)CosPi2464) + (step1[14] * (long)CosPi864); step2[9] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[14] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = -step1[10] * (long)CosPi24_64 - step1[13] * (long)CosPi8_64; - temp2 = -step1[10] * (long)CosPi8_64 + step1[13] * (long)CosPi24_64; + temp1 = (-step1[10] * (long)CosPi2464) - (step1[13] * (long)CosPi864); + temp2 = (-step1[10] * (long)CosPi864) + (step1[13] * (long)CosPi2464); step2[10] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[13] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step2[11] = step1[11]; @@ -2633,8 +2603,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[2] = HighbdWrapLow(step2[1] - step2[2], bd); step1[3] = HighbdWrapLow(step2[0] - step2[3], bd); step1[4] = step2[4]; - temp1 = (step2[6] - step2[5]) * (long)CosPi16_64; - temp2 = (step2[5] + step2[6]) * (long)CosPi16_64; + temp1 = (step2[6] - step2[5]) * (long)CosPi1664; + temp2 = (step2[5] + step2[6]) * (long)CosPi1664; step1[5] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[6] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step1[7] = step2[7]; @@ -2650,20 +2620,20 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[16] = step2[16]; step1[17] = step2[17]; - temp1 = -step2[18] * (long)CosPi8_64 + step2[29] * (long)CosPi24_64; - temp2 = step2[18] * (long)CosPi24_64 + step2[29] * (long)CosPi8_64; + temp1 = (-step2[18] * (long)CosPi864) + (step2[29] * (long)CosPi2464); + temp2 = (step2[18] * (long)CosPi2464) + (step2[29] * (long)CosPi864); step1[18] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[29] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = -step2[19] * (long)CosPi8_64 + step2[28] * (long)CosPi24_64; - temp2 = step2[19] * (long)CosPi24_64 + step2[28] * (long)CosPi8_64; + temp1 = (-step2[19] * (long)CosPi864) + (step2[28] * (long)CosPi2464); + temp2 = (step2[19] * (long)CosPi2464) + (step2[28] * (long)CosPi864); step1[19] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[28] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = -step2[20] * (long)CosPi24_64 - step2[27] * (long)CosPi8_64; - temp2 = -step2[20] * (long)CosPi8_64 + step2[27] * (long)CosPi24_64; + temp1 = (-step2[20] * (long)CosPi2464) - (step2[27] * (long)CosPi864); + temp2 = (-step2[20] * (long)CosPi864) + (step2[27] * (long)CosPi2464); step1[20] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[27] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = -step2[21] * (long)CosPi24_64 - step2[26] * (long)CosPi8_64; - temp2 = -step2[21] * (long)CosPi8_64 + step2[26] * (long)CosPi24_64; + temp1 = (-step2[21] * (long)CosPi2464) - (step2[26] * (long)CosPi864); + temp2 = (-step2[21] * (long)CosPi864) + (step2[26] * (long)CosPi2464); step1[21] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[26] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step1[22] = step2[22]; @@ -2684,12 +2654,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step2[7] = HighbdWrapLow(step1[0] - step1[7], bd); step2[8] = step1[8]; step2[9] = step1[9]; - temp1 = (-step1[10] + step1[13]) * (long)CosPi16_64; - temp2 = (step1[10] + step1[13]) * (long)CosPi16_64; + temp1 = (-step1[10] + step1[13]) * (long)CosPi1664; + temp2 = (step1[10] + step1[13]) * (long)CosPi1664; step2[10] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[13] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = (-step1[11] + step1[12]) * (long)CosPi16_64; - temp2 = (step1[11] + step1[12]) * (long)CosPi16_64; + temp1 = (-step1[11] + step1[12]) * (long)CosPi1664; + temp2 = (step1[11] + step1[12]) * (long)CosPi1664; step2[11] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step2[12] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step2[14] = step1[14]; @@ -2735,20 +2705,20 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp step1[17] = step2[17]; step1[18] = step2[18]; step1[19] = step2[19]; - temp1 = (-step2[20] + step2[27]) * (long)CosPi16_64; - temp2 = (step2[20] + step2[27]) * (long)CosPi16_64; + temp1 = (-step2[20] + step2[27]) * (long)CosPi1664; + temp2 = (step2[20] + step2[27]) * (long)CosPi1664; step1[20] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[27] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = (-step2[21] + step2[26]) * (long)CosPi16_64; - temp2 = (step2[21] + step2[26]) * (long)CosPi16_64; + temp1 = (-step2[21] + step2[26]) * (long)CosPi1664; + temp2 = (step2[21] + step2[26]) * (long)CosPi1664; step1[21] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[26] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = (-step2[22] + step2[25]) * (long)CosPi16_64; - temp2 = (step2[22] + step2[25]) * (long)CosPi16_64; + temp1 = (-step2[22] + step2[25]) * (long)CosPi1664; + temp2 = (step2[22] + step2[25]) * (long)CosPi1664; step1[22] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[25] = HighbdWrapLow(DctConstRoundShift(temp2), bd); - temp1 = (-step2[23] + step2[24]) * (long)CosPi16_64; - temp2 = (step2[23] + step2[24]) * (long)CosPi16_64; + temp1 = (-step2[23] + step2[24]) * (long)CosPi1664; + temp2 = (step2[23] + step2[24]) * (long)CosPi1664; step1[23] = HighbdWrapLow(DctConstRoundShift(temp1), bd); step1[24] = HighbdWrapLow(DctConstRoundShift(temp2), bd); step1[28] = step2[28]; @@ -2792,19 +2762,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } [SkipLocalsInit] - public static void HighbdIdct32x321024Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct32X321024Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[32 * 32]; Span outptr = output; Span tempIn = stackalloc int[32]; Span tempOut = stackalloc int[32]; // Rows - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { int zeroCoeff = 0; - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { zeroCoeff |= input[j]; } @@ -2815,33 +2784,33 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } else { - outptr[..32].Clear(); + outptr.Slice(0, 32).Clear(); } - input = input[32..]; - outptr = outptr[32..]; + input = input.Slice(32); + outptr = outptr.Slice(32); } // Columns - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - tempIn[j] = output[j * 32 + i]; + tempIn[j] = output[(j * 32) + i]; } HighbdIdct32(tempIn, tempOut, bd); - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); } } } [SkipLocalsInit] - public static void HighbdIdct32x32135Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct32X32135Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[32 * 32]; Span outptr = output; Span tempIn = stackalloc int[32]; @@ -2851,35 +2820,34 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // Rows // Only upper-left 16x16 has non-zero coeff - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { HighbdIdct32(input, outptr, bd); - input = input[32..]; - outptr = outptr[32..]; + input = input.Slice(32); + outptr = outptr.Slice(32); } // Columns - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { Span destT = dest; - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - tempIn[j] = output[j * 32 + i]; + tempIn[j] = output[(j * 32) + i]; } HighbdIdct32(tempIn, tempOut, bd); - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { destT[i] = HighbdClipPixelAdd(destT[i], BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); - destT = destT[stride..]; + destT = destT.Slice(stride); } } } [SkipLocalsInit] - public static void HighbdIdct32x3234Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct32X3234Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; Span output = stackalloc int[32 * 32]; Span outptr = output; Span tempIn = stackalloc int[32]; @@ -2889,47 +2857,47 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // Rows // Only upper-left 8x8 has non-zero coeff - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { HighbdIdct32(input, outptr, bd); - input = input[32..]; - outptr = outptr[32..]; + input = input.Slice(32); + outptr = outptr.Slice(32); } // Columns - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - tempIn[j] = output[j * 32 + i]; + tempIn[j] = output[(j * 32) + i]; } HighbdIdct32(tempIn, tempOut, bd); - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); } } } - public static void HighbdIdct32x321Add(ReadOnlySpan input, Span dest, int stride, int bd) + public static void HighbdIdct32X321Add(ReadOnlySpan input, Span dest, int stride, int bd) { - int i, j; int a1; - int output = HighbdWrapLow(DctConstRoundShift(input[0] * (long)CosPi16_64), bd); + int output = HighbdWrapLow(DctConstRoundShift(input[0] * (long)CosPi1664), bd); - output = HighbdWrapLow(DctConstRoundShift(output * (long)CosPi16_64), bd); + output = HighbdWrapLow(DctConstRoundShift(output * (long)CosPi1664), bd); a1 = BitUtils.RoundPowerOfTwo(output, 6); - for (j = 0; j < 32; ++j) + for (int j = 0; j < 32; ++j) { - for (i = 0; i < 32; ++i) + for (int i = 0; i < 32; ++i) { dest[i] = HighbdClipPixelAdd(dest[i], a1, bd); } - dest = dest[stride..]; + dest = dest.Slice(stride); } } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterAuto.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterAuto.cs new file mode 100644 index 000000000..fbd87e17f --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterAuto.cs @@ -0,0 +1,229 @@ +using Ryujinx.Common.Memory; +using System; +using System.Runtime.Intrinsics.X86; + +namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp +{ + internal class LoopFilterAuto + { + public static void LpfHorizontal4( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfHorizontal4(s, pitch, blimit, limit, thresh); + } + else + { + LoopFilterScalar.LpfHorizontal4(s, pitch, blimit[0], limit[0], thresh[0]); + } + } + + public static void LpfHorizontal4Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit0, + ReadOnlySpan limit0, + ReadOnlySpan thresh0, + ReadOnlySpan blimit1, + ReadOnlySpan limit1, + ReadOnlySpan thresh1) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfHorizontal4Dual(s, pitch, blimit0, limit0, thresh0, blimit1, limit1, thresh1); + } + else + { + LoopFilterScalar.LpfHorizontal4Dual(s, pitch, blimit0[0], limit0[0], thresh0[0], blimit1[0], limit1[0], + thresh1[0]); + } + } + + public static void LpfHorizontal8( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfHorizontal8(s, pitch, blimit, limit, thresh); + } + else + { + LoopFilterScalar.LpfHorizontal8(s, pitch, blimit[0], limit[0], thresh[0]); + } + } + + public static void LpfHorizontal8Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit0, + ReadOnlySpan limit0, + ReadOnlySpan thresh0, + ReadOnlySpan blimit1, + ReadOnlySpan limit1, + ReadOnlySpan thresh1) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfHorizontal8Dual(s, pitch, blimit0, limit0, thresh0, blimit1, limit1, thresh1); + } + else + { + LoopFilterScalar.LpfHorizontal8Dual(s, pitch, blimit0[0], limit0[0], thresh0[0], blimit1[0], limit1[0], + thresh1[0]); + } + } + + public static void LpfHorizontal16( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfHorizontal16(s, pitch, blimit, limit, thresh); + } + else + { + LoopFilterScalar.LpfHorizontal16(s, pitch, blimit[0], limit[0], thresh[0]); + } + } + + public static void LpfHorizontal16Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfHorizontal16Dual(s, pitch, blimit, limit, thresh); + } + else + { + LoopFilterScalar.LpfHorizontal16Dual(s, pitch, blimit[0], limit[0], thresh[0]); + } + } + + public static void LpfVertical4( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfVertical4(s, pitch, blimit, limit, thresh); + } + else + { + LoopFilterScalar.LpfVertical4(s, pitch, blimit[0], limit[0], thresh[0]); + } + } + + public static void LpfVertical4Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit0, + ReadOnlySpan limit0, + ReadOnlySpan thresh0, + ReadOnlySpan blimit1, + ReadOnlySpan limit1, + ReadOnlySpan thresh1) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfVertical4Dual(s, pitch, blimit0, limit0, thresh0, blimit1, limit1, thresh1); + } + else + { + LoopFilterScalar.LpfVertical4Dual(s, pitch, blimit0[0], limit0[0], thresh0[0], blimit1[0], limit1[0], + thresh1[0]); + } + } + + public static void LpfVertical8( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfVertical8(s, pitch, blimit, limit, thresh); + } + else + { + LoopFilterScalar.LpfVertical8(s, pitch, blimit[0], limit[0], thresh[0]); + } + } + + public static void LpfVertical8Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit0, + ReadOnlySpan limit0, + ReadOnlySpan thresh0, + ReadOnlySpan blimit1, + ReadOnlySpan limit1, + ReadOnlySpan thresh1) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfVertical8Dual(s, pitch, blimit0, limit0, thresh0, blimit1, limit1, thresh1); + } + else + { + LoopFilterScalar.LpfVertical8Dual(s, pitch, blimit0[0], limit0[0], thresh0[0], blimit1[0], limit1[0], + thresh1[0]); + } + } + + public static void LpfVertical16( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfVertical16(s, pitch, blimit, limit, thresh); + } + else + { + LoopFilterScalar.LpfVertical16(s, pitch, blimit[0], limit[0], thresh[0]); + } + } + + public static void LpfVertical16Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + if (Sse2.IsSupported) + { + LoopFilterSse2.LpfVertical16Dual(s, pitch, blimit, limit, thresh); + } + else + { + LoopFilterScalar.LpfVertical16Dual(s, pitch, blimit[0], limit[0], thresh[0]); + } + } + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterScalar.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterScalar.cs new file mode 100644 index 000000000..79c3f1235 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterScalar.cs @@ -0,0 +1,1093 @@ +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Common; +using System; + +namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp +{ + internal static class LoopFilterScalar + { + private static sbyte ClampSbyte(int t) + { + return (sbyte)Math.Clamp(t, -128, 127); + } + + private static short ClampSbyteHigh(int t, int bd) + { + return bd switch + { + 10 => (short)Math.Clamp(t, -128 * 4, (128 * 4) - 1), + 12 => (short)Math.Clamp(t, -128 * 16, (128 * 16) - 1), + _ => (short)Math.Clamp(t, -128, 128 - 1) + }; + } + + // Should we apply any filter at all: 11111111 yes, 00000000 no + private static sbyte FilterMask( + byte limit, + byte blimit, + byte p3, + byte p2, + byte p1, + byte p0, + byte q0, + byte q1, + byte q2, + byte q3) + { + int mask = 0; + mask |= Math.Abs(p3 - p2) > limit ? -1 : 0; + mask |= Math.Abs(p2 - p1) > limit ? -1 : 0; + mask |= Math.Abs(p1 - p0) > limit ? -1 : 0; + mask |= Math.Abs(q1 - q0) > limit ? -1 : 0; + mask |= Math.Abs(q2 - q1) > limit ? -1 : 0; + mask |= Math.Abs(q3 - q2) > limit ? -1 : 0; + mask |= (Math.Abs(p0 - q0) * 2) + (Math.Abs(p1 - q1) / 2) > blimit ? -1 : 0; + return (sbyte)~mask; + } + + private static sbyte FlatMask4( + byte thresh, + byte p3, + byte p2, + byte p1, + byte p0, + byte q0, + byte q1, + byte q2, + byte q3) + { + int mask = 0; + mask |= Math.Abs(p1 - p0) > thresh ? -1 : 0; + mask |= Math.Abs(q1 - q0) > thresh ? -1 : 0; + mask |= Math.Abs(p2 - p0) > thresh ? -1 : 0; + mask |= Math.Abs(q2 - q0) > thresh ? -1 : 0; + mask |= Math.Abs(p3 - p0) > thresh ? -1 : 0; + mask |= Math.Abs(q3 - q0) > thresh ? -1 : 0; + return (sbyte)~mask; + } + + private static sbyte FlatMask5( + byte thresh, + byte p4, + byte p3, + byte p2, + byte p1, + byte p0, + byte q0, + byte q1, + byte q2, + byte q3, + byte q4) + { + int mask = ~FlatMask4(thresh, p3, p2, p1, p0, q0, q1, q2, q3); + mask |= Math.Abs(p4 - p0) > thresh ? -1 : 0; + mask |= Math.Abs(q4 - q0) > thresh ? -1 : 0; + return (sbyte)~mask; + } + + // Is there high edge variance internal edge: 11111111 yes, 00000000 no + private static sbyte HevMask( + byte thresh, + byte p1, + byte p0, + byte q0, + byte q1) + { + int hev = 0; + hev |= Math.Abs(p1 - p0) > thresh ? -1 : 0; + hev |= Math.Abs(q1 - q0) > thresh ? -1 : 0; + return (sbyte)hev; + } + + private static void Filter4( + sbyte mask, + byte thresh, + ref byte op1, + ref byte op0, + ref byte oq0, + ref byte oq1) + { + sbyte filter1, filter2; + + sbyte ps1 = (sbyte)(op1 ^ 0x80); + sbyte ps0 = (sbyte)(op0 ^ 0x80); + sbyte qs0 = (sbyte)(oq0 ^ 0x80); + sbyte qs1 = (sbyte)(oq1 ^ 0x80); + sbyte hev = HevMask(thresh, op1, op0, oq0, oq1); + + // add outer taps if we have high edge variance + sbyte filter = (sbyte)(ClampSbyte(ps1 - qs1) & hev); + + // inner taps + filter = (sbyte)(ClampSbyte(filter + (3 * (qs0 - ps0))) & mask); + + // save bottom 3 bits so that we round one side +4 and the other +3 + // if it equals 4 we'll set it to adjust by -1 to account for the fact + // we'd round it by 3 the other way + filter1 = (sbyte)(ClampSbyte(filter + 4) >> 3); + filter2 = (sbyte)(ClampSbyte(filter + 3) >> 3); + + oq0 = (byte)(ClampSbyte(qs0 - filter1) ^ 0x80); + op0 = (byte)(ClampSbyte(ps0 + filter2) ^ 0x80); + + // outer tap adjustments + filter = (sbyte)(BitUtils.RoundPowerOfTwo(filter1, 1) & ~hev); + + oq1 = (byte)(ClampSbyte(qs1 - filter) ^ 0x80); + op1 = (byte)(ClampSbyte(ps1 + filter) ^ 0x80); + } + + public static void LpfHorizontal4( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh) + { + // loop filter designed to work using chars so that we can make maximum use + // of 8 bit simd instructions. + for (int i = 0; i < 8; ++i) + { + byte p3 = s[-4 * pitch], p2 = s[-3 * pitch], p1 = s[-2 * pitch], p0 = s[-pitch]; + byte q0 = s[0 * pitch], q1 = s[1 * pitch], q2 = s[2 * pitch], q3 = s[3 * pitch]; + sbyte mask = FilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3); + Filter4(mask, thresh, ref s[-2 * pitch], ref s[-1 * pitch], ref s[0], ref s[1 * pitch]); + s = s.Slice(1); + } + } + + public static void LpfHorizontal4Dual( + ArrayPtr s, + int pitch, + byte blimit0, + byte limit0, + byte thresh0, + byte blimit1, + byte limit1, + byte thresh1) + { + LpfHorizontal4(s, pitch, blimit0, limit0, thresh0); + LpfHorizontal4(s.Slice(8), pitch, blimit1, limit1, thresh1); + } + + public static void LpfVertical4( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh) + { + // loop filter designed to work using chars so that we can make maximum use + // of 8 bit simd instructions. + for (int i = 0; i < 8; ++i) + { + byte p3 = s[-4], p2 = s[-3], p1 = s[-2], p0 = s[-1]; + byte q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3]; + sbyte mask = FilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3); + Filter4(mask, thresh, ref s[-2], ref s[-1], ref s[0], ref s[1]); + s = s.Slice(pitch); + } + } + + public static void LpfVertical4Dual( + ArrayPtr s, + int pitch, + byte blimit0, + byte limit0, + byte thresh0, + byte blimit1, + byte limit1, + byte thresh1) + { + LpfVertical4(s, pitch, blimit0, limit0, thresh0); + LpfVertical4(s.Slice(8 * pitch), pitch, blimit1, limit1, thresh1); + } + + private static void Filter8( + sbyte mask, + byte thresh, + bool flat, + ref byte op3, + ref byte op2, + ref byte op1, + ref byte op0, + ref byte oq0, + ref byte oq1, + ref byte oq2, + ref byte oq3) + { + if (flat && mask != 0) + { + byte p3 = op3, p2 = op2, p1 = op1, p0 = op0; + byte q0 = oq0, q1 = oq1, q2 = oq2, q3 = oq3; + + // 7-tap filter [1, 1, 1, 2, 1, 1, 1] + op2 = (byte)BitUtils.RoundPowerOfTwo(p3 + p3 + p3 + (2 * p2) + p1 + p0 + q0, 3); + op1 = (byte)BitUtils.RoundPowerOfTwo(p3 + p3 + p2 + (2 * p1) + p0 + q0 + q1, 3); + op0 = (byte)BitUtils.RoundPowerOfTwo(p3 + p2 + p1 + (2 * p0) + q0 + q1 + q2, 3); + oq0 = (byte)BitUtils.RoundPowerOfTwo(p2 + p1 + p0 + (2 * q0) + q1 + q2 + q3, 3); + oq1 = (byte)BitUtils.RoundPowerOfTwo(p1 + p0 + q0 + (2 * q1) + q2 + q3 + q3, 3); + oq2 = (byte)BitUtils.RoundPowerOfTwo(p0 + q0 + q1 + (2 * q2) + q3 + q3 + q3, 3); + } + else + { + Filter4(mask, thresh, ref op1, ref op0, ref oq0, ref oq1); + } + } + + public static void LpfHorizontal8( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh) + { + // loop filter designed to work using chars so that we can make maximum use + // of 8 bit simd instructions. + for (int i = 0; i < 8; ++i) + { + byte p3 = s[-4 * pitch], p2 = s[-3 * pitch], p1 = s[-2 * pitch], p0 = s[-pitch]; + byte q0 = s[0 * pitch], q1 = s[1 * pitch], q2 = s[2 * pitch], q3 = s[3 * pitch]; + + sbyte mask = FilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3); + sbyte flat = FlatMask4(1, p3, p2, p1, p0, q0, q1, q2, q3); + Filter8( + mask, + thresh, + flat != 0, + ref s[-4 * pitch], + ref s[-3 * pitch], + ref s[-2 * pitch], + ref s[-1 * pitch], + ref s[0], + ref s[1 * pitch], + ref s[2 * pitch], + ref s[3 * pitch]); + s = s.Slice(1); + } + } + + public static void LpfHorizontal8Dual( + ArrayPtr s, + int pitch, + byte blimit0, + byte limit0, + byte thresh0, + byte blimit1, + byte limit1, + byte thresh1) + { + LpfHorizontal8(s, pitch, blimit0, limit0, thresh0); + LpfHorizontal8(s.Slice(8), pitch, blimit1, limit1, thresh1); + } + + public static void LpfVertical8( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh) + { + for (int i = 0; i < 8; ++i) + { + byte p3 = s[-4], p2 = s[-3], p1 = s[-2], p0 = s[-1]; + byte q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3]; + sbyte mask = FilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3); + sbyte flat = FlatMask4(1, p3, p2, p1, p0, q0, q1, q2, q3); + Filter8( + mask, + thresh, + flat != 0, + ref s[-4], + ref s[-3], + ref s[-2], + ref s[-1], + ref s[0], + ref s[1], + ref s[2], + ref s[3]); + s = s.Slice(pitch); + } + } + + public static void LpfVertical8Dual( + ArrayPtr s, + int pitch, + byte blimit0, + byte limit0, + byte thresh0, + byte blimit1, + byte limit1, + byte thresh1) + { + LpfVertical8(s, pitch, blimit0, limit0, thresh0); + LpfVertical8(s.Slice(8 * pitch), pitch, blimit1, limit1, thresh1); + } + + private static void Filter16( + sbyte mask, + byte thresh, + bool flat, + bool flat2, + ref byte op7, + ref byte op6, + ref byte op5, + ref byte op4, + ref byte op3, + ref byte op2, + ref byte op1, + ref byte op0, + ref byte oq0, + ref byte oq1, + ref byte oq2, + ref byte oq3, + ref byte oq4, + ref byte oq5, + ref byte oq6, + ref byte oq7) + { + if (flat2 && flat && mask != 0) + { + byte p7 = op7, p6 = op6, p5 = op5, p4 = op4, p3 = op3, p2 = op2, p1 = op1, p0 = op0; + byte q0 = oq0, q1 = oq1, q2 = oq2, q3 = oq3, q4 = oq4, q5 = oq5, q6 = oq6, q7 = oq7; + + // 15-tap filter [1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1] + op6 = (byte)BitUtils.RoundPowerOfTwo( + (p7 * 7) + (p6 * 2) + p5 + p4 + p3 + p2 + p1 + p0 + q0, 4); + op5 = (byte)BitUtils.RoundPowerOfTwo( + (p7 * 6) + p6 + (p5 * 2) + p4 + p3 + p2 + p1 + p0 + q0 + q1, 4); + op4 = (byte)BitUtils.RoundPowerOfTwo( + (p7 * 5) + p6 + p5 + (p4 * 2) + p3 + p2 + p1 + p0 + q0 + q1 + q2, 4); + op3 = (byte)BitUtils.RoundPowerOfTwo( + (p7 * 4) + p6 + p5 + p4 + (p3 * 2) + p2 + p1 + p0 + q0 + q1 + q2 + q3, 4); + op2 = (byte)BitUtils.RoundPowerOfTwo( + (p7 * 3) + p6 + p5 + p4 + p3 + (p2 * 2) + p1 + p0 + q0 + q1 + q2 + q3 + q4, 4); + op1 = (byte)BitUtils.RoundPowerOfTwo( + (p7 * 2) + p6 + p5 + p4 + p3 + p2 + (p1 * 2) + p0 + q0 + q1 + q2 + q3 + q4 + q5, 4); + op0 = (byte)BitUtils.RoundPowerOfTwo( + p7 + p6 + p5 + p4 + p3 + p2 + p1 + (p0 * 2) + q0 + q1 + q2 + q3 + q4 + q5 + q6, 4); + oq0 = (byte)BitUtils.RoundPowerOfTwo( + p6 + p5 + p4 + p3 + p2 + p1 + p0 + (q0 * 2) + q1 + q2 + q3 + q4 + q5 + q6 + q7, 4); + oq1 = (byte)BitUtils.RoundPowerOfTwo( + p5 + p4 + p3 + p2 + p1 + p0 + q0 + (q1 * 2) + q2 + q3 + q4 + q5 + q6 + (q7 * 2), 4); + oq2 = (byte)BitUtils.RoundPowerOfTwo( + p4 + p3 + p2 + p1 + p0 + q0 + q1 + (q2 * 2) + q3 + q4 + q5 + q6 + (q7 * 3), 4); + oq3 = (byte)BitUtils.RoundPowerOfTwo( + p3 + p2 + p1 + p0 + q0 + q1 + q2 + (q3 * 2) + q4 + q5 + q6 + (q7 * 4), 4); + oq4 = (byte)BitUtils.RoundPowerOfTwo( + p2 + p1 + p0 + q0 + q1 + q2 + q3 + (q4 * 2) + q5 + q6 + (q7 * 5), 4); + oq5 = (byte)BitUtils.RoundPowerOfTwo( + p1 + p0 + q0 + q1 + q2 + q3 + q4 + (q5 * 2) + q6 + (q7 * 6), 4); + oq6 = (byte)BitUtils.RoundPowerOfTwo( + p0 + q0 + q1 + q2 + q3 + q4 + q5 + (q6 * 2) + (q7 * 7), 4); + } + else + { + Filter8(mask, thresh, flat, ref op3, ref op2, ref op1, ref op0, ref oq0, ref oq1, ref oq2, ref oq3); + } + } + + private static void MbLpfHorizontalEdgeW( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int count) + { + // loop filter designed to work using chars so that we can make maximum use + // of 8 bit simd instructions. + for (int i = 0; i < 8 * count; ++i) + { + byte p3 = s[-4 * pitch], p2 = s[-3 * pitch], p1 = s[-2 * pitch], p0 = s[-pitch]; + byte q0 = s[0 * pitch], q1 = s[1 * pitch], q2 = s[2 * pitch], q3 = s[3 * pitch]; + sbyte mask = FilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3); + sbyte flat = FlatMask4(1, p3, p2, p1, p0, q0, q1, q2, q3); + sbyte flat2 = FlatMask5( + 1, + s[-8 * pitch], + s[-7 * pitch], + s[-6 * pitch], + s[-5 * pitch], + p0, + q0, + s[4 * pitch], + s[5 * pitch], + s[6 * pitch], + s[7 * pitch]); + + Filter16( + mask, + thresh, + flat != 0, + flat2 != 0, + ref s[-8 * pitch], + ref s[-7 * pitch], + ref s[-6 * pitch], + ref s[-5 * pitch], + ref s[-4 * pitch], + ref s[-3 * pitch], + ref s[-2 * pitch], + ref s[-1 * pitch], + ref s[0], + ref s[1 * pitch], + ref s[2 * pitch], + ref s[3 * pitch], + ref s[4 * pitch], + ref s[5 * pitch], + ref s[6 * pitch], + ref s[7 * pitch]); + s = s.Slice(1); + } + } + + public static void LpfHorizontal16( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh) + { + MbLpfHorizontalEdgeW(s, pitch, blimit, limit, thresh, 1); + } + + public static void LpfHorizontal16Dual( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh) + { + MbLpfHorizontalEdgeW(s, pitch, blimit, limit, thresh, 2); + } + + private static void MbLpfVerticalEdgeW( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int count) + { + for (int i = 0; i < count; ++i) + { + byte p3 = s[-4], p2 = s[-3], p1 = s[-2], p0 = s[-1]; + byte q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3]; + sbyte mask = FilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3); + sbyte flat = FlatMask4(1, p3, p2, p1, p0, q0, q1, q2, q3); + sbyte flat2 = FlatMask5(1, s[-8], s[-7], s[-6], s[-5], p0, q0, s[4], s[5], s[6], s[7]); + + Filter16( + mask, + thresh, + flat != 0, + flat2 != 0, + ref s[-8], + ref s[-7], + ref s[-6], + ref s[-5], + ref s[-4], + ref s[-3], + ref s[-2], + ref s[-1], + ref s[0], + ref s[1], + ref s[2], + ref s[3], + ref s[4], + ref s[5], + ref s[6], + ref s[7]); + s = s.Slice(pitch); + } + } + + public static void LpfVertical16( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh) + { + MbLpfVerticalEdgeW(s, pitch, blimit, limit, thresh, 8); + } + + public static void LpfVertical16Dual( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh) + { + MbLpfVerticalEdgeW(s, pitch, blimit, limit, thresh, 16); + } + + // Should we apply any filter at all: 11111111 yes, 00000000 no ? + private static sbyte HighBdFilterMask( + byte limit, + byte blimit, + ushort p3, + ushort p2, + ushort p1, + ushort p0, + ushort q0, + ushort q1, + ushort q2, + ushort q3, + int bd) + { + int mask = 0; + short limit16 = (short)(limit << (bd - 8)); + short blimit16 = (short)(blimit << (bd - 8)); + mask |= Math.Abs(p3 - p2) > limit16 ? -1 : 0; + mask |= Math.Abs(p2 - p1) > limit16 ? -1 : 0; + mask |= Math.Abs(p1 - p0) > limit16 ? -1 : 0; + mask |= Math.Abs(q1 - q0) > limit16 ? -1 : 0; + mask |= Math.Abs(q2 - q1) > limit16 ? -1 : 0; + mask |= Math.Abs(q3 - q2) > limit16 ? -1 : 0; + mask |= (Math.Abs(p0 - q0) * 2) + (Math.Abs(p1 - q1) / 2) > blimit16 ? -1 : 0; + return (sbyte)~mask; + } + + private static sbyte HighBdFlatMask4( + byte thresh, + ushort p3, + ushort p2, + ushort p1, + ushort p0, + ushort q0, + ushort q1, + ushort q2, + ushort q3, + int bd) + { + int mask = 0; + short thresh16 = (short)(thresh << (bd - 8)); + mask |= Math.Abs(p1 - p0) > thresh16 ? -1 : 0; + mask |= Math.Abs(q1 - q0) > thresh16 ? -1 : 0; + mask |= Math.Abs(p2 - p0) > thresh16 ? -1 : 0; + mask |= Math.Abs(q2 - q0) > thresh16 ? -1 : 0; + mask |= Math.Abs(p3 - p0) > thresh16 ? -1 : 0; + mask |= Math.Abs(q3 - q0) > thresh16 ? -1 : 0; + return (sbyte)~mask; + } + + private static sbyte HighBdFlatMask5( + byte thresh, + ushort p4, + ushort p3, + ushort p2, + ushort p1, + ushort p0, + ushort q0, + ushort q1, + ushort q2, + ushort q3, + ushort q4, + int bd) + { + int mask = ~HighBdFlatMask4(thresh, p3, p2, p1, p0, q0, q1, q2, q3, bd); + short thresh16 = (short)(thresh << (bd - 8)); + mask |= Math.Abs(p4 - p0) > thresh16 ? -1 : 0; + mask |= Math.Abs(q4 - q0) > thresh16 ? -1 : 0; + return (sbyte)~mask; + } + + // Is there high edge variance internal edge: + // 11111111_11111111 yes, 00000000_00000000 no ? + private static short HighBdHevMask( + byte thresh, + ushort p1, + ushort p0, + ushort q0, + ushort q1, + int bd) + { + int hev = 0; + short thresh16 = (short)(thresh << (bd - 8)); + hev |= Math.Abs(p1 - p0) > thresh16 ? -1 : 0; + hev |= Math.Abs(q1 - q0) > thresh16 ? -1 : 0; + return (short)hev; + } + + private static void HighBdFilter4( + sbyte mask, + byte thresh, + ref ushort op1, + ref ushort op0, + ref ushort oq0, + ref ushort oq1, + int bd) + { + short filter1, filter2; + // ^0x80 equivalent to subtracting 0x80 from the values to turn them + // into -128 to +127 instead of 0 to 255. + int shift = bd - 8; + short ps1 = (short)((short)op1 - (0x80 << shift)); + short ps0 = (short)((short)op0 - (0x80 << shift)); + short qs0 = (short)((short)oq0 - (0x80 << shift)); + short qs1 = (short)((short)oq1 - (0x80 << shift)); + short hev = HighBdHevMask(thresh, op1, op0, oq0, oq1, bd); + + // Add outer taps if we have high edge variance. + short filter = (short)(ClampSbyteHigh(ps1 - qs1, bd) & hev); + + // Inner taps. + filter = (short)(ClampSbyteHigh(filter + (3 * (qs0 - ps0)), bd) & mask); + + // Save bottom 3 bits so that we round one side +4 and the other +3 + // if it equals 4 we'll set it to adjust by -1 to account for the fact + // we'd round it by 3 the other way. + filter1 = (short)(ClampSbyteHigh(filter + 4, bd) >> 3); + filter2 = (short)(ClampSbyteHigh(filter + 3, bd) >> 3); + + oq0 = (ushort)(ClampSbyteHigh(qs0 - filter1, bd) + (0x80 << shift)); + op0 = (ushort)(ClampSbyteHigh(ps0 + filter2, bd) + (0x80 << shift)); + + // Outer tap adjustments. + filter = (short)(BitUtils.RoundPowerOfTwo(filter1, 1) & ~hev); + + oq1 = (ushort)(ClampSbyteHigh(qs1 - filter, bd) + (0x80 << shift)); + op1 = (ushort)(ClampSbyteHigh(ps1 + filter, bd) + (0x80 << shift)); + } + + public static void HighBdLpfHorizontal4( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int bd) + { + // loop filter designed to work using chars so that we can make maximum use + // of 8 bit simd instructions. + for (int i = 0; i < 8; ++i) + { + ushort p3 = s[-4 * pitch]; + ushort p2 = s[-3 * pitch]; + ushort p1 = s[-2 * pitch]; + ushort p0 = s[-pitch]; + ushort q0 = s[0 * pitch]; + ushort q1 = s[1 * pitch]; + ushort q2 = s[2 * pitch]; + ushort q3 = s[3 * pitch]; + sbyte mask = HighBdFilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd); + HighBdFilter4(mask, thresh, ref s[-2 * pitch], ref s[-1 * pitch], ref s[0], ref s[1 * pitch], bd); + s = s.Slice(1); + } + } + + public static void HighBdLpfHorizontal4Dual( + ArrayPtr s, + int pitch, + byte blimit0, + byte limit0, + byte thresh0, + byte blimit1, + byte limit1, + byte thresh1, + int bd) + { + HighBdLpfHorizontal4(s, pitch, blimit0, limit0, thresh0, bd); + HighBdLpfHorizontal4(s.Slice(8), pitch, blimit1, limit1, thresh1, bd); + } + + public static void HighBdLpfVertical4( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int bd) + { + // loop filter designed to work using chars so that we can make maximum use + // of 8 bit simd instructions. + for (int i = 0; i < 8; ++i) + { + ushort p3 = s[-4], p2 = s[-3], p1 = s[-2], p0 = s[-1]; + ushort q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3]; + sbyte mask = HighBdFilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd); + HighBdFilter4(mask, thresh, ref s[-2], ref s[-1], ref s[0], ref s[1], bd); + s = s.Slice(pitch); + } + } + + public static void HighBdLpfVertical4Dual( + ArrayPtr s, + int pitch, + byte blimit0, + byte limit0, + byte thresh0, + byte blimit1, + byte limit1, + byte thresh1, + int bd) + { + HighBdLpfVertical4(s, pitch, blimit0, limit0, thresh0, bd); + HighBdLpfVertical4(s.Slice(8 * pitch), pitch, blimit1, limit1, thresh1, bd); + } + + private static void HighBdFilter8( + sbyte mask, + byte thresh, + bool flat, + ref ushort op3, + ref ushort op2, + ref ushort op1, + ref ushort op0, + ref ushort oq0, + ref ushort oq1, + ref ushort oq2, + ref ushort oq3, + int bd) + { + if (flat && mask != 0) + { + ushort p3 = op3, p2 = op2, p1 = op1, p0 = op0; + ushort q0 = oq0, q1 = oq1, q2 = oq2, q3 = oq3; + + // 7-tap filter [1, 1, 1, 2, 1, 1, 1] + op2 = (ushort)BitUtils.RoundPowerOfTwo(p3 + p3 + p3 + (2 * p2) + p1 + p0 + q0, 3); + op1 = (ushort)BitUtils.RoundPowerOfTwo(p3 + p3 + p2 + (2 * p1) + p0 + q0 + q1, 3); + op0 = (ushort)BitUtils.RoundPowerOfTwo(p3 + p2 + p1 + (2 * p0) + q0 + q1 + q2, 3); + oq0 = (ushort)BitUtils.RoundPowerOfTwo(p2 + p1 + p0 + (2 * q0) + q1 + q2 + q3, 3); + oq1 = (ushort)BitUtils.RoundPowerOfTwo(p1 + p0 + q0 + (2 * q1) + q2 + q3 + q3, 3); + oq2 = (ushort)BitUtils.RoundPowerOfTwo(p0 + q0 + q1 + (2 * q2) + q3 + q3 + q3, 3); + } + else + { + HighBdFilter4(mask, thresh, ref op1, ref op0, ref oq0, ref oq1, bd); + } + } + + public static void HighBdLpfHorizontal8( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int bd) + { + // loop filter designed to work using chars so that we can make maximum use + // of 8 bit simd instructions. + for (int i = 0; i < 8; ++i) + { + ushort p3 = s[-4 * pitch], p2 = s[-3 * pitch], p1 = s[-2 * pitch], p0 = s[-pitch]; + ushort q0 = s[0 * pitch], q1 = s[1 * pitch], q2 = s[2 * pitch], q3 = s[3 * pitch]; + + sbyte mask = HighBdFilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd); + sbyte flat = HighBdFlatMask4(1, p3, p2, p1, p0, q0, q1, q2, q3, bd); + HighBdFilter8( + mask, + thresh, + flat != 0, + ref s[-4 * pitch], + ref s[-3 * pitch], + ref s[-2 * pitch], + ref s[-1 * pitch], + ref s[0], + ref s[1 * pitch], + ref s[2 * pitch], + ref s[3 * pitch], + bd); + s = s.Slice(1); + } + } + + public static void HighBdLpfHorizontal8Dual( + ArrayPtr s, + int pitch, + byte blimit0, + byte limit0, + byte thresh0, + byte blimit1, + byte limit1, + byte thresh1, + int bd) + { + HighBdLpfHorizontal8(s, pitch, blimit0, limit0, thresh0, bd); + HighBdLpfHorizontal8(s.Slice(8), pitch, blimit1, limit1, thresh1, bd); + } + + public static void HighBdLpfVertical8( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int bd) + { + for (int i = 0; i < 8; ++i) + { + ushort p3 = s[-4], p2 = s[-3], p1 = s[-2], p0 = s[-1]; + ushort q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3]; + sbyte mask = HighBdFilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd); + sbyte flat = HighBdFlatMask4(1, p3, p2, p1, p0, q0, q1, q2, q3, bd); + HighBdFilter8( + mask, + thresh, + flat != 0, + ref s[-4], + ref s[-3], + ref s[-2], + ref s[-1], + ref s[0], + ref s[1], + ref s[2], + ref s[3], + bd); + s = s.Slice(pitch); + } + } + + public static void HighBdLpfVertical8Dual( + ArrayPtr s, + int pitch, + byte blimit0, + byte limit0, + byte thresh0, + byte blimit1, + byte limit1, + byte thresh1, + int bd) + { + HighBdLpfVertical8(s, pitch, blimit0, limit0, thresh0, bd); + HighBdLpfVertical8(s.Slice(8 * pitch), pitch, blimit1, limit1, thresh1, bd); + } + + private static void HighBdFilter16( + sbyte mask, + byte thresh, + bool flat, + bool flat2, + ref ushort op7, + ref ushort op6, + ref ushort op5, + ref ushort op4, + ref ushort op3, + ref ushort op2, + ref ushort op1, + ref ushort op0, + ref ushort oq0, + ref ushort oq1, + ref ushort oq2, + ref ushort oq3, + ref ushort oq4, + ref ushort oq5, + ref ushort oq6, + ref ushort oq7, + int bd) + { + if (flat2 && flat && mask != 0) + { + ushort p7 = op7; + ushort p6 = op6; + ushort p5 = op5; + ushort p4 = op4; + ushort p3 = op3; + ushort p2 = op2; + ushort p1 = op1; + ushort p0 = op0; + ushort q0 = oq0; + ushort q1 = oq1; + ushort q2 = oq2; + ushort q3 = oq3; + ushort q4 = oq4; + ushort q5 = oq5; + ushort q6 = oq6; + ushort q7 = oq7; + + // 15-tap filter [1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1] + op6 = (ushort)BitUtils.RoundPowerOfTwo( + (p7 * 7) + (p6 * 2) + p5 + p4 + p3 + p2 + p1 + p0 + q0, 4); + op5 = (ushort)BitUtils.RoundPowerOfTwo( + (p7 * 6) + p6 + (p5 * 2) + p4 + p3 + p2 + p1 + p0 + q0 + q1, 4); + op4 = (ushort)BitUtils.RoundPowerOfTwo( + (p7 * 5) + p6 + p5 + (p4 * 2) + p3 + p2 + p1 + p0 + q0 + q1 + q2, 4); + op3 = (ushort)BitUtils.RoundPowerOfTwo( + (p7 * 4) + p6 + p5 + p4 + (p3 * 2) + p2 + p1 + p0 + q0 + q1 + q2 + q3, 4); + op2 = (ushort)BitUtils.RoundPowerOfTwo( + (p7 * 3) + p6 + p5 + p4 + p3 + (p2 * 2) + p1 + p0 + q0 + q1 + q2 + q3 + q4, 4); + op1 = (ushort)BitUtils.RoundPowerOfTwo( + (p7 * 2) + p6 + p5 + p4 + p3 + p2 + (p1 * 2) + p0 + q0 + q1 + q2 + q3 + q4 + q5, 4); + op0 = (ushort)BitUtils.RoundPowerOfTwo( + p7 + p6 + p5 + p4 + p3 + p2 + p1 + (p0 * 2) + q0 + q1 + q2 + q3 + q4 + q5 + q6, 4); + oq0 = (ushort)BitUtils.RoundPowerOfTwo( + p6 + p5 + p4 + p3 + p2 + p1 + p0 + (q0 * 2) + q1 + q2 + q3 + q4 + q5 + q6 + q7, 4); + oq1 = (ushort)BitUtils.RoundPowerOfTwo( + p5 + p4 + p3 + p2 + p1 + p0 + q0 + (q1 * 2) + q2 + q3 + q4 + q5 + q6 + (q7 * 2), 4); + oq2 = (ushort)BitUtils.RoundPowerOfTwo( + p4 + p3 + p2 + p1 + p0 + q0 + q1 + (q2 * 2) + q3 + q4 + q5 + q6 + (q7 * 3), 4); + oq3 = (ushort)BitUtils.RoundPowerOfTwo( + p3 + p2 + p1 + p0 + q0 + q1 + q2 + (q3 * 2) + q4 + q5 + q6 + (q7 * 4), 4); + oq4 = (ushort)BitUtils.RoundPowerOfTwo( + p2 + p1 + p0 + q0 + q1 + q2 + q3 + (q4 * 2) + q5 + q6 + (q7 * 5), 4); + oq5 = (ushort)BitUtils.RoundPowerOfTwo( + p1 + p0 + q0 + q1 + q2 + q3 + q4 + (q5 * 2) + q6 + (q7 * 6), 4); + oq6 = (ushort)BitUtils.RoundPowerOfTwo( + p0 + q0 + q1 + q2 + q3 + q4 + q5 + (q6 * 2) + (q7 * 7), 4); + } + else + { + HighBdFilter8(mask, thresh, flat, ref op3, ref op2, ref op1, ref op0, ref oq0, ref oq1, ref oq2, + ref oq3, bd); + } + } + + private static void HighBdMbLpfHorizontalEdgeW( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int count, + int bd) + { + // loop filter designed to work using chars so that we can make maximum use + // of 8 bit simd instructions. + for (int i = 0; i < 8 * count; ++i) + { + ushort p3 = s[-4 * pitch]; + ushort p2 = s[-3 * pitch]; + ushort p1 = s[-2 * pitch]; + ushort p0 = s[-pitch]; + ushort q0 = s[0 * pitch]; + ushort q1 = s[1 * pitch]; + ushort q2 = s[2 * pitch]; + ushort q3 = s[3 * pitch]; + sbyte mask = HighBdFilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd); + sbyte flat = HighBdFlatMask4(1, p3, p2, p1, p0, q0, q1, q2, q3, bd); + sbyte flat2 = HighBdFlatMask5( + 1, + s[-8 * pitch], + s[-7 * pitch], + s[-6 * pitch], + s[-5 * pitch], + p0, + q0, + s[4 * pitch], + s[5 * pitch], + s[6 * pitch], + s[7 * pitch], + bd); + + HighBdFilter16( + mask, + thresh, + flat != 0, + flat2 != 0, + ref s[-8 * pitch], + ref s[-7 * pitch], + ref s[-6 * pitch], + ref s[-5 * pitch], + ref s[-4 * pitch], + ref s[-3 * pitch], + ref s[-2 * pitch], + ref s[-1 * pitch], + ref s[0], + ref s[1 * pitch], + ref s[2 * pitch], + ref s[3 * pitch], + ref s[4 * pitch], + ref s[5 * pitch], + ref s[6 * pitch], + ref s[7 * pitch], + bd); + s = s.Slice(1); + } + } + + public static void HighBdLpfHorizontal16( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int bd) + { + HighBdMbLpfHorizontalEdgeW(s, pitch, blimit, limit, thresh, 1, bd); + } + + public static void HighBdLpfHorizontal16Dual( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int bd) + { + HighBdMbLpfHorizontalEdgeW(s, pitch, blimit, limit, thresh, 2, bd); + } + + private static void HighBdMbLpfVerticalEdgeW( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int count, + int bd) + { + for (int i = 0; i < count; ++i) + { + ushort p3 = s[-4]; + ushort p2 = s[-3]; + ushort p1 = s[-2]; + ushort p0 = s[-1]; + ushort q0 = s[0]; + ushort q1 = s[1]; + ushort q2 = s[2]; + ushort q3 = s[3]; + sbyte mask = HighBdFilterMask(limit, blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd); + sbyte flat = HighBdFlatMask4(1, p3, p2, p1, p0, q0, q1, q2, q3, bd); + sbyte flat2 = HighBdFlatMask5(1, s[-8], s[-7], s[-6], s[-5], p0, q0, s[4], s[5], s[6], s[7], bd); + + HighBdFilter16( + mask, + thresh, + flat != 0, + flat2 != 0, + ref s[-8], + ref s[-7], + ref s[-6], + ref s[-5], + ref s[-4], + ref s[-3], + ref s[-2], + ref s[-1], + ref s[0], + ref s[1], + ref s[2], + ref s[3], + ref s[4], + ref s[5], + ref s[6], + ref s[7], + bd); + s = s.Slice(pitch); + } + } + + public static void HighBdLpfVertical16( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int bd) + { + HighBdMbLpfVerticalEdgeW(s, pitch, blimit, limit, thresh, 8, bd); + } + + public static void HighBdLpfVertical16Dual( + ArrayPtr s, + int pitch, + byte blimit, + byte limit, + byte thresh, + int bd) + { + HighBdMbLpfVerticalEdgeW(s, pitch, blimit, limit, thresh, 16, bd); + } + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterSse2.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterSse2.cs new file mode 100644 index 000000000..0d9f496ae --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/LoopFilterSse2.cs @@ -0,0 +1,1837 @@ +using Ryujinx.Common.Memory; +using System; +using System.Runtime.Intrinsics; +using System.Runtime.Intrinsics.X86; + +namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp +{ + internal static class LoopFilterSse2 + { + private static Vector128 AbsDiff(Vector128 a, Vector128 b) + { + return Sse2.Or(Sse2.SubtractSaturate(a, b), Sse2.SubtractSaturate(b, a)); + } + + private static void FilterHevMask( + Vector128 q1P1, + Vector128 q0P0, + Vector128 p3P2, + Vector128 p2P1, + Vector128 p1P0, + Vector128 q3Q2, + Vector128 q2Q1, + Vector128 q1Q0, + Vector128 limitV, + Vector128 threshV, + out Vector128 hev, + out Vector128 mask) + { + /* (abs(q1 - q0), abs(p1 - p0) */ + Vector128 flat = AbsDiff(q1P1, q0P0); + /* abs(p1 - q1), abs(p0 - q0) */ + Vector128 absP1Q1P0Q0 = AbsDiff(p1P0, q1Q0); + Vector128 absP0Q0, absP1Q1, work; + + /* const uint8_t hev = hev_mask(thresh, *op1, *op0, *oq0, *oq1); */ + hev = Sse2.UnpackLow(Sse2.Max(flat, Sse2.ShiftRightLogical128BitLane(flat, 8)), Vector128.Zero); + hev = Sse2.CompareGreaterThan(hev.AsInt16(), threshV.AsInt16()).AsByte(); + hev = Sse2.PackSignedSaturate(hev.AsInt16(), hev.AsInt16()).AsByte(); + + /* const int8_t mask = filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3); */ + absP0Q0 = Sse2.AddSaturate(absP1Q1P0Q0, absP1Q1P0Q0); /* abs(p0 - q0) * 2 */ + absP1Q1 = Sse2.UnpackHigh(absP1Q1P0Q0, absP1Q1P0Q0); /* abs(p1 - q1) */ + absP1Q1 = Sse2.ShiftRightLogical(absP1Q1.AsInt16(), 9).AsByte(); + absP1Q1 = Sse2.PackSignedSaturate(absP1Q1.AsInt16(), absP1Q1.AsInt16()).AsByte(); /* abs(p1 - q1) / 2 */ + /* abs(p0 - q0) * 2 + abs(p1 - q1) / 2 */ + mask = Sse2.AddSaturate(absP0Q0, absP1Q1); + /* abs(p3 - p2), abs(p2 - p1) */ + work = AbsDiff(p3P2, p2P1); + flat = Sse2.Max(work, flat); + /* abs(q3 - q2), abs(q2 - q1) */ + work = AbsDiff(q3Q2, q2Q1); + flat = Sse2.Max(work, flat); + flat = Sse2.Max(flat, Sse2.ShiftRightLogical128BitLane(flat, 8)); + mask = Sse2.UnpackLow(mask.AsInt64(), flat.AsInt64()).AsByte(); + mask = Sse2.SubtractSaturate(mask, limitV); + mask = Sse2.CompareEqual(mask, Vector128.Zero); + mask = Sse2.And(mask, Sse2.ShiftRightLogical128BitLane(mask, 8)); + } + + private static void Filter4( + Vector128 p1P0, + Vector128 q1Q0, + Vector128 hev, + Vector128 mask, + Vector128 ff, + out Vector128 ps1Ps0, + out Vector128 qs1Qs0) + { + Vector128 t3T4 = Vector128.Create( + 4, 4, 4, 4, + 4, 4, 4, 4, + 3, 3, 3, 3, + 3, 3, 3, (byte)3); + Vector128 t80 = Vector128.Create((byte)0x80); + Vector128 filter, filter2Filter1, work; + + ps1Ps0 = Sse2.Xor(p1P0, t80); /* ^ 0x80 */ + qs1Qs0 = Sse2.Xor(q1Q0, t80); + + /* int8_t filter = signed_char_clamp(ps1 - qs1) & hev; */ + work = Sse2.SubtractSaturate(ps1Ps0.AsSByte(), qs1Qs0.AsSByte()).AsByte(); + filter = Sse2.And(Sse2.ShiftRightLogical128BitLane(work, 8), hev); + /* filter = signed_char_clamp(filter + 3 * (qs0 - ps0)) & mask; */ + filter = Sse2.SubtractSaturate(filter.AsSByte(), work.AsSByte()).AsByte(); + filter = Sse2.SubtractSaturate(filter.AsSByte(), work.AsSByte()).AsByte(); + filter = Sse2.SubtractSaturate(filter.AsSByte(), work.AsSByte()).AsByte(); /* + 3 * (qs0 - ps0) */ + filter = Sse2.And(filter, mask); /* & mask */ + filter = Sse2.UnpackLow(filter.AsInt64(), filter.AsInt64()).AsByte(); + + /* filter1 = signed_char_clamp(filter + 4) >> 3; */ + /* filter2 = signed_char_clamp(filter + 3) >> 3; */ + filter2Filter1 = Sse2.AddSaturate(filter.AsSByte(), t3T4.AsSByte()).AsByte(); /* signed_char_clamp */ + filter = Sse2.UnpackHigh(filter2Filter1, filter2Filter1); + filter2Filter1 = Sse2.UnpackLow(filter2Filter1, filter2Filter1); + filter2Filter1 = Sse2.ShiftRightArithmetic(filter2Filter1.AsInt16(), 11).AsByte(); /* >> 3 */ + filter = Sse2.ShiftRightArithmetic(filter.AsInt16(), 11).AsByte(); /* >> 3 */ + filter2Filter1 = Sse2.PackSignedSaturate(filter2Filter1.AsInt16(), filter.AsInt16()).AsByte(); + + /* filter = ROUND_POWER_OF_TWO(filter1, 1) & ~hev; */ + filter = Sse2.SubtractSaturate(filter2Filter1.AsSByte(), ff.AsSByte()).AsByte(); /* + 1 */ + filter = Sse2.UnpackLow(filter, filter); + filter = Sse2.ShiftRightArithmetic(filter.AsInt16(), 9).AsByte(); /* round */ + filter = Sse2.PackSignedSaturate(filter.AsInt16(), filter.AsInt16()).AsByte(); + filter = Sse2.AndNot(hev, filter); + + hev = Sse2.UnpackHigh(filter2Filter1.AsInt64(), filter.AsInt64()).AsByte(); + filter2Filter1 = Sse2.UnpackLow(filter2Filter1.AsInt64(), filter.AsInt64()).AsByte(); + + /* signed_char_clamp(qs1 - filter), signed_char_clamp(qs0 - filter1) */ + qs1Qs0 = Sse2.SubtractSaturate(qs1Qs0.AsSByte(), filter2Filter1.AsSByte()).AsByte(); + /* signed_char_clamp(ps1 + filter), signed_char_clamp(ps0 + filter2) */ + ps1Ps0 = Sse2.AddSaturate(ps1Ps0.AsSByte(), hev.AsSByte()).AsByte(); + qs1Qs0 = Sse2.Xor(qs1Qs0, t80); /* ^ 0x80 */ + ps1Ps0 = Sse2.Xor(ps1Ps0, t80); /* ^ 0x80 */ + } + + public static unsafe void LpfHorizontal4( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + Vector128 zero = Vector128.Zero; + Vector128 limitV, threshV; + + fixed (byte* pBLimit = blimit, pLimit = limit, pThresh = thresh) + { + limitV = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)pBLimit), + Sse2.LoadScalarVector128((long*)pLimit)).AsByte(); + threshV = Sse2.UnpackLow(Sse2.LoadScalarVector128((long*)pThresh).AsByte(), zero); + } + + Vector128 ff = Sse2.CompareEqual(zero, zero); + Vector128 q1P1, q0P0, p3P2, p2P1, p1P0, q3Q2, q2Q1, q1Q0, ps1Ps0, qs1Qs0; + Vector128 mask, hev; + + p3P2 = Sse2.UnpackLow(Sse2.LoadScalarVector128((long*)(s.ToPointer() - (3 * pitch))), + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (4 * pitch)))).AsByte(); + q1P1 = Sse2.UnpackLow(Sse2.LoadScalarVector128((long*)(s.ToPointer() - (2 * pitch))), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (1 * pitch)))).AsByte(); + q0P0 = Sse2.UnpackLow(Sse2.LoadScalarVector128((long*)(s.ToPointer() - (1 * pitch))), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (0 * pitch)))).AsByte(); + q3Q2 = Sse2.UnpackLow(Sse2.LoadScalarVector128((long*)(s.ToPointer() + (2 * pitch))), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (3 * pitch)))).AsByte(); + p1P0 = Sse2.UnpackLow(q0P0.AsInt64(), q1P1.AsInt64()).AsByte(); + p2P1 = Sse2.UnpackLow(q1P1.AsInt64(), p3P2.AsInt64()).AsByte(); + q1Q0 = Sse2.UnpackHigh(q0P0.AsInt64(), q1P1.AsInt64()).AsByte(); + q2Q1 = Sse2.UnpackLow(Sse2.ShiftRightLogical128BitLane(q1P1, 8).AsInt64(), q3Q2.AsInt64()).AsByte(); + + FilterHevMask(q1P1, q0P0, p3P2, p2P1, p1P0, q3Q2, q2Q1, q1Q0, limitV, threshV, out hev, out mask); + Filter4(p1P0, q1Q0, hev, mask, ff, out ps1Ps0, out qs1Qs0); + + Sse.StoreHigh((float*)(s.ToPointer() - (2 * pitch)), ps1Ps0.AsSingle()); // *op1 + Sse2.StoreScalar((long*)(s.ToPointer() - (1 * pitch)), ps1Ps0.AsInt64()); // *op0 + Sse2.StoreScalar((long*)(s.ToPointer() + (0 * pitch)), qs1Qs0.AsInt64()); // *oq0 + Sse.StoreHigh((float*)(s.ToPointer() + (1 * pitch)), qs1Qs0.AsSingle()); // *oq1 + } + + public static unsafe void LpfVertical4( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + Vector128 zero = Vector128.Zero; + Vector128 limitV, threshV; + + fixed (byte* pBLimit = blimit, pLimit = limit, pThresh = thresh) + { + limitV = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)pBLimit).AsInt64(), + Sse2.LoadScalarVector128((long*)pLimit).AsInt64()).AsByte(); + threshV = Sse2.UnpackLow(Sse2.LoadScalarVector128((long*)pThresh).AsByte(), zero); + } + + Vector128 ff = Sse2.CompareEqual(zero, zero); + Vector128 x0, x1, x2, x3; + Vector128 q1P1, q0P0, p3P2, p2P1, p1P0, q3Q2, q2Q1, q1Q0, ps1Ps0, qs1Qs0; + Vector128 mask, hev; + + // 00 10 01 11 02 12 03 13 04 14 05 15 06 16 07 17 + q1Q0 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (0 * pitch) - 4)).AsByte(), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (1 * pitch) - 4)).AsByte()); + + // 20 30 21 31 22 32 23 33 24 34 25 35 26 36 27 37 + x1 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (2 * pitch) - 4)).AsByte(), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (3 * pitch) - 4)).AsByte()); + + // 40 50 41 51 42 52 43 53 44 54 45 55 46 56 47 57 + x2 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (4 * pitch) - 4)).AsByte(), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (5 * pitch) - 4)).AsByte()); + + // 60 70 61 71 62 72 63 73 64 74 65 75 66 76 67 77 + x3 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (6 * pitch) - 4)).AsByte(), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (7 * pitch) - 4)).AsByte()); + + // Transpose 8x8 + // 00 10 20 30 01 11 21 31 02 12 22 32 03 13 23 33 + p1P0 = Sse2.UnpackLow(q1Q0.AsInt16(), x1.AsInt16()).AsByte(); + // 40 50 60 70 41 51 61 71 42 52 62 72 43 53 63 73 + x0 = Sse2.UnpackLow(x2.AsInt16(), x3.AsInt16()).AsByte(); + // 00 10 20 30 40 50 60 70 01 11 21 31 41 51 61 71 + p3P2 = Sse2.UnpackLow(p1P0.AsInt32(), x0.AsInt32()).AsByte(); + // 02 12 22 32 42 52 62 72 03 13 23 33 43 53 63 73 + p1P0 = Sse2.UnpackHigh(p1P0.AsInt32(), x0.AsInt32()).AsByte(); + p3P2 = Sse2.UnpackHigh(p3P2.AsInt64(), Sse2.ShiftLeftLogical128BitLane(p3P2, 8).AsInt64()) + .AsByte(); // swap lo and high + p1P0 = Sse2.UnpackHigh(p1P0.AsInt64(), Sse2.ShiftLeftLogical128BitLane(p1P0, 8).AsInt64()) + .AsByte(); // swap lo and high + + // 04 14 24 34 05 15 25 35 06 16 26 36 07 17 27 37 + q1Q0 = Sse2.UnpackHigh(q1Q0.AsInt16(), x1.AsInt16()).AsByte(); + // 44 54 64 74 45 55 65 75 46 56 66 76 47 57 67 77 + x2 = Sse2.UnpackHigh(x2.AsInt16(), x3.AsInt16()).AsByte(); + // 06 16 26 36 46 56 66 76 07 17 27 37 47 57 67 77 + q3Q2 = Sse2.UnpackHigh(q1Q0.AsInt32(), x2.AsInt32()).AsByte(); + // 04 14 24 34 44 54 64 74 05 15 25 35 45 55 65 75 + q1Q0 = Sse2.UnpackLow(q1Q0.AsInt32(), x2.AsInt32()).AsByte(); + + q0P0 = Sse2.UnpackLow(p1P0.AsInt64(), q1Q0.AsInt64()).AsByte(); + q1P1 = Sse2.UnpackHigh(p1P0.AsInt64(), q1Q0.AsInt64()).AsByte(); + p1P0 = Sse2.UnpackLow(q0P0.AsInt64(), q1P1.AsInt64()).AsByte(); + p2P1 = Sse2.UnpackLow(q1P1.AsInt64(), p3P2.AsInt64()).AsByte(); + q2Q1 = Sse2.UnpackLow(Sse2.ShiftRightLogical128BitLane(q1P1, 8).AsInt64(), q3Q2.AsInt64()).AsByte(); + + FilterHevMask(q1P1, q0P0, p3P2, p2P1, p1P0, q3Q2, q2Q1, q1Q0, limitV, threshV, out hev, out mask); + Filter4(p1P0, q1Q0, hev, mask, ff, out ps1Ps0, out qs1Qs0); + + // Transpose 8x4 to 4x8 + // qs1qs0: 20 21 22 23 24 25 26 27 30 31 32 33 34 34 36 37 + // ps1ps0: 10 11 12 13 14 15 16 17 00 01 02 03 04 05 06 07 + // 00 01 02 03 04 05 06 07 10 11 12 13 14 15 16 17 + ps1Ps0 = Sse2.UnpackHigh(ps1Ps0.AsInt64(), Sse2.ShiftLeftLogical128BitLane(ps1Ps0, 8).AsInt64()).AsByte(); + // 10 30 11 31 12 32 13 33 14 34 15 35 16 36 17 37 + x0 = Sse2.UnpackHigh(ps1Ps0, qs1Qs0); + // 00 20 01 21 02 22 03 23 04 24 05 25 06 26 07 27 + ps1Ps0 = Sse2.UnpackLow(ps1Ps0, qs1Qs0); + // 04 14 24 34 05 15 25 35 06 16 26 36 07 17 27 37 + qs1Qs0 = Sse2.UnpackHigh(ps1Ps0, x0); + // 00 10 20 30 01 11 21 31 02 12 22 32 03 13 23 33 + ps1Ps0 = Sse2.UnpackLow(ps1Ps0, x0); + + *(int*)(s.ToPointer() + (0 * pitch) - 2) = ps1Ps0.AsInt32().GetElement(0); + ps1Ps0 = Sse2.ShiftRightLogical128BitLane(ps1Ps0, 4); + *(int*)(s.ToPointer() + (1 * pitch) - 2) = ps1Ps0.AsInt32().GetElement(0); + ps1Ps0 = Sse2.ShiftRightLogical128BitLane(ps1Ps0, 4); + *(int*)(s.ToPointer() + (2 * pitch) - 2) = ps1Ps0.AsInt32().GetElement(0); + ps1Ps0 = Sse2.ShiftRightLogical128BitLane(ps1Ps0, 4); + *(int*)(s.ToPointer() + (3 * pitch) - 2) = ps1Ps0.AsInt32().GetElement(0); + + *(int*)(s.ToPointer() + (4 * pitch) - 2) = qs1Qs0.AsInt32().GetElement(0); + qs1Qs0 = Sse2.ShiftRightLogical128BitLane(qs1Qs0, 4); + *(int*)(s.ToPointer() + (5 * pitch) - 2) = qs1Qs0.AsInt32().GetElement(0); + qs1Qs0 = Sse2.ShiftRightLogical128BitLane(qs1Qs0, 4); + *(int*)(s.ToPointer() + (6 * pitch) - 2) = qs1Qs0.AsInt32().GetElement(0); + qs1Qs0 = Sse2.ShiftRightLogical128BitLane(qs1Qs0, 4); + *(int*)(s.ToPointer() + (7 * pitch) - 2) = qs1Qs0.AsInt32().GetElement(0); + } + + public static unsafe void LpfHorizontal16( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + Vector128 zero = Vector128.Zero; + Vector128 one = Vector128.Create((byte)1); + Vector128 blimitV, limitV, threshV; + + fixed (byte* pBLimit = blimit, pLimit = limit, pThresh = thresh) + { + blimitV = Sse2.LoadVector128(pBLimit); + limitV = Sse2.LoadVector128(pLimit); + threshV = Sse2.LoadVector128(pThresh); + } + + Vector128 mask, hev, flat, flat2; + Vector128 q7P7, q6P6, q5P5, q4P4, q3P3, q2P2, q1P1, q0P0, p0Q0, p1Q1; + Vector128 absP1P0; + + q4P4 = Sse2.LoadScalarVector128((long*)(s.ToPointer() - (5 * pitch))).AsByte(); + q4P4 = Sse.LoadHigh(q4P4.AsSingle(), (float*)(s.ToPointer() + (4 * pitch))).AsByte(); + q3P3 = Sse2.LoadScalarVector128((long*)(s.ToPointer() - (4 * pitch))).AsByte(); + q3P3 = Sse.LoadHigh(q3P3.AsSingle(), (float*)(s.ToPointer() + (3 * pitch))).AsByte(); + q2P2 = Sse2.LoadScalarVector128((long*)(s.ToPointer() - (3 * pitch))).AsByte(); + q2P2 = Sse.LoadHigh(q2P2.AsSingle(), (float*)(s.ToPointer() + (2 * pitch))).AsByte(); + q1P1 = Sse2.LoadScalarVector128((long*)(s.ToPointer() - (2 * pitch))).AsByte(); + q1P1 = Sse.LoadHigh(q1P1.AsSingle(), (float*)(s.ToPointer() + (1 * pitch))).AsByte(); + p1Q1 = Sse2.Shuffle(q1P1.AsUInt32(), 78).AsByte(); + q0P0 = Sse2.LoadScalarVector128((long*)(s.ToPointer() - (1 * pitch))).AsByte(); + q0P0 = Sse.LoadHigh(q0P0.AsSingle(), (float*)(s.ToPointer() - (0 * pitch))).AsByte(); + p0Q0 = Sse2.Shuffle(q0P0.AsUInt32(), 78).AsByte(); + + { + Vector128 absP1Q1, absP0Q0, absQ1Q0, fe, ff, work; + absP1P0 = AbsDiff(q1P1, q0P0); + absQ1Q0 = Sse2.ShiftRightLogical128BitLane(absP1P0, 8); + fe = Vector128.Create((byte)0xfe); + ff = Sse2.CompareEqual(absP1P0, absP1P0); + absP0Q0 = AbsDiff(q0P0, p0Q0); + absP1Q1 = AbsDiff(q1P1, p1Q1); + flat = Sse2.Max(absP1P0, absQ1Q0); + hev = Sse2.SubtractSaturate(flat, threshV); + hev = Sse2.Xor(Sse2.CompareEqual(hev, zero), ff); + + absP0Q0 = Sse2.AddSaturate(absP0Q0, absP0Q0); + absP1Q1 = Sse2.ShiftRightLogical(Sse2.And(absP1Q1, fe).AsInt16(), 1).AsByte(); + mask = Sse2.SubtractSaturate(Sse2.AddSaturate(absP0Q0, absP1Q1), blimitV); + mask = Sse2.Xor(Sse2.CompareEqual(mask, zero), ff); + // mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit) * -1; + mask = Sse2.Max(absP1P0, mask); + // mask |= (abs(p1 - p0) > limit) * -1; + // mask |= (abs(q1 - q0) > limit) * -1; + + work = Sse2.Max(AbsDiff(q2P2, q1P1), AbsDiff(q3P3, q2P2)); + mask = Sse2.Max(work, mask); + mask = Sse2.Max(mask, Sse2.ShiftRightLogical128BitLane(mask, 8)); + mask = Sse2.SubtractSaturate(mask, limitV); + mask = Sse2.CompareEqual(mask, zero); + } + + // lp filter + { + Vector128 t4 = Vector128.Create((byte)4); + Vector128 t3 = Vector128.Create((byte)3); + Vector128 t80 = Vector128.Create((byte)0x80); + Vector128 t1 = Vector128.Create((ushort)0x1); + Vector128 qs1Ps1 = Sse2.Xor(q1P1, t80); + Vector128 qs0Ps0 = Sse2.Xor(q0P0, t80); + Vector128 qs0 = Sse2.Xor(p0Q0, t80); + Vector128 qs1 = Sse2.Xor(p1Q1, t80); + Vector128 filt; + Vector128 workA; + Vector128 filter1, filter2; + Vector128 flat2Q6P6, flat2Q5P5, flat2Q4P4, flat2Q3P3, flat2Q2P2; + Vector128 flat2Q1P1, flat2Q0P0, flatQ2P2, flatQ1P1, flatQ0P0; + + filt = Sse2.And(Sse2.SubtractSaturate(qs1Ps1.AsSByte(), qs1.AsSByte()).AsByte(), hev); + workA = Sse2.SubtractSaturate(qs0.AsSByte(), qs0Ps0.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + // (vpx_filter + 3 * (qs0 - ps0)) & mask + filt = Sse2.And(filt, mask); + + filter1 = Sse2.AddSaturate(filt.AsSByte(), t4.AsSByte()).AsByte(); + filter2 = Sse2.AddSaturate(filt.AsSByte(), t3.AsSByte()).AsByte(); + + filter1 = Sse2.UnpackLow(zero, filter1); + filter1 = Sse2.ShiftRightArithmetic(filter1.AsInt16(), 0xB).AsByte(); + filter2 = Sse2.UnpackLow(zero, filter2); + filter2 = Sse2.ShiftRightArithmetic(filter2.AsInt16(), 0xB).AsByte(); + + // Filter1 >> 3 + filt = Sse2.PackSignedSaturate(filter2.AsInt16(), + Sse2.SubtractSaturate(zero.AsInt16(), filter1.AsInt16())).AsByte(); + qs0Ps0 = Sse2.Xor(Sse2.AddSaturate(qs0Ps0.AsSByte(), filt.AsSByte()).AsByte(), t80); + + // filt >> 1 + filt = Sse2.AddSaturate(filter1.AsInt16(), t1.AsInt16()).AsByte(); + filt = Sse2.ShiftRightArithmetic(filt.AsInt16(), 1).AsByte(); + filt = Sse2.AndNot(Sse2.ShiftRightArithmetic(Sse2.UnpackLow(zero, hev).AsInt16(), 0x8), filt.AsInt16()) + .AsByte(); + filt = Sse2.PackSignedSaturate(filt.AsInt16(), Sse2.SubtractSaturate(zero.AsInt16(), filt.AsInt16())) + .AsByte(); + qs1Ps1 = Sse2.Xor(Sse2.AddSaturate(qs1Ps1.AsSByte(), filt.AsSByte()).AsByte(), t80); + // loopfilter done + + { + Vector128 work; + flat = Sse2.Max(AbsDiff(q2P2, q0P0), AbsDiff(q3P3, q0P0)); + flat = Sse2.Max(absP1P0, flat); + flat = Sse2.Max(flat, Sse2.ShiftRightLogical128BitLane(flat, 8)); + flat = Sse2.SubtractSaturate(flat, one); + flat = Sse2.CompareEqual(flat, zero); + flat = Sse2.And(flat, mask); + + q5P5 = Sse2.LoadScalarVector128((long*)(s.ToPointer() - (6 * pitch))).AsByte(); + q5P5 = Sse.LoadHigh(q5P5.AsSingle(), (float*)(s.ToPointer() + (5 * pitch))).AsByte(); + + q6P6 = Sse2.LoadScalarVector128((long*)(s.ToPointer() - (7 * pitch))).AsByte(); + q6P6 = Sse.LoadHigh(q6P6.AsSingle(), (float*)(s.ToPointer() + (6 * pitch))).AsByte(); + flat2 = Sse2.Max(AbsDiff(q4P4, q0P0), AbsDiff(q5P5, q0P0)); + + q7P7 = Sse2.LoadScalarVector128((long*)(s.ToPointer() - (8 * pitch))).AsByte(); + q7P7 = Sse.LoadHigh(q7P7.AsSingle(), (float*)(s.ToPointer() + (7 * pitch))).AsByte(); + work = Sse2.Max(AbsDiff(q6P6, q0P0), AbsDiff(q7P7, q0P0)); + flat2 = Sse2.Max(work, flat2); + flat2 = Sse2.Max(flat2, Sse2.ShiftRightLogical128BitLane(flat2, 8)); + flat2 = Sse2.SubtractSaturate(flat2, one); + flat2 = Sse2.CompareEqual(flat2, zero); + flat2 = Sse2.And(flat2, flat); // flat2 & flat & mask + } + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // flat and wide flat calculations + { + Vector128 eight = Vector128.Create((short)8); + Vector128 four = Vector128.Create((short)4); + Vector128 p716, p616, p516, p416, p316, p216, p116, p016; + Vector128 q716, q616, q516, q416, q316, q216, q116, q016; + Vector128 pixelFilterP, pixelFilterQ; + Vector128 pixetFilterP2P1P0, pixetFilterQ2Q1Q0; + Vector128 sumP7, sumQ7, sumP3, sumQ3, resP, resQ; + + p716 = Sse2.UnpackLow(q7P7, zero).AsInt16(); + p616 = Sse2.UnpackLow(q6P6, zero).AsInt16(); + p516 = Sse2.UnpackLow(q5P5, zero).AsInt16(); + p416 = Sse2.UnpackLow(q4P4, zero).AsInt16(); + p316 = Sse2.UnpackLow(q3P3, zero).AsInt16(); + p216 = Sse2.UnpackLow(q2P2, zero).AsInt16(); + p116 = Sse2.UnpackLow(q1P1, zero).AsInt16(); + p016 = Sse2.UnpackLow(q0P0, zero).AsInt16(); + q016 = Sse2.UnpackHigh(q0P0, zero).AsInt16(); + q116 = Sse2.UnpackHigh(q1P1, zero).AsInt16(); + q216 = Sse2.UnpackHigh(q2P2, zero).AsInt16(); + q316 = Sse2.UnpackHigh(q3P3, zero).AsInt16(); + q416 = Sse2.UnpackHigh(q4P4, zero).AsInt16(); + q516 = Sse2.UnpackHigh(q5P5, zero).AsInt16(); + q616 = Sse2.UnpackHigh(q6P6, zero).AsInt16(); + q716 = Sse2.UnpackHigh(q7P7, zero).AsInt16(); + + pixelFilterP = Sse2.Add(Sse2.Add(p616, p516), Sse2.Add(p416, p316)); + pixelFilterQ = Sse2.Add(Sse2.Add(q616, q516), Sse2.Add(q416, q316)); + + pixetFilterP2P1P0 = Sse2.Add(p016, Sse2.Add(p216, p116)); + pixelFilterP = Sse2.Add(pixelFilterP, pixetFilterP2P1P0); + + pixetFilterQ2Q1Q0 = Sse2.Add(q016, Sse2.Add(q216, q116)); + pixelFilterQ = Sse2.Add(pixelFilterQ, pixetFilterQ2Q1Q0); + pixelFilterP = Sse2.Add(eight, Sse2.Add(pixelFilterP, pixelFilterQ)); + pixetFilterP2P1P0 = Sse2.Add(four, Sse2.Add(pixetFilterP2P1P0, pixetFilterQ2Q1Q0)); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterP, Sse2.Add(p716, p016)), 4); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterP, Sse2.Add(q716, q016)), 4); + flat2Q0P0 = Sse2.PackUnsignedSaturate(resP, resQ); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixetFilterP2P1P0, Sse2.Add(p316, p016)), 3); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixetFilterP2P1P0, Sse2.Add(q316, q016)), 3); + + flatQ0P0 = Sse2.PackUnsignedSaturate(resP, resQ); + + sumP7 = Sse2.Add(p716, p716); + sumQ7 = Sse2.Add(q716, q716); + sumP3 = Sse2.Add(p316, p316); + sumQ3 = Sse2.Add(q316, q316); + + pixelFilterQ = Sse2.Subtract(pixelFilterP, p616); + pixelFilterP = Sse2.Subtract(pixelFilterP, q616); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterP, Sse2.Add(sumP7, p116)), 4); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterQ, Sse2.Add(sumQ7, q116)), 4); + flat2Q1P1 = Sse2.PackUnsignedSaturate(resP, resQ); + + pixetFilterQ2Q1Q0 = Sse2.Subtract(pixetFilterP2P1P0, p216); + pixetFilterP2P1P0 = Sse2.Subtract(pixetFilterP2P1P0, q216); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixetFilterP2P1P0, Sse2.Add(sumP3, p116)), 3); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixetFilterQ2Q1Q0, Sse2.Add(sumQ3, q116)), 3); + flatQ1P1 = Sse2.PackUnsignedSaturate(resP, resQ); + + sumP7 = Sse2.Add(sumP7, p716); + sumQ7 = Sse2.Add(sumQ7, q716); + sumP3 = Sse2.Add(sumP3, p316); + sumQ3 = Sse2.Add(sumQ3, q316); + + pixelFilterP = Sse2.Subtract(pixelFilterP, q516); + pixelFilterQ = Sse2.Subtract(pixelFilterQ, p516); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterP, Sse2.Add(sumP7, p216)), 4); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterQ, Sse2.Add(sumQ7, q216)), 4); + flat2Q2P2 = Sse2.PackUnsignedSaturate(resP, resQ); + + pixetFilterP2P1P0 = Sse2.Subtract(pixetFilterP2P1P0, q116); + pixetFilterQ2Q1Q0 = Sse2.Subtract(pixetFilterQ2Q1Q0, p116); + + resP = Sse2.ShiftRightLogical(Sse2.Add(pixetFilterP2P1P0, Sse2.Add(sumP3, p216)), 3); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixetFilterQ2Q1Q0, Sse2.Add(sumQ3, q216)), 3); + flatQ2P2 = Sse2.PackUnsignedSaturate(resP, resQ); + + sumP7 = Sse2.Add(sumP7, p716); + sumQ7 = Sse2.Add(sumQ7, q716); + pixelFilterP = Sse2.Subtract(pixelFilterP, q416); + pixelFilterQ = Sse2.Subtract(pixelFilterQ, p416); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterP, Sse2.Add(sumP7, p316)), 4); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterQ, Sse2.Add(sumQ7, q316)), 4); + flat2Q3P3 = Sse2.PackUnsignedSaturate(resP, resQ); + + sumP7 = Sse2.Add(sumP7, p716); + sumQ7 = Sse2.Add(sumQ7, q716); + pixelFilterP = Sse2.Subtract(pixelFilterP, q316); + pixelFilterQ = Sse2.Subtract(pixelFilterQ, p316); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterP, Sse2.Add(sumP7, p416)), 4); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterQ, Sse2.Add(sumQ7, q416)), 4); + flat2Q4P4 = Sse2.PackUnsignedSaturate(resP, resQ); + + sumP7 = Sse2.Add(sumP7, p716); + sumQ7 = Sse2.Add(sumQ7, q716); + pixelFilterP = Sse2.Subtract(pixelFilterP, q216); + pixelFilterQ = Sse2.Subtract(pixelFilterQ, p216); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterP, Sse2.Add(sumP7, p516)), 4); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterQ, Sse2.Add(sumQ7, q516)), 4); + flat2Q5P5 = Sse2.PackUnsignedSaturate(resP, resQ); + + sumP7 = Sse2.Add(sumP7, p716); + sumQ7 = Sse2.Add(sumQ7, q716); + pixelFilterP = Sse2.Subtract(pixelFilterP, q116); + pixelFilterQ = Sse2.Subtract(pixelFilterQ, p116); + resP = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterP, Sse2.Add(sumP7, p616)), 4); + resQ = Sse2.ShiftRightLogical(Sse2.Add(pixelFilterQ, Sse2.Add(sumQ7, q616)), 4); + flat2Q6P6 = Sse2.PackUnsignedSaturate(resP, resQ); + } + // wide flat + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + flat = Sse2.Shuffle(flat.AsInt32(), 68).AsByte(); + flat2 = Sse2.Shuffle(flat2.AsInt32(), 68).AsByte(); + + q2P2 = Sse2.AndNot(flat, q2P2); + flatQ2P2 = Sse2.And(flat, flatQ2P2); + q2P2 = Sse2.Or(q2P2, flatQ2P2); + + qs1Ps1 = Sse2.AndNot(flat, qs1Ps1); + flatQ1P1 = Sse2.And(flat, flatQ1P1); + q1P1 = Sse2.Or(qs1Ps1, flatQ1P1); + + qs0Ps0 = Sse2.AndNot(flat, qs0Ps0); + flatQ0P0 = Sse2.And(flat, flatQ0P0); + q0P0 = Sse2.Or(qs0Ps0, flatQ0P0); + + q6P6 = Sse2.AndNot(flat2, q6P6); + flat2Q6P6 = Sse2.And(flat2, flat2Q6P6); + q6P6 = Sse2.Or(q6P6, flat2Q6P6); + Sse2.StoreScalar((long*)(s.ToPointer() - (7 * pitch)), q6P6.AsInt64()); + Sse.StoreHigh((float*)(s.ToPointer() + (6 * pitch)), q6P6.AsSingle()); + + q5P5 = Sse2.AndNot(flat2, q5P5); + flat2Q5P5 = Sse2.And(flat2, flat2Q5P5); + q5P5 = Sse2.Or(q5P5, flat2Q5P5); + Sse2.StoreScalar((long*)(s.ToPointer() - (6 * pitch)), q5P5.AsInt64()); + Sse.StoreHigh((float*)(s.ToPointer() + (5 * pitch)), q5P5.AsSingle()); + + q4P4 = Sse2.AndNot(flat2, q4P4); + flat2Q4P4 = Sse2.And(flat2, flat2Q4P4); + q4P4 = Sse2.Or(q4P4, flat2Q4P4); + Sse2.StoreScalar((long*)(s.ToPointer() - (5 * pitch)), q4P4.AsInt64()); + Sse.StoreHigh((float*)(s.ToPointer() + (4 * pitch)), q4P4.AsSingle()); + + q3P3 = Sse2.AndNot(flat2, q3P3); + flat2Q3P3 = Sse2.And(flat2, flat2Q3P3); + q3P3 = Sse2.Or(q3P3, flat2Q3P3); + Sse2.StoreScalar((long*)(s.ToPointer() - (4 * pitch)), q3P3.AsInt64()); + Sse.StoreHigh((float*)(s.ToPointer() + (3 * pitch)), q3P3.AsSingle()); + + q2P2 = Sse2.AndNot(flat2, q2P2); + flat2Q2P2 = Sse2.And(flat2, flat2Q2P2); + q2P2 = Sse2.Or(q2P2, flat2Q2P2); + Sse2.StoreScalar((long*)(s.ToPointer() - (3 * pitch)), q2P2.AsInt64()); + Sse.StoreHigh((float*)(s.ToPointer() + (2 * pitch)), q2P2.AsSingle()); + + q1P1 = Sse2.AndNot(flat2, q1P1); + flat2Q1P1 = Sse2.And(flat2, flat2Q1P1); + q1P1 = Sse2.Or(q1P1, flat2Q1P1); + Sse2.StoreScalar((long*)(s.ToPointer() - (2 * pitch)), q1P1.AsInt64()); + Sse.StoreHigh((float*)(s.ToPointer() + (1 * pitch)), q1P1.AsSingle()); + + q0P0 = Sse2.AndNot(flat2, q0P0); + flat2Q0P0 = Sse2.And(flat2, flat2Q0P0); + q0P0 = Sse2.Or(q0P0, flat2Q0P0); + Sse2.StoreScalar((long*)(s.ToPointer() - (1 * pitch)), q0P0.AsInt64()); + Sse.StoreHigh((float*)(s.ToPointer() - (0 * pitch)), q0P0.AsSingle()); + } + } + + private static Vector128 FilterAdd2Sub2( + Vector128 total, + Vector128 a1, + Vector128 a2, + Vector128 s1, + Vector128 s2) + { + Vector128 x = Sse2.Add(a1, total); + x = Sse2.Add(Sse2.Subtract(x, Sse2.Add(s1, s2)), a2); + return x; + } + + private static Vector128 Filter8Mask( + Vector128 flat, + Vector128 otherFilt, + Vector128 f8Lo, + Vector128 f8Hi) + { + Vector128 f8 = + Sse2.PackUnsignedSaturate(Sse2.ShiftRightLogical(f8Lo, 3), Sse2.ShiftRightLogical(f8Hi, 3)); + Vector128 result = Sse2.And(flat, f8); + return Sse2.Or(Sse2.AndNot(flat, otherFilt), result); + } + + private static Vector128 Filter16Mask( + Vector128 flat, + Vector128 otherFilt, + Vector128 fLo, + Vector128 fHi) + { + Vector128 f = + Sse2.PackUnsignedSaturate(Sse2.ShiftRightLogical(fLo, 4), Sse2.ShiftRightLogical(fHi, 4)); + Vector128 result = Sse2.And(flat, f); + return Sse2.Or(Sse2.AndNot(flat, otherFilt), result); + } + + public static unsafe void LpfHorizontal16Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + Vector128 zero = Vector128.Zero; + Vector128 one = Vector128.Create((byte)1); + Vector128 blimitV, limitV, threshV; + + fixed (byte* pBLimit = blimit, pLimit = limit, pThresh = thresh) + { + blimitV = Sse2.LoadVector128(pBLimit); + limitV = Sse2.LoadVector128(pLimit); + threshV = Sse2.LoadVector128(pThresh); + } + + Vector128 mask, hev, flat, flat2; + Vector128 p7, p6, p5; + Vector128 p4, p3, p2, p1, p0, q0, q1, q2, q3, q4; + Vector128 q5, q6, q7; + + Vector128 op2, op1, op0, oq0, oq1, oq2; + + Vector128 maxAbsP1P0Q1Q0; + + p7 = Sse2.LoadVector128(s.ToPointer() - (8 * pitch)); + p6 = Sse2.LoadVector128(s.ToPointer() - (7 * pitch)); + p5 = Sse2.LoadVector128(s.ToPointer() - (6 * pitch)); + p4 = Sse2.LoadVector128(s.ToPointer() - (5 * pitch)); + p3 = Sse2.LoadVector128(s.ToPointer() - (4 * pitch)); + p2 = Sse2.LoadVector128(s.ToPointer() - (3 * pitch)); + p1 = Sse2.LoadVector128(s.ToPointer() - (2 * pitch)); + p0 = Sse2.LoadVector128(s.ToPointer() - (1 * pitch)); + q0 = Sse2.LoadVector128(s.ToPointer() - (0 * pitch)); + q1 = Sse2.LoadVector128(s.ToPointer() + (1 * pitch)); + q2 = Sse2.LoadVector128(s.ToPointer() + (2 * pitch)); + q3 = Sse2.LoadVector128(s.ToPointer() + (3 * pitch)); + q4 = Sse2.LoadVector128(s.ToPointer() + (4 * pitch)); + q5 = Sse2.LoadVector128(s.ToPointer() + (5 * pitch)); + q6 = Sse2.LoadVector128(s.ToPointer() + (6 * pitch)); + q7 = Sse2.LoadVector128(s.ToPointer() + (7 * pitch)); + + { + Vector128 absP1P0 = AbsDiff(p1, p0); + Vector128 absQ1Q0 = AbsDiff(q1, q0); + Vector128 fe = Vector128.Create((byte)0xfe); + Vector128 ff = Sse2.CompareEqual(zero, zero); + Vector128 absP0Q0 = AbsDiff(p0, q0); + Vector128 absP1Q1 = AbsDiff(p1, q1); + Vector128 work; + maxAbsP1P0Q1Q0 = Sse2.Max(absP1P0, absQ1Q0); + + absP0Q0 = Sse2.AddSaturate(absP0Q0, absP0Q0); + absP1Q1 = Sse2.ShiftRightLogical(Sse2.And(absP1Q1, fe).AsInt16(), 1).AsByte(); + mask = Sse2.SubtractSaturate(Sse2.AddSaturate(absP0Q0, absP1Q1), blimitV); + mask = Sse2.Xor(Sse2.CompareEqual(mask, zero), ff); + // mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit) * -1; + mask = Sse2.Max(maxAbsP1P0Q1Q0, mask); + // mask |= (abs(p1 - p0) > limit) * -1; + // mask |= (abs(q1 - q0) > limit) * -1; + work = Sse2.Max(AbsDiff(p2, p1), AbsDiff(p3, p2)); + mask = Sse2.Max(work, mask); + work = Sse2.Max(AbsDiff(q2, q1), AbsDiff(q3, q2)); + mask = Sse2.Max(work, mask); + mask = Sse2.SubtractSaturate(mask, limitV); + mask = Sse2.CompareEqual(mask, zero); + } + + { + Vector128 work; + work = Sse2.Max(AbsDiff(p2, p0), AbsDiff(q2, q0)); + flat = Sse2.Max(work, maxAbsP1P0Q1Q0); + work = Sse2.Max(AbsDiff(p3, p0), AbsDiff(q3, q0)); + flat = Sse2.Max(work, flat); + work = Sse2.Max(AbsDiff(p4, p0), AbsDiff(q4, q0)); + flat = Sse2.SubtractSaturate(flat, one); + flat = Sse2.CompareEqual(flat, zero); + flat = Sse2.And(flat, mask); + flat2 = Sse2.Max(AbsDiff(p5, p0), AbsDiff(q5, q0)); + flat2 = Sse2.Max(work, flat2); + work = Sse2.Max(AbsDiff(p6, p0), AbsDiff(q6, q0)); + flat2 = Sse2.Max(work, flat2); + work = Sse2.Max(AbsDiff(p7, p0), AbsDiff(q7, q0)); + flat2 = Sse2.Max(work, flat2); + flat2 = Sse2.SubtractSaturate(flat2, one); + flat2 = Sse2.CompareEqual(flat2, zero); + flat2 = Sse2.And(flat2, flat); // flat2 & flat & mask + } + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // filter4 + { + Vector128 t4 = Vector128.Create((byte)4); + Vector128 t3 = Vector128.Create((byte)3); + Vector128 t80 = Vector128.Create((byte)0x80); + Vector128 te0 = Vector128.Create((byte)0xe0); + Vector128 t1F = Vector128.Create((byte)0x1f); + Vector128 t1 = Vector128.Create((byte)0x1); + Vector128 t7F = Vector128.Create((byte)0x7f); + Vector128 ff = Sse2.CompareEqual(t4, t4); + + Vector128 filt; + Vector128 workA; + Vector128 filter1, filter2; + + op1 = Sse2.Xor(p1, t80); + op0 = Sse2.Xor(p0, t80); + oq0 = Sse2.Xor(q0, t80); + oq1 = Sse2.Xor(q1, t80); + + hev = Sse2.SubtractSaturate(maxAbsP1P0Q1Q0, threshV); + hev = Sse2.Xor(Sse2.CompareEqual(hev, zero), ff); + filt = Sse2.And(Sse2.SubtractSaturate(op1.AsSByte(), oq1.AsSByte()).AsByte(), hev); + + workA = Sse2.SubtractSaturate(oq0.AsSByte(), op0.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + // (vpx_filter + 3 * (qs0 - ps0)) & mask + filt = Sse2.And(filt, mask); + filter1 = Sse2.AddSaturate(filt.AsSByte(), t4.AsSByte()).AsByte(); + filter2 = Sse2.AddSaturate(filt.AsSByte(), t3.AsSByte()).AsByte(); + + // Filter1 >> 3 + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filter1.AsSByte()).AsByte(); + filter1 = Sse2.ShiftRightLogical(filter1.AsInt16(), 3).AsByte(); + workA = Sse2.And(workA, te0); + filter1 = Sse2.And(filter1, t1F); + filter1 = Sse2.Or(filter1, workA); + oq0 = Sse2.Xor(Sse2.SubtractSaturate(oq0.AsSByte(), filter1.AsSByte()).AsByte(), t80); + + // Filter2 >> 3 + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filter2.AsSByte()).AsByte(); + filter2 = Sse2.ShiftRightLogical(filter2.AsInt16(), 3).AsByte(); + workA = Sse2.And(workA, te0); + filter2 = Sse2.And(filter2, t1F); + filter2 = Sse2.Or(filter2, workA); + op0 = Sse2.Xor(Sse2.AddSaturate(op0.AsSByte(), filter2.AsSByte()).AsByte(), t80); + + // filt >> 1 + filt = Sse2.AddSaturate(filter1.AsSByte(), t1.AsSByte()).AsByte(); + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filt.AsSByte()).AsByte(); + filt = Sse2.ShiftRightLogical(filt.AsInt16(), 1).AsByte(); + workA = Sse2.And(workA, t80); + filt = Sse2.And(filt, t7F); + filt = Sse2.Or(filt, workA); + filt = Sse2.AndNot(hev, filt); + op1 = Sse2.Xor(Sse2.AddSaturate(op1.AsSByte(), filt.AsSByte()).AsByte(), t80); + oq1 = Sse2.Xor(Sse2.SubtractSaturate(oq1.AsSByte(), filt.AsSByte()).AsByte(), t80); + // loopfilter done + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // filter8 + { + Vector128 four = Vector128.Create((short)4); + Vector128 p3Lo = Sse2.UnpackLow(p3, zero).AsInt16(); + Vector128 p2Lo = Sse2.UnpackLow(p2, zero).AsInt16(); + Vector128 p1Lo = Sse2.UnpackLow(p1, zero).AsInt16(); + Vector128 p0Lo = Sse2.UnpackLow(p0, zero).AsInt16(); + Vector128 q0Lo = Sse2.UnpackLow(q0, zero).AsInt16(); + Vector128 q1Lo = Sse2.UnpackLow(q1, zero).AsInt16(); + Vector128 q2Lo = Sse2.UnpackLow(q2, zero).AsInt16(); + Vector128 q3Lo = Sse2.UnpackLow(q3, zero).AsInt16(); + + Vector128 p3Hi = Sse2.UnpackHigh(p3, zero).AsInt16(); + Vector128 p2Hi = Sse2.UnpackHigh(p2, zero).AsInt16(); + Vector128 p1Hi = Sse2.UnpackHigh(p1, zero).AsInt16(); + Vector128 p0Hi = Sse2.UnpackHigh(p0, zero).AsInt16(); + Vector128 q0Hi = Sse2.UnpackHigh(q0, zero).AsInt16(); + Vector128 q1Hi = Sse2.UnpackHigh(q1, zero).AsInt16(); + Vector128 q2Hi = Sse2.UnpackHigh(q2, zero).AsInt16(); + Vector128 q3Hi = Sse2.UnpackHigh(q3, zero).AsInt16(); + Vector128 f8Lo, f8Hi; + + f8Lo = Sse2.Add(Sse2.Add(p3Lo, four), Sse2.Add(p3Lo, p2Lo)); + f8Lo = Sse2.Add(Sse2.Add(p3Lo, f8Lo), Sse2.Add(p2Lo, p1Lo)); + f8Lo = Sse2.Add(Sse2.Add(p0Lo, q0Lo), f8Lo); + + f8Hi = Sse2.Add(Sse2.Add(p3Hi, four), Sse2.Add(p3Hi, p2Hi)); + f8Hi = Sse2.Add(Sse2.Add(p3Hi, f8Hi), Sse2.Add(p2Hi, p1Hi)); + f8Hi = Sse2.Add(Sse2.Add(p0Hi, q0Hi), f8Hi); + + op2 = Filter8Mask(flat, p2, f8Lo, f8Hi); + + f8Lo = FilterAdd2Sub2(f8Lo, q1Lo, p1Lo, p2Lo, p3Lo); + f8Hi = FilterAdd2Sub2(f8Hi, q1Hi, p1Hi, p2Hi, p3Hi); + op1 = Filter8Mask(flat, op1, f8Lo, f8Hi); + + f8Lo = FilterAdd2Sub2(f8Lo, q2Lo, p0Lo, p1Lo, p3Lo); + f8Hi = FilterAdd2Sub2(f8Hi, q2Hi, p0Hi, p1Hi, p3Hi); + op0 = Filter8Mask(flat, op0, f8Lo, f8Hi); + + f8Lo = FilterAdd2Sub2(f8Lo, q3Lo, q0Lo, p0Lo, p3Lo); + f8Hi = FilterAdd2Sub2(f8Hi, q3Hi, q0Hi, p0Hi, p3Hi); + oq0 = Filter8Mask(flat, oq0, f8Lo, f8Hi); + + f8Lo = FilterAdd2Sub2(f8Lo, q3Lo, q1Lo, q0Lo, p2Lo); + f8Hi = FilterAdd2Sub2(f8Hi, q3Hi, q1Hi, q0Hi, p2Hi); + oq1 = Filter8Mask(flat, oq1, f8Lo, f8Hi); + + f8Lo = FilterAdd2Sub2(f8Lo, q3Lo, q2Lo, q1Lo, p1Lo); + f8Hi = FilterAdd2Sub2(f8Hi, q3Hi, q2Hi, q1Hi, p1Hi); + oq2 = Filter8Mask(flat, q2, f8Lo, f8Hi); + } + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // wide flat calculations + { + Vector128 eight = Vector128.Create((short)8); + Vector128 p7Lo = Sse2.UnpackLow(p7, zero).AsInt16(); + Vector128 p6Lo = Sse2.UnpackLow(p6, zero).AsInt16(); + Vector128 p5Lo = Sse2.UnpackLow(p5, zero).AsInt16(); + Vector128 p4Lo = Sse2.UnpackLow(p4, zero).AsInt16(); + Vector128 p3Lo = Sse2.UnpackLow(p3, zero).AsInt16(); + Vector128 p2Lo = Sse2.UnpackLow(p2, zero).AsInt16(); + Vector128 p1Lo = Sse2.UnpackLow(p1, zero).AsInt16(); + Vector128 p0Lo = Sse2.UnpackLow(p0, zero).AsInt16(); + Vector128 q0Lo = Sse2.UnpackLow(q0, zero).AsInt16(); + Vector128 q1Lo = Sse2.UnpackLow(q1, zero).AsInt16(); + Vector128 q2Lo = Sse2.UnpackLow(q2, zero).AsInt16(); + Vector128 q3Lo = Sse2.UnpackLow(q3, zero).AsInt16(); + Vector128 q4Lo = Sse2.UnpackLow(q4, zero).AsInt16(); + Vector128 q5Lo = Sse2.UnpackLow(q5, zero).AsInt16(); + Vector128 q6Lo = Sse2.UnpackLow(q6, zero).AsInt16(); + Vector128 q7Lo = Sse2.UnpackLow(q7, zero).AsInt16(); + + Vector128 p7Hi = Sse2.UnpackHigh(p7, zero).AsInt16(); + Vector128 p6Hi = Sse2.UnpackHigh(p6, zero).AsInt16(); + Vector128 p5Hi = Sse2.UnpackHigh(p5, zero).AsInt16(); + Vector128 p4Hi = Sse2.UnpackHigh(p4, zero).AsInt16(); + Vector128 p3Hi = Sse2.UnpackHigh(p3, zero).AsInt16(); + Vector128 p2Hi = Sse2.UnpackHigh(p2, zero).AsInt16(); + Vector128 p1Hi = Sse2.UnpackHigh(p1, zero).AsInt16(); + Vector128 p0Hi = Sse2.UnpackHigh(p0, zero).AsInt16(); + Vector128 q0Hi = Sse2.UnpackHigh(q0, zero).AsInt16(); + Vector128 q1Hi = Sse2.UnpackHigh(q1, zero).AsInt16(); + Vector128 q2Hi = Sse2.UnpackHigh(q2, zero).AsInt16(); + Vector128 q3Hi = Sse2.UnpackHigh(q3, zero).AsInt16(); + Vector128 q4Hi = Sse2.UnpackHigh(q4, zero).AsInt16(); + Vector128 q5Hi = Sse2.UnpackHigh(q5, zero).AsInt16(); + Vector128 q6Hi = Sse2.UnpackHigh(q6, zero).AsInt16(); + Vector128 q7Hi = Sse2.UnpackHigh(q7, zero).AsInt16(); + + Vector128 fLo; + Vector128 fHi; + + fLo = Sse2.Subtract(Sse2.ShiftLeftLogical(p7Lo, 3), p7Lo); // p7 * 7 + fLo = Sse2.Add(Sse2.ShiftLeftLogical(p6Lo, 1), Sse2.Add(p4Lo, fLo)); + fLo = Sse2.Add(Sse2.Add(p3Lo, fLo), Sse2.Add(p2Lo, p1Lo)); + fLo = Sse2.Add(Sse2.Add(p0Lo, q0Lo), fLo); + fLo = Sse2.Add(Sse2.Add(p5Lo, eight), fLo); + + fHi = Sse2.Subtract(Sse2.ShiftLeftLogical(p7Hi, 3), p7Hi); // p7 * 7 + fHi = Sse2.Add(Sse2.ShiftLeftLogical(p6Hi, 1), Sse2.Add(p4Hi, fHi)); + fHi = Sse2.Add(Sse2.Add(p3Hi, fHi), Sse2.Add(p2Hi, p1Hi)); + fHi = Sse2.Add(Sse2.Add(p0Hi, q0Hi), fHi); + fHi = Sse2.Add(Sse2.Add(p5Hi, eight), fHi); + + p6 = Filter16Mask(flat2, p6, fLo, fHi); + Sse2.Store(s.ToPointer() - (7 * pitch), p6); + + fLo = FilterAdd2Sub2(fLo, q1Lo, p5Lo, p6Lo, p7Lo); + fHi = FilterAdd2Sub2(fHi, q1Hi, p5Hi, p6Hi, p7Hi); + p5 = Filter16Mask(flat2, p5, fLo, fHi); + Sse2.Store(s.ToPointer() - (6 * pitch), p5); + + fLo = FilterAdd2Sub2(fLo, q2Lo, p4Lo, p5Lo, p7Lo); + fHi = FilterAdd2Sub2(fHi, q2Hi, p4Hi, p5Hi, p7Hi); + p4 = Filter16Mask(flat2, p4, fLo, fHi); + Sse2.Store(s.ToPointer() - (5 * pitch), p4); + + fLo = FilterAdd2Sub2(fLo, q3Lo, p3Lo, p4Lo, p7Lo); + fHi = FilterAdd2Sub2(fHi, q3Hi, p3Hi, p4Hi, p7Hi); + p3 = Filter16Mask(flat2, p3, fLo, fHi); + Sse2.Store(s.ToPointer() - (4 * pitch), p3); + + fLo = FilterAdd2Sub2(fLo, q4Lo, p2Lo, p3Lo, p7Lo); + fHi = FilterAdd2Sub2(fHi, q4Hi, p2Hi, p3Hi, p7Hi); + op2 = Filter16Mask(flat2, op2, fLo, fHi); + Sse2.Store(s.ToPointer() - (3 * pitch), op2); + + fLo = FilterAdd2Sub2(fLo, q5Lo, p1Lo, p2Lo, p7Lo); + fHi = FilterAdd2Sub2(fHi, q5Hi, p1Hi, p2Hi, p7Hi); + op1 = Filter16Mask(flat2, op1, fLo, fHi); + Sse2.Store(s.ToPointer() - (2 * pitch), op1); + + fLo = FilterAdd2Sub2(fLo, q6Lo, p0Lo, p1Lo, p7Lo); + fHi = FilterAdd2Sub2(fHi, q6Hi, p0Hi, p1Hi, p7Hi); + op0 = Filter16Mask(flat2, op0, fLo, fHi); + Sse2.Store(s.ToPointer() - (1 * pitch), op0); + + fLo = FilterAdd2Sub2(fLo, q7Lo, q0Lo, p0Lo, p7Lo); + fHi = FilterAdd2Sub2(fHi, q7Hi, q0Hi, p0Hi, p7Hi); + oq0 = Filter16Mask(flat2, oq0, fLo, fHi); + Sse2.Store(s.ToPointer() - (0 * pitch), oq0); + + fLo = FilterAdd2Sub2(fLo, q7Lo, q1Lo, p6Lo, q0Lo); + fHi = FilterAdd2Sub2(fHi, q7Hi, q1Hi, p6Hi, q0Hi); + oq1 = Filter16Mask(flat2, oq1, fLo, fHi); + Sse2.Store(s.ToPointer() + (1 * pitch), oq1); + + fLo = FilterAdd2Sub2(fLo, q7Lo, q2Lo, p5Lo, q1Lo); + fHi = FilterAdd2Sub2(fHi, q7Hi, q2Hi, p5Hi, q1Hi); + oq2 = Filter16Mask(flat2, oq2, fLo, fHi); + Sse2.Store(s.ToPointer() + (2 * pitch), oq2); + + fLo = FilterAdd2Sub2(fLo, q7Lo, q3Lo, p4Lo, q2Lo); + fHi = FilterAdd2Sub2(fHi, q7Hi, q3Hi, p4Hi, q2Hi); + q3 = Filter16Mask(flat2, q3, fLo, fHi); + Sse2.Store(s.ToPointer() + (3 * pitch), q3); + + fLo = FilterAdd2Sub2(fLo, q7Lo, q4Lo, p3Lo, q3Lo); + fHi = FilterAdd2Sub2(fHi, q7Hi, q4Hi, p3Hi, q3Hi); + q4 = Filter16Mask(flat2, q4, fLo, fHi); + Sse2.Store(s.ToPointer() + (4 * pitch), q4); + + fLo = FilterAdd2Sub2(fLo, q7Lo, q5Lo, p2Lo, q4Lo); + fHi = FilterAdd2Sub2(fHi, q7Hi, q5Hi, p2Hi, q4Hi); + q5 = Filter16Mask(flat2, q5, fLo, fHi); + Sse2.Store(s.ToPointer() + (5 * pitch), q5); + + fLo = FilterAdd2Sub2(fLo, q7Lo, q6Lo, p1Lo, q5Lo); + fHi = FilterAdd2Sub2(fHi, q7Hi, q6Hi, p1Hi, q5Hi); + q6 = Filter16Mask(flat2, q6, fLo, fHi); + Sse2.Store(s.ToPointer() + (6 * pitch), q6); + } + // wide flat + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + } + } + + public static unsafe void LpfHorizontal8( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + Vector128 flatOp2; + Vector128 flatOp1; + Vector128 flatOp0; + Vector128 flatOq2; + Vector128 flatOq1; + Vector128 flatOq0; + Vector128 zero = Vector128.Zero; + Vector128 blimitV, limitV, threshV; + + fixed (byte* pBLimit = blimit, pLimit = limit, pThresh = thresh) + { + blimitV = Sse2.LoadVector128(pBLimit); + limitV = Sse2.LoadVector128(pLimit); + threshV = Sse2.LoadVector128(pThresh); + } + + Vector128 mask, hev, flat; + Vector128 p3, p2, p1, p0, q0, q1, q2, q3; + Vector128 q3P3, q2P2, q1P1, q0P0, p1Q1, p0Q0; + + q3P3 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (4 * pitch))), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (3 * pitch)))).AsByte(); + q2P2 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (3 * pitch))), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (2 * pitch)))).AsByte(); + q1P1 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (2 * pitch))), + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (1 * pitch)))).AsByte(); + q0P0 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (1 * pitch))), + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (0 * pitch)))).AsByte(); + p1Q1 = Sse2.Shuffle(q1P1.AsInt32(), 78).AsByte(); + p0Q0 = Sse2.Shuffle(q0P0.AsInt32(), 78).AsByte(); + + { + // filter_mask and hev_mask + Vector128 one = Vector128.Create((byte)1); + Vector128 fe = Vector128.Create((byte)0xfe); + Vector128 ff = Sse2.CompareEqual(fe, fe); + Vector128 absP1Q1, absP0Q0, absQ1Q0, absP1P0, work; + absP1P0 = AbsDiff(q1P1, q0P0); + absQ1Q0 = Sse2.ShiftRightLogical128BitLane(absP1P0, 8); + + absP0Q0 = AbsDiff(q0P0, p0Q0); + absP1Q1 = AbsDiff(q1P1, p1Q1); + flat = Sse2.Max(absP1P0, absQ1Q0); + hev = Sse2.SubtractSaturate(flat, threshV); + hev = Sse2.Xor(Sse2.CompareEqual(hev, zero), ff); + + absP0Q0 = Sse2.AddSaturate(absP0Q0, absP0Q0); + absP1Q1 = Sse2.ShiftRightLogical(Sse2.And(absP1Q1, fe).AsInt16(), 1).AsByte(); + mask = Sse2.SubtractSaturate(Sse2.AddSaturate(absP0Q0, absP1Q1), blimitV); + mask = Sse2.Xor(Sse2.CompareEqual(mask, zero), ff); + // mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit) * -1; + mask = Sse2.Max(absP1P0, mask); + // mask |= (abs(p1 - p0) > limit) * -1; + // mask |= (abs(q1 - q0) > limit) * -1; + + work = Sse2.Max(AbsDiff(q2P2, q1P1), AbsDiff(q3P3, q2P2)); + mask = Sse2.Max(work, mask); + mask = Sse2.Max(mask, Sse2.ShiftRightLogical128BitLane(mask, 8)); + mask = Sse2.SubtractSaturate(mask, limitV); + mask = Sse2.CompareEqual(mask, zero); + + // flat_mask4 + + flat = Sse2.Max(AbsDiff(q2P2, q0P0), AbsDiff(q3P3, q0P0)); + flat = Sse2.Max(absP1P0, flat); + flat = Sse2.Max(flat, Sse2.ShiftRightLogical128BitLane(flat, 8)); + flat = Sse2.SubtractSaturate(flat, one); + flat = Sse2.CompareEqual(flat, zero); + flat = Sse2.And(flat, mask); + } + + { + Vector128 four = Vector128.Create((short)4); + { + Vector128 workpA, workpB, workpShft; + p3 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (4 * pitch))).AsByte(), zero); + p2 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (3 * pitch))).AsByte(), zero); + p1 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (2 * pitch))).AsByte(), zero); + p0 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (1 * pitch))).AsByte(), zero); + q0 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() - (0 * pitch))).AsByte(), zero); + q1 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (1 * pitch))).AsByte(), zero); + q2 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (2 * pitch))).AsByte(), zero); + q3 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(s.ToPointer() + (3 * pitch))).AsByte(), zero); + + workpA = Sse2.Add(Sse2.Add(p3.AsInt16(), p3.AsInt16()), Sse2.Add(p2.AsInt16(), p1.AsInt16())); + workpA = Sse2.Add(Sse2.Add(workpA, four), p0.AsInt16()); + workpB = Sse2.Add(Sse2.Add(q0.AsInt16(), p2.AsInt16()), p3.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOp2, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpB = Sse2.Add(Sse2.Add(q0.AsInt16(), q1.AsInt16()), p1.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOp1, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpA = Sse2.Add(Sse2.Subtract(workpA, p3.AsInt16()), q2.AsInt16()); + workpB = Sse2.Add(Sse2.Subtract(workpB, p1.AsInt16()), p0.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOp0, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpA = Sse2.Add(Sse2.Subtract(workpA, p3.AsInt16()), q3.AsInt16()); + workpB = Sse2.Add(Sse2.Subtract(workpB, p0.AsInt16()), q0.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOq0, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpA = Sse2.Add(Sse2.Subtract(workpA, p2.AsInt16()), q3.AsInt16()); + workpB = Sse2.Add(Sse2.Subtract(workpB, q0.AsInt16()), q1.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOq1, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpA = Sse2.Add(Sse2.Subtract(workpA, p1.AsInt16()), q3.AsInt16()); + workpB = Sse2.Add(Sse2.Subtract(workpB, q1.AsInt16()), q2.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOq2, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + } + } + // lp filter + { + Vector128 t4 = Vector128.Create((byte)4); + Vector128 t3 = Vector128.Create((byte)3); + Vector128 t80 = Vector128.Create((byte)0x80); + Vector128 t1 = Vector128.Create((byte)0x1); + Vector128 ps1 = + Sse2.Xor(Sse2.LoadScalarVector128((long*)(s.ToPointer() - (2 * pitch))).AsByte(), + t80); + Vector128 ps0 = + Sse2.Xor(Sse2.LoadScalarVector128((long*)(s.ToPointer() - (1 * pitch))).AsByte(), + t80); + Vector128 qs0 = + Sse2.Xor(Sse2.LoadScalarVector128((long*)(s.ToPointer() + (0 * pitch))).AsByte(), + t80); + Vector128 qs1 = + Sse2.Xor(Sse2.LoadScalarVector128((long*)(s.ToPointer() + (1 * pitch))).AsByte(), + t80); + Vector128 filt; + Vector128 workA; + Vector128 filter1, filter2; + + filt = Sse2.And(Sse2.SubtractSaturate(ps1.AsSByte(), qs1.AsSByte()).AsByte(), hev); + workA = Sse2.SubtractSaturate(qs0.AsSByte(), ps0.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + // (vpx_filter + 3 * (qs0 - ps0)) & mask + filt = Sse2.And(filt, mask); + + filter1 = Sse2.AddSaturate(filt.AsSByte(), t4.AsSByte()).AsByte(); + filter2 = Sse2.AddSaturate(filt.AsSByte(), t3.AsSByte()).AsByte(); + + // Filter1 >> 3 + filter1 = Sse2.UnpackLow(zero, filter1); + filter1 = Sse2.ShiftRightArithmetic(filter1.AsInt16(), 11).AsByte(); + filter1 = Sse2.PackSignedSaturate(filter1.AsInt16(), filter1.AsInt16()).AsByte(); + + // Filter2 >> 3 + filter2 = Sse2.UnpackLow(zero, filter2); + filter2 = Sse2.ShiftRightArithmetic(filter2.AsInt16(), 11).AsByte(); + filter2 = Sse2.PackSignedSaturate(filter2.AsInt16(), zero.AsInt16()).AsByte(); + + // filt >> 1 + filt = Sse2.AddSaturate(filter1.AsSByte(), t1.AsSByte()).AsByte(); + filt = Sse2.UnpackLow(zero, filt); + filt = Sse2.ShiftRightArithmetic(filt.AsInt16(), 9).AsByte(); + filt = Sse2.PackSignedSaturate(filt.AsInt16(), zero.AsInt16()).AsByte(); + + filt = Sse2.AndNot(hev, filt); + + workA = Sse2.Xor(Sse2.SubtractSaturate(qs0.AsSByte(), filter1.AsSByte()).AsByte(), t80); + q0 = Sse2.LoadScalarVector128((long*)&flatOq0).AsByte(); + workA = Sse2.AndNot(flat, workA); + q0 = Sse2.And(flat, q0); + q0 = Sse2.Or(workA, q0); + + workA = Sse2.Xor(Sse2.SubtractSaturate(qs1.AsSByte(), filt.AsSByte()).AsByte(), t80); + q1 = Sse2.LoadScalarVector128((long*)&flatOq1).AsByte(); + workA = Sse2.AndNot(flat, workA); + q1 = Sse2.And(flat, q1); + q1 = Sse2.Or(workA, q1); + + workA = Sse2.LoadVector128(s.ToPointer() + (2 * pitch)); + q2 = Sse2.LoadScalarVector128((long*)&flatOq2).AsByte(); + workA = Sse2.AndNot(flat, workA); + q2 = Sse2.And(flat, q2); + q2 = Sse2.Or(workA, q2); + + workA = Sse2.Xor(Sse2.AddSaturate(ps0.AsSByte(), filter2.AsSByte()).AsByte(), t80); + p0 = Sse2.LoadScalarVector128((long*)&flatOp0).AsByte(); + workA = Sse2.AndNot(flat, workA); + p0 = Sse2.And(flat, p0); + p0 = Sse2.Or(workA, p0); + + workA = Sse2.Xor(Sse2.AddSaturate(ps1.AsSByte(), filt.AsSByte()).AsByte(), t80); + p1 = Sse2.LoadScalarVector128((long*)&flatOp1).AsByte(); + workA = Sse2.AndNot(flat, workA); + p1 = Sse2.And(flat, p1); + p1 = Sse2.Or(workA, p1); + + workA = Sse2.LoadVector128(s.ToPointer() - (3 * pitch)); + p2 = Sse2.LoadScalarVector128((long*)&flatOp2).AsByte(); + workA = Sse2.AndNot(flat, workA); + p2 = Sse2.And(flat, p2); + p2 = Sse2.Or(workA, p2); + + Sse2.StoreScalar((long*)(s.ToPointer() - (3 * pitch)), p2.AsInt64()); + Sse2.StoreScalar((long*)(s.ToPointer() - (2 * pitch)), p1.AsInt64()); + Sse2.StoreScalar((long*)(s.ToPointer() - (1 * pitch)), p0.AsInt64()); + Sse2.StoreScalar((long*)(s.ToPointer() + (0 * pitch)), q0.AsInt64()); + Sse2.StoreScalar((long*)(s.ToPointer() + (1 * pitch)), q1.AsInt64()); + Sse2.StoreScalar((long*)(s.ToPointer() + (2 * pitch)), q2.AsInt64()); + } + } + + public static unsafe void LpfHorizontal8Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit0, + ReadOnlySpan limit0, + ReadOnlySpan thresh0, + ReadOnlySpan blimit1, + ReadOnlySpan limit1, + ReadOnlySpan thresh1) + { + Vector128 flatOp2; + Vector128 flatOp1; + Vector128 flatOp0; + Vector128 flatOq2; + Vector128 flatOq1; + Vector128 flatOq0; + Vector128 zero = Vector128.Zero; + Vector128 blimit, limit, thresh; + + fixed (byte* pBLimit0 = blimit0, pLimit0 = limit0, pThresh0 = thresh0, + pBLimit1 = blimit1, pLimit1 = limit1, pThresh1 = thresh1) + { + blimit = Sse2.UnpackLow(Sse2.LoadVector128(pBLimit0).AsInt64(), Sse2.LoadVector128(pBLimit1).AsInt64()) + .AsByte(); + limit = Sse2.UnpackLow(Sse2.LoadVector128(pLimit0).AsInt64(), Sse2.LoadVector128(pLimit1).AsInt64()) + .AsByte(); + thresh = Sse2.UnpackLow(Sse2.LoadVector128(pThresh0).AsInt64(), Sse2.LoadVector128(pThresh1).AsInt64()) + .AsByte(); + } + + Vector128 mask, hev, flat; + Vector128 p3, p2, p1, p0, q0, q1, q2, q3; + + p3 = Sse2.LoadVector128(s.ToPointer() - (4 * pitch)); + p2 = Sse2.LoadVector128(s.ToPointer() - (3 * pitch)); + p1 = Sse2.LoadVector128(s.ToPointer() - (2 * pitch)); + p0 = Sse2.LoadVector128(s.ToPointer() - (1 * pitch)); + q0 = Sse2.LoadVector128(s.ToPointer() - (0 * pitch)); + q1 = Sse2.LoadVector128(s.ToPointer() + (1 * pitch)); + q2 = Sse2.LoadVector128(s.ToPointer() + (2 * pitch)); + q3 = Sse2.LoadVector128(s.ToPointer() + (3 * pitch)); + { + Vector128 absP1P0 = Sse2.Or(Sse2.SubtractSaturate(p1, p0), Sse2.SubtractSaturate(p0, p1)); + Vector128 absQ1Q0 = Sse2.Or(Sse2.SubtractSaturate(q1, q0), Sse2.SubtractSaturate(q0, q1)); + Vector128 one = Vector128.Create((byte)1); + Vector128 fe = Vector128.Create((byte)0xfe); + Vector128 ff = Sse2.CompareEqual(absP1P0, absP1P0); + Vector128 absP0Q0 = Sse2.Or(Sse2.SubtractSaturate(p0, q0), Sse2.SubtractSaturate(q0, p0)); + Vector128 absP1Q1 = Sse2.Or(Sse2.SubtractSaturate(p1, q1), Sse2.SubtractSaturate(q1, p1)); + Vector128 work; + + // filter_mask and hev_mask + flat = Sse2.Max(absP1P0, absQ1Q0); + hev = Sse2.SubtractSaturate(flat, thresh); + hev = Sse2.Xor(Sse2.CompareEqual(hev, zero), ff); + + absP0Q0 = Sse2.AddSaturate(absP0Q0, absP0Q0); + absP1Q1 = Sse2.ShiftRightLogical(Sse2.And(absP1Q1, fe).AsInt16(), 1).AsByte(); + mask = Sse2.SubtractSaturate(Sse2.AddSaturate(absP0Q0, absP1Q1), blimit); + mask = Sse2.Xor(Sse2.CompareEqual(mask, zero), ff); + // mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit) * -1; + mask = Sse2.Max(flat, mask); + // mask |= (abs(p1 - p0) > limit) * -1; + // mask |= (abs(q1 - q0) > limit) * -1; + work = Sse2.Max( + Sse2.Or(Sse2.SubtractSaturate(p2, p1), Sse2.SubtractSaturate(p1, p2)), + Sse2.Or(Sse2.SubtractSaturate(p3, p2), Sse2.SubtractSaturate(p2, p3))); + mask = Sse2.Max(work, mask); + work = Sse2.Max( + Sse2.Or(Sse2.SubtractSaturate(q2, q1), Sse2.SubtractSaturate(q1, q2)), + Sse2.Or(Sse2.SubtractSaturate(q3, q2), Sse2.SubtractSaturate(q2, q3))); + mask = Sse2.Max(work, mask); + mask = Sse2.SubtractSaturate(mask, limit); + mask = Sse2.CompareEqual(mask, zero); + + // flat_mask4 + work = Sse2.Max( + Sse2.Or(Sse2.SubtractSaturate(p2, p0), Sse2.SubtractSaturate(p0, p2)), + Sse2.Or(Sse2.SubtractSaturate(q2, q0), Sse2.SubtractSaturate(q0, q2))); + flat = Sse2.Max(work, flat); + work = Sse2.Max( + Sse2.Or(Sse2.SubtractSaturate(p3, p0), Sse2.SubtractSaturate(p0, p3)), + Sse2.Or(Sse2.SubtractSaturate(q3, q0), Sse2.SubtractSaturate(q0, q3))); + flat = Sse2.Max(work, flat); + flat = Sse2.SubtractSaturate(flat, one); + flat = Sse2.CompareEqual(flat, zero); + flat = Sse2.And(flat, mask); + } + { + Vector128 four = Vector128.Create((short)4); + ArrayPtr src = s; + int i = 0; + + do + { + Vector128 workpA, workpB, workpShft; + p3 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(src.ToPointer() - (4 * pitch))).AsByte(), zero); + p2 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(src.ToPointer() - (3 * pitch))).AsByte(), zero); + p1 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(src.ToPointer() - (2 * pitch))).AsByte(), zero); + p0 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(src.ToPointer() - (1 * pitch))).AsByte(), zero); + q0 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(src.ToPointer() - (0 * pitch))).AsByte(), zero); + q1 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(src.ToPointer() + (1 * pitch))).AsByte(), zero); + q2 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(src.ToPointer() + (2 * pitch))).AsByte(), zero); + q3 = Sse2.UnpackLow( + Sse2.LoadScalarVector128((long*)(src.ToPointer() + (3 * pitch))).AsByte(), zero); + + workpA = Sse2.Add(Sse2.Add(p3.AsInt16(), p3.AsInt16()), Sse2.Add(p2.AsInt16(), p1.AsInt16())); + workpA = Sse2.Add(Sse2.Add(workpA, four), p0.AsInt16()); + workpB = Sse2.Add(Sse2.Add(q0.AsInt16(), p2.AsInt16()), p3.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOp2 + i, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpB = Sse2.Add(Sse2.Add(q0.AsInt16(), q1.AsInt16()), p1.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOp1 + i, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpA = Sse2.Add(Sse2.Subtract(workpA, p3.AsInt16()), q2.AsInt16()); + workpB = Sse2.Add(Sse2.Subtract(workpB, p1.AsInt16()), p0.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOp0 + i, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpA = Sse2.Add(Sse2.Subtract(workpA, p3.AsInt16()), q3.AsInt16()); + workpB = Sse2.Add(Sse2.Subtract(workpB, p0.AsInt16()), q0.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOq0 + i, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpA = Sse2.Add(Sse2.Subtract(workpA, p2.AsInt16()), q3.AsInt16()); + workpB = Sse2.Add(Sse2.Subtract(workpB, q0.AsInt16()), q1.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOq1 + i, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + workpA = Sse2.Add(Sse2.Subtract(workpA, p1.AsInt16()), q3.AsInt16()); + workpB = Sse2.Add(Sse2.Subtract(workpB, q1.AsInt16()), q2.AsInt16()); + workpShft = Sse2.ShiftRightLogical(Sse2.Add(workpA, workpB), 3); + Sse2.StoreScalar((long*)&flatOq2 + i, Sse2.PackUnsignedSaturate(workpShft, workpShft).AsInt64()); + + src = src.Slice(8); + } while (++i < 2); + } + // lp filter + { + Vector128 t4 = Vector128.Create((byte)4); + Vector128 t3 = Vector128.Create((byte)3); + Vector128 t80 = Vector128.Create((byte)0x80); + Vector128 te0 = Vector128.Create((byte)0xe0); + Vector128 t1F = Vector128.Create((byte)0x1f); + Vector128 t1 = Vector128.Create((byte)0x1); + Vector128 t7F = Vector128.Create((byte)0x7f); + + Vector128 ps1 = Sse2.Xor(Sse2.LoadVector128(s.ToPointer() - (2 * pitch)), t80); + Vector128 ps0 = Sse2.Xor(Sse2.LoadVector128(s.ToPointer() - (1 * pitch)), t80); + Vector128 qs0 = Sse2.Xor(Sse2.LoadVector128(s.ToPointer() + (0 * pitch)), t80); + Vector128 qs1 = Sse2.Xor(Sse2.LoadVector128(s.ToPointer() + (1 * pitch)), t80); + Vector128 filt; + Vector128 workA; + Vector128 filter1, filter2; + + filt = Sse2.And(Sse2.SubtractSaturate(ps1.AsSByte(), qs1.AsSByte()).AsByte(), hev); + workA = Sse2.SubtractSaturate(qs0.AsSByte(), ps0.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + // (vpx_filter + 3 * (qs0 - ps0)) & mask + filt = Sse2.And(filt, mask); + + filter1 = Sse2.AddSaturate(filt.AsSByte(), t4.AsSByte()).AsByte(); + filter2 = Sse2.AddSaturate(filt.AsSByte(), t3.AsSByte()).AsByte(); + + // Filter1 >> 3 + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filter1.AsSByte()).AsByte(); + filter1 = Sse2.ShiftRightLogical(filter1.AsInt16(), 3).AsByte(); + workA = Sse2.And(workA, te0); + filter1 = Sse2.And(filter1, t1F); + filter1 = Sse2.Or(filter1, workA); + + // Filter2 >> 3 + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filter2.AsSByte()).AsByte(); + filter2 = Sse2.ShiftRightLogical(filter2.AsInt16(), 3).AsByte(); + workA = Sse2.And(workA, te0); + filter2 = Sse2.And(filter2, t1F); + filter2 = Sse2.Or(filter2, workA); + + // filt >> 1 + filt = Sse2.AddSaturate(filter1.AsSByte(), t1.AsSByte()).AsByte(); + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filt.AsSByte()).AsByte(); + filt = Sse2.ShiftRightLogical(filt.AsInt16(), 1).AsByte(); + workA = Sse2.And(workA, t80); + filt = Sse2.And(filt, t7F); + filt = Sse2.Or(filt, workA); + + filt = Sse2.AndNot(hev, filt); + + workA = Sse2.Xor(Sse2.SubtractSaturate(qs0.AsSByte(), filter1.AsSByte()).AsByte(), t80); + q0 = Sse2.LoadVector128((byte*)&flatOq0); + workA = Sse2.AndNot(flat, workA); + q0 = Sse2.And(flat, q0); + q0 = Sse2.Or(workA, q0); + + workA = Sse2.Xor(Sse2.SubtractSaturate(qs1.AsSByte(), filt.AsSByte()).AsByte(), t80); + q1 = Sse2.LoadVector128((byte*)&flatOq1); + workA = Sse2.AndNot(flat, workA); + q1 = Sse2.And(flat, q1); + q1 = Sse2.Or(workA, q1); + + workA = Sse2.LoadVector128(s.ToPointer() + (2 * pitch)); + q2 = Sse2.LoadVector128((byte*)&flatOq2); + workA = Sse2.AndNot(flat, workA); + q2 = Sse2.And(flat, q2); + q2 = Sse2.Or(workA, q2); + + workA = Sse2.Xor(Sse2.AddSaturate(ps0.AsSByte(), filter2.AsSByte()).AsByte(), t80); + p0 = Sse2.LoadVector128((byte*)&flatOp0); + workA = Sse2.AndNot(flat, workA); + p0 = Sse2.And(flat, p0); + p0 = Sse2.Or(workA, p0); + + workA = Sse2.Xor(Sse2.AddSaturate(ps1.AsSByte(), filt.AsSByte()).AsByte(), t80); + p1 = Sse2.LoadVector128((byte*)&flatOp1); + workA = Sse2.AndNot(flat, workA); + p1 = Sse2.And(flat, p1); + p1 = Sse2.Or(workA, p1); + + workA = Sse2.LoadVector128(s.ToPointer() - (3 * pitch)); + p2 = Sse2.LoadVector128((byte*)&flatOp2); + workA = Sse2.AndNot(flat, workA); + p2 = Sse2.And(flat, p2); + p2 = Sse2.Or(workA, p2); + + Sse2.Store(s.ToPointer() - (3 * pitch), p2); + Sse2.Store(s.ToPointer() - (2 * pitch), p1); + Sse2.Store(s.ToPointer() - (1 * pitch), p0); + Sse2.Store(s.ToPointer() + (0 * pitch), q0); + Sse2.Store(s.ToPointer() + (1 * pitch), q1); + Sse2.Store(s.ToPointer() + (2 * pitch), q2); + } + } + + public static unsafe void LpfHorizontal4Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit0, + ReadOnlySpan limit0, + ReadOnlySpan thresh0, + ReadOnlySpan blimit1, + ReadOnlySpan limit1, + ReadOnlySpan thresh1) + { + Vector128 blimit, limit, thresh; + + fixed (byte* pBLimit0 = blimit0, pLimit0 = limit0, pThresh0 = thresh0, + pBLimit1 = blimit1, pLimit1 = limit1, pThresh1 = thresh1) + { + blimit = Sse2.UnpackLow(Sse2.LoadVector128(pBLimit0).AsInt64(), Sse2.LoadVector128(pBLimit1).AsInt64()) + .AsByte(); + limit = Sse2.UnpackLow(Sse2.LoadVector128(pLimit0).AsInt64(), Sse2.LoadVector128(pLimit1).AsInt64()) + .AsByte(); + thresh = Sse2.UnpackLow(Sse2.LoadVector128(pThresh0).AsInt64(), Sse2.LoadVector128(pThresh1).AsInt64()) + .AsByte(); + } + + Vector128 zero = Vector128.Zero; + Vector128 p3, p2, p1, p0, q0, q1, q2, q3; + Vector128 mask, hev, flat; + + p3 = Sse2.LoadVector128(s.ToPointer() - (4 * pitch)); + p2 = Sse2.LoadVector128(s.ToPointer() - (3 * pitch)); + p1 = Sse2.LoadVector128(s.ToPointer() - (2 * pitch)); + p0 = Sse2.LoadVector128(s.ToPointer() - (1 * pitch)); + q0 = Sse2.LoadVector128(s.ToPointer() - (0 * pitch)); + q1 = Sse2.LoadVector128(s.ToPointer() + (1 * pitch)); + q2 = Sse2.LoadVector128(s.ToPointer() + (2 * pitch)); + q3 = Sse2.LoadVector128(s.ToPointer() + (3 * pitch)); + + // filter_mask and hev_mask + { + Vector128 absP1P0 = Sse2.Or(Sse2.SubtractSaturate(p1, p0), Sse2.SubtractSaturate(p0, p1)); + Vector128 absQ1Q0 = Sse2.Or(Sse2.SubtractSaturate(q1, q0), Sse2.SubtractSaturate(q0, q1)); + Vector128 fe = Vector128.Create((byte)0xfe); + Vector128 ff = Sse2.CompareEqual(absP1P0, absP1P0); + Vector128 absP0Q0 = Sse2.Or(Sse2.SubtractSaturate(p0, q0), Sse2.SubtractSaturate(q0, p0)); + Vector128 absP1Q1 = Sse2.Or(Sse2.SubtractSaturate(p1, q1), Sse2.SubtractSaturate(q1, p1)); + Vector128 work; + + flat = Sse2.Max(absP1P0, absQ1Q0); + hev = Sse2.SubtractSaturate(flat, thresh); + hev = Sse2.Xor(Sse2.CompareEqual(hev, zero), ff); + + absP0Q0 = Sse2.AddSaturate(absP0Q0, absP0Q0); + absP1Q1 = Sse2.ShiftRightLogical(Sse2.And(absP1Q1, fe).AsInt16(), 1).AsByte(); + mask = Sse2.SubtractSaturate(Sse2.AddSaturate(absP0Q0, absP1Q1), blimit); + mask = Sse2.Xor(Sse2.CompareEqual(mask, zero), ff); + // mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit) * -1; + mask = Sse2.Max(flat, mask); + // mask |= (abs(p1 - p0) > limit) * -1; + // mask |= (abs(q1 - q0) > limit) * -1; + work = Sse2.Max( + Sse2.Or(Sse2.SubtractSaturate(p2, p1), Sse2.SubtractSaturate(p1, p2)), + Sse2.Or(Sse2.SubtractSaturate(p3, p2), Sse2.SubtractSaturate(p2, p3))); + mask = Sse2.Max(work, mask); + work = Sse2.Max( + Sse2.Or(Sse2.SubtractSaturate(q2, q1), Sse2.SubtractSaturate(q1, q2)), + Sse2.Or(Sse2.SubtractSaturate(q3, q2), Sse2.SubtractSaturate(q2, q3))); + mask = Sse2.Max(work, mask); + mask = Sse2.SubtractSaturate(mask, limit); + mask = Sse2.CompareEqual(mask, zero); + } + + // filter4 + { + Vector128 t4 = Vector128.Create((byte)4); + Vector128 t3 = Vector128.Create((byte)3); + Vector128 t80 = Vector128.Create((byte)0x80); + Vector128 te0 = Vector128.Create((byte)0xe0); + Vector128 t1F = Vector128.Create((byte)0x1f); + Vector128 t1 = Vector128.Create((byte)0x1); + Vector128 t7F = Vector128.Create((byte)0x7f); + + Vector128 ps1 = Sse2.Xor(Sse2.LoadVector128(s.ToPointer() - (2 * pitch)), t80); + Vector128 ps0 = Sse2.Xor(Sse2.LoadVector128(s.ToPointer() - (1 * pitch)), t80); + Vector128 qs0 = Sse2.Xor(Sse2.LoadVector128(s.ToPointer() + (0 * pitch)), t80); + Vector128 qs1 = Sse2.Xor(Sse2.LoadVector128(s.ToPointer() + (1 * pitch)), t80); + Vector128 filt; + Vector128 workA; + Vector128 filter1, filter2; + + filt = Sse2.And(Sse2.SubtractSaturate(ps1.AsSByte(), qs1.AsSByte()).AsByte(), hev); + workA = Sse2.SubtractSaturate(qs0.AsSByte(), ps0.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + filt = Sse2.AddSaturate(filt.AsSByte(), workA.AsSByte()).AsByte(); + // (vpx_filter + 3 * (qs0 - ps0)) & mask + filt = Sse2.And(filt, mask); + + filter1 = Sse2.AddSaturate(filt.AsSByte(), t4.AsSByte()).AsByte(); + filter2 = Sse2.AddSaturate(filt.AsSByte(), t3.AsSByte()).AsByte(); + + // Filter1 >> 3 + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filter1.AsSByte()).AsByte(); + filter1 = Sse2.ShiftRightLogical(filter1.AsInt16(), 3).AsByte(); + workA = Sse2.And(workA, te0); + filter1 = Sse2.And(filter1, t1F); + filter1 = Sse2.Or(filter1, workA); + + // Filter2 >> 3 + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filter2.AsSByte()).AsByte(); + filter2 = Sse2.ShiftRightLogical(filter2.AsInt16(), 3).AsByte(); + workA = Sse2.And(workA, te0); + filter2 = Sse2.And(filter2, t1F); + filter2 = Sse2.Or(filter2, workA); + + // filt >> 1 + filt = Sse2.AddSaturate(filter1.AsSByte(), t1.AsSByte()).AsByte(); + workA = Sse2.CompareGreaterThan(zero.AsSByte(), filt.AsSByte()).AsByte(); + filt = Sse2.ShiftRightLogical(filt.AsInt16(), 1).AsByte(); + workA = Sse2.And(workA, t80); + filt = Sse2.And(filt, t7F); + filt = Sse2.Or(filt, workA); + + filt = Sse2.AndNot(hev, filt); + + q0 = Sse2.Xor(Sse2.SubtractSaturate(qs0.AsSByte(), filter1.AsSByte()).AsByte(), t80); + q1 = Sse2.Xor(Sse2.SubtractSaturate(qs1.AsSByte(), filt.AsSByte()).AsByte(), t80); + p0 = Sse2.Xor(Sse2.AddSaturate(ps0.AsSByte(), filter2.AsSByte()).AsByte(), t80); + p1 = Sse2.Xor(Sse2.AddSaturate(ps1.AsSByte(), filt.AsSByte()).AsByte(), t80); + + Sse2.Store(s.ToPointer() - (2 * pitch), p1); + Sse2.Store(s.ToPointer() - (1 * pitch), p0); + Sse2.Store(s.ToPointer() + (0 * pitch), q0); + Sse2.Store(s.ToPointer() + (1 * pitch), q1); + } + } + + private static unsafe void Transpose8X16( + ArrayPtr in0, + ArrayPtr in1, + int inP, + ArrayPtr output, + int outP) + { + Vector128 x0, x1, x2, x3, x4, x5, x6, x7; + Vector128 x8, x9, x10, x11, x12, x13, x14, x15; + + // 2-way interleave w/hoisting of unpacks + x0 = Sse2.LoadScalarVector128((long*)in0.ToPointer()).AsByte(); // 1 + x1 = Sse2.LoadScalarVector128((long*)(in0.ToPointer() + inP)).AsByte(); // 3 + x0 = Sse2.UnpackLow(x0, x1); // 1 + + x2 = Sse2.LoadScalarVector128((long*)(in0.ToPointer() + (2 * inP))).AsByte(); // 5 + x3 = Sse2.LoadScalarVector128((long*)(in0.ToPointer() + (3 * inP))).AsByte(); // 7 + x1 = Sse2.UnpackLow(x2, x3); // 2 + + x4 = Sse2.LoadScalarVector128((long*)(in0.ToPointer() + (4 * inP))).AsByte(); // 9 + x5 = Sse2.LoadScalarVector128((long*)(in0.ToPointer() + (5 * inP))).AsByte(); // 11 + x2 = Sse2.UnpackLow(x4, x5); // 3 + + x6 = Sse2.LoadScalarVector128((long*)(in0.ToPointer() + (6 * inP))).AsByte(); // 13 + x7 = Sse2.LoadScalarVector128((long*)(in0.ToPointer() + (7 * inP))).AsByte(); // 15 + x3 = Sse2.UnpackLow(x6, x7); // 4 + x4 = Sse2.UnpackLow(x0.AsInt16(), x1.AsInt16()).AsByte(); // 9 + + x8 = Sse2.LoadScalarVector128((long*)in1.ToPointer()).AsByte(); // 2 + x9 = Sse2.LoadScalarVector128((long*)(in1.ToPointer() + inP)).AsByte(); // 4 + x8 = Sse2.UnpackLow(x8, x9); // 5 + x5 = Sse2.UnpackLow(x2.AsInt16(), x3.AsInt16()).AsByte(); // 10 + + x10 = Sse2.LoadScalarVector128((long*)(in1.ToPointer() + (2 * inP))).AsByte(); // 6 + x11 = Sse2.LoadScalarVector128((long*)(in1.ToPointer() + (3 * inP))).AsByte(); // 8 + x9 = Sse2.UnpackLow(x10, x11); // 6 + + x12 = Sse2.LoadScalarVector128((long*)(in1.ToPointer() + (4 * inP))).AsByte(); // 10 + x13 = Sse2.LoadScalarVector128((long*)(in1.ToPointer() + (5 * inP))).AsByte(); // 12 + x10 = Sse2.UnpackLow(x12, x13); // 7 + x12 = Sse2.UnpackLow(x8.AsInt16(), x9.AsInt16()).AsByte(); // 11 + + x14 = Sse2.LoadScalarVector128((long*)(in1.ToPointer() + (6 * inP))).AsByte(); // 14 + x15 = Sse2.LoadScalarVector128((long*)(in1.ToPointer() + (7 * inP))).AsByte(); // 16 + x11 = Sse2.UnpackLow(x14, x15); // 8 + x13 = Sse2.UnpackLow(x10.AsInt16(), x11.AsInt16()).AsByte(); // 12 + + x6 = Sse2.UnpackLow(x4.AsInt32(), x5.AsInt32()).AsByte(); // 13 + x7 = Sse2.UnpackHigh(x4.AsInt32(), x5.AsInt32()).AsByte(); // 14 + x14 = Sse2.UnpackLow(x12.AsInt32(), x13.AsInt32()).AsByte(); // 15 + x15 = Sse2.UnpackHigh(x12.AsInt32(), x13.AsInt32()).AsByte(); // 16 + + // Store first 4-line result + Sse2.Store(output.ToPointer(), Sse2.UnpackLow(x6.AsInt64(), x14.AsInt64()).AsByte()); + Sse2.Store(output.ToPointer() + outP, Sse2.UnpackHigh(x6.AsInt64(), x14.AsInt64()).AsByte()); + Sse2.Store(output.ToPointer() + (2 * outP), Sse2.UnpackLow(x7.AsInt64(), x15.AsInt64()).AsByte()); + Sse2.Store(output.ToPointer() + (3 * outP), Sse2.UnpackHigh(x7.AsInt64(), x15.AsInt64()).AsByte()); + + x4 = Sse2.UnpackHigh(x0.AsInt16(), x1.AsInt16()).AsByte(); + x5 = Sse2.UnpackHigh(x2.AsInt16(), x3.AsInt16()).AsByte(); + x12 = Sse2.UnpackHigh(x8.AsInt16(), x9.AsInt16()).AsByte(); + x13 = Sse2.UnpackHigh(x10.AsInt16(), x11.AsInt16()).AsByte(); + + x6 = Sse2.UnpackLow(x4.AsInt32(), x5.AsInt32()).AsByte(); + x7 = Sse2.UnpackHigh(x4.AsInt32(), x5.AsInt32()).AsByte(); + x14 = Sse2.UnpackLow(x12.AsInt32(), x13.AsInt32()).AsByte(); + x15 = Sse2.UnpackHigh(x12.AsInt32(), x13.AsInt32()).AsByte(); + + // Store second 4-line result + Sse2.Store(output.ToPointer() + (4 * outP), Sse2.UnpackLow(x6.AsInt64(), x14.AsInt64()).AsByte()); + Sse2.Store(output.ToPointer() + (5 * outP), Sse2.UnpackHigh(x6.AsInt64(), x14.AsInt64()).AsByte()); + Sse2.Store(output.ToPointer() + (6 * outP), Sse2.UnpackLow(x7.AsInt64(), x15.AsInt64()).AsByte()); + Sse2.Store(output.ToPointer() + (7 * outP), Sse2.UnpackHigh(x7.AsInt64(), x15.AsInt64()).AsByte()); + } + + private static unsafe void Transpose( + ReadOnlySpan> src, + int inP, + ReadOnlySpan> dst, + int outP, + int num8X8ToTranspose) + { + int idx8X8 = 0; + Vector128 x0, x1, x2, x3, x4, x5, x6, x7; + + do + { + ArrayPtr input = src[idx8X8]; + ArrayPtr output = dst[idx8X8]; + + x0 = Sse2.LoadScalarVector128((long*)(input.ToPointer() + (0 * inP))) + .AsByte(); // 00 01 02 03 04 05 06 07 + x1 = Sse2.LoadScalarVector128((long*)(input.ToPointer() + (1 * inP))) + .AsByte(); // 10 11 12 13 14 15 16 17 + // 00 10 01 11 02 12 03 13 04 14 05 15 06 16 07 17 + x0 = Sse2.UnpackLow(x0, x1); + + x2 = Sse2.LoadScalarVector128((long*)(input.ToPointer() + (2 * inP))) + .AsByte(); // 20 21 22 23 24 25 26 27 + x3 = Sse2.LoadScalarVector128((long*)(input.ToPointer() + (3 * inP))) + .AsByte(); // 30 31 32 33 34 35 36 37 + // 20 30 21 31 22 32 23 33 24 34 25 35 26 36 27 37 + x1 = Sse2.UnpackLow(x2, x3); + + x4 = Sse2.LoadScalarVector128((long*)(input.ToPointer() + (4 * inP))) + .AsByte(); // 40 41 42 43 44 45 46 47 + x5 = Sse2.LoadScalarVector128((long*)(input.ToPointer() + (5 * inP))) + .AsByte(); // 50 51 52 53 54 55 56 57 + // 40 50 41 51 42 52 43 53 44 54 45 55 46 56 47 57 + x2 = Sse2.UnpackLow(x4, x5); + + x6 = Sse2.LoadScalarVector128((long*)(input.ToPointer() + (6 * inP))) + .AsByte(); // 60 61 62 63 64 65 66 67 + x7 = Sse2.LoadScalarVector128((long*)(input.ToPointer() + (7 * inP))) + .AsByte(); // 70 71 72 73 74 75 76 77 + // 60 70 61 71 62 72 63 73 64 74 65 75 66 76 67 77 + x3 = Sse2.UnpackLow(x6, x7); + + // 00 10 20 30 01 11 21 31 02 12 22 32 03 13 23 33 + x4 = Sse2.UnpackLow(x0.AsInt16(), x1.AsInt16()).AsByte(); + // 40 50 60 70 41 51 61 71 42 52 62 72 43 53 63 73 + x5 = Sse2.UnpackLow(x2.AsInt16(), x3.AsInt16()).AsByte(); + // 00 10 20 30 40 50 60 70 01 11 21 31 41 51 61 71 + x6 = Sse2.UnpackLow(x4.AsInt32(), x5.AsInt32()).AsByte(); + Sse2.StoreScalar((long*)(output.ToPointer() + (0 * outP)), x6.AsInt64()); // 00 10 20 30 40 50 60 70 + Sse2.StoreHigh((double*)(output.ToPointer() + (1 * outP)), x6.AsDouble()); // 01 11 21 31 41 51 61 71 + // 02 12 22 32 42 52 62 72 03 13 23 33 43 53 63 73 + x7 = Sse2.UnpackHigh(x4.AsInt32(), x5.AsInt32()).AsByte(); + Sse2.StoreScalar((long*)(output.ToPointer() + (2 * outP)), x7.AsInt64()); // 02 12 22 32 42 52 62 72 + Sse2.StoreHigh((double*)(output.ToPointer() + (3 * outP)), x7.AsDouble()); // 03 13 23 33 43 53 63 73 + + // 04 14 24 34 05 15 25 35 06 16 26 36 07 17 27 37 + x4 = Sse2.UnpackHigh(x0.AsInt16(), x1.AsInt16()).AsByte(); + // 44 54 64 74 45 55 65 75 46 56 66 76 47 57 67 77 + x5 = Sse2.UnpackHigh(x2.AsInt16(), x3.AsInt16()).AsByte(); + // 04 14 24 34 44 54 64 74 05 15 25 35 45 55 65 75 + x6 = Sse2.UnpackLow(x4.AsInt32(), x5.AsInt32()).AsByte(); + Sse2.StoreScalar((long*)(output.ToPointer() + (4 * outP)), x6.AsInt64()); // 04 14 24 34 44 54 64 74 + Sse2.StoreHigh((double*)(output.ToPointer() + (5 * outP)), x6.AsDouble()); // 05 15 25 35 45 55 65 75 + // 06 16 26 36 46 56 66 76 07 17 27 37 47 57 67 77 + x7 = Sse2.UnpackHigh(x4.AsInt32(), x5.AsInt32()).AsByte(); + + Sse2.StoreScalar((long*)(output.ToPointer() + (6 * outP)), x7.AsInt64()); // 06 16 26 36 46 56 66 76 + Sse2.StoreHigh((double*)(output.ToPointer() + (7 * outP)), x7.AsDouble()); // 07 17 27 37 47 57 67 77 + } while (++idx8X8 < num8X8ToTranspose); + } + + public static unsafe void LpfVertical4Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit0, + ReadOnlySpan limit0, + ReadOnlySpan thresh0, + ReadOnlySpan blimit1, + ReadOnlySpan limit1, + ReadOnlySpan thresh1) + { + ulong* tDstStorage = stackalloc ulong[16]; + ArrayPtr tDst = new((byte*)tDstStorage, 16 * 8); + Span> src = stackalloc ArrayPtr[2]; + Span> dst = stackalloc ArrayPtr[2]; + + // Transpose 8x16 + Transpose8X16(s.Slice(-4), s.Slice(-4 + (pitch * 8)), pitch, tDst, 16); + + // Loop filtering + LpfHorizontal4Dual(tDst.Slice(4 * 16), 16, blimit0, limit0, thresh0, blimit1, limit1, thresh1); + src[0] = tDst; + src[1] = tDst.Slice(8); + dst[0] = s.Slice(-4); + dst[1] = s.Slice(-4 + (pitch * 8)); + + // Transpose back + Transpose(src, 16, dst, pitch, 2); + } + + public static unsafe void LpfVertical8( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + ulong* tDstStorage = stackalloc ulong[8]; + ArrayPtr tDst = new((byte*)tDstStorage, 8 * 8); + Span> src = stackalloc ArrayPtr[1]; + Span> dst = stackalloc ArrayPtr[1]; + + // Transpose 8x8 + src[0] = s.Slice(-4); + dst[0] = tDst; + + Transpose(src, pitch, dst, 8, 1); + + // Loop filtering + LpfHorizontal8(tDst.Slice(4 * 8), 8, blimit, limit, thresh); + + // Transpose back + Transpose(dst, 8, src, pitch, 1); + } + + public static unsafe void LpfVertical8Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit0, + ReadOnlySpan limit0, + ReadOnlySpan thresh0, + ReadOnlySpan blimit1, + ReadOnlySpan limit1, + ReadOnlySpan thresh1) + { + ulong* tDstStorage = stackalloc ulong[16]; + ArrayPtr tDst = new((byte*)tDstStorage, 16 * 8); + Span> src = stackalloc ArrayPtr[2]; + Span> dst = stackalloc ArrayPtr[2]; + + // Transpose 8x16 + Transpose8X16(s.Slice(-4), s.Slice(-4 + (pitch * 8)), pitch, tDst, 16); + + // Loop filtering + LpfHorizontal8Dual(tDst.Slice(4 * 16), 16, blimit0, limit0, thresh0, blimit1, limit1, thresh1); + + src[0] = tDst; + src[1] = tDst.Slice(8); + + dst[0] = s.Slice(-4); + dst[1] = s.Slice(-4 + (pitch * 8)); + + // Transpose back + Transpose(src, 16, dst, pitch, 2); + } + + public static unsafe void LpfVertical16( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + ulong* tDstStorage = stackalloc ulong[16]; + ArrayPtr tDst = new((byte*)tDstStorage, 16 * 8); + Span> src = stackalloc ArrayPtr[2]; + Span> dst = stackalloc ArrayPtr[2]; + + src[0] = s.Slice(-8); + src[1] = s; + dst[0] = tDst; + dst[1] = tDst.Slice(8 * 8); + + // Transpose 16x8 + Transpose(src, pitch, dst, 8, 2); + + // Loop filtering + LpfHorizontal16(tDst.Slice(8 * 8), 8, blimit, limit, thresh); + + // Transpose back + Transpose(dst, 8, src, pitch, 2); + } + + public static unsafe void LpfVertical16Dual( + ArrayPtr s, + int pitch, + ReadOnlySpan blimit, + ReadOnlySpan limit, + ReadOnlySpan thresh) + { + Vector128* tDstStorage = stackalloc Vector128[16]; + ArrayPtr tDst = new((byte*)tDstStorage, 256); + + // Transpose 16x16 + Transpose8X16(s.Slice(-8), s.Slice(-8 + (8 * pitch)), pitch, tDst, 16); + Transpose8X16(s, s.Slice(8 * pitch), pitch, tDst.Slice(8 * 16), 16); + + // Loop filtering + LpfHorizontal16Dual(tDst.Slice(8 * 16), 16, blimit, limit, thresh); + + // Transpose back + Transpose8X16(tDst, tDst.Slice(8 * 16), 16, s.Slice(-8), pitch); + Transpose8X16(tDst.Slice(8), tDst.Slice(8 + (8 * 16)), 16, s.Slice(-8 + (8 * pitch)), pitch); + } + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Prob.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Prob.cs index 4d75b35df..df82dc7a9 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Prob.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Prob.cs @@ -1,4 +1,4 @@ -using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Common; using System; using System.Diagnostics; @@ -12,10 +12,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { Debug.Assert(den != 0); { - int p = (int)(((ulong)num * 256 + (den >> 1)) / den); + int p = (int)((((ulong)num * 256) + (den >> 1)) / den); // (p > 255) ? 255 : (p < 1) ? 1 : p; int clippedProb = p | ((255 - p) >> 23) | (p == 0 ? 1 : 0); - return (byte)clippedProb; } } @@ -23,14 +22,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp /* This function assumes prob1 and prob2 are already within [1,255] range. */ public static byte WeightedProb(int prob1, int prob2, int factor) { - return (byte)BitUtils.RoundPowerOfTwo(prob1 * (256 - factor) + prob2 * factor, 8); + return (byte)BitUtils.RoundPowerOfTwo((prob1 * (256 - factor)) + (prob2 * factor), 8); } // MODE_MV_MAX_UPDATE_FACTOR (128) * count / MODE_MV_COUNT_SAT; - private static readonly uint[] _countToUpdateFactor = { - 0, 6, 12, 19, 25, 32, 38, 44, 51, 57, 64, - 70, 76, 83, 89, 96, 102, 108, 115, 121, 128, - }; + private static readonly uint[] _countToUpdateFactor = + [ + 0, 6, 12, 19, 25, 32, 38, 44, 51, 57, 64, 70, 76, 83, 89, 96, 102, 108, 115, 121, 128 + ]; private const int ModeMvCountSat = 20; @@ -41,14 +40,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { return preProb; } - else - { - uint count = Math.Min(den, ModeMvCountSat); - uint factor = _countToUpdateFactor[(int)count]; - byte prob = GetProb(ct0, den); - return WeightedProb(preProb, prob, (int)factor); - } + uint count = Math.Min(den, ModeMvCountSat); + uint factor = _countToUpdateFactor[(int)count]; + byte prob = GetProb(ct0, den); + return WeightedProb(preProb, prob, (int)factor); } private static uint TreeMergeProbsImpl( @@ -59,17 +55,17 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Span probs) { int l = tree[i]; - uint leftCount = (l <= 0) ? counts[-l] : TreeMergeProbsImpl((uint)l, tree, preProbs, counts, probs); + uint leftCount = l <= 0 ? counts[-l] : TreeMergeProbsImpl((uint)l, tree, preProbs, counts, probs); int r = tree[i + 1]; - uint rightCount = (r <= 0) ? counts[-r] : TreeMergeProbsImpl((uint)r, tree, preProbs, counts, probs); + uint rightCount = r <= 0 ? counts[-r] : TreeMergeProbsImpl((uint)r, tree, preProbs, counts, probs); probs[(int)(i >> 1)] = ModeMvMergeProbs(preProbs[(int)(i >> 1)], leftCount, rightCount); - return leftCount + rightCount; } - public static void TreeMergeProbs(sbyte[] tree, ReadOnlySpan preProbs, ReadOnlySpan counts, Span probs) + public static void TreeMergeProbs(sbyte[] tree, ReadOnlySpan preProbs, ReadOnlySpan counts, + Span probs) { TreeMergeProbsImpl(0, tree, preProbs, counts, probs); } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs index 60a20b43f..e6f34d266 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs @@ -1,4 +1,5 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Types; using System; using System.Buffers.Binary; @@ -6,18 +7,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { internal struct Reader { - private static readonly byte[] _norm = { - 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - }; + private static readonly byte[] _norm = + [ + 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + ]; + private const int BdValueSize = sizeof(ulong) * 8; // This is meant to be a large, positive constant that can still be efficiently @@ -36,16 +37,13 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { return true; } - else - { - _buffer = new ArrayPtr(ref buffer[0], size); - Value = 0; - Count = -8; - Range = 255; - Fill(); - return ReadBit() != 0; // Marker bit - } + _buffer = new ArrayPtr(ref buffer[0], size); + Value = 0; + Count = -8; + Range = 255; + Fill(); + return ReadBit() != 0; // Marker bit } private void Fill() @@ -65,7 +63,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp ulong bigEndianValues = BinaryPrimitives.ReadUInt64BigEndian(buffer); nv = bigEndianValues >> (BdValueSize - bits); count += bits; - buffer = buffer[(bits >> 3)..]; + buffer = buffer.Slice(bits >> 3); value = Value | (nv << (shift & 0x7)); } else @@ -84,7 +82,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp { count += 8; value |= (ulong)buffer[0] << shift; - buffer = buffer[1..]; + buffer = buffer.Slice(1); shift -= 8; } } @@ -98,7 +96,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Count = count; } - public readonly bool HasError() + public bool HasError() { // Check if we have reached the end of the buffer. // @@ -124,7 +122,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp ulong bigsplit; int count; uint range; - uint split = (Range * (uint)prob + (256 - (uint)prob)) >> 8; + uint split = ((Range * (uint)prob) + (256 - (uint)prob)) >> 8; if (Count < 0) { @@ -188,7 +186,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp public int ReadBool(int prob, ref ulong value, ref int count, ref uint range) { - uint split = (range * (uint)prob + (256 - (uint)prob)) >> 8; + uint split = ((range * (uint)prob) + (256 - (uint)prob)) >> 8; ulong bigsplit = (ulong)split << (BdValueSize - 8); if (count < 0) @@ -202,8 +200,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp if (value >= bigsplit) { - range -= split; - value -= bigsplit; + range = range - split; + value = value - bigsplit; { int shift = _norm[range]; range <<= shift; @@ -212,6 +210,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp } return 1; } + range = split; { int shift = _norm[range]; @@ -230,7 +229,82 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp Count -= 8; _buffer = _buffer.Slice(-1); } + return _buffer; } + + private int DecodeUniform() + { + const int L = 8; + const int M = (1 << L) - 191; + int v = ReadLiteral(L - 1); + return v < M ? v : (v << 1) - M + ReadBit(); + } + + public int DecodeTermSubexp() + { + if (ReadBit() == 0) + { + return ReadLiteral(4); + } + + if (ReadBit() == 0) + { + return ReadLiteral(4) + 16; + } + + if (ReadBit() == 0) + { + return ReadLiteral(5) + 32; + } + + return DecodeUniform() + 64; + } + + public TxMode ReadTxMode() + { + TxMode txMode = (TxMode)ReadLiteral(2); + if (txMode == TxMode.Allow32X32) + { + txMode += ReadBit(); + } + + return txMode; + } + + public int ReadCoeff( + ReadOnlySpan probs, + int n, + ref ulong value, + ref int count, + ref uint range) + { + int val = 0; + for (int i = 0; i < n; ++i) + { + val = (val << 1) | ReadBool(probs[i], ref value, ref count, ref range); + } + + return val; + } + + public void DiffUpdateProb(ref byte p) + { + if (Read(Entropy.DiffUpdateProb) != 0) + { + p = (byte)DSubExp.InvRemapProb(DecodeTermSubexp(), p); + } + } + + public void UpdateMvProbs(Span p, int n) + { + for (int i = 0; i < n; ++i) + { + if (Read(EntropyMv.UpdateProb) != 0) + { + p[i] = (byte)((ReadLiteral(7) << 1) | 1); + } + } + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/TxfmCommon.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/TxfmCommon.cs index 209f19510..d84c0bb16 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/TxfmCommon.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Dsp/TxfmCommon.cs @@ -13,42 +13,42 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp // for (int i = 1; i < 32; ++i) // Console.WriteLine("public const short CosPi{0}_64 = {1};", i, MathF.Round(16384 * MathF.Cos(i * MathF.PI / 64))); // Note: sin(k * Pi / 64) = cos((32 - k) * Pi / 64) - public const short CosPi1_64 = 16364; - public const short CosPi2_64 = 16305; - public const short CosPi3_64 = 16207; - public const short CosPi4_64 = 16069; - public const short CosPi5_64 = 15893; - public const short CosPi6_64 = 15679; - public const short CosPi7_64 = 15426; - public const short CosPi8_64 = 15137; - public const short CosPi9_64 = 14811; - public const short CosPi10_64 = 14449; - public const short CosPi11_64 = 14053; - public const short CosPi12_64 = 13623; - public const short CosPi13_64 = 13160; - public const short CosPi14_64 = 12665; - public const short CosPi15_64 = 12140; - public const short CosPi16_64 = 11585; - public const short CosPi17_64 = 11003; - public const short CosPi18_64 = 10394; - public const short CosPi19_64 = 9760; - public const short CosPi20_64 = 9102; - public const short CosPi21_64 = 8423; - public const short CosPi22_64 = 7723; - public const short CosPi23_64 = 7005; - public const short CosPi24_64 = 6270; - public const short CosPi25_64 = 5520; - public const short CosPi26_64 = 4756; - public const short CosPi27_64 = 3981; - public const short CosPi28_64 = 3196; - public const short CosPi29_64 = 2404; - public const short CosPi30_64 = 1606; - public const short CosPi31_64 = 804; + public const short CosPi164 = 16364; + public const short CosPi264 = 16305; + public const short CosPi364 = 16207; + public const short CosPi464 = 16069; + public const short CosPi564 = 15893; + public const short CosPi664 = 15679; + public const short CosPi764 = 15426; + public const short CosPi864 = 15137; + public const short CosPi964 = 14811; + public const short CosPi1064 = 14449; + public const short CosPi1164 = 14053; + public const short CosPi1264 = 13623; + public const short CosPi1364 = 13160; + public const short CosPi1464 = 12665; + public const short CosPi1564 = 12140; + public const short CosPi1664 = 11585; + public const short CosPi1764 = 11003; + public const short CosPi1864 = 10394; + public const short CosPi1964 = 9760; + public const short CosPi2064 = 9102; + public const short CosPi2164 = 8423; + public const short CosPi2264 = 7723; + public const short CosPi2364 = 7005; + public const short CosPi2464 = 6270; + public const short CosPi2564 = 5520; + public const short CosPi2664 = 4756; + public const short CosPi2764 = 3981; + public const short CosPi2864 = 3196; + public const short CosPi2964 = 2404; + public const short CosPi3064 = 1606; + public const short CosPi3164 = 804; // 16384 * sqrt(2) * sin(kPi / 9) * 2 / 3 - public const short SinPi1_9 = 5283; - public const short SinPi2_9 = 9929; - public const short SinPi3_9 = 13377; - public const short SinPi4_9 = 15212; + public const short SinPi19 = 5283; + public const short SinPi29 = 9929; + public const short SinPi39 = 13377; + public const short SinPi49 = 15212; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Entropy.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Entropy.cs new file mode 100644 index 000000000..380879453 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Entropy.cs @@ -0,0 +1,623 @@ +using Ryujinx.Graphics.Nvdec.Vp9.Types; +using System; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +namespace Ryujinx.Graphics.Nvdec.Vp9 +{ + internal static class Entropy + { + public const int DiffUpdateProb = 252; + + // Coefficient token alphabet + public const int ZeroToken = 0; // 0 Extra Bits 0+0 + public const int OneToken = 1; // 1 Extra Bits 0+1 + public const int TwoToken = 2; // 2 Extra Bits 0+1 + public const int ThreeToken = 3; // 3 Extra Bits 0+1 + public const int FourToken = 4; // 4 Extra Bits 0+1 + public const int Category1Token = 5; // 5-6 Extra Bits 1+1 + public const int Category2Token = 6; // 7-10 Extra Bits 2+1 + public const int Category3Token = 7; // 11-18 Extra Bits 3+1 + public const int Category4Token = 8; // 19-34 Extra Bits 4+1 + public const int Category5Token = 9; // 35-66 Extra Bits 5+1 + public const int Category6Token = 10; // 67+ Extra Bits 14+1 + public const int EobToken = 11; // EOB Extra Bits 0+0 + + public const int EntropyTokens = 12; + + public const int RefTypes = 2; // intra=0, inter=1 + + /* Middle dimension reflects the coefficient position within the transform. */ + public const int CoefBands = 6; + + /* Inside dimension is measure of nearby complexity, that reflects the energy + of nearby coefficients are nonzero. For the first coefficient (DC, unless + block type is 0), we look at the (already encoded) blocks above and to the + left of the current block. The context index is then the number (0,1,or 2) + of these blocks having nonzero coefficients. + After decoding a coefficient, the measure is determined by the size of the + most recently decoded coefficient. + Note that the intuitive meaning of this measure changes as coefficients + are decoded, e.g., prior to the first token, a zero means that my neighbors + are empty while, after the first token, because of the use of end-of-block, + a zero means we just decoded a zero and hence guarantees that a non-zero + coefficient will appear later in this block. However, this shift + in meaning is perfectly OK because our context depends also on the + coefficient band (and since zigzag positions 0, 1, and 2 are in + distinct bands). */ + + public const int CoeffContexts = 6; + + public static int BAND_COEFF_CONTEXTS(int band) + { + return band == 0 ? 3 : CoeffContexts; + } + + public const int UnconstrainedNodes = 3; + + public const int PivotNode = 2; + + public const int Cat1MinVal = 5; + public const int Cat2MinVal = 7; + public const int Cat3MinVal = 11; + public const int Cat4MinVal = 19; + public const int Cat5MinVal = 35; + public const int Cat6MinVal = 67; + + public static readonly byte[] Cat1Prob = [159]; + public static readonly byte[] Cat2Prob = [165, 145]; + public static readonly byte[] Cat3Prob = [173, 148, 140]; + public static readonly byte[] Cat4Prob = [176, 155, 140, 135]; + public static readonly byte[] Cat5Prob = [180, 157, 141, 134, 130]; + + public static readonly byte[] Cat6Prob = + [ + 254, 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129 + ]; + + public static readonly byte[] Cat6ProbHigh12 = + [ + 255, 255, 255, 255, 254, 254, 54, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129 + ]; + + public const int EobModelToken = 3; + + private static readonly byte[] _coefbandTrans8X8Plus = + [ + 0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, + // beyond MAXBAND_INDEX+1 all values are filled as 5 + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 + ]; + + private static readonly byte[] _coefbandTrans4X4 = [0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5]; + + public static readonly byte[][] Pareto8Full = + [ + [3, 86, 128, 6, 86, 23, 88, 29], [6, 86, 128, 11, 87, 42, 91, 52], + [9, 86, 129, 17, 88, 61, 94, 76], [12, 86, 129, 22, 88, 77, 97, 93], + [15, 87, 129, 28, 89, 93, 100, 110], [17, 87, 129, 33, 90, 105, 103, 123], + [20, 88, 130, 38, 91, 118, 106, 136], [23, 88, 130, 43, 91, 128, 108, 146], + [26, 89, 131, 48, 92, 139, 111, 156], [28, 89, 131, 53, 93, 147, 114, 163], + [31, 90, 131, 58, 94, 156, 117, 171], [34, 90, 131, 62, 94, 163, 119, 177], + [37, 90, 132, 66, 95, 171, 122, 184], [39, 90, 132, 70, 96, 177, 124, 189], + [42, 91, 132, 75, 97, 183, 127, 194], [44, 91, 132, 79, 97, 188, 129, 198], + [47, 92, 133, 83, 98, 193, 132, 202], [49, 92, 133, 86, 99, 197, 134, 205], + [52, 93, 133, 90, 100, 201, 137, 208], [54, 93, 133, 94, 100, 204, 139, 211], + [57, 94, 134, 98, 101, 208, 142, 214], [59, 94, 134, 101, 102, 211, 144, 216], + [62, 94, 135, 105, 103, 214, 146, 218], + [64, 94, 135, 108, 103, 216, 148, 220], + [66, 95, 135, 111, 104, 219, 151, 222], + [68, 95, 135, 114, 105, 221, 153, 223], + [71, 96, 136, 117, 106, 224, 155, 225], + [73, 96, 136, 120, 106, 225, 157, 226], + [76, 97, 136, 123, 107, 227, 159, 228], + [78, 97, 136, 126, 108, 229, 160, 229], + [80, 98, 137, 129, 109, 231, 162, 231], + [82, 98, 137, 131, 109, 232, 164, 232], + [84, 98, 138, 134, 110, 234, 166, 233], + [86, 98, 138, 137, 111, 235, 168, 234], + [89, 99, 138, 140, 112, 236, 170, 235], + [91, 99, 138, 142, 112, 237, 171, 235], + [93, 100, 139, 145, 113, 238, 173, 236], + [95, 100, 139, 147, 114, 239, 174, 237], + [97, 101, 140, 149, 115, 240, 176, 238], + [99, 101, 140, 151, 115, 241, 177, 238], + [101, 102, 140, 154, 116, 242, 179, 239], + [103, 102, 140, 156, 117, 242, 180, 239], + [105, 103, 141, 158, 118, 243, 182, 240], + [107, 103, 141, 160, 118, 243, 183, 240], + [109, 104, 141, 162, 119, 244, 185, 241], + [111, 104, 141, 164, 119, 244, 186, 241], + [113, 104, 142, 166, 120, 245, 187, 242], + [114, 104, 142, 168, 121, 245, 188, 242], + [116, 105, 143, 170, 122, 246, 190, 243], + [118, 105, 143, 171, 122, 246, 191, 243], + [120, 106, 143, 173, 123, 247, 192, 244], + [121, 106, 143, 175, 124, 247, 193, 244], + [123, 107, 144, 177, 125, 248, 195, 244], + [125, 107, 144, 178, 125, 248, 196, 244], + [127, 108, 145, 180, 126, 249, 197, 245], + [128, 108, 145, 181, 127, 249, 198, 245], + [130, 109, 145, 183, 128, 249, 199, 245], + [132, 109, 145, 184, 128, 249, 200, 245], + [134, 110, 146, 186, 129, 250, 201, 246], + [135, 110, 146, 187, 130, 250, 202, 246], + [137, 111, 147, 189, 131, 251, 203, 246], + [138, 111, 147, 190, 131, 251, 204, 246], + [140, 112, 147, 192, 132, 251, 205, 247], + [141, 112, 147, 193, 132, 251, 206, 247], + [143, 113, 148, 194, 133, 251, 207, 247], + [144, 113, 148, 195, 134, 251, 207, 247], + [146, 114, 149, 197, 135, 252, 208, 248], + [147, 114, 149, 198, 135, 252, 209, 248], + [149, 115, 149, 199, 136, 252, 210, 248], + [150, 115, 149, 200, 137, 252, 210, 248], + [152, 115, 150, 201, 138, 252, 211, 248], + [153, 115, 150, 202, 138, 252, 212, 248], + [155, 116, 151, 204, 139, 253, 213, 249], + [156, 116, 151, 205, 139, 253, 213, 249], + [158, 117, 151, 206, 140, 253, 214, 249], + [159, 117, 151, 207, 141, 253, 215, 249], + [161, 118, 152, 208, 142, 253, 216, 249], + [162, 118, 152, 209, 142, 253, 216, 249], + [163, 119, 153, 210, 143, 253, 217, 249], + [164, 119, 153, 211, 143, 253, 217, 249], + [166, 120, 153, 212, 144, 254, 218, 250], + [167, 120, 153, 212, 145, 254, 219, 250], + [168, 121, 154, 213, 146, 254, 220, 250], + [169, 121, 154, 214, 146, 254, 220, 250], + [171, 122, 155, 215, 147, 254, 221, 250], + [172, 122, 155, 216, 147, 254, 221, 250], + [173, 123, 155, 217, 148, 254, 222, 250], + [174, 123, 155, 217, 149, 254, 222, 250], + [176, 124, 156, 218, 150, 254, 223, 250], + [177, 124, 156, 219, 150, 254, 223, 250], + [178, 125, 157, 220, 151, 254, 224, 251], + [179, 125, 157, 220, 151, 254, 224, 251], + [180, 126, 157, 221, 152, 254, 225, 251], + [181, 126, 157, 221, 152, 254, 225, 251], + [183, 127, 158, 222, 153, 254, 226, 251], + [184, 127, 158, 223, 154, 254, 226, 251], + [185, 128, 159, 224, 155, 255, 227, 251], + [186, 128, 159, 224, 155, 255, 227, 251], + [187, 129, 160, 225, 156, 255, 228, 251], + [188, 130, 160, 225, 156, 255, 228, 251], + [189, 131, 160, 226, 157, 255, 228, 251], + [190, 131, 160, 226, 158, 255, 228, 251], + [191, 132, 161, 227, 159, 255, 229, 251], + [192, 132, 161, 227, 159, 255, 229, 251], + [193, 133, 162, 228, 160, 255, 230, 252], + [194, 133, 162, 229, 160, 255, 230, 252], + [195, 134, 163, 230, 161, 255, 231, 252], + [196, 134, 163, 230, 161, 255, 231, 252], + [197, 135, 163, 231, 162, 255, 231, 252], + [198, 135, 163, 231, 162, 255, 231, 252], + [199, 136, 164, 232, 163, 255, 232, 252], + [200, 136, 164, 232, 164, 255, 232, 252], + [201, 137, 165, 233, 165, 255, 233, 252], + [201, 137, 165, 233, 165, 255, 233, 252], + [202, 138, 166, 233, 166, 255, 233, 252], + [203, 138, 166, 233, 166, 255, 233, 252], + [204, 139, 166, 234, 167, 255, 234, 252], + [205, 139, 166, 234, 167, 255, 234, 252], + [206, 140, 167, 235, 168, 255, 235, 252], + [206, 140, 167, 235, 168, 255, 235, 252], + [207, 141, 168, 236, 169, 255, 235, 252], + [208, 141, 168, 236, 170, 255, 235, 252], + [209, 142, 169, 237, 171, 255, 236, 252], + [209, 143, 169, 237, 171, 255, 236, 252], + [210, 144, 169, 237, 172, 255, 236, 252], + [211, 144, 169, 237, 172, 255, 236, 252], + [212, 145, 170, 238, 173, 255, 237, 252], + [213, 145, 170, 238, 173, 255, 237, 252], + [214, 146, 171, 239, 174, 255, 237, 253], + [214, 146, 171, 239, 174, 255, 237, 253], + [215, 147, 172, 240, 175, 255, 238, 253], + [215, 147, 172, 240, 175, 255, 238, 253], + [216, 148, 173, 240, 176, 255, 238, 253], + [217, 148, 173, 240, 176, 255, 238, 253], + [218, 149, 173, 241, 177, 255, 239, 253], + [218, 149, 173, 241, 178, 255, 239, 253], + [219, 150, 174, 241, 179, 255, 239, 253], + [219, 151, 174, 241, 179, 255, 239, 253], + [220, 152, 175, 242, 180, 255, 240, 253], + [221, 152, 175, 242, 180, 255, 240, 253], + [222, 153, 176, 242, 181, 255, 240, 253], + [222, 153, 176, 242, 181, 255, 240, 253], + [223, 154, 177, 243, 182, 255, 240, 253], + [223, 154, 177, 243, 182, 255, 240, 253], + [224, 155, 178, 244, 183, 255, 241, 253], + [224, 155, 178, 244, 183, 255, 241, 253], + [225, 156, 178, 244, 184, 255, 241, 253], + [225, 157, 178, 244, 184, 255, 241, 253], + [226, 158, 179, 244, 185, 255, 242, 253], + [227, 158, 179, 244, 185, 255, 242, 253], + [228, 159, 180, 245, 186, 255, 242, 253], + [228, 159, 180, 245, 186, 255, 242, 253], + [229, 160, 181, 245, 187, 255, 242, 253], + [229, 160, 181, 245, 187, 255, 242, 253], + [230, 161, 182, 246, 188, 255, 243, 253], + [230, 162, 182, 246, 188, 255, 243, 253], + [231, 163, 183, 246, 189, 255, 243, 253], + [231, 163, 183, 246, 189, 255, 243, 253], + [232, 164, 184, 247, 190, 255, 243, 253], + [232, 164, 184, 247, 190, 255, 243, 253], + [233, 165, 185, 247, 191, 255, 244, 253], + [233, 165, 185, 247, 191, 255, 244, 253], + [234, 166, 185, 247, 192, 255, 244, 253], + [234, 167, 185, 247, 192, 255, 244, 253], + [235, 168, 186, 248, 193, 255, 244, 253], + [235, 168, 186, 248, 193, 255, 244, 253], + [236, 169, 187, 248, 194, 255, 244, 253], + [236, 169, 187, 248, 194, 255, 244, 253], + [236, 170, 188, 248, 195, 255, 245, 253], + [236, 170, 188, 248, 195, 255, 245, 253], + [237, 171, 189, 249, 196, 255, 245, 254], + [237, 172, 189, 249, 196, 255, 245, 254], + [238, 173, 190, 249, 197, 255, 245, 254], + [238, 173, 190, 249, 197, 255, 245, 254], + [239, 174, 191, 249, 198, 255, 245, 254], + [239, 174, 191, 249, 198, 255, 245, 254], + [240, 175, 192, 249, 199, 255, 246, 254], + [240, 176, 192, 249, 199, 255, 246, 254], + [240, 177, 193, 250, 200, 255, 246, 254], + [240, 177, 193, 250, 200, 255, 246, 254], + [241, 178, 194, 250, 201, 255, 246, 254], + [241, 178, 194, 250, 201, 255, 246, 254], + [242, 179, 195, 250, 202, 255, 246, 254], + [242, 180, 195, 250, 202, 255, 246, 254], + [242, 181, 196, 250, 203, 255, 247, 254], + [242, 181, 196, 250, 203, 255, 247, 254], + [243, 182, 197, 251, 204, 255, 247, 254], + [243, 183, 197, 251, 204, 255, 247, 254], + [244, 184, 198, 251, 205, 255, 247, 254], + [244, 184, 198, 251, 205, 255, 247, 254], + [244, 185, 199, 251, 206, 255, 247, 254], + [244, 185, 199, 251, 206, 255, 247, 254], + [245, 186, 200, 251, 207, 255, 247, 254], + [245, 187, 200, 251, 207, 255, 247, 254], + [246, 188, 201, 252, 207, 255, 248, 254], + [246, 188, 201, 252, 207, 255, 248, 254], + [246, 189, 202, 252, 208, 255, 248, 254], + [246, 190, 202, 252, 208, 255, 248, 254], + [247, 191, 203, 252, 209, 255, 248, 254], + [247, 191, 203, 252, 209, 255, 248, 254], + [247, 192, 204, 252, 210, 255, 248, 254], + [247, 193, 204, 252, 210, 255, 248, 254], + [248, 194, 205, 252, 211, 255, 248, 254], + [248, 194, 205, 252, 211, 255, 248, 254], + [248, 195, 206, 252, 212, 255, 249, 254], + [248, 196, 206, 252, 212, 255, 249, 254], + [249, 197, 207, 253, 213, 255, 249, 254], + [249, 197, 207, 253, 213, 255, 249, 254], + [249, 198, 208, 253, 214, 255, 249, 254], + [249, 199, 209, 253, 214, 255, 249, 254], + [250, 200, 210, 253, 215, 255, 249, 254], + [250, 200, 210, 253, 215, 255, 249, 254], + [250, 201, 211, 253, 215, 255, 249, 254], + [250, 202, 211, 253, 215, 255, 249, 254], + [250, 203, 212, 253, 216, 255, 249, 254], + [250, 203, 212, 253, 216, 255, 249, 254], + [251, 204, 213, 253, 217, 255, 250, 254], + [251, 205, 213, 253, 217, 255, 250, 254], + [251, 206, 214, 254, 218, 255, 250, 254], + [251, 206, 215, 254, 218, 255, 250, 254], + [252, 207, 216, 254, 219, 255, 250, 254], + [252, 208, 216, 254, 219, 255, 250, 254], + [252, 209, 217, 254, 220, 255, 250, 254], + [252, 210, 217, 254, 220, 255, 250, 254], + [252, 211, 218, 254, 221, 255, 250, 254], + [252, 212, 218, 254, 221, 255, 250, 254], + [253, 213, 219, 254, 222, 255, 250, 254], + [253, 213, 220, 254, 222, 255, 250, 254], + [253, 214, 221, 254, 223, 255, 250, 254], + [253, 215, 221, 254, 223, 255, 250, 254], + [253, 216, 222, 254, 224, 255, 251, 254], + [253, 217, 223, 254, 224, 255, 251, 254], + [253, 218, 224, 254, 225, 255, 251, 254], + [253, 219, 224, 254, 225, 255, 251, 254], + [254, 220, 225, 254, 225, 255, 251, 254], + [254, 221, 226, 254, 225, 255, 251, 254], + [254, 222, 227, 255, 226, 255, 251, 254], + [254, 223, 227, 255, 226, 255, 251, 254], + [254, 224, 228, 255, 227, 255, 251, 254], + [254, 225, 229, 255, 227, 255, 251, 254], + [254, 226, 230, 255, 228, 255, 251, 254], + [254, 227, 230, 255, 229, 255, 251, 254], + [255, 228, 231, 255, 230, 255, 251, 254], + [255, 229, 232, 255, 230, 255, 251, 254], + [255, 230, 233, 255, 231, 255, 252, 254], + [255, 231, 234, 255, 231, 255, 252, 254], + [255, 232, 235, 255, 232, 255, 252, 254], + [255, 233, 236, 255, 232, 255, 252, 254], + [255, 235, 237, 255, 233, 255, 252, 254], + [255, 236, 238, 255, 234, 255, 252, 254], + [255, 238, 240, 255, 235, 255, 252, 255], + [255, 239, 241, 255, 235, 255, 252, 254], + [255, 241, 243, 255, 236, 255, 252, 254], + [255, 243, 245, 255, 237, 255, 252, 254], + [255, 246, 247, 255, 239, 255, 253, 255] + ]; + + internal static readonly byte[] DefaultCoefProbs4X4 = + [ + // Y plane + // Intra + // Band 0 + 195, 29, 183, 84, 49, 136, 8, 42, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 31, 107, 169, 35, 99, 159, 17, 82, 140, 8, 66, 114, 2, 44, 76, 1, 19, 32, + // Band 2 + 40, 132, 201, 29, 114, 187, 13, 91, 157, 7, 75, 127, 3, 58, 95, 1, 28, 47, + // Band 3 + 69, 142, 221, 42, 122, 201, 15, 91, 159, 6, 67, 121, 1, 42, 77, 1, 17, 31, + // Band 4 + 102, 148, 228, 67, 117, 204, 17, 82, 154, 6, 59, 114, 2, 39, 75, 1, 15, 29, + // Band 5 + 156, 57, 233, 119, 57, 212, 58, 48, 163, 29, 40, 124, 12, 30, 81, 3, 12, 31, + // Inter + // Band 0 + 191, 107, 226, 124, 117, 204, 25, 99, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 29, 148, 210, 37, 126, 194, 8, 93, 157, 2, 68, 118, 1, 39, 69, 1, 17, 33, + // Band 2 + 41, 151, 213, 27, 123, 193, 3, 82, 144, 1, 58, 105, 1, 32, 60, 1, 13, 26, + // Band 3 + 59, 159, 220, 23, 126, 198, 4, 88, 151, 1, 66, 114, 1, 38, 71, 1, 18, 34, + // Band 4 + 114, 136, 232, 51, 114, 207, 11, 83, 155, 3, 56, 105, 1, 33, 65, 1, 17, 34, + // Band 5 + 149, 65, 234, 121, 57, 215, 61, 49, 166, 28, 36, 114, 12, 25, 76, 3, 16, 42, + // UV plane + // Intra + // Band 0 + 214, 49, 220, 132, 63, 188, 42, 65, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 85, 137, 221, 104, 131, 216, 49, 111, 192, 21, 87, 155, 2, 49, 87, 1, 16, 28, + // Band 2 + 89, 163, 230, 90, 137, 220, 29, 100, 183, 10, 70, 135, 2, 42, 81, 1, 17, 33, + // Band 3 + 108, 167, 237, 55, 133, 222, 15, 97, 179, 4, 72, 135, 1, 45, 85, 1, 19, 38, + // Band 4 + 124, 146, 240, 66, 124, 224, 17, 88, 175, 4, 58, 122, 1, 36, 75, 1, 18, 37, + // Band 5 + 141, 79, 241, 126, 70, 227, 66, 58, 182, 30, 44, 136, 12, 34, 96, 2, 20, 47, + // Inter + // Band 0 + 229, 99, 249, 143, 111, 235, 46, 109, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 82, 158, 236, 94, 146, 224, 25, 117, 191, 9, 87, 149, 3, 56, 99, 1, 33, 57, + // Band 2 + 83, 167, 237, 68, 145, 222, 10, 103, 177, 2, 72, 131, 1, 41, 79, 1, 20, 39, + // Band 3 + 99, 167, 239, 47, 141, 224, 10, 104, 178, 2, 73, 133, 1, 44, 85, 1, 22, 47, + // Band 4 + 127, 145, 243, 71, 129, 228, 17, 93, 177, 3, 61, 124, 1, 41, 84, 1, 21, 52, + // Band 5 + 157, 78, 244, 140, 72, 231, 69, 58, 184, 31, 44, 137, 14, 38, 105, 8, 23, 61 + ]; + + internal static readonly byte[] DefaultCoefProbs8X8 = + [ + // Y plane + // Intra + // Band 0 + 125, 34, 187, 52, 41, 133, 6, 31, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 37, 109, 153, 51, 102, 147, 23, 87, 128, 8, 67, 101, 1, 41, 63, 1, 19, 29, + // Band 2 + 31, 154, 185, 17, 127, 175, 6, 96, 145, 2, 73, 114, 1, 51, 82, 1, 28, 45, + // Band 3 + 23, 163, 200, 10, 131, 185, 2, 93, 148, 1, 67, 111, 1, 41, 69, 1, 14, 24, + // Band 4 + 29, 176, 217, 12, 145, 201, 3, 101, 156, 1, 69, 111, 1, 39, 63, 1, 14, 23, + // Band 5 + 57, 192, 233, 25, 154, 215, 6, 109, 167, 3, 78, 118, 1, 48, 69, 1, 21, 29, + // Inter + // Band 0 + 202, 105, 245, 108, 106, 216, 18, 90, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 33, 172, 219, 64, 149, 206, 14, 117, 177, 5, 90, 141, 2, 61, 95, 1, 37, 57, + // Band 2 + 33, 179, 220, 11, 140, 198, 1, 89, 148, 1, 60, 104, 1, 33, 57, 1, 12, 21, + // Band 3 + 30, 181, 221, 8, 141, 198, 1, 87, 145, 1, 58, 100, 1, 31, 55, 1, 12, 20, + // Band 4 + 32, 186, 224, 7, 142, 198, 1, 86, 143, 1, 58, 100, 1, 31, 55, 1, 12, 22, + // Band 5 + 57, 192, 227, 20, 143, 204, 3, 96, 154, 1, 68, 112, 1, 42, 69, 1, 19, 32, + // UV plane + // Intra + // Band 0 + 212, 35, 215, 113, 47, 169, 29, 48, 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 74, 129, 203, 106, 120, 203, 49, 107, 178, 19, 84, 144, 4, 50, 84, 1, 15, 25, + // Band 2 + 71, 172, 217, 44, 141, 209, 15, 102, 173, 6, 76, 133, 2, 51, 89, 1, 24, 42, + // Band 3 + 64, 185, 231, 31, 148, 216, 8, 103, 175, 3, 74, 131, 1, 46, 81, 1, 18, 30, + // Band 4 + 65, 196, 235, 25, 157, 221, 5, 105, 174, 1, 67, 120, 1, 38, 69, 1, 15, 30, + // Band 5 + 65, 204, 238, 30, 156, 224, 7, 107, 177, 2, 70, 124, 1, 42, 73, 1, 18, 34, + // Inter + // Band 0 + 225, 86, 251, 144, 104, 235, 42, 99, 181, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 85, 175, 239, 112, 165, 229, 29, 136, 200, 12, 103, 162, 6, 77, 123, 2, 53, 84, + // Band 2 + 75, 183, 239, 30, 155, 221, 3, 106, 171, 1, 74, 128, 1, 44, 76, 1, 17, 28, + // Band 3 + 73, 185, 240, 27, 159, 222, 2, 107, 172, 1, 75, 127, 1, 42, 73, 1, 17, 29, + // Band 4 + 62, 190, 238, 21, 159, 222, 2, 107, 172, 1, 72, 122, 1, 40, 71, 1, 18, 32, + // Band 5 + 61, 199, 240, 27, 161, 226, 4, 113, 180, 1, 76, 129, 1, 46, 80, 1, 23, 41 + ]; + + internal static readonly byte[] DefaultCoefProbs16X16 = + [ + // Y plane + // Intra + // Band 0 + 7, 27, 153, 5, 30, 95, 1, 16, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 50, 75, 127, 57, 75, 124, 27, 67, 108, 10, 54, 86, 1, 33, 52, 1, 12, 18, + // Band 2 + 43, 125, 151, 26, 108, 148, 7, 83, 122, 2, 59, 89, 1, 38, 60, 1, 17, 27, + // Band 3 + 23, 144, 163, 13, 112, 154, 2, 75, 117, 1, 50, 81, 1, 31, 51, 1, 14, 23, + // Band 4 + 18, 162, 185, 6, 123, 171, 1, 78, 125, 1, 51, 86, 1, 31, 54, 1, 14, 23, + // Band 5 + 15, 199, 227, 3, 150, 204, 1, 91, 146, 1, 55, 95, 1, 30, 53, 1, 11, 20, + // Inter + // Band 0 + 19, 55, 240, 19, 59, 196, 3, 52, 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 41, 166, 207, 104, 153, 199, 31, 123, 181, 14, 101, 152, 5, 72, 106, 1, 36, 52, + // Band 2 + 35, 176, 211, 12, 131, 190, 2, 88, 144, 1, 60, 101, 1, 36, 60, 1, 16, 28, + // Band 3 + 28, 183, 213, 8, 134, 191, 1, 86, 142, 1, 56, 96, 1, 30, 53, 1, 12, 20, + // Band 4 + 20, 190, 215, 4, 135, 192, 1, 84, 139, 1, 53, 91, 1, 28, 49, 1, 11, 20, + // Band 5 + 13, 196, 216, 2, 137, 192, 1, 86, 143, 1, 57, 99, 1, 32, 56, 1, 13, 24, + // UV plane + // Intra + // Band 0 + 211, 29, 217, 96, 47, 156, 22, 43, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 78, 120, 193, 111, 116, 186, 46, 102, 164, 15, 80, 128, 2, 49, 76, 1, 18, 28, + // Band 2 + 71, 161, 203, 42, 132, 192, 10, 98, 150, 3, 69, 109, 1, 44, 70, 1, 18, 29, + // Band 3 + 57, 186, 211, 30, 140, 196, 4, 93, 146, 1, 62, 102, 1, 38, 65, 1, 16, 27, + // Band 4 + 47, 199, 217, 14, 145, 196, 1, 88, 142, 1, 57, 98, 1, 36, 62, 1, 15, 26, + // Band 5 + 26, 219, 229, 5, 155, 207, 1, 94, 151, 1, 60, 104, 1, 36, 62, 1, 16, 28, + // Inter + // Band 0 + 233, 29, 248, 146, 47, 220, 43, 52, 140, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 100, 163, 232, 179, 161, 222, 63, 142, 204, 37, 113, 174, 26, 89, 137, 18, 68, 97, + // Band 2 + 85, 181, 230, 32, 146, 209, 7, 100, 164, 3, 71, 121, 1, 45, 77, 1, 18, 30, + // Band 3 + 65, 187, 230, 20, 148, 207, 2, 97, 159, 1, 68, 116, 1, 40, 70, 1, 14, 29, + // Band 4 + 40, 194, 227, 8, 147, 204, 1, 94, 155, 1, 65, 112, 1, 39, 66, 1, 14, 26, + // Band 5 + 16, 208, 228, 3, 151, 207, 1, 98, 160, 1, 67, 117, 1, 41, 74, 1, 17, 31 + ]; + + internal static readonly byte[] DefaultCoefProbs32X32 = + [ + // Y plane + // Intra + // Band 0 + 17, 38, 140, 7, 34, 80, 1, 17, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 37, 75, 128, 41, 76, 128, 26, 66, 116, 12, 52, 94, 2, 32, 55, 1, 10, 16, + // Band 2 + 50, 127, 154, 37, 109, 152, 16, 82, 121, 5, 59, 85, 1, 35, 54, 1, 13, 20, + // Band 3 + 40, 142, 167, 17, 110, 157, 2, 71, 112, 1, 44, 72, 1, 27, 45, 1, 11, 17, + // Band 4 + 30, 175, 188, 9, 124, 169, 1, 74, 116, 1, 48, 78, 1, 30, 49, 1, 11, 18, + // Band 5 + 10, 222, 223, 2, 150, 194, 1, 83, 128, 1, 48, 79, 1, 27, 45, 1, 11, 17, + // Inter + // Band 0 + 36, 41, 235, 29, 36, 193, 10, 27, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 85, 165, 222, 177, 162, 215, 110, 135, 195, 57, 113, 168, 23, 83, 120, 10, 49, 61, + // Band 2 + 85, 190, 223, 36, 139, 200, 5, 90, 146, 1, 60, 103, 1, 38, 65, 1, 18, 30, + // Band 3 + 72, 202, 223, 23, 141, 199, 2, 86, 140, 1, 56, 97, 1, 36, 61, 1, 16, 27, + // Band 4 + 55, 218, 225, 13, 145, 200, 1, 86, 141, 1, 57, 99, 1, 35, 61, 1, 13, 22, + // Band 5 + 15, 235, 212, 1, 132, 184, 1, 84, 139, 1, 57, 97, 1, 34, 56, 1, 14, 23, + // UV plane + // Intra + // Band 0 + 181, 21, 201, 61, 37, 123, 10, 38, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 47, 106, 172, 95, 104, 173, 42, 93, 159, 18, 77, 131, 4, 50, 81, 1, 17, 23, + // Band 2 + 62, 147, 199, 44, 130, 189, 28, 102, 154, 18, 75, 115, 2, 44, 65, 1, 12, 19, + // Band 3 + 55, 153, 210, 24, 130, 194, 3, 93, 146, 1, 61, 97, 1, 31, 50, 1, 10, 16, + // Band 4 + 49, 186, 223, 17, 148, 204, 1, 96, 142, 1, 53, 83, 1, 26, 44, 1, 11, 17, + // Band 5 + 13, 217, 212, 2, 136, 180, 1, 78, 124, 1, 50, 83, 1, 29, 49, 1, 14, 23, + // Inter + // Band 0 + 197, 13, 247, 82, 17, 222, 25, 17, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // Band 1 + 126, 186, 247, 234, 191, 243, 176, 177, 234, 104, 158, 220, 66, 128, 186, 55, 90, 137, + // Band 2 + 111, 197, 242, 46, 158, 219, 9, 104, 171, 2, 65, 125, 1, 44, 80, 1, 17, 91, + // Band 3 + 104, 208, 245, 39, 168, 224, 3, 109, 162, 1, 79, 124, 1, 50, 102, 1, 43, 102, + // Band 4 + 84, 220, 246, 31, 177, 231, 2, 115, 180, 1, 79, 134, 1, 55, 77, 1, 60, 79, + // Band 5 + 43, 243, 240, 8, 180, 217, 1, 115, 166, 1, 84, 121, 1, 51, 67, 1, 16, 6 + ]; + + public static byte[] GetBandTranslate(int txSize) + { + return txSize == (int)TxSize.Tx4X4 ? _coefbandTrans4X4 : _coefbandTrans8X8Plus; + } + + public static void CopyProbs(ref T dest, ReadOnlySpan probs) where T : unmanaged + { + if (Unsafe.SizeOf() != probs.Length) + { + throw new Exception("size mismatch expected: " + probs.Length + " got: " + Unsafe.SizeOf()); + } + + probs.CopyTo(MemoryMarshal.Cast(MemoryMarshal.CreateSpan(ref dest, 1))); + } + + internal const int CoefCountSat = 24; + internal const int CoefMaxUpdateFactor = 112; + internal const int CoefCountSatKey = 24; + internal const int CoefMaxUpdateFactorKey = 112; + internal const int CoefCountSatAfterKey = 24; + internal const int CoefMaxUpdateFactorAfterKey = 128; + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/EntropyMode.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/EntropyMode.cs new file mode 100644 index 000000000..586045976 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/EntropyMode.cs @@ -0,0 +1,390 @@ +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Types; +using Ryujinx.Graphics.Video; +using System; + +namespace Ryujinx.Graphics.Nvdec.Vp9 +{ + internal class EntropyMode + { + public const int BlockSizeGroups = 4; + + public const int TxSizeContexts = 2; + + public static readonly byte[][][] KfYModeProb = + [ + [ + // above = dc + [137, 30, 42, 148, 151, 207, 70, 52, 91], // left = dc + [92, 45, 102, 136, 116, 180, 74, 90, 100], // left = v + [73, 32, 19, 187, 222, 215, 46, 34, 100], // left = h + [91, 30, 32, 116, 121, 186, 93, 86, 94], // left = d45 + [72, 35, 36, 149, 68, 206, 68, 63, 105], // left = d135 + [73, 31, 28, 138, 57, 124, 55, 122, 151], // left = d117 + [67, 23, 21, 140, 126, 197, 40, 37, 171], // left = d153 + [86, 27, 28, 128, 154, 212, 45, 43, 53], // left = d207 + [74, 32, 27, 107, 86, 160, 63, 134, 102], // left = d63 + [59, 67, 44, 140, 161, 202, 78, 67, 119] // left = tm + ], + [ + // above = v + [63, 36, 126, 146, 123, 158, 60, 90, 96], // left = dc + [43, 46, 168, 134, 107, 128, 69, 142, 92], // left = v + [44, 29, 68, 159, 201, 177, 50, 57, 77], // left = h + [58, 38, 76, 114, 97, 172, 78, 133, 92], // left = d45 + [46, 41, 76, 140, 63, 184, 69, 112, 57], // left = d135 + [38, 32, 85, 140, 46, 112, 54, 151, 133], // left = d117 + [39, 27, 61, 131, 110, 175, 44, 75, 136], // left = d153 + [52, 30, 74, 113, 130, 175, 51, 64, 58], // left = d207 + [47, 35, 80, 100, 74, 143, 64, 163, 74], // left = d63 + [36, 61, 116, 114, 128, 162, 80, 125, 82] // left = tm + ], + [ + // above = h + [82, 26, 26, 171, 208, 204, 44, 32, 105], // left = dc + [55, 44, 68, 166, 179, 192, 57, 57, 108], // left = v + [42, 26, 11, 199, 241, 228, 23, 15, 85], // left = h + [68, 42, 19, 131, 160, 199, 55, 52, 83], // left = d45 + [58, 50, 25, 139, 115, 232, 39, 52, 118], // left = d135 + [50, 35, 33, 153, 104, 162, 64, 59, 131], // left = d117 + [44, 24, 16, 150, 177, 202, 33, 19, 156], // left = d153 + [55, 27, 12, 153, 203, 218, 26, 27, 49], // left = d207 + [53, 49, 21, 110, 116, 168, 59, 80, 76], // left = d63 + [38, 72, 19, 168, 203, 212, 50, 50, 107] // left = tm + ], + [ + // above = d45 + [103, 26, 36, 129, 132, 201, 83, 80, 93], // left = dc + [59, 38, 83, 112, 103, 162, 98, 136, 90], // left = v + [62, 30, 23, 158, 200, 207, 59, 57, 50], // left = h + [67, 30, 29, 84, 86, 191, 102, 91, 59], // left = d45 + [60, 32, 33, 112, 71, 220, 64, 89, 104], // left = d135 + [53, 26, 34, 130, 56, 149, 84, 120, 103], // left = d117 + [53, 21, 23, 133, 109, 210, 56, 77, 172], // left = d153 + [77, 19, 29, 112, 142, 228, 55, 66, 36], // left = d207 + [61, 29, 29, 93, 97, 165, 83, 175, 162], // left = d63 + [47, 47, 43, 114, 137, 181, 100, 99, 95] // left = tm + ], + [ + // above = d135 + [69, 23, 29, 128, 83, 199, 46, 44, 101], // left = dc + [53, 40, 55, 139, 69, 183, 61, 80, 110], // left = v + [40, 29, 19, 161, 180, 207, 43, 24, 91], // left = h + [60, 34, 19, 105, 61, 198, 53, 64, 89], // left = d45 + [52, 31, 22, 158, 40, 209, 58, 62, 89], // left = d135 + [44, 31, 29, 147, 46, 158, 56, 102, 198], // left = d117 + [35, 19, 12, 135, 87, 209, 41, 45, 167], // left = d153 + [55, 25, 21, 118, 95, 215, 38, 39, 66], // left = d207 + [51, 38, 25, 113, 58, 164, 70, 93, 97], // left = d63 + [47, 54, 34, 146, 108, 203, 72, 103, 151] // left = tm + ], + [ + // above = d117 + [64, 19, 37, 156, 66, 138, 49, 95, 133], // left = dc + [46, 27, 80, 150, 55, 124, 55, 121, 135], // left = v + [36, 23, 27, 165, 149, 166, 54, 64, 118], // left = h + [53, 21, 36, 131, 63, 163, 60, 109, 81], // left = d45 + [40, 26, 35, 154, 40, 185, 51, 97, 123], // left = d135 + [35, 19, 34, 179, 19, 97, 48, 129, 124], // left = d117 + [36, 20, 26, 136, 62, 164, 33, 77, 154], // left = d153 + [45, 18, 32, 130, 90, 157, 40, 79, 91], // left = d207 + [45, 26, 28, 129, 45, 129, 49, 147, 123], // left = d63 + [38, 44, 51, 136, 74, 162, 57, 97, 121] // left = tm + ], + [ + // above = d153 + [75, 17, 22, 136, 138, 185, 32, 34, 166], // left = dc + [56, 39, 58, 133, 117, 173, 48, 53, 187], // left = v + [35, 21, 12, 161, 212, 207, 20, 23, 145], // left = h + [56, 29, 19, 117, 109, 181, 55, 68, 112], // left = d45 + [47, 29, 17, 153, 64, 220, 59, 51, 114], // left = d135 + [46, 16, 24, 136, 76, 147, 41, 64, 172], // left = d117 + [34, 17, 11, 108, 152, 187, 13, 15, 209], // left = d153 + [51, 24, 14, 115, 133, 209, 32, 26, 104], // left = d207 + [55, 30, 18, 122, 79, 179, 44, 88, 116], // left = d63 + [37, 49, 25, 129, 168, 164, 41, 54, 148] // left = tm + ], + [ + // above = d207 + [82, 22, 32, 127, 143, 213, 39, 41, 70], // left = dc + [62, 44, 61, 123, 105, 189, 48, 57, 64], // left = v + [47, 25, 17, 175, 222, 220, 24, 30, 86], // left = h + [68, 36, 17, 106, 102, 206, 59, 74, 74], // left = d45 + [57, 39, 23, 151, 68, 216, 55, 63, 58], // left = d135 + [49, 30, 35, 141, 70, 168, 82, 40, 115], // left = d117 + [51, 25, 15, 136, 129, 202, 38, 35, 139], // left = d153 + [68, 26, 16, 111, 141, 215, 29, 28, 28], // left = d207 + [59, 39, 19, 114, 75, 180, 77, 104, 42], // left = d63 + [40, 61, 26, 126, 152, 206, 61, 59, 93] // left = tm + ], + [ + // above = d63 + [78, 23, 39, 111, 117, 170, 74, 124, 94], // left = dc + [48, 34, 86, 101, 92, 146, 78, 179, 134], // left = v + [47, 22, 24, 138, 187, 178, 68, 69, 59], // left = h + [56, 25, 33, 105, 112, 187, 95, 177, 129], // left = d45 + [48, 31, 27, 114, 63, 183, 82, 116, 56], // left = d135 + [43, 28, 37, 121, 63, 123, 61, 192, 169], // left = d117 + [42, 17, 24, 109, 97, 177, 56, 76, 122], // left = d153 + [58, 18, 28, 105, 139, 182, 70, 92, 63], // left = d207 + [46, 23, 32, 74, 86, 150, 67, 183, 88], // left = d63 + [36, 38, 48, 92, 122, 165, 88, 137, 91] // left = tm + ], + [ + // above = tm + [65, 70, 60, 155, 159, 199, 61, 60, 81], // left = dc + [44, 78, 115, 132, 119, 173, 71, 112, 93], // left = v + [39, 38, 21, 184, 227, 206, 42, 32, 64], // left = h + [58, 47, 36, 124, 137, 193, 80, 82, 78], // left = d45 + [49, 50, 35, 144, 95, 205, 63, 78, 59], // left = d135 + [41, 53, 52, 148, 71, 142, 65, 128, 51], // left = d117 + [40, 36, 28, 143, 143, 202, 40, 55, 137], // left = d153 + [52, 34, 29, 129, 183, 227, 42, 35, 43], // left = d207 + [42, 44, 44, 104, 105, 164, 64, 130, 80], // left = d63 + [43, 81, 53, 140, 169, 204, 68, 84, 72] // left = tm + ] + ]; + + public static readonly byte[][] KfUvModeProb = + [ + [144, 11, 54, 157, 195, 130, 46, 58, 108], // y = dc + [118, 15, 123, 148, 131, 101, 44, 93, 131], // y = v + [113, 12, 23, 188, 226, 142, 26, 32, 125], // y = h + [120, 11, 50, 123, 163, 135, 64, 77, 103], // y = d45 + [113, 9, 36, 155, 111, 157, 32, 44, 161], // y = d135 + [116, 9, 55, 176, 76, 96, 37, 61, 149], // y = d117 + [115, 9, 28, 141, 161, 167, 21, 25, 193], // y = d153 + [120, 12, 32, 145, 195, 142, 32, 38, 86], // y = d207 + [116, 12, 64, 120, 140, 125, 49, 115, 121], // y = d63 + [102, 19, 66, 162, 182, 122, 35, 59, 128] // y = tm + ]; + + private static readonly byte[] _defaultIfYProbs = + [ + 65, 32, 18, 144, 162, 194, 41, 51, 98, // block_size < 8x8 + 132, 68, 18, 165, 217, 196, 45, 40, 78, // block_size < 16x16 + 173, 80, 19, 176, 240, 193, 64, 35, 46, // block_size < 32x32 + 221, 135, 38, 194, 248, 121, 96, 85, 29 // block_size >= 32x32 + ]; + + private static readonly byte[] _defaultIfUvProbs = + [ + 120, 7, 76, 176, 208, 126, 28, 54, 103, // y = dc + 48, 12, 154, 155, 139, 90, 34, 117, 119, // y = v + 67, 6, 25, 204, 243, 158, 13, 21, 96, // y = h + 97, 5, 44, 131, 176, 139, 48, 68, 97, // y = d45 + 83, 5, 42, 156, 111, 152, 26, 49, 152, // y = d135 + 80, 5, 58, 178, 74, 83, 33, 62, 145, // y = d117 + 86, 5, 32, 154, 192, 168, 14, 22, 163, // y = d153 + 85, 5, 32, 156, 216, 148, 19, 29, 73, // y = d207 + 77, 7, 64, 116, 132, 122, 37, 126, 120, // y = d63 + 101, 21, 107, 181, 192, 103, 19, 67, 125 // y = tm + ]; + + private static readonly byte[] _defaultPartitionProbs = + [ + // 8x8 . 4x4 + 199, 122, 141, // a/l both not split + 147, 63, 159, // a split, l not split + 148, 133, 118, // l split, a not split + 121, 104, 114, // a/l both split + // 16x16 . 8x8 + 174, 73, 87, // a/l both not split + 92, 41, 83, // a split, l not split + 82, 99, 50, // l split, a not split + 53, 39, 39, // a/l both split + // 32x32 . 16x16 + 177, 58, 59, // a/l both not split + 68, 26, 63, // a split, l not split + 52, 79, 25, // l split, a not split + 17, 14, 12, // a/l both split + // 64x64 . 32x32 + 222, 34, 30, // a/l both not split + 72, 16, 44, // a split, l not split + 58, 32, 12, // l split, a not split + 10, 7, 6 // a/l both split + ]; + + private static readonly byte[] _defaultInterModeProbs = + [ + 2, 173, 34, // 0 = both zero mv + 7, 145, 85, // 1 = one zero mv + one a predicted mv + 7, 166, 63, // 2 = two predicted mvs + 7, 94, 66, // 3 = one predicted/zero and one new mv + 8, 64, 46, // 4 = two new mvs + 17, 81, 31, // 5 = one intra neighbour + x + 25, 29, 30 // 6 = two intra neighbours + ]; + + /* Array indices are identical to previously-existing INTRAMODECONTEXTNODES. */ + public static readonly sbyte[] IntraModeTree = + [ + -(int)PredictionMode.DcPred, 2, /* 0 = DC_NODE */ -(int)PredictionMode.TmPred, 4, /* 1 = TM_NODE */ + -(int)PredictionMode.VPred, 6, /* 2 = V_NODE */ 8, 12, /* 3 = COM_NODE */ -(int)PredictionMode.HPred, + 10, /* 4 = H_NODE */ -(int)PredictionMode.D135Pred, -(int)PredictionMode.D117Pred, /* 5 = D135_NODE */ + -(int)PredictionMode.D45Pred, 14, /* 6 = D45_NODE */ -(int)PredictionMode.D63Pred, + 16, /* 7 = D63_NODE */ -(int)PredictionMode.D153Pred, -(int)PredictionMode.D207Pred /* 8 = D153_NODE */ + ]; + + public static readonly sbyte[] InterModeTree = + [ + -((int)PredictionMode.ZeroMv - (int)PredictionMode.NearestMv), 2, + -((int)PredictionMode.NearestMv - (int)PredictionMode.NearestMv), 4, + -((int)PredictionMode.NearMv - (int)PredictionMode.NearestMv), + -((int)PredictionMode.NewMv - (int)PredictionMode.NearestMv) + ]; + + public static readonly sbyte[] PartitionTree = + [ + -(sbyte)PartitionType.PartitionNone, 2, -(sbyte)PartitionType.PartitionHorz, 4, + -(sbyte)PartitionType.PartitionVert, -(sbyte)PartitionType.PartitionSplit + ]; + + public static readonly sbyte[] SwitchableInterpTree = + [ + -Constants.EightTap, 2, -Constants.EightTapSmooth, -Constants.EightTapSharp + ]; + + private static readonly byte[] _defaultIntraInterP = [9, 102, 187, 225]; + private static readonly byte[] _defaultCompInterP = [239, 183, 119, 96, 41]; + private static readonly byte[] _defaultCompRefP = [50, 126, 123, 221, 226]; + private static readonly byte[] _defaultSingleRefP = [33, 16, 77, 74, 142, 142, 172, 170, 238, 247]; + private static readonly byte[] _defaultTxProbs = [3, 136, 37, 5, 52, 13, 20, 152, 15, 101, 100, 66]; + + static EntropyMode() + { + byte[][] kfPartitionProbs = + [ + // 8x8 . 4x4 + [158, 97, 94], // a/l both not split + [93, 24, 99], // a split, l not split + [85, 119, 44], // l split, a not split + [62, 59, 67], // a/l both split + + // 16x16 . 8x8 + [149, 53, 53], // a/l both not split + [94, 20, 48], // a split, l not split + [83, 53, 24], // l split, a not split + [52, 18, 18], // a/l both split + + // 32x32 . 16x16 + [150, 40, 39], // a/l both not split + [78, 12, 26], // a split, l not split + [67, 33, 11], // l split, a not split + [24, 7, 5], // a/l both split + + // 64x64 . 32x32 + [174, 35, 49], // a/l both not split + [68, 11, 27], // a split, l not split + [57, 15, 9], // l split, a not split + [12, 3, 3] // a/l both split + ]; + } + + private static readonly byte[] _defaultSkipProbs = [192, 128, 64]; + + private static readonly byte[] _defaultSwitchableInterpProb = [235, 162, 36, 255, 34, 3, 149, 144]; + + private static void InitModeProbs(ref Vp9EntropyProbs fc) + { + Entropy.CopyProbs(ref fc.UvModeProb, _defaultIfUvProbs); + Entropy.CopyProbs(ref fc.YModeProb, _defaultIfYProbs); + Entropy.CopyProbs(ref fc.SwitchableInterpProb, _defaultSwitchableInterpProb); + Entropy.CopyProbs(ref fc.PartitionProb, _defaultPartitionProbs); + Entropy.CopyProbs(ref fc.IntraInterProb, _defaultIntraInterP); + Entropy.CopyProbs(ref fc.CompInterProb, _defaultCompInterP); + Entropy.CopyProbs(ref fc.CompRefProb, _defaultCompRefP); + Entropy.CopyProbs(ref fc.SingleRefProb, _defaultSingleRefP); + Entropy.CopyProbs(ref fc.Tx32x32Prob, _defaultTxProbs.AsSpan().Slice(0, 6)); + Entropy.CopyProbs(ref fc.Tx16x16Prob, _defaultTxProbs.AsSpan().Slice(6, 4)); + Entropy.CopyProbs(ref fc.Tx8x8Prob, _defaultTxProbs.AsSpan().Slice(10, 2)); + Entropy.CopyProbs(ref fc.SkipProb, _defaultSkipProbs); + Entropy.CopyProbs(ref fc.InterModeProb, _defaultInterModeProbs); + } + + internal static void TxCountsToBranchCounts32X32(ReadOnlySpan txCount32X32P, + ref Array3> ct32X32P) + { + ct32X32P[0][0] = txCount32X32P[(int)TxSize.Tx4X4]; + ct32X32P[0][1] = txCount32X32P[(int)TxSize.Tx8X8] + txCount32X32P[(int)TxSize.Tx16X16] + + txCount32X32P[(int)TxSize.Tx32X32]; + ct32X32P[1][0] = txCount32X32P[(int)TxSize.Tx8X8]; + ct32X32P[1][1] = txCount32X32P[(int)TxSize.Tx16X16] + txCount32X32P[(int)TxSize.Tx32X32]; + ct32X32P[2][0] = txCount32X32P[(int)TxSize.Tx16X16]; + ct32X32P[2][1] = txCount32X32P[(int)TxSize.Tx32X32]; + } + + internal static void TxCountsToBranchCounts16X16(ReadOnlySpan txCount16X16P, + ref Array2> ct16X16P) + { + ct16X16P[0][0] = txCount16X16P[(int)TxSize.Tx4X4]; + ct16X16P[0][1] = txCount16X16P[(int)TxSize.Tx8X8] + txCount16X16P[(int)TxSize.Tx16X16]; + ct16X16P[1][0] = txCount16X16P[(int)TxSize.Tx8X8]; + ct16X16P[1][1] = txCount16X16P[(int)TxSize.Tx16X16]; + } + + internal static void TxCountsToBranchCounts8X8(ReadOnlySpan txCount8X8P, + ref Array1> ct8X8P) + { + ct8X8P[0][0] = txCount8X8P[(int)TxSize.Tx4X4]; + ct8X8P[0][1] = txCount8X8P[(int)TxSize.Tx8X8]; + } + + public static unsafe void SetupPastIndependence(ref Vp9Common cm) + { + // Reset the segment feature data to the default stats: + // Features disabled, 0, with delta coding (Default state). + ref Types.LoopFilter lf = ref cm.Lf; + + cm.Seg.ClearAllSegFeatures(); + cm.Seg.AbsDelta = Segmentation.SegmentDeltadata; + + if (!cm.LastFrameSegMap.IsNull) + { + MemoryUtil.Fill(cm.LastFrameSegMap.ToPointer(), (byte)0, cm.MiRows * cm.MiCols); + } + + if (!cm.CurrentFrameSegMap.IsNull) + { + MemoryUtil.Fill(cm.CurrentFrameSegMap.ToPointer(), (byte)0, cm.MiRows * cm.MiCols); + } + + // Reset the mode ref deltas for loop filter + lf.LastRefDeltas = new Array4(); + lf.LastModeDeltas = new Array2(); + lf.SetDefaultLfDeltas(); + + // To force update of the sharpness + lf.LastSharpnessLevel = -1; + + cm.DefaultCoefProbs(); + InitModeProbs(ref cm.Fc.Value); + cm.InitMvProbs(); + + if (cm.FrameType == FrameType.KeyFrame || cm.ErrorResilientMode != 0 || cm.ResetFrameContext == 3) + { + // Reset all frame contexts. + for (int i = 0; i < Constants.FrameContexts; ++i) + { + cm.FrameContexts[i] = cm.Fc.Value; + } + } + else if (cm.ResetFrameContext == 2) + { + // Reset only the frame context specified in the frame header. + cm.FrameContexts[(int)cm.FrameContextIdx] = cm.Fc.Value; + } + + // prev_mip will only be allocated in encoder. + if (cm.FrameIsIntraOnly() && !cm.PrevMip.IsNull) + { + cm.PrevMi.Value = new ModeInfo(); + } + + cm.RefFrameSignBias = new Array4(); + + cm.FrameContextIdx = 0; + } + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/EntropyMv.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/EntropyMv.cs new file mode 100644 index 000000000..4fa8e6d4c --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/EntropyMv.cs @@ -0,0 +1,165 @@ +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Types; +using Ryujinx.Graphics.Video; +using System.Diagnostics; + +namespace Ryujinx.Graphics.Nvdec.Vp9 +{ + internal static class EntropyMv + { + public const int UpdateProb = 252; + + /* Symbols for coding which components are zero jointly */ + public const int Joints = 4; + + + public static readonly sbyte[] JointTree = + [ + -(sbyte)MvJointType.Zero, 2, -(sbyte)MvJointType.Hnzvz, 4, + -(sbyte)MvJointType.Hzvnz, -(sbyte)MvJointType.Hnzvnz + ]; + + public static readonly sbyte[] ClassTree = + [ + -(sbyte)MvClassType.Class0, 2, -(sbyte)MvClassType.Class1, 4, 6, 8, -(sbyte)MvClassType.Class2, + -(sbyte)MvClassType.Class3, 10, 12, -(sbyte)MvClassType.Class4, -(sbyte)MvClassType.Class5, + -(sbyte)MvClassType.Class6, 14, 16, 18, -(sbyte)MvClassType.Class7, -(sbyte)MvClassType.Class8, + -(sbyte)MvClassType.Class9, -(sbyte)MvClassType.Class10 + ]; + + public static readonly sbyte[] Class0Tree = [-0, -1]; + + public static readonly sbyte[] FpTree = [-0, 2, -1, 4, -2, -3]; + + private static bool JointVertical(MvJointType type) + { + return type == MvJointType.Hzvnz || type == MvJointType.Hnzvnz; + } + + private static bool JointHorizontal(MvJointType type) + { + return type == MvJointType.Hnzvz || type == MvJointType.Hnzvnz; + } + + private static readonly byte[] _logInBase2 = + [ + 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 10 + ]; + + private static int ClassBase(MvClassType c) + { + return c != 0 ? Class0Size << ((int)c + 2) : 0; + } + + private static MvClassType GetClass(int z, Ptr offset) + { + MvClassType c = z >= Class0Size * 4096 + ? MvClassType.Class10 + : (MvClassType)_logInBase2[z >> 3]; + if (!offset.IsNull) + { + offset.Value = z - ClassBase(c); + } + + return c; + } + + private static void IncComponent(int v, ref Vp9BackwardUpdates compCounts, int compIndex, int incr, int usehp) + { + int o = 0; + Debug.Assert(v != 0); /* should not be zero */ + int s = v < 0 ? 1 : 0; + compCounts.Sign[compIndex][s] += (uint)incr; + int z = (s != 0 ? -v : v) - 1 /* magnitude - 1 */; + + int c = (int)GetClass(z, new Ptr(ref o)); + compCounts.Classes[compIndex][c] += (uint)incr; + + int d = o >> 3 /* int mv data */; + int f = (o >> 1) & 3 /* fractional pel mv data */; + int e = o & 1 /* high precision mv data */; + + if (c == (int)MvClassType.Class0) + { + compCounts.Class0[compIndex][d] += (uint)incr; + compCounts.Class0Fp[compIndex][d][f] += (uint)incr; + compCounts.Class0Hp[compIndex][e] += (uint)(usehp * incr); + } + else + { + int b = c + Class0Bits - 1; // number of bits + for (int i = 0; i < b; ++i) + { + compCounts.Bits[compIndex][i][(d >> i) & 1] += (uint)incr; + } + + compCounts.Fp[compIndex][f] += (uint)incr; + compCounts.Hp[compIndex][e] += (uint)(usehp * incr); + } + } + + public static void Inc(ref Mv mv, Ptr counts) + { + if (!counts.IsNull) + { + MvJointType j = mv.GetJoint(); + ++counts.Value.Joints[(int)j]; + + if (JointVertical(j)) + { + IncComponent(mv.Row, ref counts.Value, 0, 1, 1); + } + + if (JointHorizontal(j)) + { + IncComponent(mv.Col, ref counts.Value, 1, 1, 1); + } + } + } + + /* Symbols for coding magnitude class of nonzero components */ + public const int Classes = 11; + + public const int Class0Bits = 1; /* bits at integer precision for class 0 */ + public const int Class0Size = 1 << Class0Bits; + public const int OffsetBits = Classes + Class0Bits - 2; + public const int FpSize = 4; + + public const int MaxBits = Classes + Class0Bits + 2; + public const int Max = (1 << MaxBits) - 1; + public const int Vals = (Max << 1) + 1; + + public const int InUseBits = 14; + public const int Upp = (1 << InUseBits) - 1; + public const int Low = -(1 << InUseBits); + } +} diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/FrameBuffers.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/FrameBuffers.cs new file mode 100644 index 000000000..a5692c446 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/FrameBuffers.cs @@ -0,0 +1,78 @@ +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Types; + +namespace Ryujinx.Graphics.Nvdec.Vp9 +{ + internal struct InternalFrameBuffer + { + public ArrayPtr Data; + public bool InUse; + } + + internal struct InternalFrameBufferList + { + public ArrayPtr IntFb; + } + + internal static class FrameBuffers + { + public static int GetFrameBuffer(MemoryAllocator allocator, Ptr cbPriv, ulong minSize, + ref VpxCodecFrameBuffer fb) + { + int i; + if (cbPriv.IsNull) + { + return -1; + } + + // Find a free frame buffer. + for (i = 0; i < cbPriv.Value.IntFb.Length; ++i) + { + if (!cbPriv.Value.IntFb[i].InUse) + { + break; + } + } + + if (i == cbPriv.Value.IntFb.Length) + { + return -1; + } + + if ((ulong)cbPriv.Value.IntFb[i].Data.Length < minSize) + { + if (!cbPriv.Value.IntFb[i].Data.IsNull) + { + allocator.Free(cbPriv.Value.IntFb[i].Data); + } + + // The data must be zeroed to fix a valgrind error from the C loop filter + // due to access uninitialized memory in frame border. It could be + // skipped if border were totally removed. + cbPriv.Value.IntFb[i].Data = allocator.Allocate((int)minSize); + if (cbPriv.Value.IntFb[i].Data.IsNull) + { + return -1; + } + } + + fb.Data = cbPriv.Value.IntFb[i].Data; + cbPriv.Value.IntFb[i].InUse = true; + + // Set the frame buffer's private data to point at the internal frame buffer. + fb.Priv = new Ptr(ref cbPriv.Value.IntFb[i]); + return 0; + } + + public static int ReleaseFrameBuffer(Ptr cbPriv, ref VpxCodecFrameBuffer fb) + { + if (!fb.Priv.IsNull) + { + fb.Priv.Value.InUse = false; + } + + return 0; + } + } +} diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Idct.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Idct.cs index ebebf0ef9..f080fc825 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Idct.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Idct.cs @@ -1,4 +1,4 @@ -using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Common; using Ryujinx.Graphics.Nvdec.Vp9.Types; using System; using static Ryujinx.Graphics.Nvdec.Vp9.Dsp.InvTxfm; @@ -8,11 +8,13 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 internal static class Idct { private delegate void Transform1D(ReadOnlySpan input, Span output); + private delegate void HighbdTransform1D(ReadOnlySpan input, Span output, int bd); private struct Transform2D { - public Transform1D Cols, Rows; // Vertical and horizontal + public readonly Transform1D Cols; // Vertical and horizontal + public readonly Transform1D Rows; // Vertical and horizontal public Transform2D(Transform1D cols, Transform1D rows) { @@ -23,7 +25,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 private struct HighbdTransform2D { - public HighbdTransform1D Cols, Rows; // Vertical and horizontal + public readonly HighbdTransform1D Cols; // Vertical and horizontal + public readonly HighbdTransform1D Rows; // Vertical and horizontal public HighbdTransform2D(HighbdTransform1D cols, HighbdTransform1D rows) { @@ -32,55 +35,56 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } - private static readonly Transform2D[] _iht4 = { + private static readonly Transform2D[] _iht4 = + [ new(Idct4, Idct4), // DCT_DCT = 0 new(Iadst4, Idct4), // ADST_DCT = 1 new(Idct4, Iadst4), // DCT_ADST = 2 - new(Iadst4, Iadst4), // ADST_ADST = 3 - }; + new(Iadst4, Iadst4) // ADST_ADST = 3 + ]; - public static void Iht4x416Add(ReadOnlySpan input, Span dest, int stride, int txType) + public static void Iht4X416Add(ReadOnlySpan input, Span dest, int stride, int txType) { - int i, j; Span output = stackalloc int[4 * 4]; Span outptr = output; Span tempIn = stackalloc int[4]; Span tempOut = stackalloc int[4]; // Inverse transform row vectors - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { _iht4[txType].Rows(input, outptr); - input = input[4..]; - outptr = outptr[4..]; + input = input.Slice(4); + outptr = outptr.Slice(4); } // Inverse transform column vectors - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { - for (j = 0; j < 4; ++j) + for (int j = 0; j < 4; ++j) { - tempIn[j] = output[j * 4 + i]; + tempIn[j] = output[(j * 4) + i]; } _iht4[txType].Cols(tempIn, tempOut); - for (j = 0; j < 4; ++j) + for (int j = 0; j < 4; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 4)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 4)); } } } - private static readonly Transform2D[] _iht8 = { + private static readonly Transform2D[] _iht8 = + [ new(Idct8, Idct8), // DCT_DCT = 0 new(Iadst8, Idct8), // ADST_DCT = 1 new(Idct8, Iadst8), // DCT_ADST = 2 - new(Iadst8, Iadst8), // ADST_ADST = 3 - }; + new(Iadst8, Iadst8) // ADST_ADST = 3 + ]; - public static void Iht8x864Add(ReadOnlySpan input, Span dest, int stride, int txType) + public static void Iht8X864Add(ReadOnlySpan input, Span dest, int stride, int txType) { - int i, j; Span output = stackalloc int[8 * 8]; Span outptr = output; Span tempIn = stackalloc int[8]; @@ -88,39 +92,40 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 Transform2D ht = _iht8[txType]; // Inverse transform row vectors - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { ht.Rows(input, outptr); - input = input[8..]; - outptr = outptr[8..]; + input = input.Slice(8); + outptr = outptr.Slice(8); } // Inverse transform column vectors - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - tempIn[j] = output[j * 8 + i]; + tempIn[j] = output[(j * 8) + i]; } ht.Cols(tempIn, tempOut); - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 5)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 5)); } } } - private static readonly Transform2D[] _iht16 = { + private static readonly Transform2D[] _iht16 = + [ new(Idct16, Idct16), // DCT_DCT = 0 new(Iadst16, Idct16), // ADST_DCT = 1 new(Idct16, Iadst16), // DCT_ADST = 2 - new(Iadst16, Iadst16), // ADST_ADST = 3 - }; + new(Iadst16, Iadst16) // ADST_ADST = 3 + ]; - public static void Iht16x16256Add(ReadOnlySpan input, Span dest, int stride, int txType) + public static void Iht16X16256Add(ReadOnlySpan input, Span dest, int stride, int txType) { - int i, j; Span output = stackalloc int[16 * 16]; Span outptr = output; Span tempIn = stackalloc int[16]; @@ -128,55 +133,56 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 Transform2D ht = _iht16[txType]; // Rows - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { ht.Rows(input, outptr); - input = input[16..]; - outptr = outptr[16..]; + input = input.Slice(16); + outptr = outptr.Slice(16); } // Columns - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - tempIn[j] = output[j * 16 + i]; + tempIn[j] = output[(j * 16) + i]; } ht.Cols(tempIn, tempOut); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - dest[j * stride + i] = ClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); + dest[(j * stride) + i] = + ClipPixelAdd(dest[(j * stride) + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6)); } } } // Idct - public static void Idct4x4Add(ReadOnlySpan input, Span dest, int stride, int eob) + public static void Idct4X4Add(ReadOnlySpan input, Span dest, int stride, int eob) { if (eob > 1) { - Idct4x416Add(input, dest, stride); + Idct4X416Add(input, dest, stride); } else { - Idct4x41Add(input, dest, stride); + Idct4X41Add(input, dest, stride); } } - public static void Iwht4x4Add(ReadOnlySpan input, Span dest, int stride, int eob) + public static void Iwht4X4Add(ReadOnlySpan input, Span dest, int stride, int eob) { if (eob > 1) { - Iwht4x416Add(input, dest, stride); + Iwht4X416Add(input, dest, stride); } else { - Iwht4x41Add(input, dest, stride); + Iwht4X41Add(input, dest, stride); } } - public static void Idct8x8Add(ReadOnlySpan input, Span dest, int stride, int eob) + public static void Idct8X8Add(ReadOnlySpan input, Span dest, int stride, int eob) { // If dc is 1, then input[0] is the reconstructed value, do not need // dequantization. Also, when dc is 1, dc is counted in eobs, namely eobs >=1. @@ -186,149 +192,150 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (eob == 1) { // DC only DCT coefficient - Idct8x81Add(input, dest, stride); + Idct8X81Add(input, dest, stride); } else if (eob <= 12) { - Idct8x812Add(input, dest, stride); + Idct8X812Add(input, dest, stride); } else { - Idct8x864Add(input, dest, stride); + Idct8X864Add(input, dest, stride); } } - public static void Idct16x16Add(ReadOnlySpan input, Span dest, int stride, int eob) + public static void Idct16X16Add(ReadOnlySpan input, Span dest, int stride, int eob) { /* The calculation can be simplified if there are not many non-zero dct * coefficients. Use eobs to separate different cases. */ if (eob == 1) /* DC only DCT coefficient. */ { - Idct16x161Add(input, dest, stride); + Idct16X161Add(input, dest, stride); } else if (eob <= 10) { - Idct16x1610Add(input, dest, stride); + Idct16X1610Add(input, dest, stride); } else if (eob <= 38) { - Idct16x1638Add(input, dest, stride); + Idct16X1638Add(input, dest, stride); } else { - Idct16x16256Add(input, dest, stride); + Idct16X16256Add(input, dest, stride); } } - public static void Idct32x32Add(ReadOnlySpan input, Span dest, int stride, int eob) + public static void Idct32X32Add(ReadOnlySpan input, Span dest, int stride, int eob) { if (eob == 1) { - Idct32x321Add(input, dest, stride); + Idct32X321Add(input, dest, stride); } else if (eob <= 34) { // Non-zero coeff only in upper-left 8x8 - Idct32x3234Add(input, dest, stride); + Idct32X3234Add(input, dest, stride); } else if (eob <= 135) { // Non-zero coeff only in upper-left 16x16 - Idct32x32135Add(input, dest, stride); + Idct32X32135Add(input, dest, stride); } else { - Idct32x321024Add(input, dest, stride); + Idct32X321024Add(input, dest, stride); } } // Iht - public static void Iht4x4Add(TxType txType, ReadOnlySpan input, Span dest, int stride, int eob) + public static void Iht4X4Add(TxType txType, ReadOnlySpan input, Span dest, int stride, int eob) { if (txType == TxType.DctDct) { - Idct4x4Add(input, dest, stride, eob); + Idct4X4Add(input, dest, stride, eob); } else { - Iht4x416Add(input, dest, stride, (int)txType); + Iht4X416Add(input, dest, stride, (int)txType); } } - public static void Iht8x8Add(TxType txType, ReadOnlySpan input, Span dest, int stride, int eob) + public static void Iht8X8Add(TxType txType, ReadOnlySpan input, Span dest, int stride, int eob) { if (txType == TxType.DctDct) { - Idct8x8Add(input, dest, stride, eob); + Idct8X8Add(input, dest, stride, eob); } else { - Iht8x864Add(input, dest, stride, (int)txType); + Iht8X864Add(input, dest, stride, (int)txType); } } - public static void Iht16x16Add(TxType txType, ReadOnlySpan input, Span dest, - int stride, int eob) + public static void Iht16X16Add(TxType txType, ReadOnlySpan input, Span dest, + int stride, int eob) { if (txType == TxType.DctDct) { - Idct16x16Add(input, dest, stride, eob); + Idct16X16Add(input, dest, stride, eob); } else { - Iht16x16256Add(input, dest, stride, (int)txType); + Iht16X16256Add(input, dest, stride, (int)txType); } } - private static readonly HighbdTransform2D[] _highbdIht4 = { + private static readonly HighbdTransform2D[] _highbdIht4 = + [ new(HighbdIdct4, HighbdIdct4), // DCT_DCT = 0 new(HighbdIadst4, HighbdIdct4), // ADST_DCT = 1 new(HighbdIdct4, HighbdIadst4), // DCT_ADST = 2 - new(HighbdIadst4, HighbdIadst4), // ADST_ADST = 3 - }; + new(HighbdIadst4, HighbdIadst4) // ADST_ADST = 3 + ]; - public static void HighbdIht4x416Add(ReadOnlySpan input, Span dest, int stride, int txType, int bd) + public static void HighbdIht4X416Add(ReadOnlySpan input, Span dest, int stride, int txType, int bd) { - int i, j; Span output = stackalloc int[4 * 4]; Span outptr = output; Span tempIn = stackalloc int[4]; Span tempOut = stackalloc int[4]; // Inverse transform row vectors. - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { _highbdIht4[txType].Rows(input, outptr, bd); - input = input[4..]; - outptr = outptr[4..]; + input = input.Slice(4); + outptr = outptr.Slice(4); } // Inverse transform column vectors. - for (i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { - for (j = 0; j < 4; ++j) + for (int j = 0; j < 4; ++j) { - tempIn[j] = output[j * 4 + i]; + tempIn[j] = output[(j * 4) + i]; } _highbdIht4[txType].Cols(tempIn, tempOut, bd); - for (j = 0; j < 4; ++j) + for (int j = 0; j < 4; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 4), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 4), bd); } } } - private static readonly HighbdTransform2D[] _highIht8 = { + private static readonly HighbdTransform2D[] _highIht8 = + [ new(HighbdIdct8, HighbdIdct8), // DCT_DCT = 0 new(HighbdIadst8, HighbdIdct8), // ADST_DCT = 1 new(HighbdIdct8, HighbdIadst8), // DCT_ADST = 2 - new(HighbdIadst8, HighbdIadst8), // ADST_ADST = 3 - }; + new(HighbdIadst8, HighbdIadst8) // ADST_ADST = 3 + ]; - public static void HighbdIht8x864Add(ReadOnlySpan input, Span dest, int stride, int txType, int bd) + public static void HighbdIht8X864Add(ReadOnlySpan input, Span dest, int stride, int txType, int bd) { - int i, j; Span output = stackalloc int[8 * 8]; Span outptr = output; Span tempIn = stackalloc int[8]; @@ -336,39 +343,41 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 HighbdTransform2D ht = _highIht8[txType]; // Inverse transform row vectors. - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { ht.Rows(input, outptr, bd); - input = input[8..]; - outptr = output[8..]; + input = input.Slice(8); + outptr = output.Slice(8); } // Inverse transform column vectors. - for (i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - tempIn[j] = output[j * 8 + i]; + tempIn[j] = output[(j * 8) + i]; } ht.Cols(tempIn, tempOut, bd); - for (j = 0; j < 8; ++j) + for (int j = 0; j < 8; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 5), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 5), bd); } } } - private static readonly HighbdTransform2D[] _highIht16 = { + private static readonly HighbdTransform2D[] _highIht16 = + [ new(HighbdIdct16, HighbdIdct16), // DCT_DCT = 0 new(HighbdIadst16, HighbdIdct16), // ADST_DCT = 1 new(HighbdIdct16, HighbdIadst16), // DCT_ADST = 2 - new(HighbdIadst16, HighbdIadst16), // ADST_ADST = 3 - }; + new(HighbdIadst16, HighbdIadst16) // ADST_ADST = 3 + ]; - public static void HighbdIht16x16256Add(ReadOnlySpan input, Span dest, int stride, int txType, int bd) + public static void HighbdIht16X16256Add(ReadOnlySpan input, Span dest, int stride, int txType, + int bd) { - int i, j; Span output = stackalloc int[16 * 16]; Span outptr = output; Span tempIn = stackalloc int[16]; @@ -376,55 +385,56 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 HighbdTransform2D ht = _highIht16[txType]; // Rows - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { ht.Rows(input, outptr, bd); - input = input[16..]; - outptr = output[16..]; + input = input.Slice(16); + outptr = output.Slice(16); } // Columns - for (i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - tempIn[j] = output[j * 16 + i]; + tempIn[j] = output[(j * 16) + i]; } ht.Cols(tempIn, tempOut, bd); - for (j = 0; j < 16; ++j) + for (int j = 0; j < 16; ++j) { - dest[j * stride + i] = HighbdClipPixelAdd(dest[j * stride + i], BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); + dest[(j * stride) + i] = HighbdClipPixelAdd(dest[(j * stride) + i], + BitUtils.RoundPowerOfTwo(tempOut[j], 6), bd); } } } // Idct - public static void HighbdIdct4x4Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) + public static void HighbdIdct4X4Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) { if (eob > 1) { - HighbdIdct4x416Add(input, dest, stride, bd); + HighbdIdct4X416Add(input, dest, stride, bd); } else { - HighbdIdct4x41Add(input, dest, stride, bd); + HighbdIdct4X41Add(input, dest, stride, bd); } } - public static void HighbdIwht4x4Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) + public static void HighbdIwht4X4Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) { if (eob > 1) { - HighbdIwht4x416Add(input, dest, stride, bd); + HighbdIwht4X416Add(input, dest, stride, bd); } else { - HighbdIwht4x41Add(input, dest, stride, bd); + HighbdIwht4X41Add(input, dest, stride, bd); } } - public static void HighbdIdct8x8Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) + public static void HighbdIdct8X8Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) { // If dc is 1, then input[0] is the reconstructed value, do not need // dequantization. Also, when dc is 1, dc is counted in eobs, namely eobs >=1. @@ -434,97 +444,100 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // DC only DCT coefficient if (eob == 1) { - Vpx_Highbdidct8x8_1_add_c(input, dest, stride, bd); + VpxHighbdidct8X81AddC(input, dest, stride, bd); } else if (eob <= 12) { - HighbdIdct8x812Add(input, dest, stride, bd); + HighbdIdct8X812Add(input, dest, stride, bd); } else { - HighbdIdct8x864Add(input, dest, stride, bd); + HighbdIdct8X864Add(input, dest, stride, bd); } } - public static void HighbdIdct16x16Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) + public static void HighbdIdct16X16Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) { // The calculation can be simplified if there are not many non-zero dct // coefficients. Use eobs to separate different cases. // DC only DCT coefficient. if (eob == 1) { - HighbdIdct16x161Add(input, dest, stride, bd); + HighbdIdct16X161Add(input, dest, stride, bd); } else if (eob <= 10) { - HighbdIdct16x1610Add(input, dest, stride, bd); + HighbdIdct16X1610Add(input, dest, stride, bd); } else if (eob <= 38) { - HighbdIdct16x1638Add(input, dest, stride, bd); + HighbdIdct16X1638Add(input, dest, stride, bd); } else { - HighbdIdct16x16256Add(input, dest, stride, bd); + HighbdIdct16X16256Add(input, dest, stride, bd); } } - public static void HighbdIdct32x32Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) + public static void HighbdIdct32X32Add(ReadOnlySpan input, Span dest, int stride, int eob, int bd) { // Non-zero coeff only in upper-left 8x8 if (eob == 1) { - HighbdIdct32x321Add(input, dest, stride, bd); + HighbdIdct32X321Add(input, dest, stride, bd); } else if (eob <= 34) { - HighbdIdct32x3234Add(input, dest, stride, bd); + HighbdIdct32X3234Add(input, dest, stride, bd); } else if (eob <= 135) { - HighbdIdct32x32135Add(input, dest, stride, bd); + HighbdIdct32X32135Add(input, dest, stride, bd); } else { - HighbdIdct32x321024Add(input, dest, stride, bd); + HighbdIdct32X321024Add(input, dest, stride, bd); } } // Iht - public static void HighbdIht4x4Add(TxType txType, ReadOnlySpan input, Span dest, int stride, int eob, int bd) + public static void HighbdIht4X4Add(TxType txType, ReadOnlySpan input, Span dest, int stride, + int eob, int bd) { if (txType == TxType.DctDct) { - HighbdIdct4x4Add(input, dest, stride, eob, bd); + HighbdIdct4X4Add(input, dest, stride, eob, bd); } else { - HighbdIht4x416Add(input, dest, stride, (int)txType, bd); + HighbdIht4X416Add(input, dest, stride, (int)txType, bd); } } - public static void HighbdIht8x8Add(TxType txType, ReadOnlySpan input, Span dest, int stride, int eob, int bd) + public static void HighbdIht8X8Add(TxType txType, ReadOnlySpan input, Span dest, int stride, + int eob, int bd) { if (txType == TxType.DctDct) { - HighbdIdct8x8Add(input, dest, stride, eob, bd); + HighbdIdct8X8Add(input, dest, stride, eob, bd); } else { - HighbdIht8x864Add(input, dest, stride, (int)txType, bd); + HighbdIht8X864Add(input, dest, stride, (int)txType, bd); } } - public static void HighbdIht16x16Add(TxType txType, ReadOnlySpan input, Span dest, int stride, int eob, int bd) + public static void HighbdIht16X16Add(TxType txType, ReadOnlySpan input, Span dest, int stride, + int eob, int bd) { if (txType == TxType.DctDct) { - HighbdIdct16x16Add(input, dest, stride, eob, bd); + HighbdIdct16X16Add(input, dest, stride, eob, bd); } else { - HighbdIht16x16256Add(input, dest, stride, (int)txType, bd); + HighbdIht16X16256Add(input, dest, stride, (int)txType, bd); } } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/InternalErrorException.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/InternalErrorException.cs index d4ba0d88b..efcd9c23b 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/InternalErrorException.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/InternalErrorException.cs @@ -2,7 +2,7 @@ using System; namespace Ryujinx.Graphics.Nvdec.Vp9 { - class InternalErrorException : Exception + internal class InternalErrorException : Exception { public InternalErrorException(string message) : base(message) { @@ -12,4 +12,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/InternalErrorInfo.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/InternalErrorInfo.cs index cfec81ed1..9acfc211d 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/InternalErrorInfo.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/InternalErrorInfo.cs @@ -11,4 +11,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 throw new InternalErrorException(message); } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/LoopFilter.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/LoopFilter.cs index 9b2564d70..937a196dd 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/LoopFilter.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/LoopFilter.cs @@ -1,8 +1,12 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Dsp; using Ryujinx.Graphics.Nvdec.Vp9.Types; using System; +using System.Diagnostics; using System.Runtime.InteropServices; +using System.Threading; +using System.Threading.Tasks; namespace Ryujinx.Graphics.Nvdec.Vp9 { @@ -13,11 +17,119 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 public const int MaxRefLfDeltas = 4; public const int MaxModeLfDeltas = 2; + private struct LfSync + { + private int[] _curSbCol; + private object[] _syncObjects; + private int _syncRange; + + private static int GetSyncRange(int width) + { + // nsync numbers are picked by testing. For example, for 4k + // video, using 4 gives best performance. + if (width < 640) + { + return 1; + } + + if (width <= 1280) + { + return 2; + } + + if (width <= 4096) + { + return 4; + } + + return 8; + } + + public void Initialize(int width, int sbRows) + { + if (_curSbCol == null || _curSbCol.Length != sbRows) + { + _curSbCol = new int[sbRows]; + _syncObjects = new object[sbRows]; + + for (int i = 0; i < sbRows; i++) + { + _syncObjects[i] = new object(); + } + } + + _syncRange = GetSyncRange(width); + _curSbCol.AsSpan().Fill(-1); + } + + public void SyncRead(int r, int c) + { + if (_curSbCol == null) + { + return; + } + + int nsync = _syncRange; + + if (r != 0 && (c & (nsync - 1)) == 0) + { + object syncObject = _syncObjects[r - 1]; + lock (syncObject) + { + while (c > _curSbCol[r - 1] - nsync) + { + Monitor.Wait(syncObject); + } + } + } + } + + public void SyncWrite(int r, int c, int sbCols) + { + if (_curSbCol == null) + { + return; + } + + int nsync = _syncRange; + + int cur; + // Only signal when there are enough filtered SB for next row to run. + bool sig = true; + + if (c < sbCols - 1) + { + cur = c; + + if (c % nsync != 0) + { + sig = false; + } + } + else + { + cur = sbCols + nsync; + } + + if (sig) + { + object syncObject = _syncObjects[r]; + + lock (syncObject) + { + _curSbCol[r] = cur; + + Monitor.Pulse(syncObject); + } + } + } + } + // 64 bit masks for left transform size. Each 1 represents a position where // we should apply a loop filter across the left border of an 8x8 block // boundary. // - // In the case of TX_16X16 -> ( in low order byte first we end up with + // In the case of (int)TxSize.Tx16x16 . ( in low order byte first we end up with // a mask that looks like this // // 10101010 @@ -30,18 +142,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // 10101010 // // A loopfilter should be applied to every other 8x8 horizontally. - private static readonly ulong[] _left64X64TxformMask = { - 0xffffffffffffffffUL, // TX_4X4 - 0xffffffffffffffffUL, // TX_8x8 - 0x5555555555555555UL, // TX_16x16 - 0x1111111111111111UL, // TX_32x32 - }; + private static readonly ulong[] _left64X64TxformMask = + [ + 0xffffffffffffffffUL, // (int)TxSize.Tx4x4 + 0xffffffffffffffffUL, // (int)TxSize.Tx8x8 + 0x5555555555555555UL, // (int)TxSize.Tx16x16 + 0x1111111111111111UL // (int)TxSize.Tx32x32 + ]; // 64 bit masks for above transform size. Each 1 represents a position where // we should apply a loop filter across the top border of an 8x8 block // boundary. // - // In the case of TX_32x32 -> ( in low order byte first we end up with + // In the case of (int)TxSize.Tx32x32 . ( in low order byte first we end up with // a mask that looks like this // // 11111111 @@ -54,18 +167,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // 00000000 // // A loopfilter should be applied to every other 4 the row vertically. - private static readonly ulong[] _above64X64TxformMask = { - 0xffffffffffffffffUL, // TX_4X4 - 0xffffffffffffffffUL, // TX_8x8 - 0x00ff00ff00ff00ffUL, // TX_16x16 - 0x000000ff000000ffUL, // TX_32x32 - }; + private static readonly ulong[] _above64X64TxformMask = + [ + 0xffffffffffffffffUL, // (int)TxSize.Tx4x4 + 0xffffffffffffffffUL, // (int)TxSize.Tx8x8 + 0x00ff00ff00ff00ffUL, // (int)TxSize.Tx16x16 + 0x000000ff000000ffUL // (int)TxSize.Tx32x32 + ]; // 64 bit masks for prediction sizes (left). Each 1 represents a position // where left border of an 8x8 block. These are aligned to the right most // appropriate bit, and then shifted into place. // - // In the case of TX_16x32 -> ( low order byte first ) we end up with + // In the case of TX_16x32 . ( low order byte first ) we end up with // a mask that looks like this : // // 10000000 @@ -76,158 +190,164 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // 00000000 // 00000000 // 00000000 - private static readonly ulong[] _leftPredictionMask = { - 0x0000000000000001UL, // BLOCK_4X4, - 0x0000000000000001UL, // BLOCK_4X8, - 0x0000000000000001UL, // BLOCK_8X4, - 0x0000000000000001UL, // BLOCK_8X8, - 0x0000000000000101UL, // BLOCK_8X16, - 0x0000000000000001UL, // BLOCK_16X8, - 0x0000000000000101UL, // BLOCK_16X16, - 0x0000000001010101UL, // BLOCK_16X32, - 0x0000000000000101UL, // BLOCK_32X16, - 0x0000000001010101UL, // BLOCK_32X32, - 0x0101010101010101UL, // BLOCK_32X64, - 0x0000000001010101UL, // BLOCK_64X32, - 0x0101010101010101UL, // BLOCK_64X64 - }; + private static readonly ulong[] _leftPredictionMask = + [ + 0x0000000000000001UL, // BLOCK_4x4, + 0x0000000000000001UL, // BLOCK_4x8, + 0x0000000000000001UL, // BLOCK_8x4, + 0x0000000000000001UL, // BLOCK_8x8, + 0x0000000000000101UL, // BLOCK_8x16, + 0x0000000000000001UL, // BLOCK_16x8, + 0x0000000000000101UL, // BLOCK_16x16, + 0x0000000001010101UL, // BLOCK_16x32, + 0x0000000000000101UL, // BLOCK_32x16, + 0x0000000001010101UL, // BLOCK_32x32, + 0x0101010101010101UL, // BLOCK_32x64, + 0x0000000001010101UL, // BLOCK_64x32, + 0x0101010101010101UL // BLOCK_64x64 + ]; // 64 bit mask to shift and set for each prediction size. - private static readonly ulong[] _abovePredictionMask = { - 0x0000000000000001UL, // BLOCK_4X4 - 0x0000000000000001UL, // BLOCK_4X8 - 0x0000000000000001UL, // BLOCK_8X4 - 0x0000000000000001UL, // BLOCK_8X8 - 0x0000000000000001UL, // BLOCK_8X16, - 0x0000000000000003UL, // BLOCK_16X8 - 0x0000000000000003UL, // BLOCK_16X16 - 0x0000000000000003UL, // BLOCK_16X32, - 0x000000000000000fUL, // BLOCK_32X16, - 0x000000000000000fUL, // BLOCK_32X32, - 0x000000000000000fUL, // BLOCK_32X64, - 0x00000000000000ffUL, // BLOCK_64X32, - 0x00000000000000ffUL, // BLOCK_64X64 - }; + private static readonly ulong[] _abovePredictionMask = + [ + 0x0000000000000001UL, // BLOCK_4x4 + 0x0000000000000001UL, // BLOCK_4x8 + 0x0000000000000001UL, // BLOCK_8x4 + 0x0000000000000001UL, // BLOCK_8x8 + 0x0000000000000001UL, // BLOCK_8x16, + 0x0000000000000003UL, // BLOCK_16x8 + 0x0000000000000003UL, // BLOCK_16x16 + 0x0000000000000003UL, // BLOCK_16x32, + 0x000000000000000fUL, // BLOCK_32x16, + 0x000000000000000fUL, // BLOCK_32x32, + 0x000000000000000fUL, // BLOCK_32x64, + 0x00000000000000ffUL, // BLOCK_64x32, + 0x00000000000000ffUL // BLOCK_64x64 + ]; // 64 bit mask to shift and set for each prediction size. A bit is set for // each 8x8 block that would be in the left most block of the given block // size in the 64x64 block. - private static readonly ulong[] _sizeMask = { - 0x0000000000000001UL, // BLOCK_4X4 - 0x0000000000000001UL, // BLOCK_4X8 - 0x0000000000000001UL, // BLOCK_8X4 - 0x0000000000000001UL, // BLOCK_8X8 - 0x0000000000000101UL, // BLOCK_8X16, - 0x0000000000000003UL, // BLOCK_16X8 - 0x0000000000000303UL, // BLOCK_16X16 - 0x0000000003030303UL, // BLOCK_16X32, - 0x0000000000000f0fUL, // BLOCK_32X16, - 0x000000000f0f0f0fUL, // BLOCK_32X32, - 0x0f0f0f0f0f0f0f0fUL, // BLOCK_32X64, - 0x00000000ffffffffUL, // BLOCK_64X32, - 0xffffffffffffffffUL, // BLOCK_64X64 - }; + private static readonly ulong[] _sizeMask = + [ + 0x0000000000000001UL, // BLOCK_4x4 + 0x0000000000000001UL, // BLOCK_4x8 + 0x0000000000000001UL, // BLOCK_8x4 + 0x0000000000000001UL, // BLOCK_8x8 + 0x0000000000000101UL, // BLOCK_8x16, + 0x0000000000000003UL, // BLOCK_16x8 + 0x0000000000000303UL, // BLOCK_16x16 + 0x0000000003030303UL, // BLOCK_16x32, + 0x0000000000000f0fUL, // BLOCK_32x16, + 0x000000000f0f0f0fUL, // BLOCK_32x32, + 0x0f0f0f0f0f0f0f0fUL, // BLOCK_32x64, + 0x00000000ffffffffUL, // BLOCK_64x32, + 0xffffffffffffffffUL // BLOCK_64x64 + ]; // These are used for masking the left and above borders. -#pragma warning disable IDE0051 // Remove unused private member private const ulong LeftBorder = 0x1111111111111111UL; private const ulong AboveBorder = 0x000000ff000000ffUL; -#pragma warning restore IDE0051 // 16 bit masks for uv transform sizes. - private static readonly ushort[] _left64X64TxformMaskUv = { - 0xffff, // TX_4X4 - 0xffff, // TX_8x8 - 0x5555, // TX_16x16 - 0x1111, // TX_32x32 - }; + private static readonly ushort[] _left64X64TxformMaskUv = + [ + 0xffff, // (int)TxSize.Tx4x4 + 0xffff, // (int)TxSize.Tx8x8 + 0x5555, // (int)TxSize.Tx16x16 + 0x1111 // (int)TxSize.Tx32x32 + ]; - private static readonly ushort[] _above64X64TxformMaskUv = { - 0xffff, // TX_4X4 - 0xffff, // TX_8x8 - 0x0f0f, // TX_16x16 - 0x000f, // TX_32x32 - }; + private static readonly ushort[] _above64X64TxformMaskUv = + [ + 0xffff, // (int)TxSize.Tx4x4 + 0xffff, // (int)TxSize.Tx8x8 + 0x0f0f, // (int)TxSize.Tx16x16 + 0x000f // (int)TxSize.Tx32x32 + ]; // 16 bit left mask to shift and set for each uv prediction size. - private static readonly ushort[] _leftPredictionMaskUv = { - 0x0001, // BLOCK_4X4, - 0x0001, // BLOCK_4X8, - 0x0001, // BLOCK_8X4, - 0x0001, // BLOCK_8X8, - 0x0001, // BLOCK_8X16, - 0x0001, // BLOCK_16X8, - 0x0001, // BLOCK_16X16, - 0x0011, // BLOCK_16X32, - 0x0001, // BLOCK_32X16, - 0x0011, // BLOCK_32X32, - 0x1111, // BLOCK_32X64 - 0x0011, // BLOCK_64X32, - 0x1111, // BLOCK_64X64 - }; + private static readonly ushort[] _leftPredictionMaskUv = + [ + 0x0001, // BLOCK_4x4, + 0x0001, // BLOCK_4x8, + 0x0001, // BLOCK_8x4, + 0x0001, // BLOCK_8x8, + 0x0001, // BLOCK_8x16, + 0x0001, // BLOCK_16x8, + 0x0001, // BLOCK_16x16, + 0x0011, // BLOCK_16x32, + 0x0001, // BLOCK_32x16, + 0x0011, // BLOCK_32x32, + 0x1111, // BLOCK_32x64 + 0x0011, // BLOCK_64x32, + 0x1111 // BLOCK_64x64 + ]; // 16 bit above mask to shift and set for uv each prediction size. - private static readonly ushort[] _abovePredictionMaskUv = { - 0x0001, // BLOCK_4X4 - 0x0001, // BLOCK_4X8 - 0x0001, // BLOCK_8X4 - 0x0001, // BLOCK_8X8 - 0x0001, // BLOCK_8X16, - 0x0001, // BLOCK_16X8 - 0x0001, // BLOCK_16X16 - 0x0001, // BLOCK_16X32, - 0x0003, // BLOCK_32X16, - 0x0003, // BLOCK_32X32, - 0x0003, // BLOCK_32X64, - 0x000f, // BLOCK_64X32, - 0x000f, // BLOCK_64X64 - }; + private static readonly ushort[] _abovePredictionMaskUv = + [ + 0x0001, // BLOCK_4x4 + 0x0001, // BLOCK_4x8 + 0x0001, // BLOCK_8x4 + 0x0001, // BLOCK_8x8 + 0x0001, // BLOCK_8x16, + 0x0001, // BLOCK_16x8 + 0x0001, // BLOCK_16x16 + 0x0001, // BLOCK_16x32, + 0x0003, // BLOCK_32x16, + 0x0003, // BLOCK_32x32, + 0x0003, // BLOCK_32x64, + 0x000f, // BLOCK_64x32, + 0x000f // BLOCK_64x64 + ]; // 64 bit mask to shift and set for each uv prediction size - private static readonly ushort[] _sizeMaskUv = { - 0x0001, // BLOCK_4X4 - 0x0001, // BLOCK_4X8 - 0x0001, // BLOCK_8X4 - 0x0001, // BLOCK_8X8 - 0x0001, // BLOCK_8X16, - 0x0001, // BLOCK_16X8 - 0x0001, // BLOCK_16X16 - 0x0011, // BLOCK_16X32, - 0x0003, // BLOCK_32X16, - 0x0033, // BLOCK_32X32, - 0x3333, // BLOCK_32X64, - 0x00ff, // BLOCK_64X32, - 0xffff, // BLOCK_64X64 - }; + private static readonly ushort[] _sizeMaskUv = + [ + 0x0001, // BLOCK_4x4 + 0x0001, // BLOCK_4x8 + 0x0001, // BLOCK_8x4 + 0x0001, // BLOCK_8x8 + 0x0001, // BLOCK_8x16, + 0x0001, // BLOCK_16x8 + 0x0001, // BLOCK_16x16 + 0x0011, // BLOCK_16x32, + 0x0003, // BLOCK_32x16, + 0x0033, // BLOCK_32x32, + 0x3333, // BLOCK_32x64, + 0x00ff, // BLOCK_64x32, + 0xffff // BLOCK_64x64 + ]; -#pragma warning disable IDE0051 // Remove unused private member private const ushort LeftBorderUv = 0x1111; private const ushort AboveBorderUv = 0x000f; -#pragma warning restore IDE0051 - private static readonly int[] _modeLfLut = { + private static readonly int[] _modeLfLut = + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // INTRA_MODES - 1, 1, 0, 1, // INTER_MODES (ZEROMV == 0) - }; + 1, 1, 0, 1 // INTER_MODES (ZEROMV == 0) + ]; private static byte GetFilterLevel(ref LoopFilterInfoN lfiN, ref ModeInfo mi) { return lfiN.Lvl[mi.SegmentId][mi.RefFrame[0]][_modeLfLut[(int)mi.Mode]]; } - private static ref LoopFilterMask GetLfm(ref Types.LoopFilter lf, int miRow, int miCol) + private static Span GetLfm(ref Types.LoopFilter lf, int miRow, int miCol) { - return ref lf.Lfm[(miCol >> 3) + ((miRow >> 3) * lf.LfmStride)]; + return lf.Lfm.AsSpan().Slice((miCol >> 3) + ((miRow >> 3) * lf.LfmStride)); } // 8x8 blocks in a superblock. A "1" represents the first block in a 16x16 // or greater area. - private static readonly byte[][] _firstBlockIn16X16 = { - new byte[] { 1, 0, 1, 0, 1, 0, 1, 0 }, new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 }, - new byte[] { 1, 0, 1, 0, 1, 0, 1, 0 }, new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 }, - new byte[] { 1, 0, 1, 0, 1, 0, 1, 0 }, new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 }, - new byte[] { 1, 0, 1, 0, 1, 0, 1, 0 }, new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 }, - }; + private static readonly byte[][] _firstBlockIn16X16 = + [ + [1, 0, 1, 0, 1, 0, 1, 0], [0, 0, 0, 0, 0, 0, 0, 0], + [1, 0, 1, 0, 1, 0, 1, 0], [0, 0, 0, 0, 0, 0, 0, 0], + [1, 0, 1, 0, 1, 0, 1, 0], [0, 0, 0, 0, 0, 0, 0, 0], + [1, 0, 1, 0, 1, 0, 1, 0], [0, 0, 0, 0, 0, 0, 0, 0] + ]; // This function sets up the bit masks for a block represented // by miRow, miCol in a 64x64 region. @@ -238,15 +358,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 ref LoopFilterInfoN lfiN = ref cm.LfInfo; int filterLevel = GetFilterLevel(ref lfiN, ref mi); TxSize txSizeUv = Luts.UvTxsizeLookup[(int)blockSize][(int)txSizeY][1][1]; - ref LoopFilterMask lfm = ref GetLfm(ref cm.Lf, miRow, miCol); + ref LoopFilterMask lfm = ref GetLfm(ref cm.Lf, miRow, miCol)[0]; ref ulong leftY = ref lfm.LeftY[(int)txSizeY]; ref ulong aboveY = ref lfm.AboveY[(int)txSizeY]; - ref ulong int4X4Y = ref lfm.Int4x4Y; + ref ulong int4X4Y = ref lfm.Int4X4Y; ref ushort leftUv = ref lfm.LeftUv[(int)txSizeUv]; ref ushort aboveUv = ref lfm.AboveUv[(int)txSizeUv]; - ref ushort int4X4Uv = ref lfm.Int4x4Uv; - int rowInSb = (miRow & 7); - int colInSb = (miCol & 7); + ref ushort int4X4Uv = ref lfm.Int4X4Uv; + int rowInSb = miRow & 7; + int colInSb = miCol & 7; int shiftY = colInSb + (rowInSb << 3); int shiftUv = (colInSb >> 1) + ((rowInSb >> 1) << 2); int buildUv = _firstBlockIn16X16[rowInSb][colInSb]; @@ -257,10 +377,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } int index = shiftY; - int i; - for (i = 0; i < bh; i++) + + for (int i = 0; i < bh; i++) { - MemoryMarshal.CreateSpan(ref lfm.LflY[index], 64 - index)[..bw].Fill((byte)filterLevel); + MemoryMarshal.CreateSpan(ref lfm.LflY[index], 64 - index).Slice(0, bw).Fill((byte)filterLevel); index += 8; } @@ -307,22 +427,156 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // Try to determine what to do with the internal 4x4 block boundaries. These // differ from the 4x4 boundaries on the outside edge of an 8x8 in that the // internal ones can be skipped and don't depend on the prediction block size. - if (txSizeY == TxSize.Tx4x4) + if (txSizeY == TxSize.Tx4X4) { int4X4Y |= _sizeMask[(int)blockSize] << shiftY; } - if (buildUv != 0 && txSizeUv == TxSize.Tx4x4) + if (buildUv != 0 && txSizeUv == TxSize.Tx4X4) { int4X4Uv |= (ushort)((_sizeMaskUv[(int)blockSize] & 0xffff) << shiftUv); } } + private static void AdjustMask(ref Vp9Common cm, int miRow, int miCol, ref LoopFilterMask lfm) + { + const ulong LeftBorder = 0x1111111111111111UL; + const ulong AboveBorder = 0x000000ff000000ffUL; + const ushort LeftBorderUv = 0x1111; + const ushort AboveBorderUv = 0x000f; + + + // The largest loopfilter we have is 16x16 so we use the 16x16 mask + // for 32x32 transforms also. + lfm.LeftY[(int)TxSize.Tx16X16] |= lfm.LeftY[(int)TxSize.Tx32X32]; + lfm.AboveY[(int)TxSize.Tx16X16] |= lfm.AboveY[(int)TxSize.Tx32X32]; + lfm.LeftUv[(int)TxSize.Tx16X16] |= lfm.LeftUv[(int)TxSize.Tx32X32]; + lfm.AboveUv[(int)TxSize.Tx16X16] |= lfm.AboveUv[(int)TxSize.Tx32X32]; + + // We do at least 8 tap filter on every 32x32 even if the transform size + // is 4x4. So if the 4x4 is set on a border pixel add it to the 8x8 and + // remove it from the 4x4. + lfm.LeftY[(int)TxSize.Tx8X8] |= lfm.LeftY[(int)TxSize.Tx4X4] & LeftBorder; + lfm.LeftY[(int)TxSize.Tx4X4] &= ~LeftBorder; + lfm.AboveY[(int)TxSize.Tx8X8] |= lfm.AboveY[(int)TxSize.Tx4X4] & AboveBorder; + lfm.AboveY[(int)TxSize.Tx4X4] &= ~AboveBorder; + lfm.LeftUv[(int)TxSize.Tx8X8] |= (ushort)(lfm.LeftUv[(int)TxSize.Tx4X4] & LeftBorderUv); + lfm.LeftUv[(int)TxSize.Tx4X4] &= unchecked((ushort)~LeftBorderUv); + lfm.AboveUv[(int)TxSize.Tx8X8] |= (ushort)(lfm.AboveUv[(int)TxSize.Tx4X4] & AboveBorderUv); + lfm.AboveUv[(int)TxSize.Tx4X4] &= unchecked((ushort)~AboveBorderUv); + + // We do some special edge handling. + if (miRow + Constants.MiBlockSize > cm.MiRows) + { + int rows = cm.MiRows - miRow; + + // Each pixel inside the border gets a 1, + ulong maskY = (1UL << (rows << 3)) - 1; + ushort maskUv = (ushort)((1 << (((rows + 1) >> 1) << 2)) - 1); + + // Remove values completely outside our border. + for (int i = 0; i < (int)TxSize.Tx32X32; i++) + { + lfm.LeftY[i] &= maskY; + lfm.AboveY[i] &= maskY; + lfm.LeftUv[i] &= maskUv; + lfm.AboveUv[i] &= maskUv; + } + + lfm.Int4X4Y &= maskY; + lfm.Int4X4Uv &= maskUv; + + // We don't apply a wide loop filter on the last uv block row. If set + // apply the shorter one instead. + if (rows == 1) + { + lfm.AboveUv[(int)TxSize.Tx8X8] |= lfm.AboveUv[(int)TxSize.Tx16X16]; + lfm.AboveUv[(int)TxSize.Tx16X16] = 0; + } + + if (rows == 5) + { + lfm.AboveUv[(int)TxSize.Tx8X8] |= (ushort)(lfm.AboveUv[(int)TxSize.Tx16X16] & 0xff00); + lfm.AboveUv[(int)TxSize.Tx16X16] &= (ushort)~(lfm.AboveUv[(int)TxSize.Tx16X16] & 0xff00); + } + } + + if (miCol + Constants.MiBlockSize > cm.MiCols) + { + int columns = cm.MiCols - miCol; + + // Each pixel inside the border gets a 1, the multiply copies the border + // to where we need it. + ulong maskY = ((1UL << columns) - 1) * 0x0101010101010101UL; + ushort maskUv = (ushort)(((1 << ((columns + 1) >> 1)) - 1) * 0x1111); + + // Internal edges are not applied on the last column of the image so + // we mask 1 more for the internal edges + ushort maskUvInt = (ushort)(((1 << (columns >> 1)) - 1) * 0x1111); + + // Remove the bits outside the image edge. + for (int i = 0; i < (int)TxSize.Tx32X32; i++) + { + lfm.LeftY[i] &= maskY; + lfm.AboveY[i] &= maskY; + lfm.LeftUv[i] &= maskUv; + lfm.AboveUv[i] &= maskUv; + } + + lfm.Int4X4Y &= maskY; + lfm.Int4X4Uv &= maskUvInt; + + // We don't apply a wide loop filter on the last uv column. If set + // apply the shorter one instead. + if (columns == 1) + { + lfm.LeftUv[(int)TxSize.Tx8X8] |= lfm.LeftUv[(int)TxSize.Tx16X16]; + lfm.LeftUv[(int)TxSize.Tx16X16] = 0; + } + + if (columns == 5) + { + lfm.LeftUv[(int)TxSize.Tx8X8] |= (ushort)(lfm.LeftUv[(int)TxSize.Tx16X16] & 0xcccc); + lfm.LeftUv[(int)TxSize.Tx16X16] &= (ushort)~(lfm.LeftUv[(int)TxSize.Tx16X16] & 0xcccc); + } + } + + // We don't apply a loop filter on the first column in the image, mask that + // out. + if (miCol == 0) + { + for (int i = 0; i < (int)TxSize.Tx32X32; i++) + { + lfm.LeftY[i] &= 0xfefefefefefefefeUL; + lfm.LeftUv[i] &= 0xeeee; + } + } + + // Assert if we try to apply 2 different loop filters at the same position. + Debug.Assert((lfm.LeftY[(int)TxSize.Tx16X16] & lfm.LeftY[(int)TxSize.Tx8X8]) == 0); + Debug.Assert((lfm.LeftY[(int)TxSize.Tx16X16] & lfm.LeftY[(int)TxSize.Tx4X4]) == 0); + Debug.Assert((lfm.LeftY[(int)TxSize.Tx8X8] & lfm.LeftY[(int)TxSize.Tx4X4]) == 0); + Debug.Assert((lfm.Int4X4Y & lfm.LeftY[(int)TxSize.Tx16X16]) == 0); + Debug.Assert((lfm.LeftUv[(int)TxSize.Tx16X16] & lfm.LeftUv[(int)TxSize.Tx8X8]) == 0); + Debug.Assert((lfm.LeftUv[(int)TxSize.Tx16X16] & lfm.LeftUv[(int)TxSize.Tx4X4]) == 0); + Debug.Assert((lfm.LeftUv[(int)TxSize.Tx8X8] & lfm.LeftUv[(int)TxSize.Tx4X4]) == 0); + Debug.Assert((lfm.Int4X4Uv & lfm.LeftUv[(int)TxSize.Tx16X16]) == 0); + Debug.Assert((lfm.AboveY[(int)TxSize.Tx16X16] & lfm.AboveY[(int)TxSize.Tx8X8]) == 0); + Debug.Assert((lfm.AboveY[(int)TxSize.Tx16X16] & lfm.AboveY[(int)TxSize.Tx4X4]) == 0); + Debug.Assert((lfm.AboveY[(int)TxSize.Tx8X8] & lfm.AboveY[(int)TxSize.Tx4X4]) == 0); + Debug.Assert((lfm.Int4X4Y & lfm.AboveY[(int)TxSize.Tx16X16]) == 0); + Debug.Assert((lfm.AboveUv[(int)TxSize.Tx16X16] & lfm.AboveUv[(int)TxSize.Tx8X8]) == 0); + Debug.Assert((lfm.AboveUv[(int)TxSize.Tx16X16] & lfm.AboveUv[(int)TxSize.Tx4X4]) == 0); + Debug.Assert((lfm.AboveUv[(int)TxSize.Tx8X8] & lfm.AboveUv[(int)TxSize.Tx4X4]) == 0); + Debug.Assert((lfm.Int4X4Uv & lfm.AboveUv[(int)TxSize.Tx16X16]) == 0); + } + public static unsafe void ResetLfm(ref Vp9Common cm) { if (cm.Lf.FilterLevel != 0) { - MemoryUtil.Fill(cm.Lf.Lfm.ToPointer(), new LoopFilterMask(), ((cm.MiRows + (Constants.MiBlockSize - 1)) >> 3) * cm.Lf.LfmStride); + MemoryUtil.Fill(cm.Lf.Lfm.ToPointer(), new LoopFilterMask(), + ((cm.MiRows + (Constants.MiBlockSize - 1)) >> 3) * cm.Lf.LfmStride); } } @@ -338,9 +592,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (sharpnessLvl > 0) { - if (blockInsideLimit > (9 - sharpnessLvl)) + if (blockInsideLimit > 9 - sharpnessLvl) { - blockInsideLimit = (9 - sharpnessLvl); + blockInsideLimit = 9 - sharpnessLvl; } } @@ -350,7 +604,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } lfi.Lfthr[lvl].Lim.AsSpan().Fill((byte)blockInsideLimit); - lfi.Lfthr[lvl].Mblim.AsSpan().Fill((byte)(2 * (lvl + 2) + blockInsideLimit)); + lfi.Lfthr[lvl].Mblim.AsSpan().Fill((byte)((2 * (lvl + 2)) + blockInsideLimit)); } } @@ -375,10 +629,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 for (segId = 0; segId < Constants.MaxSegments; segId++) { int lvlSeg = defaultFiltLvl; - if (seg.IsSegFeatureActive(segId, SegLvlFeatures.SegLvlAltLf) != 0) + if (seg.IsSegFeatureActive(segId, SegLvlFeatures.AltLf) != 0) { - int data = seg.GetSegData(segId, SegLvlFeatures.SegLvlAltLf); - lvlSeg = Math.Clamp(seg.AbsDelta == Constants.SegmentAbsData ? data : defaultFiltLvl + data, 0, MaxLoopFilter); + int data = seg.GetSegData(segId, SegLvlFeatures.AltLf); + lvlSeg = Math.Clamp(seg.AbsDelta == Constants.SegmentAbsData ? data : defaultFiltLvl + data, 0, + MaxLoopFilter); } if (!lf.ModeRefDeltaEnabled) @@ -390,19 +645,1322 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 else { int refr, mode; - int intraLvl = lvlSeg + lf.RefDeltas[Constants.IntraFrame] * scale; + int intraLvl = lvlSeg + (lf.RefDeltas[Constants.IntraFrame] * scale); lfi.Lvl[segId][Constants.IntraFrame][0] = (byte)Math.Clamp(intraLvl, 0, MaxLoopFilter); for (refr = Constants.LastFrame; refr < Constants.MaxRefFrames; ++refr) { for (mode = 0; mode < MaxModeLfDeltas; ++mode) { - int interLvl = lvlSeg + lf.RefDeltas[refr] * scale + lf.ModeDeltas[mode] * scale; + int interLvl = lvlSeg + (lf.RefDeltas[refr] * scale) + (lf.ModeDeltas[mode] * scale); lfi.Lvl[segId][refr][mode] = (byte)Math.Clamp(interLvl, 0, MaxLoopFilter); } } } } } + + private static void FilterSelectivelyVertRow2( + int subsamplingFactor, + ArrayPtr s, + int pitch, + uint mask16X16, + uint mask8X8, + uint mask4X4, + uint mask4X4Int, + ReadOnlySpan lfthr, + ReadOnlySpan lfl) + { + uint dualMaskCutoff = subsamplingFactor != 0 ? 0xffu : 0xffffu; + int lflForward = subsamplingFactor != 0 ? 4 : 8; + uint dualOne = 1u | (1u << lflForward); + Span> ss = stackalloc ArrayPtr[2]; + Span lfis = stackalloc LoopFilterThresh[2]; + ss[0] = s; + + for (uint mask = (mask16X16 | mask8X8 | mask4X4 | mask4X4Int) & dualMaskCutoff; + mask != 0; + mask = (mask & ~dualOne) >> 1) + { + if ((mask & dualOne) != 0) + { + lfis[0] = lfthr[lfl[0]]; + lfis[1] = lfthr[lfl[lflForward]]; + ss[1] = ss[0].Slice(8 * pitch); + + if ((mask16X16 & dualOne) != 0) + { + if ((mask16X16 & dualOne) == dualOne) + { + LoopFilterAuto.LpfVertical16Dual(ss[0], pitch, lfis[0].Mblim.AsSpan(), lfis[0].Lim.AsSpan(), + lfis[0].HevThr.AsSpan()); + } + else + { + ref LoopFilterThresh lfi = ref lfis[(mask16X16 & 1) == 0 ? 1 : 0]; + LoopFilterAuto.LpfVertical16(ss[(mask16X16 & 1) == 0 ? 1 : 0], pitch, lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), lfi.HevThr.AsSpan()); + } + } + + if ((mask8X8 & dualOne) != 0) + { + if ((mask8X8 & dualOne) == dualOne) + { + LoopFilterAuto.LpfVertical8Dual( + ss[0], + pitch, + lfis[0].Mblim.AsSpan(), + lfis[0].Lim.AsSpan(), + lfis[0].HevThr.AsSpan(), + lfis[1].Mblim.AsSpan(), + lfis[1].Lim.AsSpan(), + lfis[1].HevThr.AsSpan()); + } + else + { + ref LoopFilterThresh lfi = ref lfis[(mask8X8 & 1) == 0 ? 1 : 0]; + LoopFilterAuto.LpfVertical8( + ss[(mask8X8 & 1) == 0 ? 1 : 0], + pitch, + lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + } + } + + if ((mask4X4 & dualOne) != 0) + { + if ((mask4X4 & dualOne) == dualOne) + { + LoopFilterAuto.LpfVertical4Dual( + ss[0], + pitch, + lfis[0].Mblim.AsSpan(), + lfis[0].Lim.AsSpan(), + lfis[0].HevThr.AsSpan(), + lfis[1].Mblim.AsSpan(), + lfis[1].Lim.AsSpan(), + lfis[1].HevThr.AsSpan()); + } + else + { + ref LoopFilterThresh lfi = ref lfis[(mask4X4 & 1) == 0 ? 1 : 0]; + LoopFilterAuto.LpfVertical4(ss[(mask4X4 & 1) == 0 ? 1 : 0], pitch, lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), lfi.HevThr.AsSpan()); + } + } + + if ((mask4X4Int & dualOne) != 0) + { + if ((mask4X4Int & dualOne) == dualOne) + { + LoopFilterAuto.LpfVertical4Dual( + ss[0].Slice(4), + pitch, + lfis[0].Mblim.AsSpan(), + lfis[0].Lim.AsSpan(), + lfis[0].HevThr.AsSpan(), + lfis[1].Mblim.AsSpan(), + lfis[1].Lim.AsSpan(), + lfis[1].HevThr.AsSpan()); + } + else + { + ref LoopFilterThresh lfi = ref lfis[(mask4X4Int & 1) == 0 ? 1 : 0]; + LoopFilterAuto.LpfVertical4(ss[(mask4X4Int & 1) == 0 ? 1 : 0].Slice(4), pitch, + lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), lfi.HevThr.AsSpan()); + } + } + } + + ss[0] = ss[0].Slice(8); + lfl = lfl.Slice(1); + mask16X16 >>= 1; + mask8X8 >>= 1; + mask4X4 >>= 1; + mask4X4Int >>= 1; + } + } + + private static void HighbdFilterSelectivelyVertRow2( + int subsamplingFactor, + ArrayPtr s, + int pitch, + uint mask16X16, + uint mask8X8, + uint mask4X4, + uint mask4X4Int, + ReadOnlySpan lfthr, + ReadOnlySpan lfl, + int bd) + { + uint dualMaskCutoff = subsamplingFactor != 0 ? 0xffu : 0xffffu; + int lflForward = subsamplingFactor != 0 ? 4 : 8; + uint dualOne = 1u | (1u << lflForward); + Span> ss = stackalloc ArrayPtr[2]; + Span lfis = stackalloc LoopFilterThresh[2]; + ss[0] = s; + + for (uint mask = (mask16X16 | mask8X8 | mask4X4 | mask4X4Int) & dualMaskCutoff; + mask != 0; + mask = (mask & ~dualOne) >> 1) + { + if ((mask & dualOne) != 0) + { + lfis[0] = lfthr[lfl[0]]; + lfis[1] = lfthr[lfl[lflForward]]; + ss[1] = ss[0].Slice(8 * pitch); + + if ((mask16X16 & dualOne) != 0) + { + if ((mask16X16 & dualOne) == dualOne) + { + LoopFilterScalar.HighBdLpfVertical16Dual(ss[0], pitch, lfis[0].Mblim[0], lfis[0].Lim[0], + lfis[0].HevThr[0], bd); + } + else + { + ref LoopFilterThresh lfi = ref lfis[(mask16X16 & 1) == 0 ? 1 : 0]; + LoopFilterScalar.HighBdLpfVertical16(ss[(mask16X16 & 1) == 0 ? 1 : 0], pitch, lfi.Mblim[0], + lfi.Lim[0], lfi.HevThr[0], bd); + } + } + + if ((mask8X8 & dualOne) != 0) + { + if ((mask8X8 & dualOne) == dualOne) + { + LoopFilterScalar.HighBdLpfVertical8Dual( + ss[0], + pitch, + lfis[0].Mblim[0], + lfis[0].Lim[0], + lfis[0].HevThr[0], + lfis[1].Mblim[0], + lfis[1].Lim[0], + lfis[1].HevThr[0], + bd); + } + else + { + ref LoopFilterThresh lfi = ref lfis[(mask8X8 & 1) == 0 ? 1 : 0]; + LoopFilterScalar.HighBdLpfVertical8( + ss[(mask8X8 & 1) == 0 ? 1 : 0], + pitch, + lfi.Mblim[0], + lfi.Lim[0], + lfi.HevThr[0], + bd); + } + } + + if ((mask4X4 & dualOne) != 0) + { + if ((mask4X4 & dualOne) == dualOne) + { + LoopFilterScalar.HighBdLpfVertical4Dual( + ss[0], + pitch, + lfis[0].Mblim[0], + lfis[0].Lim[0], + lfis[0].HevThr[0], + lfis[1].Mblim[0], + lfis[1].Lim[0], + lfis[1].HevThr[0], + bd); + } + else + { + ref LoopFilterThresh lfi = ref lfis[(mask4X4 & 1) == 0 ? 1 : 0]; + LoopFilterScalar.HighBdLpfVertical4(ss[(mask4X4 & 1) == 0 ? 1 : 0], pitch, lfi.Mblim[0], + lfi.Lim[0], lfi.HevThr[0], bd); + } + } + + if ((mask4X4Int & dualOne) != 0) + { + if ((mask4X4Int & dualOne) == dualOne) + { + LoopFilterScalar.HighBdLpfVertical4Dual( + ss[0].Slice(4), + pitch, + lfis[0].Mblim[0], + lfis[0].Lim[0], + lfis[0].HevThr[0], + lfis[1].Mblim[0], + lfis[1].Lim[0], + lfis[1].HevThr[0], + bd); + } + else + { + ref LoopFilterThresh lfi = ref lfis[(mask4X4Int & 1) == 0 ? 1 : 0]; + LoopFilterScalar.HighBdLpfVertical4(ss[(mask4X4Int & 1) == 0 ? 1 : 0].Slice(4), pitch, + lfi.Mblim[0], lfi.Lim[0], lfi.HevThr[0], bd); + } + } + } + + ss[0] = ss[0].Slice(8); + lfl = lfl.Slice(1); + mask16X16 >>= 1; + mask8X8 >>= 1; + mask4X4 >>= 1; + mask4X4Int >>= 1; + } + } + + private static void FilterSelectivelyHoriz( + ArrayPtr s, + int pitch, + uint mask16X16, + uint mask8X8, + uint mask4X4, + uint mask4X4Int, + ReadOnlySpan lfthr, + ReadOnlySpan lfl) + { + int count; + + for (uint mask = mask16X16 | mask8X8 | mask4X4 | mask4X4Int; mask != 0; mask >>= count) + { + count = 1; + if ((mask & 1) != 0) + { + LoopFilterThresh lfi = lfthr[lfl[0]]; + + if ((mask16X16 & 1) != 0) + { + if ((mask16X16 & 3) == 3) + { + LoopFilterAuto.LpfHorizontal16Dual(s, pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + count = 2; + } + else + { + LoopFilterAuto.LpfHorizontal16(s, pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + } + } + else if ((mask8X8 & 1) != 0) + { + if ((mask8X8 & 3) == 3) + { + // Next block's thresholds. + LoopFilterThresh lfin = lfthr[lfl[1]]; + + LoopFilterAuto.LpfHorizontal8Dual( + s, + pitch, + lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan(), + lfin.Mblim.AsSpan(), + lfin.Lim.AsSpan(), + lfin.HevThr.AsSpan()); + + if ((mask4X4Int & 3) == 3) + { + LoopFilterAuto.LpfHorizontal4Dual( + s.Slice(4 * pitch), + pitch, + lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan(), + lfin.Mblim.AsSpan(), + lfin.Lim.AsSpan(), + lfin.HevThr.AsSpan()); + } + else if ((mask4X4Int & 1) != 0) + { + LoopFilterAuto.LpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), lfi.HevThr.AsSpan()); + } + else if ((mask4X4Int & 2) != 0) + { + LoopFilterAuto.LpfHorizontal4(s.Slice(8 + (4 * pitch)), pitch, lfin.Mblim.AsSpan(), + lfin.Lim.AsSpan(), lfin.HevThr.AsSpan()); + } + + count = 2; + } + else + { + LoopFilterAuto.LpfHorizontal8(s, pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + + if ((mask4X4Int & 1) != 0) + { + LoopFilterAuto.LpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), lfi.HevThr.AsSpan()); + } + } + } + else if ((mask4X4 & 1) != 0) + { + if ((mask4X4 & 3) == 3) + { + // Next block's thresholds. + LoopFilterThresh lfin = lfthr[lfl[1]]; + + LoopFilterAuto.LpfHorizontal4Dual( + s, + pitch, + lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan(), + lfin.Mblim.AsSpan(), + lfin.Lim.AsSpan(), + lfin.HevThr.AsSpan()); + + if ((mask4X4Int & 3) == 3) + { + LoopFilterAuto.LpfHorizontal4Dual( + s.Slice(4 * pitch), + pitch, + lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan(), + lfin.Mblim.AsSpan(), + lfin.Lim.AsSpan(), + lfin.HevThr.AsSpan()); + } + else if ((mask4X4Int & 1) != 0) + { + LoopFilterAuto.LpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), lfi.HevThr.AsSpan()); + } + else if ((mask4X4Int & 2) != 0) + { + LoopFilterAuto.LpfHorizontal4(s.Slice(8 + (4 * pitch)), pitch, lfin.Mblim.AsSpan(), + lfin.Lim.AsSpan(), lfin.HevThr.AsSpan()); + } + + count = 2; + } + else + { + LoopFilterAuto.LpfHorizontal4(s, pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + + if ((mask4X4Int & 1) != 0) + { + LoopFilterAuto.LpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim.AsSpan(), + lfi.Lim.AsSpan(), lfi.HevThr.AsSpan()); + } + } + } + else + { + LoopFilterAuto.LpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + } + } + + s = s.Slice(8 * count); + lfl = lfl.Slice(count); + mask16X16 >>= count; + mask8X8 >>= count; + mask4X4 >>= count; + mask4X4Int >>= count; + } + } + + private static void HighbdFilterSelectivelyHoriz( + ArrayPtr s, + int pitch, + uint mask16X16, + uint mask8X8, + uint mask4X4, + uint mask4X4Int, + ReadOnlySpan lfthr, + ReadOnlySpan lfl, + int bd) + { + int count; + + for (uint mask = mask16X16 | mask8X8 | mask4X4 | mask4X4Int; mask != 0; mask >>= count) + { + count = 1; + if ((mask & 1) != 0) + { + LoopFilterThresh lfi = lfthr[lfl[0]]; + + if ((mask16X16 & 1) != 0) + { + if ((mask16X16 & 3) == 3) + { + LoopFilterScalar.HighBdLpfHorizontal16Dual(s, pitch, lfi.Mblim[0], lfi.Lim[0], + lfi.HevThr[0], bd); + count = 2; + } + else + { + LoopFilterScalar.HighBdLpfHorizontal16(s, pitch, lfi.Mblim[0], lfi.Lim[0], lfi.HevThr[0], + bd); + } + } + else if ((mask8X8 & 1) != 0) + { + if ((mask8X8 & 3) == 3) + { + // Next block's thresholds. + LoopFilterThresh lfin = lfthr[lfl[1]]; + + LoopFilterScalar.HighBdLpfHorizontal8Dual( + s, + pitch, + lfi.Mblim[0], + lfi.Lim[0], + lfi.HevThr[0], + lfin.Mblim[0], + lfin.Lim[0], + lfin.HevThr[0], + bd); + + if ((mask4X4Int & 3) == 3) + { + LoopFilterScalar.HighBdLpfHorizontal4Dual( + s.Slice(4 * pitch), + pitch, + lfi.Mblim[0], + lfi.Lim[0], + lfi.HevThr[0], + lfin.Mblim[0], + lfin.Lim[0], + lfin.HevThr[0], + bd); + } + else if ((mask4X4Int & 1) != 0) + { + LoopFilterScalar.HighBdLpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim[0], + lfi.Lim[0], lfi.HevThr[0], bd); + } + else if ((mask4X4Int & 2) != 0) + { + LoopFilterScalar.HighBdLpfHorizontal4(s.Slice(8 + (4 * pitch)), pitch, lfin.Mblim[0], + lfin.Lim[0], lfin.HevThr[0], bd); + } + + count = 2; + } + else + { + LoopFilterScalar.HighBdLpfHorizontal8(s, pitch, lfi.Mblim[0], lfi.Lim[0], lfi.HevThr[0], + bd); + + if ((mask4X4Int & 1) != 0) + { + LoopFilterScalar.HighBdLpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim[0], + lfi.Lim[0], lfi.HevThr[0], bd); + } + } + } + else if ((mask4X4 & 1) != 0) + { + if ((mask4X4 & 3) == 3) + { + // Next block's thresholds. + LoopFilterThresh lfin = lfthr[lfl[1]]; + + LoopFilterScalar.HighBdLpfHorizontal4Dual( + s, + pitch, + lfi.Mblim[0], + lfi.Lim[0], + lfi.HevThr[0], + lfin.Mblim[0], + lfin.Lim[0], + lfin.HevThr[0], + bd); + + if ((mask4X4Int & 3) == 3) + { + LoopFilterScalar.HighBdLpfHorizontal4Dual( + s.Slice(4 * pitch), + pitch, + lfi.Mblim[0], + lfi.Lim[0], + lfi.HevThr[0], + lfin.Mblim[0], + lfin.Lim[0], + lfin.HevThr[0], + bd); + } + else if ((mask4X4Int & 1) != 0) + { + LoopFilterScalar.HighBdLpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim[0], + lfi.Lim[0], lfi.HevThr[0], bd); + } + else if ((mask4X4Int & 2) != 0) + { + LoopFilterScalar.HighBdLpfHorizontal4(s.Slice(8 + (4 * pitch)), pitch, lfin.Mblim[0], + lfin.Lim[0], lfin.HevThr[0], bd); + } + + count = 2; + } + else + { + LoopFilterScalar.HighBdLpfHorizontal4(s, pitch, lfi.Mblim[0], lfi.Lim[0], lfi.HevThr[0], + bd); + + if ((mask4X4Int & 1) != 0) + { + LoopFilterScalar.HighBdLpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim[0], + lfi.Lim[0], lfi.HevThr[0], bd); + } + } + } + else + { + LoopFilterScalar.HighBdLpfHorizontal4(s.Slice(4 * pitch), pitch, lfi.Mblim[0], lfi.Lim[0], + lfi.HevThr[0], bd); + } + } + + s = s.Slice(8 * count); + lfl = lfl.Slice(count); + mask16X16 >>= count; + mask8X8 >>= count; + mask4X4 >>= count; + mask4X4Int >>= count; + } + } + + private static void FilterSelectivelyVert( + ArrayPtr s, + int pitch, + uint mask16X16, + uint mask8X8, + uint mask4X4, + uint mask4X4Int, + ReadOnlySpan lfthr, + ReadOnlySpan lfl) + { + for (uint mask = mask16X16 | mask8X8 | mask4X4 | mask4X4Int; mask != 0; mask >>= 1) + { + LoopFilterThresh lfi = lfthr[lfl[0]]; + + if ((mask & 1) != 0) + { + if ((mask16X16 & 1) != 0) + { + LoopFilterAuto.LpfVertical16(s, pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + } + else if ((mask8X8 & 1) != 0) + { + LoopFilterAuto.LpfVertical8(s, pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + } + else if ((mask4X4 & 1) != 0) + { + LoopFilterAuto.LpfVertical4(s, pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + } + } + + if ((mask4X4Int & 1) != 0) + { + LoopFilterAuto.LpfVertical4(s.Slice(4), pitch, lfi.Mblim.AsSpan(), lfi.Lim.AsSpan(), + lfi.HevThr.AsSpan()); + } + + s = s.Slice(8); + lfl = lfl.Slice(1); + mask16X16 >>= 1; + mask8X8 >>= 1; + mask4X4 >>= 1; + mask4X4Int >>= 1; + } + } + + private static void HighbdFilterSelectivelyVert( + ArrayPtr s, + int pitch, + uint mask16X16, + uint mask8X8, + uint mask4X4, + uint mask4X4Int, + ReadOnlySpan lfthr, + ReadOnlySpan lfl, + int bd) + { + for (uint mask = mask16X16 | mask8X8 | mask4X4 | mask4X4Int; mask != 0; mask >>= 1) + { + LoopFilterThresh lfi = lfthr[lfl[0]]; + + if ((mask & 1) != 0) + { + if ((mask16X16 & 1) != 0) + { + LoopFilterScalar.HighBdLpfVertical16(s, pitch, lfi.Mblim[0], lfi.Lim[0], lfi.HevThr[0], bd); + } + else if ((mask8X8 & 1) != 0) + { + LoopFilterScalar.HighBdLpfVertical8(s, pitch, lfi.Mblim[0], lfi.Lim[0], lfi.HevThr[0], bd); + } + else if ((mask4X4 & 1) != 0) + { + LoopFilterScalar.HighBdLpfVertical4(s, pitch, lfi.Mblim[0], lfi.Lim[0], lfi.HevThr[0], bd); + } + } + + if ((mask4X4Int & 1) != 0) + { + LoopFilterScalar.HighBdLpfVertical4(s.Slice(4), pitch, lfi.Mblim[0], lfi.Lim[0], lfi.HevThr[0], bd); + } + + s = s.Slice(8); + lfl = lfl.Slice(1); + mask16X16 >>= 1; + mask8X8 >>= 1; + mask4X4 >>= 1; + mask4X4Int >>= 1; + } + } + + private static readonly byte[] _num4X4BlocksWideLookup = [1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 16, 16]; + private static readonly byte[] _num4X4BlocksHighLookup = [1, 2, 1, 2, 4, 2, 4, 8, 4, 8, 16, 8, 16]; + private static readonly byte[] _num8X8BlocksWideLookup = [1, 1, 1, 1, 1, 2, 2, 2, 4, 4, 4, 8, 8]; + private static readonly byte[] _num8X8BlocksHighLookup = [1, 1, 1, 1, 2, 1, 2, 4, 2, 4, 8, 4, 8]; + + private static void FilterBlockPlaneNon420( + ref Vp9Common cm, + ref MacroBlockDPlane plane, + ArrayPtr> mi8X8, + int miRow, + int miCol) + { + int ssX = plane.SubsamplingX; + int ssY = plane.SubsamplingY; + int rowStep = 1 << ssY; + int colStep = 1 << ssX; + int rowStepStride = cm.MiStride * rowStep; + ref Buf2D dst = ref plane.Dst; + ArrayPtr dst0 = dst.Buf; + Span mask16X16 = stackalloc int[Constants.MiBlockSize]; + Span mask8X8 = stackalloc int[Constants.MiBlockSize]; + Span mask4X4 = stackalloc int[Constants.MiBlockSize]; + Span mask4X4Int = stackalloc int[Constants.MiBlockSize]; + Span lfl = stackalloc byte[Constants.MiBlockSize * Constants.MiBlockSize]; + + + for (int r = 0; r < Constants.MiBlockSize && miRow + r < cm.MiRows; r += rowStep) + { + uint mask16X16C = 0; + uint mask8X8C = 0; + uint mask4X4C = 0; + uint borderMask; + + // Determine the vertical edges that need filtering + for (int c = 0; c < Constants.MiBlockSize && miCol + c < cm.MiCols; c += colStep) + { + ref ModeInfo mi = ref mi8X8[c].Value; + BlockSize sbType = mi.SbType; + bool skipThis = mi.Skip != 0 && mi.IsInterBlock(); + // left edge of current unit is block/partition edge -> no skip + bool blockEdgeLeft = _num4X4BlocksWideLookup[(int)sbType] <= 1 || (c & (_num8X8BlocksWideLookup[(int)sbType] - 1)) == 0; + bool skipThisC = skipThis && !blockEdgeLeft; + // top edge of current unit is block/partition edge -> no skip + bool blockEdgeAbove = _num4X4BlocksHighLookup[(int)sbType] <= 1 || (r & (_num8X8BlocksHighLookup[(int)sbType] - 1)) == 0; + bool skipThisR = skipThis && !blockEdgeAbove; + TxSize txSize = mi.GetUvTxSize(ref plane); + bool skipBorder4X4C = ssX != 0 && miCol + c == cm.MiCols - 1; + bool skipBorder4X4R = ssY != 0 && miRow + r == cm.MiRows - 1; + + // Filter level can vary per MI + if ((lfl[(r << 3) + (c >> ssX)] = GetFilterLevel(ref cm.LfInfo, ref mi)) == 0) + { + continue; + } + + // Build masks based on the transform size of each block + if (txSize == TxSize.Tx32X32) + { + if (!skipThisC && ((c >> ssX) & 3) == 0) + { + if (!skipBorder4X4C) + { + mask16X16C |= 1u << (c >> ssX); + } + else + { + mask8X8C |= 1u << (c >> ssX); + } + } + + if (!skipThisR && ((r >> ssY) & 3) == 0) + { + if (!skipBorder4X4R) + { + mask16X16[r] |= 1 << (c >> ssX); + } + else + { + mask8X8[r] |= 1 << (c >> ssX); + } + } + } + else if (txSize == TxSize.Tx16X16) + { + if (!skipThisC && ((c >> ssX) & 1) == 0) + { + if (!skipBorder4X4C) + { + mask16X16C |= 1u << (c >> ssX); + } + else + { + mask8X8C |= 1u << (c >> ssX); + } + } + + if (!skipThisR && ((r >> ssY) & 1) == 0) + { + if (!skipBorder4X4R) + { + mask16X16[r] |= 1 << (c >> ssX); + } + else + { + mask8X8[r] |= 1 << (c >> ssX); + } + } + } + else + { + // force 8x8 filtering on 32x32 boundaries + if (!skipThisC) + { + if (txSize == TxSize.Tx8X8 || ((c >> ssX) & 3) == 0) + { + mask8X8C |= 1u << (c >> ssX); + } + else + { + mask4X4C |= 1u << (c >> ssX); + } + } + + if (!skipThisR) + { + if (txSize == TxSize.Tx8X8 || ((r >> ssY) & 3) == 0) + { + mask8X8[r] |= 1 << (c >> ssX); + } + else + { + mask4X4[r] |= 1 << (c >> ssX); + } + } + + if (!skipThis && txSize < TxSize.Tx8X8 && !skipBorder4X4C) + { + mask4X4Int[r] |= 1 << (c >> ssX); + } + } + } + + // Disable filtering on the leftmost column + borderMask = ~(miCol == 0 ? 1u : 0u); + + if (cm.UseHighBitDepth) + { + HighbdFilterSelectivelyVert( + ConvertToUshortPtr(dst.Buf), + dst.Stride, + mask16X16C & borderMask, + mask8X8C & borderMask, + mask4X4C & borderMask, + (uint)mask4X4Int[r], + cm.LfInfo.Lfthr.AsSpan(), + lfl.Slice(r << 3), + (int)cm.BitDepth); + } + else + { + FilterSelectivelyVert( + dst.Buf, + dst.Stride, + mask16X16C & borderMask, + mask8X8C & borderMask, + mask4X4C & borderMask, + (uint)mask4X4Int[r], + cm.LfInfo.Lfthr.AsSpan(), + lfl.Slice(r << 3)); + } + + dst.Buf = dst.Buf.Slice(8 * dst.Stride); + mi8X8 = mi8X8.Slice(rowStepStride); + } + + // Now do horizontal pass + dst.Buf = dst0; + for (int r = 0; r < Constants.MiBlockSize && miRow + r < cm.MiRows; r += rowStep) + { + bool skipBorder4X4R = ssY != 0 && miRow + r == cm.MiRows - 1; + uint mask4X4IntR = skipBorder4X4R ? 0u : (uint)mask4X4Int[r]; + + uint mask16X16R; + uint mask8X8R; + uint mask4X4R; + + if (miRow + r == 0) + { + mask16X16R = 0; + mask8X8R = 0; + mask4X4R = 0; + } + else + { + mask16X16R = (uint)mask16X16[r]; + mask8X8R = (uint)mask8X8[r]; + mask4X4R = (uint)mask4X4[r]; + } + + if (cm.UseHighBitDepth) + { + HighbdFilterSelectivelyHoriz( + ConvertToUshortPtr(dst.Buf), + dst.Stride, + mask16X16R, + mask8X8R, + mask4X4R, + mask4X4IntR, + cm.LfInfo.Lfthr.AsSpan(), + lfl.Slice(r << 3), + (int)cm.BitDepth); + } + else + { + FilterSelectivelyHoriz( + dst.Buf, + dst.Stride, + mask16X16R, + mask8X8R, + mask4X4R, + mask4X4IntR, + cm.LfInfo.Lfthr.AsSpan(), + lfl.Slice(r << 3)); + } + + dst.Buf = dst.Buf.Slice(8 * dst.Stride); + } + } + + private static void FilterBlockPlaneSs00(ref Vp9Common cm, ref MacroBlockDPlane plane, int miRow, + ref LoopFilterMask lfm) + { + ref Buf2D dst = ref plane.Dst; + ArrayPtr dst0 = dst.Buf; + ulong mask16X16 = lfm.LeftY[(int)TxSize.Tx16X16]; + ulong mask8X8 = lfm.LeftY[(int)TxSize.Tx8X8]; + ulong mask4X4 = lfm.LeftY[(int)TxSize.Tx4X4]; + ulong mask4X4Int = lfm.Int4X4Y; + + Debug.Assert(plane.SubsamplingX == 0 && plane.SubsamplingY == 0); + + // Vertical pass: do 2 rows at one time + for (int r = 0; r < Constants.MiBlockSize && miRow + r < cm.MiRows; r += 2) + { + if (cm.UseHighBitDepth) + { + // Disable filtering on the leftmost column. + HighbdFilterSelectivelyVertRow2( + plane.SubsamplingX, + ConvertToUshortPtr(dst.Buf), + dst.Stride, + (uint)mask16X16, + (uint)mask8X8, + (uint)mask4X4, + (uint)mask4X4Int, + cm.LfInfo.Lfthr.AsSpan(), + lfm.LflY.AsSpan().Slice(r << 3), + (int)cm.BitDepth); + } + else + { + // Disable filtering on the leftmost column. + FilterSelectivelyVertRow2( + plane.SubsamplingX, + dst.Buf, + dst.Stride, + (uint)mask16X16, + (uint)mask8X8, + (uint)mask4X4, + (uint)mask4X4Int, + cm.LfInfo.Lfthr.AsSpan(), + lfm.LflY.AsSpan().Slice(r << 3)); + } + + dst.Buf = dst.Buf.Slice(16 * dst.Stride); + mask16X16 >>= 16; + mask8X8 >>= 16; + mask4X4 >>= 16; + mask4X4Int >>= 16; + } + + // Horizontal pass + dst.Buf = dst0; + mask16X16 = lfm.AboveY[(int)TxSize.Tx16X16]; + mask8X8 = lfm.AboveY[(int)TxSize.Tx8X8]; + mask4X4 = lfm.AboveY[(int)TxSize.Tx4X4]; + mask4X4Int = lfm.Int4X4Y; + + for (int r = 0; r < Constants.MiBlockSize && miRow + r < cm.MiRows; r++) + { + uint mask16X16R; + uint mask8X8R; + uint mask4X4R; + + if (miRow + r == 0) + { + mask16X16R = 0; + mask8X8R = 0; + mask4X4R = 0; + } + else + { + mask16X16R = (uint)mask16X16 & 0xff; + mask8X8R = (uint)mask8X8 & 0xff; + mask4X4R = (uint)mask4X4 & 0xff; + } + + if (cm.UseHighBitDepth) + { + HighbdFilterSelectivelyHoriz( + ConvertToUshortPtr(dst.Buf), + dst.Stride, + mask16X16R, + mask8X8R, + mask4X4R, + (uint)mask4X4Int & 0xff, + cm.LfInfo.Lfthr.AsSpan(), + lfm.LflY.AsSpan().Slice(r << 3), + (int)cm.BitDepth); + } + else + { + FilterSelectivelyHoriz( + dst.Buf, + dst.Stride, + mask16X16R, + mask8X8R, + mask4X4R, + (uint)mask4X4Int & 0xff, + cm.LfInfo.Lfthr.AsSpan(), + lfm.LflY.AsSpan().Slice(r << 3)); + } + + dst.Buf = dst.Buf.Slice(8 * dst.Stride); + mask16X16 >>= 8; + mask8X8 >>= 8; + mask4X4 >>= 8; + mask4X4Int >>= 8; + } + } + + private static void FilterBlockPlaneSs11(ref Vp9Common cm, ref MacroBlockDPlane plane, int miRow, + ref LoopFilterMask lfm) + { + Buf2D dst = plane.Dst; + ArrayPtr dst0 = dst.Buf; + + Span lflUv = stackalloc byte[16]; + + ushort mask16X16 = lfm.LeftUv[(int)TxSize.Tx16X16]; + ushort mask8X8 = lfm.LeftUv[(int)TxSize.Tx8X8]; + ushort mask4X4 = lfm.LeftUv[(int)TxSize.Tx4X4]; + ushort mask4X4Int = lfm.Int4X4Uv; + + Debug.Assert(plane.SubsamplingX == 1 && plane.SubsamplingY == 1); + + // Vertical pass: do 2 rows at one time + for (int r = 0; r < Constants.MiBlockSize && miRow + r < cm.MiRows; r += 4) + { + for (int c = 0; c < Constants.MiBlockSize >> 1; c++) + { + lflUv[(r << 1) + c] = lfm.LflY[(r << 3) + (c << 1)]; + lflUv[((r + 2) << 1) + c] = lfm.LflY[((r + 2) << 3) + (c << 1)]; + } + + if (cm.UseHighBitDepth) + { + // Disable filtering on the leftmost column. + HighbdFilterSelectivelyVertRow2( + plane.SubsamplingX, + ConvertToUshortPtr(dst.Buf), + dst.Stride, + mask16X16, + mask8X8, + mask4X4, + mask4X4Int, + cm.LfInfo.Lfthr.AsSpan(), + lflUv.Slice(r << 1), + (int)cm.BitDepth); + } + else + { + // Disable filtering on the leftmost column. + FilterSelectivelyVertRow2( + plane.SubsamplingX, + dst.Buf, + dst.Stride, + mask16X16, + mask8X8, + mask4X4, + mask4X4Int, + cm.LfInfo.Lfthr.AsSpan(), + lflUv.Slice(r << 1)); + } + + dst.Buf = dst.Buf.Slice(16 * dst.Stride); + mask16X16 >>= 8; + mask8X8 >>= 8; + mask4X4 >>= 8; + mask4X4Int >>= 8; + } + + // Horizontal pass + dst.Buf = dst0; + mask16X16 = lfm.AboveUv[(int)TxSize.Tx16X16]; + mask8X8 = lfm.AboveUv[(int)TxSize.Tx8X8]; + mask4X4 = lfm.AboveUv[(int)TxSize.Tx4X4]; + mask4X4Int = lfm.Int4X4Uv; + + for (int r = 0; r < Constants.MiBlockSize && miRow + r < cm.MiRows; r += 2) + { + bool skipBorder4X4R = miRow + r == cm.MiRows - 1; + uint mask4X4IntR = skipBorder4X4R ? 0u : (uint)mask4X4Int & 0xf; + uint mask16X16R; + uint mask8X8R; + uint mask4X4R; + + if (miRow + r == 0) + { + mask16X16R = 0; + mask8X8R = 0; + mask4X4R = 0; + } + else + { + mask16X16R = (uint)mask16X16 & 0xf; + mask8X8R = (uint)mask8X8 & 0xf; + mask4X4R = (uint)mask4X4 & 0xf; + } + + if (cm.UseHighBitDepth) + { + HighbdFilterSelectivelyHoriz( + ConvertToUshortPtr(dst.Buf), + dst.Stride, + mask16X16R, + mask8X8R, + mask4X4R, + mask4X4IntR, + cm.LfInfo.Lfthr.AsSpan(), + lflUv.Slice(r << 1), + (int)cm.BitDepth); + } + else + { + FilterSelectivelyHoriz( + dst.Buf, + dst.Stride, + mask16X16R, + mask8X8R, + mask4X4R, + mask4X4IntR, + cm.LfInfo.Lfthr.AsSpan(), + lflUv.Slice(r << 1)); + } + + dst.Buf = dst.Buf.Slice(8 * dst.Stride); + mask16X16 >>= 4; + mask8X8 >>= 4; + mask4X4 >>= 4; + mask4X4Int >>= 4; + } + } + + private enum LfPath + { + LfPathSlow, + LfPath420, + LfPath444 + } + + private static void LoopFilterRows( + ref Surface frameBuffer, + ref Vp9Common cm, + Array3 planes, + int start, + int stop, + int step, + bool yOnly, + LfSync lfSync) + { + int numPlanes = yOnly ? 1 : Constants.MaxMbPlane; + int sbCols = TileInfo.MiColsAlignedToSb(cm.MiCols) >> Constants.MiBlockSizeLog2; + LfPath path; + int miRow, miCol; + + if (yOnly) + { + path = LfPath.LfPath444; + } + else if (planes[1].SubsamplingY == 1 && planes[1].SubsamplingX == 1) + { + path = LfPath.LfPath420; + } + else if (planes[1].SubsamplingY == 0 && planes[1].SubsamplingX == 0) + { + path = LfPath.LfPath444; + } + else + { + path = LfPath.LfPathSlow; + } + + for (miRow = start; miRow < stop; miRow += step) + { + ArrayPtr> mi = cm.MiGridVisible.Slice(miRow * cm.MiStride); + Span lfm = GetLfm(ref cm.Lf, miRow, 0); + + for (miCol = 0; miCol < cm.MiCols; miCol += Constants.MiBlockSize, lfm = lfm.Slice(1)) + { + int r = miRow >> Constants.MiBlockSizeLog2; + int c = miCol >> Constants.MiBlockSizeLog2; + int plane; + + lfSync.SyncRead(r, c); + + ReconInter.SetupDstPlanes(ref planes, ref frameBuffer, miRow, miCol); + + AdjustMask(ref cm, miRow, miCol, ref lfm[0]); + + FilterBlockPlaneSs00(ref cm, ref planes[0], miRow, ref lfm[0]); + for (plane = 1; plane < numPlanes; ++plane) + { + switch (path) + { + case LfPath.LfPath420: + FilterBlockPlaneSs11(ref cm, ref planes[plane], miRow, ref lfm[0]); + break; + case LfPath.LfPath444: + FilterBlockPlaneSs00(ref cm, ref planes[plane], miRow, ref lfm[0]); + break; + case LfPath.LfPathSlow: + FilterBlockPlaneNon420(ref cm, ref planes[plane], mi.Slice(miCol), miRow, + miCol); + break; + } + } + + lfSync.SyncWrite(r, c, sbCols); + } + } + } + + public static void LoopFilterFrame( + ref Surface frame, + ref Vp9Common cm, + ref MacroBlockD xd, + int frameFilterLevel, + bool yOnly, + bool partialFrame) + { + if (frameFilterLevel == 0) + { + return; + } + + int startMiRow = 0; + int miRowsToFilter = cm.MiRows; + + if (partialFrame && cm.MiRows > 8) + { + startMiRow = cm.MiRows >> 1; + startMiRow &= ~7; + miRowsToFilter = Math.Max(cm.MiRows / 8, 8); + } + + int endMiRow = startMiRow + miRowsToFilter; + + LoopFilterRows(ref frame, ref cm, xd.Plane, startMiRow, endMiRow, Constants.MiBlockSize, yOnly, + default); + } + + private static void LoopFilterRowsMt( + ref Surface frameBuffer, + ref Vp9Common cm, + Array3 planes, + int start, + int stop, + bool yOnly, + int threadCount) + { + int sbRows = TileInfo.MiColsAlignedToSb(cm.MiRows) >> Constants.MiBlockSizeLog2; + int numTileCols = 1 << cm.Log2TileCols; + int numWorkers = Math.Min(threadCount, Math.Min(numTileCols, sbRows)); + + LfSync lfSync = new(); + lfSync.Initialize(cm.Width, sbRows); + + Ptr frameBufferPtr = new(ref frameBuffer); + Ptr cmPtr = new(ref cm); + + Parallel.For(0, numWorkers, n => + { + LoopFilterRows( + ref frameBufferPtr.Value, + ref cmPtr.Value, + planes, + start + (n * Constants.MiBlockSize), + stop, + numWorkers * Constants.MiBlockSize, + yOnly, + lfSync); + }); + } + + public static void LoopFilterFrameMt( + ref Surface frame, + ref Vp9Common cm, + ref MacroBlockD xd, + int frameFilterLevel, + bool yOnly, + bool partialFrame, + int threadCount) + { + if (frameFilterLevel == 0) + { + return; + } + + int startMiRow = 0; + int miRowsToFilter = cm.MiRows; + + if (partialFrame && cm.MiRows > 8) + { + startMiRow = cm.MiRows >> 1; + startMiRow &= ~7; + miRowsToFilter = Math.Max(cm.MiRows / 8, 8); + } + + int endMiRow = startMiRow + miRowsToFilter; + + LoopFilterFrameInit(ref cm, frameFilterLevel); + LoopFilterRowsMt(ref frame, ref cm, xd.Plane, startMiRow, endMiRow, yOnly, threadCount); + } + + private static unsafe ArrayPtr ConvertToUshortPtr(ArrayPtr s) + { + return new ArrayPtr((ushort*)s.ToPointer(), s.Length / 2); + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Luts.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Luts.cs index 5245b3f32..d54dbeec5 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Luts.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Luts.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Types; using System; @@ -6,174 +6,182 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { internal static class Luts { - public static ReadOnlySpan SizeGroupLookup => new byte[] { 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3 }; + public static ReadOnlySpan SizeGroupLookup => [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3]; - public static readonly BlockSize[][] SubsizeLookup = { - new[] - { // PARTITION_NONE - BlockSize.Block4x4, BlockSize.Block4x8, BlockSize.Block8x4, BlockSize.Block8x8, BlockSize.Block8x16, BlockSize.Block16x8, - BlockSize.Block16x16, BlockSize.Block16x32, BlockSize.Block32x16, BlockSize.Block32x32, BlockSize.Block32x64, - BlockSize.Block64x32, BlockSize.Block64x64, - }, - new[] - { // PARTITION_HORZ - BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block8x4, BlockSize.BlockInvalid, - BlockSize.BlockInvalid, BlockSize.Block16x8, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block32x16, - BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block64x32, - }, - new[] - { // PARTITION_VERT - BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block4x8, BlockSize.BlockInvalid, - BlockSize.BlockInvalid, BlockSize.Block8x16, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block16x32, - BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block32x64, - }, - new[] - { // PARTITION_SPLIT - BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block4x4, BlockSize.BlockInvalid, - BlockSize.BlockInvalid, BlockSize.Block8x8, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block16x16, - BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block32x32, - }, + public static readonly BlockSize[][] SubsizeLookup = new BlockSize[][] + { + [ // PARTITION_NONE + BlockSize.Block4X4, BlockSize.Block4X8, BlockSize.Block8X4, BlockSize.Block8X8, BlockSize.Block8X16, BlockSize.Block16X8, + BlockSize.Block16X16, BlockSize.Block16X32, BlockSize.Block32X16, BlockSize.Block32X32, BlockSize.Block32X64, + BlockSize.Block64X32, BlockSize.Block64X64 + ], + [ // PARTITION_HORZ + BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block8X4, BlockSize.BlockInvalid, + BlockSize.BlockInvalid, BlockSize.Block16X8, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block32X16, + BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block64X32 + ], + [ // PARTITION_VERT + BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block4X8, BlockSize.BlockInvalid, + BlockSize.BlockInvalid, BlockSize.Block8X16, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block16X32, + BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block32X64 + ], + [ // PARTITION_SPLIT + BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block4X4, BlockSize.BlockInvalid, + BlockSize.BlockInvalid, BlockSize.Block8X8, BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block16X16, + BlockSize.BlockInvalid, BlockSize.BlockInvalid, BlockSize.Block32X32 + ] }; - public static readonly TxSize[] MaxTxSizeLookup = { - TxSize.Tx4x4, TxSize.Tx4x4, TxSize.Tx4x4, TxSize.Tx8x8, TxSize.Tx8x8, TxSize.Tx8x8, TxSize.Tx16x16, - TxSize.Tx16x16, TxSize.Tx16x16, TxSize.Tx32x32, TxSize.Tx32x32, TxSize.Tx32x32, TxSize.Tx32x32, - }; + public static readonly TxSize[] MaxTxSizeLookup = + [ + TxSize.Tx4X4, TxSize.Tx4X4, TxSize.Tx4X4, TxSize.Tx8X8, TxSize.Tx8X8, TxSize.Tx8X8, TxSize.Tx16X16, + TxSize.Tx16X16, TxSize.Tx16X16, TxSize.Tx32X32, TxSize.Tx32X32, TxSize.Tx32X32, TxSize.Tx32X32 + ]; - public static readonly TxSize[] TxModeToBiggestTxSize = { - TxSize.Tx4x4, // ONLY_4X4 - TxSize.Tx8x8, // ALLOW_8X8 - TxSize.Tx16x16, // ALLOW_16X16 - TxSize.Tx32x32, // ALLOW_32X32 - TxSize.Tx32x32, // TX_MODE_SELECT - }; + public static readonly TxSize[] TxModeToBiggestTxSize = + [ + TxSize.Tx4X4, // ONLY_4X4 + TxSize.Tx8X8, // ALLOW_8X8 + TxSize.Tx16X16, // ALLOW_16X16 + TxSize.Tx32X32, // ALLOW_32X32 + TxSize.Tx32X32 // TX_MODE_SELECT + ]; - public static readonly BlockSize[][][] SsSizeLookup = { + public static readonly BlockSize[][][] SsSizeLookup = + [ // ss_x == 0 ss_x == 0 ss_x == 1 ss_x == 1 // ss_y == 0 ss_y == 1 ss_y == 0 ss_y == 1 - new[] { new[] { BlockSize.Block4x4, BlockSize.BlockInvalid }, new[] { BlockSize.BlockInvalid, BlockSize.BlockInvalid } }, - new[] { new[] { BlockSize.Block4x8, BlockSize.Block4x4 }, new[] { BlockSize.BlockInvalid, BlockSize.BlockInvalid } }, - new[] { new[] { BlockSize.Block8x4, BlockSize.BlockInvalid }, new[] { BlockSize.Block4x4, BlockSize.BlockInvalid } }, - new[] { new[] { BlockSize.Block8x8, BlockSize.Block8x4 }, new[] { BlockSize.Block4x8, BlockSize.Block4x4 } }, - new[] { new[] { BlockSize.Block8x16, BlockSize.Block8x8 }, new[] { BlockSize.BlockInvalid, BlockSize.Block4x8 } }, - new[] { new[] { BlockSize.Block16x8, BlockSize.BlockInvalid }, new[] { BlockSize.Block8x8, BlockSize.Block8x4 } }, - new[] { new[] { BlockSize.Block16x16, BlockSize.Block16x8 }, new[] { BlockSize.Block8x16, BlockSize.Block8x8 } }, - new[] { new[] { BlockSize.Block16x32, BlockSize.Block16x16 }, new[] { BlockSize.BlockInvalid, BlockSize.Block8x16 } }, - new[] { new[] { BlockSize.Block32x16, BlockSize.BlockInvalid }, new[] { BlockSize.Block16x16, BlockSize.Block16x8 } }, - new[] { new[] { BlockSize.Block32x32, BlockSize.Block32x16 }, new[] { BlockSize.Block16x32, BlockSize.Block16x16 } }, - new[] { new[] { BlockSize.Block32x64, BlockSize.Block32x32 }, new[] { BlockSize.BlockInvalid, BlockSize.Block16x32 } }, - new[] { new[] { BlockSize.Block64x32, BlockSize.BlockInvalid }, new[] { BlockSize.Block32x32, BlockSize.Block32x16 } }, - new[] { new[] { BlockSize.Block64x64, BlockSize.Block64x32 }, new[] { BlockSize.Block32x64, BlockSize.Block32x32 } }, - }; + new BlockSize[][] { [BlockSize.Block4X4, BlockSize.BlockInvalid], [BlockSize.BlockInvalid, BlockSize.BlockInvalid + ] + }, + new BlockSize[][] { [BlockSize.Block4X8, BlockSize.Block4X4], [BlockSize.BlockInvalid, BlockSize.BlockInvalid + ] + }, + new BlockSize[][] { [BlockSize.Block8X4, BlockSize.BlockInvalid], [BlockSize.Block4X4, BlockSize.BlockInvalid + ] + }, + new BlockSize[][] { [BlockSize.Block8X8, BlockSize.Block8X4], [BlockSize.Block4X8, BlockSize.Block4X4] }, + new BlockSize[][] { [BlockSize.Block8X16, BlockSize.Block8X8], [BlockSize.BlockInvalid, BlockSize.Block4X8] + }, + new BlockSize[][] { [BlockSize.Block16X8, BlockSize.BlockInvalid], [BlockSize.Block8X8, BlockSize.Block8X4] + }, + new BlockSize[][] { [BlockSize.Block16X16, BlockSize.Block16X8], [BlockSize.Block8X16, BlockSize.Block8X8] }, + new BlockSize[][] { [BlockSize.Block16X32, BlockSize.Block16X16], [BlockSize.BlockInvalid, BlockSize.Block8X16 + ] + }, + new BlockSize[][] { [BlockSize.Block32X16, BlockSize.BlockInvalid], [BlockSize.Block16X16, BlockSize.Block16X8 + ] + }, + new BlockSize[][] { [BlockSize.Block32X32, BlockSize.Block32X16], [BlockSize.Block16X32, BlockSize.Block16X16 + ] + }, + new BlockSize[][] { [BlockSize.Block32X64, BlockSize.Block32X32], [BlockSize.BlockInvalid, BlockSize.Block16X32 + ] + }, + new BlockSize[][] { [BlockSize.Block64X32, BlockSize.BlockInvalid], [BlockSize.Block32X32, BlockSize.Block32X16 + ] + }, + new BlockSize[][] { [BlockSize.Block64X64, BlockSize.Block64X32], [BlockSize.Block32X64, BlockSize.Block32X32 + ] + } + ]; - public static readonly TxSize[][][][] UvTxsizeLookup = { - // ss_x == 0 ss_x == 0 ss_x == 1 ss_x == 1 + public static readonly TxSize[][][][] UvTxsizeLookup = + [ + // ss_x == 0 ss_x == 0 ss_x == 1 ss_x == 1 // ss_y == 0 ss_y == 1 ss_y == 0 ss_y == 1 - new[] - { - // BLOCK_4X4 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - }, - new[] - { - // BLOCK_4X8 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - }, - new[] - { - // BLOCK_8X4 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - }, - new[] - { - // BLOCK_8X8 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - }, - new[] - { - // BLOCK_8X16 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - }, - new[] - { - // BLOCK_16X8 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx4x4 }, new[] { TxSize.Tx8x8, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx4x4 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx4x4 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - }, - new[] - { - // BLOCK_16X16 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - }, - new[] - { - // BLOCK_16X32 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx16x16 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx16x16 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - }, - new[] - { - // BLOCK_32X16 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx8x8 }, new[] { TxSize.Tx16x16, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx8x8 }, new[] { TxSize.Tx16x16, TxSize.Tx8x8 } }, - }, - new[] - { - // BLOCK_32X32 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx16x16 }, new[] { TxSize.Tx16x16, TxSize.Tx16x16 } }, - new[] { new[] { TxSize.Tx32x32, TxSize.Tx16x16 }, new[] { TxSize.Tx16x16, TxSize.Tx16x16 } }, - }, - new[] - { - // BLOCK_32X64 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx16x16 }, new[] { TxSize.Tx16x16, TxSize.Tx16x16 } }, - new[] { new[] { TxSize.Tx32x32, TxSize.Tx32x32 }, new[] { TxSize.Tx16x16, TxSize.Tx16x16 } }, - }, - new[] - { - // BLOCK_64X32 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx16x16 }, new[] { TxSize.Tx16x16, TxSize.Tx16x16 } }, - new[] { new[] { TxSize.Tx32x32, TxSize.Tx16x16 }, new[] { TxSize.Tx32x32, TxSize.Tx16x16 } }, - }, - new[] - { - // BLOCK_64X64 - new[] { new[] { TxSize.Tx4x4, TxSize.Tx4x4 }, new[] { TxSize.Tx4x4, TxSize.Tx4x4 } }, - new[] { new[] { TxSize.Tx8x8, TxSize.Tx8x8 }, new[] { TxSize.Tx8x8, TxSize.Tx8x8 } }, - new[] { new[] { TxSize.Tx16x16, TxSize.Tx16x16 }, new[] { TxSize.Tx16x16, TxSize.Tx16x16 } }, - new[] { new[] { TxSize.Tx32x32, TxSize.Tx32x32 }, new[] { TxSize.Tx32x32, TxSize.Tx32x32 } }, - }, - }; + [ + // BLOCK_4X4 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] } + ], + [ + // BLOCK_4x8 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] } + ], + [ + // BLOCK_8x4 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] } + ], + [ + // BLOCK_8X8 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] } + ], + [ + // BLOCK_8x16 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx4X4, TxSize.Tx4X4] } + ], + [ + // BLOCK_16x8 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx4X4], [TxSize.Tx8X8, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx4X4], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx4X4], [TxSize.Tx8X8, TxSize.Tx8X8] } + ], + [ + // BLOCK_16X16 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] } + ], + [ + // BLOCK_16x32 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx16X16], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx16X16], [TxSize.Tx8X8, TxSize.Tx8X8] } + ], + [ + // BLOCK_32x16 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx8X8], [TxSize.Tx16X16, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx8X8], [TxSize.Tx16X16, TxSize.Tx8X8] } + ], + [ + // BLOCK_32X32 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx16X16], [TxSize.Tx16X16, TxSize.Tx16X16] }, + new TxSize[][] { [TxSize.Tx32X32, TxSize.Tx16X16], [TxSize.Tx16X16, TxSize.Tx16X16] } + ], + [ + // BLOCK_32x64 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx16X16], [TxSize.Tx16X16, TxSize.Tx16X16] }, + new TxSize[][] { [TxSize.Tx32X32, TxSize.Tx32X32], [TxSize.Tx16X16, TxSize.Tx16X16] } + ], + [ + // BLOCK_64x32 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx16X16], [TxSize.Tx16X16, TxSize.Tx16X16] }, + new TxSize[][] { [TxSize.Tx32X32, TxSize.Tx16X16], [TxSize.Tx32X32, TxSize.Tx16X16] } + ], + [ + // BLOCK_64x64 + new TxSize[][] { [TxSize.Tx4X4, TxSize.Tx4X4], [TxSize.Tx4X4, TxSize.Tx4X4] }, + new TxSize[][] { [TxSize.Tx8X8, TxSize.Tx8X8], [TxSize.Tx8X8, TxSize.Tx8X8] }, + new TxSize[][] { [TxSize.Tx16X16, TxSize.Tx16X16], [TxSize.Tx16X16, TxSize.Tx16X16] }, + new TxSize[][] { [TxSize.Tx32X32, TxSize.Tx32X32], [TxSize.Tx32X32, TxSize.Tx32X32] } + ] + ]; public struct PartitionContextPair { @@ -190,25 +198,27 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // Generates 4 bit field in which each bit set to 1 represents // a blocksize partition 1111 means we split 64x64, 32x32, 16x16 // and 8x8. 1000 means we just split the 64x64 to 32x32 - public static readonly PartitionContextPair[] PartitionContextLookup = { - new(15, 15), // 4X4 - {0b1111, 0b1111} - new(15, 14), // 4X8 - {0b1111, 0b1110} - new(14, 15), // 8X4 - {0b1110, 0b1111} - new(14, 14), // 8X8 - {0b1110, 0b1110} - new(14, 12), // 8X16 - {0b1110, 0b1100} - new(12, 14), // 16X8 - {0b1100, 0b1110} - new(12, 12), // 16X16 - {0b1100, 0b1100} - new(12, 8), // 16X32 - {0b1100, 0b1000} - new(8, 12), // 32X16 - {0b1000, 0b1100} - new(8, 8), // 32X32 - {0b1000, 0b1000} - new(8, 0), // 32X64 - {0b1000, 0b0000} - new(0, 8), // 64X32 - {0b0000, 0b1000} - new(0, 0), // 64X64 - {0b0000, 0b0000} - }; + public static readonly PartitionContextPair[] PartitionContextLookup = + [ + new(15, 15), // 4X4 - {0b1111, 0b1111} + new(15, 14), // 4x8 - {0b1111, 0b1110} + new(14, 15), // 8x4 - {0b1110, 0b1111} + new(14, 14), // 8X8 - {0b1110, 0b1110} + new(14, 12), // 8x16 - {0b1110, 0b1100} + new(12, 14), // 16x8 - {0b1100, 0b1110} + new(12, 12), // 16X16 - {0b1100, 0b1100} + new(12, 8), // 16x32 - {0b1100, 0b1000} + new(8, 12), // 32x16 - {0b1000, 0b1100} + new(8, 8), // 32X32 - {0b1000, 0b1000} + new(8, 0), // 32x64 - {0b1000, 0b0000} + new(0, 8), // 64x32 - {0b0000, 0b1000} + new(0, 0) // 64x64 - {0b0000, 0b0000} + ]; // Filter - private static readonly Array8[] _bilinearFilters = { + private static readonly Array8[] _bilinearFilters = + [ NewArray8Short(0, 0, 0, 128, 0, 0, 0, 0), NewArray8Short(0, 0, 0, 120, 8, 0, 0, 0), NewArray8Short(0, 0, 0, 112, 16, 0, 0, 0), NewArray8Short(0, 0, 0, 104, 24, 0, 0, 0), NewArray8Short(0, 0, 0, 96, 32, 0, 0, 0), NewArray8Short(0, 0, 0, 88, 40, 0, 0, 0), @@ -216,11 +226,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 NewArray8Short(0, 0, 0, 64, 64, 0, 0, 0), NewArray8Short(0, 0, 0, 56, 72, 0, 0, 0), NewArray8Short(0, 0, 0, 48, 80, 0, 0, 0), NewArray8Short(0, 0, 0, 40, 88, 0, 0, 0), NewArray8Short(0, 0, 0, 32, 96, 0, 0, 0), NewArray8Short(0, 0, 0, 24, 104, 0, 0, 0), - NewArray8Short(0, 0, 0, 16, 112, 0, 0, 0), NewArray8Short(0, 0, 0, 8, 120, 0, 0, 0), - }; + NewArray8Short(0, 0, 0, 16, 112, 0, 0, 0), NewArray8Short(0, 0, 0, 8, 120, 0, 0, 0) + ]; // Lagrangian interpolation filter - private static readonly Array8[] _subPelFilters8 = { + private static readonly Array8[] _subPelFilters8 = + [ NewArray8Short(0, 0, 0, 128, 0, 0, 0, 0), NewArray8Short(0, 1, -5, 126, 8, -3, 1, 0), NewArray8Short(-1, 3, -10, 122, 18, -6, 2, 0), NewArray8Short(-1, 4, -13, 118, 27, -9, 3, -1), NewArray8Short(-1, 4, -16, 112, 37, -11, 4, -1), NewArray8Short(-1, 5, -18, 105, 48, -14, 4, -1), @@ -228,11 +239,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 NewArray8Short(-1, 6, -19, 78, 78, -19, 6, -1), NewArray8Short(-1, 5, -18, 68, 88, -19, 6, -1), NewArray8Short(-1, 5, -16, 58, 97, -19, 5, -1), NewArray8Short(-1, 4, -14, 48, 105, -18, 5, -1), NewArray8Short(-1, 4, -11, 37, 112, -16, 4, -1), NewArray8Short(-1, 3, -9, 27, 118, -13, 4, -1), - NewArray8Short(0, 2, -6, 18, 122, -10, 3, -1), NewArray8Short(0, 1, -3, 8, 126, -5, 1, 0), - }; + NewArray8Short(0, 2, -6, 18, 122, -10, 3, -1), NewArray8Short(0, 1, -3, 8, 126, -5, 1, 0) + ]; // DCT based filter - private static readonly Array8[] _subPelFilters8S = { + private static readonly Array8[] _subPelFilters8S = + [ NewArray8Short(0, 0, 0, 128, 0, 0, 0, 0), NewArray8Short(-1, 3, -7, 127, 8, -3, 1, 0), NewArray8Short(-2, 5, -13, 125, 17, -6, 3, -1), NewArray8Short(-3, 7, -17, 121, 27, -10, 5, -2), NewArray8Short(-4, 9, -20, 115, 37, -13, 6, -2), NewArray8Short(-4, 10, -23, 108, 48, -16, 8, -3), @@ -240,11 +252,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 NewArray8Short(-4, 11, -23, 80, 80, -23, 11, -4), NewArray8Short(-4, 10, -21, 70, 90, -24, 11, -4), NewArray8Short(-3, 9, -19, 59, 100, -24, 10, -4), NewArray8Short(-3, 8, -16, 48, 108, -23, 10, -4), NewArray8Short(-2, 6, -13, 37, 115, -20, 9, -4), NewArray8Short(-2, 5, -10, 27, 121, -17, 7, -3), - NewArray8Short(-1, 3, -6, 17, 125, -13, 5, -2), NewArray8Short(0, 1, -3, 8, 127, -7, 3, -1), - }; + NewArray8Short(-1, 3, -6, 17, 125, -13, 5, -2), NewArray8Short(0, 1, -3, 8, 127, -7, 3, -1) + ]; // freqmultiplier = 0.5 - private static readonly Array8[] _subPelFilters8Lp = { + private static readonly Array8[] _subPelFilters8Lp = + [ NewArray8Short(0, 0, 0, 128, 0, 0, 0, 0), NewArray8Short(-3, -1, 32, 64, 38, 1, -3, 0), NewArray8Short(-2, -2, 29, 63, 41, 2, -3, 0), NewArray8Short(-2, -2, 26, 63, 43, 4, -4, 0), NewArray8Short(-2, -3, 24, 62, 46, 5, -4, 0), NewArray8Short(-2, -3, 21, 60, 49, 7, -4, 0), @@ -252,65 +265,74 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 NewArray8Short(-1, -4, 14, 55, 55, 14, -4, -1), NewArray8Short(-1, -4, 12, 53, 57, 16, -4, -1), NewArray8Short(0, -4, 9, 51, 59, 18, -4, -1), NewArray8Short(0, -4, 7, 49, 60, 21, -3, -2), NewArray8Short(0, -4, 5, 46, 62, 24, -3, -2), NewArray8Short(0, -4, 4, 43, 63, 26, -2, -2), - NewArray8Short(0, -3, 2, 41, 63, 29, -2, -2), NewArray8Short(0, -3, 1, 38, 64, 32, -1, -3), - }; + NewArray8Short(0, -3, 2, 41, 63, 29, -2, -2), NewArray8Short(0, -3, 1, 38, 64, 32, -1, -3) + ]; private static Array8 NewArray8Short(short e0, short e1, short e2, short e3, short e4, short e5, short e6, short e7) { - Array8 output = new(); - - output[0] = e0; - output[1] = e1; - output[2] = e2; - output[3] = e3; - output[4] = e4; - output[5] = e5; - output[6] = e6; - output[7] = e7; + Array8 output = new() + { + [0] = e0, + [1] = e1, + [2] = e2, + [3] = e3, + [4] = e4, + [5] = e5, + [6] = e6, + [7] = e7 + }; return output; } - public static readonly Array8[][] Vp9FilterKernels = { - _subPelFilters8, _subPelFilters8Lp, _subPelFilters8S, _bilinearFilters, - }; + public static readonly Array8[][] FilterKernels = + [ + _subPelFilters8, _subPelFilters8Lp, _subPelFilters8S, _bilinearFilters + ]; // Scan - private static readonly short[] _defaultScan4X4 = { - 0, 4, 1, 5, 8, 2, 12, 9, 3, 6, 13, 10, 7, 14, 11, 15, - }; + private static readonly short[] _defaultScan4X4 = + [ + 0, 4, 1, 5, 8, 2, 12, 9, 3, 6, 13, 10, 7, 14, 11, 15 + ]; - private static readonly short[] _colScan4X4 = { - 0, 4, 8, 1, 12, 5, 9, 2, 13, 6, 10, 3, 7, 14, 11, 15, - }; + private static readonly short[] _colScan4X4 = + [ + 0, 4, 8, 1, 12, 5, 9, 2, 13, 6, 10, 3, 7, 14, 11, 15 + ]; - private static readonly short[] _rowScan4X4 = { - 0, 1, 4, 2, 5, 3, 6, 8, 9, 7, 12, 10, 13, 11, 14, 15, - }; + private static readonly short[] _rowScan4X4 = + [ + 0, 1, 4, 2, 5, 3, 6, 8, 9, 7, 12, 10, 13, 11, 14, 15 + ]; - private static readonly short[] _defaultScan8X8 = { + private static readonly short[] _defaultScan8X8 = + [ 0, 8, 1, 16, 9, 2, 17, 24, 10, 3, 18, 25, 32, 11, 4, 26, 33, 19, 40, 12, 34, 27, 5, 41, 20, 48, 13, 35, 42, 28, 21, 6, 49, 56, 36, 43, 29, 7, 14, 50, 57, 44, 22, 37, 15, 51, 58, 30, - 45, 23, 52, 59, 38, 31, 60, 53, 46, 39, 61, 54, 47, 62, 55, 63, - }; + 45, 23, 52, 59, 38, 31, 60, 53, 46, 39, 61, 54, 47, 62, 55, 63 + ]; - private static readonly short[] _colScan8X8 = { + private static readonly short[] _colScan8X8 = + [ 0, 8, 16, 1, 24, 9, 32, 17, 2, 40, 25, 10, 33, 18, 48, 3, 26, 41, 11, 56, 19, 34, 4, 49, 27, 42, 12, 35, 20, 57, 50, 28, 5, 43, 13, 36, 58, 51, 21, 44, 6, 29, 59, 37, 14, 52, 22, 7, - 45, 60, 30, 15, 38, 53, 23, 46, 31, 61, 39, 54, 47, 62, 55, 63, - }; + 45, 60, 30, 15, 38, 53, 23, 46, 31, 61, 39, 54, 47, 62, 55, 63 + ]; - private static readonly short[] _rowScan8X8 = { + private static readonly short[] _rowScan8X8 = + [ 0, 1, 2, 8, 9, 3, 16, 10, 4, 17, 11, 24, 5, 18, 25, 12, 19, 26, 32, 6, 13, 20, 33, 27, 7, 34, 40, 21, 28, 41, 14, 35, 48, 42, 29, 36, 49, 22, 43, 15, 56, 37, 50, 44, 30, 57, 23, 51, - 58, 45, 38, 52, 31, 59, 53, 46, 60, 39, 61, 47, 54, 55, 62, 63, - }; + 58, 45, 38, 52, 31, 59, 53, 46, 60, 39, 61, 47, 54, 55, 62, 63 + ]; - private static readonly short[] _defaultScan16X16 = { + private static readonly short[] _defaultScan16X16 = + [ 0, 16, 1, 32, 17, 2, 48, 33, 18, 3, 64, 34, 49, 19, 65, 80, 50, 4, 35, 66, 20, 81, 96, 51, 5, 36, 82, 97, 67, 112, 21, 52, 98, 37, 83, 113, 6, 68, 128, 53, 22, 99, 114, 84, 7, @@ -328,10 +350,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 172, 110, 247, 157, 79, 218, 203, 126, 233, 188, 248, 95, 173, 142, 219, 111, 249, 234, 158, 127, 189, 204, 250, 235, 143, 174, 220, 205, 159, 251, 190, 221, 175, 236, 237, 191, 206, 252, 222, 253, 207, 238, 223, 254, 239, - 255, - }; + 255 + ]; - private static readonly short[] _colScan16X16 = { + private static readonly short[] _colScan16X16 = + [ 0, 16, 32, 48, 1, 64, 17, 80, 33, 96, 49, 2, 65, 112, 18, 81, 34, 128, 50, 97, 3, 66, 144, 19, 113, 35, 82, 160, 98, 51, 129, 4, 67, 176, 20, 114, 145, 83, 36, 99, 130, 52, 192, 5, 161, @@ -349,10 +372,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 78, 203, 31, 141, 234, 94, 47, 188, 63, 157, 110, 250, 219, 79, 126, 204, 173, 142, 95, 189, 111, 235, 158, 220, 251, 127, 174, 143, 205, 236, 159, 190, 221, 252, 175, 206, 237, 191, 253, 222, 238, 207, 254, 223, 239, - 255, - }; + 255 + ]; - private static readonly short[] _rowScan16X16 = { + private static readonly short[] _rowScan16X16 = + [ 0, 1, 2, 16, 3, 17, 4, 18, 32, 5, 33, 19, 6, 34, 48, 20, 49, 7, 35, 21, 50, 64, 8, 36, 65, 22, 51, 37, 80, 9, 66, 52, 23, 38, 81, 67, 10, 53, 24, 82, 68, 96, 39, 11, 54, @@ -370,10 +394,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 217, 231, 95, 246, 232, 126, 203, 247, 233, 173, 218, 142, 111, 158, 188, 248, 127, 234, 219, 249, 189, 204, 143, 174, 159, 250, 235, 205, 220, 175, 190, 251, 221, 191, 206, 236, 207, 237, 252, 222, 253, 223, 238, 239, 254, - 255, - }; + 255 + ]; - private static readonly short[] _defaultScan32X32 = { + private static readonly short[] _defaultScan32X32 = + [ 0, 32, 1, 64, 33, 2, 96, 65, 34, 128, 3, 97, 66, 160, 129, 35, 98, 4, 67, 130, 161, 192, 36, 99, 224, 5, 162, 193, 68, 131, 37, 100, 225, 194, 256, 163, 69, 132, 6, @@ -452,57 +477,64 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 767, 920, 796, 952, 921, 828, 797, 984, 953, 922, 860, 829, 798, 1016, 985, 954, 923, 892, 861, 830, 799, 1017, 986, 955, 893, 862, 831, 1018, 987, 894, 863, 1019, 895, 924, 956, 925, 988, 957, 926, - 1020, 989, 958, 927, 1021, 990, 959, 1022, 991, 1023, - }; + 1020, 989, 958, 927, 1021, 990, 959, 1022, 991, 1023 + ]; // Neighborhood 2-tuples for various scans and blocksizes, // in {top, left} order for each position in corresponding scan order. - private static readonly short[] _defaultScan4X4Neighbors = { + private static readonly short[] _defaultScan4X4Neighbors = + [ 0, 0, 0, 0, 0, 0, 1, 4, 4, 4, 1, 1, 8, 8, 5, 8, 2, - 2, 2, 5, 9, 12, 6, 9, 3, 6, 10, 13, 7, 10, 11, 14, 0, 0, - }; + 2, 2, 5, 9, 12, 6, 9, 3, 6, 10, 13, 7, 10, 11, 14, 0, 0 + ]; - private static readonly short[] _colScan4X4Neighbors = { + private static readonly short[] _colScan4X4Neighbors = + [ 0, 0, 0, 0, 4, 4, 0, 0, 8, 8, 1, 1, 5, 5, 1, 1, 9, - 9, 2, 2, 6, 6, 2, 2, 3, 3, 10, 10, 7, 7, 11, 11, 0, 0, - }; + 9, 2, 2, 6, 6, 2, 2, 3, 3, 10, 10, 7, 7, 11, 11, 0, 0 + ]; - private static readonly short[] _rowScan4X4Neighbors = { + private static readonly short[] _rowScan4X4Neighbors = + [ 0, 0, 0, 0, 0, 0, 1, 1, 4, 4, 2, 2, 5, 5, 4, 4, 8, - 8, 6, 6, 8, 8, 9, 9, 12, 12, 10, 10, 13, 13, 14, 14, 0, 0, - }; + 8, 6, 6, 8, 8, 9, 9, 12, 12, 10, 10, 13, 13, 14, 14, 0, 0 + ]; - private static readonly short[] _colScan8X8Neighbors = { + private static readonly short[] _colScan8X8Neighbors = + [ 0, 0, 0, 0, 8, 8, 0, 0, 16, 16, 1, 1, 24, 24, 9, 9, 1, 1, 32, 32, 17, 17, 2, 2, 25, 25, 10, 10, 40, 40, 2, 2, 18, 18, 33, 33, 3, 3, 48, 48, 11, 11, 26, 26, 3, 3, 41, 41, 19, 19, 34, 34, 4, 4, 27, 27, 12, 12, 49, 49, 42, 42, 20, 20, 4, 4, 35, 35, 5, 5, 28, 28, 50, 50, 43, 43, 13, 13, 36, 36, 5, 5, 21, 21, 51, 51, 29, 29, 6, 6, 44, 44, 14, 14, 6, 6, 37, 37, 52, 52, 22, 22, 7, 7, 30, 30, 45, 45, 15, 15, 38, 38, 23, 23, - 53, 53, 31, 31, 46, 46, 39, 39, 54, 54, 47, 47, 55, 55, 0, 0, - }; + 53, 53, 31, 31, 46, 46, 39, 39, 54, 54, 47, 47, 55, 55, 0, 0 + ]; - private static readonly short[] _rowScan8X8Neighbors = { + private static readonly short[] _rowScan8X8Neighbors = + [ 0, 0, 0, 0, 1, 1, 0, 0, 8, 8, 2, 2, 8, 8, 9, 9, 3, 3, 16, 16, 10, 10, 16, 16, 4, 4, 17, 17, 24, 24, 11, 11, 18, 18, 25, 25, 24, 24, 5, 5, 12, 12, 19, 19, 32, 32, 26, 26, 6, 6, 33, 33, 32, 32, 20, 20, 27, 27, 40, 40, 13, 13, 34, 34, 40, 40, 41, 41, 28, 28, 35, 35, 48, 48, 21, 21, 42, 42, 14, 14, 48, 48, 36, 36, 49, 49, 43, 43, 29, 29, 56, 56, 22, 22, 50, 50, 57, 57, 44, 44, 37, 37, 51, 51, 30, 30, 58, 58, 52, 52, 45, 45, 59, 59, - 38, 38, 60, 60, 46, 46, 53, 53, 54, 54, 61, 61, 62, 62, 0, 0, - }; + 38, 38, 60, 60, 46, 46, 53, 53, 54, 54, 61, 61, 62, 62, 0, 0 + ]; - private static readonly short[] _defaultScan8X8Neighbors = { + private static readonly short[] _defaultScan8X8Neighbors = + [ 0, 0, 0, 0, 0, 0, 8, 8, 1, 8, 1, 1, 9, 16, 16, 16, 2, 9, 2, 2, 10, 17, 17, 24, 24, 24, 3, 10, 3, 3, 18, 25, 25, 32, 11, 18, 32, 32, 4, 11, 26, 33, 19, 26, 4, 4, 33, 40, 12, 19, 40, 40, 5, 12, 27, 34, 34, 41, 20, 27, 13, 20, 5, 5, 41, 48, 48, 48, 28, 35, 35, 42, 21, 28, 6, 6, 6, 13, 42, 49, 49, 56, 36, 43, 14, 21, 29, 36, 7, 14, 43, 50, 50, 57, 22, 29, 37, 44, 15, 22, 44, 51, 51, 58, 30, 37, 23, 30, 52, 59, 45, 52, 38, 45, - 31, 38, 53, 60, 46, 53, 39, 46, 54, 61, 47, 54, 55, 62, 0, 0, - }; + 31, 38, 53, 60, 46, 53, 39, 46, 54, 61, 47, 54, 55, 62, 0, 0 + ]; - private static readonly short[] _colScan16X16Neighbors = { + private static readonly short[] _colScan16X16Neighbors = + [ 0, 0, 0, 0, 16, 16, 32, 32, 0, 0, 48, 48, 1, 1, 64, 64, 17, 17, 80, 80, 33, 33, 1, 1, 49, 49, 96, 96, 2, 2, 65, 65, 18, 18, 112, 112, 34, 34, 81, 81, 2, 2, 50, 50, 128, @@ -537,10 +569,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 142, 204, 204, 235, 235, 111, 111, 158, 158, 127, 127, 189, 189, 220, 220, 143, 143, 174, 174, 205, 205, 236, 236, 159, 159, 190, 190, 221, 221, 175, 175, 237, 237, 206, 206, 222, 222, 191, 191, 238, 238, 207, 207, 223, 223, - 239, 239, 0, 0, - }; + 239, 239, 0, 0 + ]; - private static readonly short[] _rowScan16X16Neighbors = { + private static readonly short[] _rowScan16X16Neighbors = + [ 0, 0, 0, 0, 1, 1, 0, 0, 2, 2, 16, 16, 3, 3, 17, 17, 16, 16, 4, 4, 32, 32, 18, 18, 5, 5, 33, 33, 32, 32, 19, 19, 48, 48, 6, 6, 34, 34, 20, 20, 49, 49, 48, 48, 7, @@ -575,10 +608,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 142, 173, 173, 158, 158, 249, 249, 234, 234, 204, 204, 219, 219, 174, 174, 189, 189, 250, 250, 220, 220, 190, 190, 205, 205, 235, 235, 206, 206, 236, 236, 251, 251, 221, 221, 252, 252, 222, 222, 237, 237, 238, 238, 253, 253, - 254, 254, 0, 0, - }; + 254, 254, 0, 0 + ]; - private static readonly short[] _defaultScan16X16Neighbors = { + private static readonly short[] _defaultScan16X16Neighbors = + [ 0, 0, 0, 0, 0, 0, 16, 16, 1, 16, 1, 1, 32, 32, 17, 32, 2, 17, 2, 2, 48, 48, 18, 33, 33, 48, 3, 18, 49, 64, 64, 64, 34, 49, 3, 3, 19, 34, 50, 65, 4, 19, 65, 80, 80, @@ -613,10 +647,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 249, 219, 234, 127, 142, 158, 173, 204, 219, 189, 204, 143, 158, 235, 250, 174, 189, 205, 220, 159, 174, 220, 235, 221, 236, 175, 190, 190, 205, 236, 251, 206, 221, 237, 252, 191, 206, 222, 237, 207, 222, 238, 253, 223, 238, - 239, 254, 0, 0, - }; + 239, 254, 0, 0 + ]; - private static readonly short[] _defaultScan32X32Neighbors = { + private static readonly short[] _defaultScan32X32Neighbors = + [ 0, 0, 0, 0, 0, 0, 32, 32, 1, 32, 1, 1, 64, 64, 33, 64, 2, 33, 96, 96, 2, 2, 65, 96, 34, 65, 128, 128, 97, 128, 3, 34, 66, 97, 3, 3, 35, 66, 98, 129, 129, 160, @@ -763,43 +798,50 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 799, 830, 986, 1017, 955, 986, 862, 893, 831, 862, 987, 1018, 863, 894, 892, 923, 924, 955, 893, 924, 956, 987, 925, 956, 894, 925, 988, 1019, 957, 988, 926, 957, 895, 926, 989, 1020, 958, 989, 927, 958, 990, 1021, - 959, 990, 991, 1022, 0, 0, - }; + 959, 990, 991, 1022, 0, 0 + ]; - private static readonly short[] _vp9DefaultIscan4X4 = { - 0, 2, 5, 8, 1, 3, 9, 12, 4, 7, 11, 14, 6, 10, 13, 15, - }; + private static readonly short[] _defaultIscan4X4 = + [ + 0, 2, 5, 8, 1, 3, 9, 12, 4, 7, 11, 14, 6, 10, 13, 15 + ]; - private static readonly short[] _vp9ColIscan4X4 = { - 0, 3, 7, 11, 1, 5, 9, 12, 2, 6, 10, 14, 4, 8, 13, 15, - }; + private static readonly short[] _colIscan4X4 = + [ + 0, 3, 7, 11, 1, 5, 9, 12, 2, 6, 10, 14, 4, 8, 13, 15 + ]; - private static readonly short[] _vp9RowIscan4X4 = { - 0, 1, 3, 5, 2, 4, 6, 9, 7, 8, 11, 13, 10, 12, 14, 15, - }; + private static readonly short[] _rowIscan4X4 = + [ + 0, 1, 3, 5, 2, 4, 6, 9, 7, 8, 11, 13, 10, 12, 14, 15 + ]; - private static readonly short[] _vp9ColIscan8X8 = { + private static readonly short[] _colIscan8X8 = + [ 0, 3, 8, 15, 22, 32, 40, 47, 1, 5, 11, 18, 26, 34, 44, 51, 2, 7, 13, 20, 28, 38, 46, 54, 4, 10, 16, 24, 31, 41, 50, 56, 6, 12, 21, 27, 35, 43, 52, 58, 9, 17, 25, 33, 39, 48, 55, 60, - 14, 23, 30, 37, 45, 53, 59, 62, 19, 29, 36, 42, 49, 57, 61, 63, - }; + 14, 23, 30, 37, 45, 53, 59, 62, 19, 29, 36, 42, 49, 57, 61, 63 + ]; - private static readonly short[] _vp9RowIscan8X8 = { + private static readonly short[] _rowIscan8X8 = + [ 0, 1, 2, 5, 8, 12, 19, 24, 3, 4, 7, 10, 15, 20, 30, 39, 6, 9, 13, 16, 21, 27, 37, 46, 11, 14, 17, 23, 28, 34, 44, 52, 18, 22, 25, 31, 35, 41, 50, 57, 26, 29, 33, 38, 43, 49, 55, 59, - 32, 36, 42, 47, 51, 54, 60, 61, 40, 45, 48, 53, 56, 58, 62, 63, - }; + 32, 36, 42, 47, 51, 54, 60, 61, 40, 45, 48, 53, 56, 58, 62, 63 + ]; - private static readonly short[] _vp9DefaultIscan8X8 = { + private static readonly short[] _defaultIscan8X8 = + [ 0, 2, 5, 9, 14, 22, 31, 37, 1, 4, 8, 13, 19, 26, 38, 44, 3, 6, 10, 17, 24, 30, 42, 49, 7, 11, 15, 21, 29, 36, 47, 53, 12, 16, 20, 27, 34, 43, 52, 57, 18, 23, 28, 35, 41, 48, 56, 60, - 25, 32, 39, 45, 50, 55, 59, 62, 33, 40, 46, 51, 54, 58, 61, 63, - }; + 25, 32, 39, 45, 50, 55, 59, 62, 33, 40, 46, 51, 54, 58, 61, 63 + ]; - private static readonly short[] _vp9ColIscan16X16 = { + private static readonly short[] _colIscan16X16 = + [ 0, 4, 11, 20, 31, 43, 59, 75, 85, 109, 130, 150, 165, 181, 195, 198, 1, 6, 14, 23, 34, 47, 64, 81, 95, 114, 135, 153, 171, 188, 201, 212, 2, 8, 16, 25, 38, 52, 67, 83, 101, 116, 136, 157, 172, 190, 205, 216, @@ -815,10 +857,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 42, 61, 77, 90, 106, 121, 134, 148, 160, 173, 191, 211, 225, 238, 245, 251, 50, 72, 87, 100, 118, 128, 145, 158, 168, 183, 204, 222, 233, 242, 249, 253, 57, 80, 97, 111, 131, 143, 155, 169, 178, 192, 214, 231, 239, 246, 250, 254, - 65, 88, 107, 124, 139, 152, 163, 177, 185, 199, 221, 234, 243, 248, 252, 255, - }; + 65, 88, 107, 124, 139, 152, 163, 177, 185, 199, 221, 234, 243, 248, 252, 255 + ]; - private static readonly short[] _vp9RowIscan16X16 = { + private static readonly short[] _rowIscan16X16 = + [ 0, 1, 2, 4, 6, 9, 12, 17, 22, 29, 36, 43, 54, 64, 76, 86, 3, 5, 7, 11, 15, 19, 25, 32, 38, 48, 59, 68, 84, 99, 115, 130, 8, 10, 13, 18, 23, 27, 33, 42, 51, 60, 72, 88, 103, @@ -836,10 +879,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 156, 166, 172, 180, 189, 199, 200, 210, 220, 228, 238, 242, 249, 251, 152, 163, 171, 183, 186, 193, 201, 211, 214, 218, 227, 236, 245, 247, 252, 253, 158, 173, 187, 194, 198, 209, 213, 217, 225, 229, 235, 241, 248, 250, 254, - 255, - }; + 255 + ]; - private static readonly short[] _vp9DefaultIscan16X16 = { + private static readonly short[] _defaultIscan16X16 = + [ 0, 2, 5, 9, 17, 24, 36, 44, 55, 72, 88, 104, 128, 143, 166, 179, 1, 4, 8, 13, 20, 30, 40, 54, 66, 79, 96, 113, 141, 154, 178, 196, 3, 7, 11, 18, 25, 33, 46, 57, 71, 86, 101, 119, 148, @@ -857,10 +901,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 126, 136, 149, 162, 171, 183, 194, 204, 215, 224, 236, 241, 248, 252, 121, 135, 144, 158, 170, 181, 192, 200, 209, 218, 227, 233, 243, 244, 251, 254, 137, 152, 160, 174, 184, 195, 206, 212, 220, 226, 232, 239, 247, 249, 253, - 255, - }; + 255 + ]; - private static readonly short[] _vp9DefaultIscan32X32 = { + private static readonly short[] _defaultIscan32X32 = + [ 0, 2, 5, 10, 17, 25, 38, 47, 62, 83, 101, 121, 145, 170, 193, 204, 210, 219, 229, 233, 245, 257, 275, 299, 342, 356, 377, 405, 455, 471, 495, 527, 1, 4, 8, 15, 22, 30, 45, @@ -939,8 +984,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 850, 876, 889, 905, 917, 937, 947, 959, 968, 982, 989, 997, 1003, 1011, 1015, 1019, 1022, 496, 528, 552, 568, 618, 646, 667, 681, 724, 748, 766, 778, 814, 834, 849, 859, 888, 904, 916, 924, 946, 958, - 967, 973, 988, 996, 1002, 1006, 1014, 1018, 1021, 1023, - }; + 967, 973, 988, 996, 1002, 1006, 1014, 1018, 1021, 1023 + ]; public class ScanOrder { @@ -956,90 +1001,92 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } - public static readonly ScanOrder[] Vp9DefaultScanOrders = { - new(_defaultScan4X4, _vp9DefaultIscan4X4, _defaultScan4X4Neighbors), - new(_defaultScan8X8, _vp9DefaultIscan8X8, _defaultScan8X8Neighbors), - new(_defaultScan16X16, _vp9DefaultIscan16X16, _defaultScan16X16Neighbors), - new(_defaultScan32X32, _vp9DefaultIscan32X32, _defaultScan32X32Neighbors), - }; + public static readonly ScanOrder[] DefaultScanOrders = + [ + new(_defaultScan4X4, _defaultIscan4X4, _defaultScan4X4Neighbors), + new(_defaultScan8X8, _defaultIscan8X8, _defaultScan8X8Neighbors), + new(_defaultScan16X16, _defaultIscan16X16, _defaultScan16X16Neighbors), + new(_defaultScan32X32, _defaultIscan32X32, _defaultScan32X32Neighbors) + ]; - public static readonly ScanOrder[][] Vp9ScanOrders = { - new ScanOrder[] - { // TX_4X4 - new(_defaultScan4X4, _vp9DefaultIscan4X4, _defaultScan4X4Neighbors), - new(_rowScan4X4, _vp9RowIscan4X4, _rowScan4X4Neighbors), - new(_colScan4X4, _vp9ColIscan4X4, _colScan4X4Neighbors), - new(_defaultScan4X4, _vp9DefaultIscan4X4, _defaultScan4X4Neighbors), - }, - new ScanOrder[] - { // TX_8X8 - new(_defaultScan8X8, _vp9DefaultIscan8X8, _defaultScan8X8Neighbors), - new(_rowScan8X8, _vp9RowIscan8X8, _rowScan8X8Neighbors), - new(_colScan8X8, _vp9ColIscan8X8, _colScan8X8Neighbors), - new(_defaultScan8X8, _vp9DefaultIscan8X8, _defaultScan8X8Neighbors), - }, - new ScanOrder[] - { // TX_16X16 - new(_defaultScan16X16, _vp9DefaultIscan16X16, _defaultScan16X16Neighbors), - new(_rowScan16X16, _vp9RowIscan16X16, _rowScan16X16Neighbors), - new(_colScan16X16, _vp9ColIscan16X16, _colScan16X16Neighbors), - new(_defaultScan16X16, _vp9DefaultIscan16X16, _defaultScan16X16Neighbors), - }, - new ScanOrder[] - { // TX_32X32 - new(_defaultScan32X32, _vp9DefaultIscan32X32, _defaultScan32X32Neighbors), - new(_defaultScan32X32, _vp9DefaultIscan32X32, _defaultScan32X32Neighbors), - new(_defaultScan32X32, _vp9DefaultIscan32X32, _defaultScan32X32Neighbors), - new(_defaultScan32X32, _vp9DefaultIscan32X32, _defaultScan32X32Neighbors), - }, + public static readonly ScanOrder[][] ScanOrders = new ScanOrder[][] + { + [ // TX_4X4 + new ScanOrder(_defaultScan4X4, _defaultIscan4X4, _defaultScan4X4Neighbors), + new ScanOrder(_rowScan4X4, _rowIscan4X4, _rowScan4X4Neighbors), + new ScanOrder(_colScan4X4, _colIscan4X4, _colScan4X4Neighbors), + new ScanOrder(_defaultScan4X4, _defaultIscan4X4, _defaultScan4X4Neighbors) + ], + [ // TX_8X8 + new ScanOrder(_defaultScan8X8, _defaultIscan8X8, _defaultScan8X8Neighbors), + new ScanOrder(_rowScan8X8, _rowIscan8X8, _rowScan8X8Neighbors), + new ScanOrder(_colScan8X8, _colIscan8X8, _colScan8X8Neighbors), + new ScanOrder(_defaultScan8X8, _defaultIscan8X8, _defaultScan8X8Neighbors) + ], + [ // TX_16X16 + new ScanOrder(_defaultScan16X16, _defaultIscan16X16, _defaultScan16X16Neighbors), + new ScanOrder(_rowScan16X16, _rowIscan16X16, _rowScan16X16Neighbors), + new ScanOrder(_colScan16X16, _colIscan16X16, _colScan16X16Neighbors), + new ScanOrder(_defaultScan16X16, _defaultIscan16X16, _defaultScan16X16Neighbors) + ], + [ // TX_32X32 + new ScanOrder(_defaultScan32X32, _defaultIscan32X32, _defaultScan32X32Neighbors), + new ScanOrder(_defaultScan32X32, _defaultIscan32X32, _defaultScan32X32Neighbors), + new ScanOrder(_defaultScan32X32, _defaultIscan32X32, _defaultScan32X32Neighbors), + new ScanOrder(_defaultScan32X32, _defaultIscan32X32, _defaultScan32X32Neighbors) + ] }; // Entropy MV - public static readonly sbyte[] Vp9MvJointTree = { - -(sbyte)MvJointType.MvJointZero, 2, -(sbyte)MvJointType.MvJointHnzvz, 4, -(sbyte)MvJointType.MvJointHzvnz, -(sbyte)MvJointType.MvJointHnzvnz, - }; + public static readonly sbyte[] MvJointTree = + [ + -(sbyte)MvJointType.Zero, 2, -(sbyte)MvJointType.Hnzvz, 4, -(sbyte)MvJointType.Hzvnz, -(sbyte)MvJointType.Hnzvnz + ]; - public static readonly sbyte[] Vp9MvClassTree = { - -(sbyte)MvClassType.MvClass0, + public static readonly sbyte[] MvClassTree = + [ + -(sbyte)MvClassType.Class0, 2, - -(sbyte)MvClassType.MvClass1, + -(sbyte)MvClassType.Class1, 4, 6, 8, - -(sbyte)MvClassType.MvClass2, - -(sbyte)MvClassType.MvClass3, + -(sbyte)MvClassType.Class2, + -(sbyte)MvClassType.Class3, 10, 12, - -(sbyte)MvClassType.MvClass4, - -(sbyte)MvClassType.MvClass5, - -(sbyte)MvClassType.MvClass6, + -(sbyte)MvClassType.Class4, + -(sbyte)MvClassType.Class5, + -(sbyte)MvClassType.Class6, 14, 16, 18, - -(sbyte)MvClassType.MvClass7, - -(sbyte)MvClassType.MvClass8, - -(sbyte)MvClassType.MvClass9, - -(sbyte)MvClassType.MvClass10, - }; + -(sbyte)MvClassType.Class7, + -(sbyte)MvClassType.Class8, + -(sbyte)MvClassType.Class9, + -(sbyte)MvClassType.Class10 + ]; - public static ReadOnlySpan Vp9MvFPTree => new sbyte[] { -0, 2, -1, 4, -2, -3 }; + public static ReadOnlySpan MvFpTree => [-0, 2, -1, 4, -2, -3]; // Entropy - public static ReadOnlySpan Vp9Cat1Prob => new byte[] { 159 }; - public static ReadOnlySpan Vp9Cat2Prob => new byte[] { 165, 145 }; - public static ReadOnlySpan Vp9Cat3Prob => new byte[] { 173, 148, 140 }; - public static ReadOnlySpan Vp9Cat4Prob => new byte[] { 176, 155, 140, 135 }; - public static ReadOnlySpan Vp9Cat5Prob => new byte[] { 180, 157, 141, 134, 130 }; - public static ReadOnlySpan Vp9Cat6Prob => new byte[] { 254, 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129 }; + public static ReadOnlySpan Cat1Prob => [159]; + public static ReadOnlySpan Cat2Prob => [165, 145]; + public static ReadOnlySpan Cat3Prob => [173, 148, 140]; + public static ReadOnlySpan Cat4Prob => [176, 155, 140, 135]; + public static ReadOnlySpan Cat5Prob => [180, 157, 141, 134, 130]; + public static ReadOnlySpan Cat6Prob => [254, 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129 + ]; - public static ReadOnlySpan Vp9Cat6ProbHigh12 => new byte[] - { - 255, 255, 255, 255, 254, 254, 54, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129, - }; + public static ReadOnlySpan Cat6ProbHigh12 => + [ + 255, 255, 255, 255, 254, 254, 54, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129 + ]; - private static readonly byte[] _vp9CoefbandTrans8X8Plus = { + private static readonly byte[] _coefbandTrans8X8Plus = + [ 0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, // Beyond MAXBAND_INDEX+1 all values are filled as 5 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -1080,308 +1127,228 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - }; + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 + ]; - private static ReadOnlySpan Vp9CoefbandTrans4X4 => new byte[] - { - 0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, - }; + private static ReadOnlySpan CoefbandTrans4X4 => + [ + 0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5 + ]; public static ReadOnlySpan GetBandTranslate(TxSize txSize) { - return txSize == TxSize.Tx4x4 ? Vp9CoefbandTrans4X4 : _vp9CoefbandTrans8X8Plus; + return txSize == TxSize.Tx4X4 ? CoefbandTrans4X4 : _coefbandTrans8X8Plus; } - public static readonly byte[][] Vp9Pareto8Full = { - new byte[] { 3, 86, 128, 6, 86, 23, 88, 29 }, - new byte[] { 6, 86, 128, 11, 87, 42, 91, 52 }, - new byte[] { 9, 86, 129, 17, 88, 61, 94, 76 }, - new byte[] { 12, 86, 129, 22, 88, 77, 97, 93 }, - new byte[] { 15, 87, 129, 28, 89, 93, 100, 110 }, - new byte[] { 17, 87, 129, 33, 90, 105, 103, 123 }, - new byte[] { 20, 88, 130, 38, 91, 118, 106, 136 }, - new byte[] { 23, 88, 130, 43, 91, 128, 108, 146 }, - new byte[] { 26, 89, 131, 48, 92, 139, 111, 156 }, - new byte[] { 28, 89, 131, 53, 93, 147, 114, 163 }, - new byte[] { 31, 90, 131, 58, 94, 156, 117, 171 }, - new byte[] { 34, 90, 131, 62, 94, 163, 119, 177 }, - new byte[] { 37, 90, 132, 66, 95, 171, 122, 184 }, - new byte[] { 39, 90, 132, 70, 96, 177, 124, 189 }, - new byte[] { 42, 91, 132, 75, 97, 183, 127, 194 }, - new byte[] { 44, 91, 132, 79, 97, 188, 129, 198 }, - new byte[] { 47, 92, 133, 83, 98, 193, 132, 202 }, - new byte[] { 49, 92, 133, 86, 99, 197, 134, 205 }, - new byte[] { 52, 93, 133, 90, 100, 201, 137, 208 }, - new byte[] { 54, 93, 133, 94, 100, 204, 139, 211 }, - new byte[] { 57, 94, 134, 98, 101, 208, 142, 214 }, - new byte[] { 59, 94, 134, 101, 102, 211, 144, 216 }, - new byte[] { 62, 94, 135, 105, 103, 214, 146, 218 }, - new byte[] { 64, 94, 135, 108, 103, 216, 148, 220 }, - new byte[] { 66, 95, 135, 111, 104, 219, 151, 222 }, - new byte[] { 68, 95, 135, 114, 105, 221, 153, 223 }, - new byte[] { 71, 96, 136, 117, 106, 224, 155, 225 }, - new byte[] { 73, 96, 136, 120, 106, 225, 157, 226 }, - new byte[] { 76, 97, 136, 123, 107, 227, 159, 228 }, - new byte[] { 78, 97, 136, 126, 108, 229, 160, 229 }, - new byte[] { 80, 98, 137, 129, 109, 231, 162, 231 }, - new byte[] { 82, 98, 137, 131, 109, 232, 164, 232 }, - new byte[] { 84, 98, 138, 134, 110, 234, 166, 233 }, - new byte[] { 86, 98, 138, 137, 111, 235, 168, 234 }, - new byte[] { 89, 99, 138, 140, 112, 236, 170, 235 }, - new byte[] { 91, 99, 138, 142, 112, 237, 171, 235 }, - new byte[] { 93, 100, 139, 145, 113, 238, 173, 236 }, - new byte[] { 95, 100, 139, 147, 114, 239, 174, 237 }, - new byte[] { 97, 101, 140, 149, 115, 240, 176, 238 }, - new byte[] { 99, 101, 140, 151, 115, 241, 177, 238 }, - new byte[] { 101, 102, 140, 154, 116, 242, 179, 239 }, - new byte[] { 103, 102, 140, 156, 117, 242, 180, 239 }, - new byte[] { 105, 103, 141, 158, 118, 243, 182, 240 }, - new byte[] { 107, 103, 141, 160, 118, 243, 183, 240 }, - new byte[] { 109, 104, 141, 162, 119, 244, 185, 241 }, - new byte[] { 111, 104, 141, 164, 119, 244, 186, 241 }, - new byte[] { 113, 104, 142, 166, 120, 245, 187, 242 }, - new byte[] { 114, 104, 142, 168, 121, 245, 188, 242 }, - new byte[] { 116, 105, 143, 170, 122, 246, 190, 243 }, - new byte[] { 118, 105, 143, 171, 122, 246, 191, 243 }, - new byte[] { 120, 106, 143, 173, 123, 247, 192, 244 }, - new byte[] { 121, 106, 143, 175, 124, 247, 193, 244 }, - new byte[] { 123, 107, 144, 177, 125, 248, 195, 244 }, - new byte[] { 125, 107, 144, 178, 125, 248, 196, 244 }, - new byte[] { 127, 108, 145, 180, 126, 249, 197, 245 }, - new byte[] { 128, 108, 145, 181, 127, 249, 198, 245 }, - new byte[] { 130, 109, 145, 183, 128, 249, 199, 245 }, - new byte[] { 132, 109, 145, 184, 128, 249, 200, 245 }, - new byte[] { 134, 110, 146, 186, 129, 250, 201, 246 }, - new byte[] { 135, 110, 146, 187, 130, 250, 202, 246 }, - new byte[] { 137, 111, 147, 189, 131, 251, 203, 246 }, - new byte[] { 138, 111, 147, 190, 131, 251, 204, 246 }, - new byte[] { 140, 112, 147, 192, 132, 251, 205, 247 }, - new byte[] { 141, 112, 147, 193, 132, 251, 206, 247 }, - new byte[] { 143, 113, 148, 194, 133, 251, 207, 247 }, - new byte[] { 144, 113, 148, 195, 134, 251, 207, 247 }, - new byte[] { 146, 114, 149, 197, 135, 252, 208, 248 }, - new byte[] { 147, 114, 149, 198, 135, 252, 209, 248 }, - new byte[] { 149, 115, 149, 199, 136, 252, 210, 248 }, - new byte[] { 150, 115, 149, 200, 137, 252, 210, 248 }, - new byte[] { 152, 115, 150, 201, 138, 252, 211, 248 }, - new byte[] { 153, 115, 150, 202, 138, 252, 212, 248 }, - new byte[] { 155, 116, 151, 204, 139, 253, 213, 249 }, - new byte[] { 156, 116, 151, 205, 139, 253, 213, 249 }, - new byte[] { 158, 117, 151, 206, 140, 253, 214, 249 }, - new byte[] { 159, 117, 151, 207, 141, 253, 215, 249 }, - new byte[] { 161, 118, 152, 208, 142, 253, 216, 249 }, - new byte[] { 162, 118, 152, 209, 142, 253, 216, 249 }, - new byte[] { 163, 119, 153, 210, 143, 253, 217, 249 }, - new byte[] { 164, 119, 153, 211, 143, 253, 217, 249 }, - new byte[] { 166, 120, 153, 212, 144, 254, 218, 250 }, - new byte[] { 167, 120, 153, 212, 145, 254, 219, 250 }, - new byte[] { 168, 121, 154, 213, 146, 254, 220, 250 }, - new byte[] { 169, 121, 154, 214, 146, 254, 220, 250 }, - new byte[] { 171, 122, 155, 215, 147, 254, 221, 250 }, - new byte[] { 172, 122, 155, 216, 147, 254, 221, 250 }, - new byte[] { 173, 123, 155, 217, 148, 254, 222, 250 }, - new byte[] { 174, 123, 155, 217, 149, 254, 222, 250 }, - new byte[] { 176, 124, 156, 218, 150, 254, 223, 250 }, - new byte[] { 177, 124, 156, 219, 150, 254, 223, 250 }, - new byte[] { 178, 125, 157, 220, 151, 254, 224, 251 }, - new byte[] { 179, 125, 157, 220, 151, 254, 224, 251 }, - new byte[] { 180, 126, 157, 221, 152, 254, 225, 251 }, - new byte[] { 181, 126, 157, 221, 152, 254, 225, 251 }, - new byte[] { 183, 127, 158, 222, 153, 254, 226, 251 }, - new byte[] { 184, 127, 158, 223, 154, 254, 226, 251 }, - new byte[] { 185, 128, 159, 224, 155, 255, 227, 251 }, - new byte[] { 186, 128, 159, 224, 155, 255, 227, 251 }, - new byte[] { 187, 129, 160, 225, 156, 255, 228, 251 }, - new byte[] { 188, 130, 160, 225, 156, 255, 228, 251 }, - new byte[] { 189, 131, 160, 226, 157, 255, 228, 251 }, - new byte[] { 190, 131, 160, 226, 158, 255, 228, 251 }, - new byte[] { 191, 132, 161, 227, 159, 255, 229, 251 }, - new byte[] { 192, 132, 161, 227, 159, 255, 229, 251 }, - new byte[] { 193, 133, 162, 228, 160, 255, 230, 252 }, - new byte[] { 194, 133, 162, 229, 160, 255, 230, 252 }, - new byte[] { 195, 134, 163, 230, 161, 255, 231, 252 }, - new byte[] { 196, 134, 163, 230, 161, 255, 231, 252 }, - new byte[] { 197, 135, 163, 231, 162, 255, 231, 252 }, - new byte[] { 198, 135, 163, 231, 162, 255, 231, 252 }, - new byte[] { 199, 136, 164, 232, 163, 255, 232, 252 }, - new byte[] { 200, 136, 164, 232, 164, 255, 232, 252 }, - new byte[] { 201, 137, 165, 233, 165, 255, 233, 252 }, - new byte[] { 201, 137, 165, 233, 165, 255, 233, 252 }, - new byte[] { 202, 138, 166, 233, 166, 255, 233, 252 }, - new byte[] { 203, 138, 166, 233, 166, 255, 233, 252 }, - new byte[] { 204, 139, 166, 234, 167, 255, 234, 252 }, - new byte[] { 205, 139, 166, 234, 167, 255, 234, 252 }, - new byte[] { 206, 140, 167, 235, 168, 255, 235, 252 }, - new byte[] { 206, 140, 167, 235, 168, 255, 235, 252 }, - new byte[] { 207, 141, 168, 236, 169, 255, 235, 252 }, - new byte[] { 208, 141, 168, 236, 170, 255, 235, 252 }, - new byte[] { 209, 142, 169, 237, 171, 255, 236, 252 }, - new byte[] { 209, 143, 169, 237, 171, 255, 236, 252 }, - new byte[] { 210, 144, 169, 237, 172, 255, 236, 252 }, - new byte[] { 211, 144, 169, 237, 172, 255, 236, 252 }, - new byte[] { 212, 145, 170, 238, 173, 255, 237, 252 }, - new byte[] { 213, 145, 170, 238, 173, 255, 237, 252 }, - new byte[] { 214, 146, 171, 239, 174, 255, 237, 253 }, - new byte[] { 214, 146, 171, 239, 174, 255, 237, 253 }, - new byte[] { 215, 147, 172, 240, 175, 255, 238, 253 }, - new byte[] { 215, 147, 172, 240, 175, 255, 238, 253 }, - new byte[] { 216, 148, 173, 240, 176, 255, 238, 253 }, - new byte[] { 217, 148, 173, 240, 176, 255, 238, 253 }, - new byte[] { 218, 149, 173, 241, 177, 255, 239, 253 }, - new byte[] { 218, 149, 173, 241, 178, 255, 239, 253 }, - new byte[] { 219, 150, 174, 241, 179, 255, 239, 253 }, - new byte[] { 219, 151, 174, 241, 179, 255, 239, 253 }, - new byte[] { 220, 152, 175, 242, 180, 255, 240, 253 }, - new byte[] { 221, 152, 175, 242, 180, 255, 240, 253 }, - new byte[] { 222, 153, 176, 242, 181, 255, 240, 253 }, - new byte[] { 222, 153, 176, 242, 181, 255, 240, 253 }, - new byte[] { 223, 154, 177, 243, 182, 255, 240, 253 }, - new byte[] { 223, 154, 177, 243, 182, 255, 240, 253 }, - new byte[] { 224, 155, 178, 244, 183, 255, 241, 253 }, - new byte[] { 224, 155, 178, 244, 183, 255, 241, 253 }, - new byte[] { 225, 156, 178, 244, 184, 255, 241, 253 }, - new byte[] { 225, 157, 178, 244, 184, 255, 241, 253 }, - new byte[] { 226, 158, 179, 244, 185, 255, 242, 253 }, - new byte[] { 227, 158, 179, 244, 185, 255, 242, 253 }, - new byte[] { 228, 159, 180, 245, 186, 255, 242, 253 }, - new byte[] { 228, 159, 180, 245, 186, 255, 242, 253 }, - new byte[] { 229, 160, 181, 245, 187, 255, 242, 253 }, - new byte[] { 229, 160, 181, 245, 187, 255, 242, 253 }, - new byte[] { 230, 161, 182, 246, 188, 255, 243, 253 }, - new byte[] { 230, 162, 182, 246, 188, 255, 243, 253 }, - new byte[] { 231, 163, 183, 246, 189, 255, 243, 253 }, - new byte[] { 231, 163, 183, 246, 189, 255, 243, 253 }, - new byte[] { 232, 164, 184, 247, 190, 255, 243, 253 }, - new byte[] { 232, 164, 184, 247, 190, 255, 243, 253 }, - new byte[] { 233, 165, 185, 247, 191, 255, 244, 253 }, - new byte[] { 233, 165, 185, 247, 191, 255, 244, 253 }, - new byte[] { 234, 166, 185, 247, 192, 255, 244, 253 }, - new byte[] { 234, 167, 185, 247, 192, 255, 244, 253 }, - new byte[] { 235, 168, 186, 248, 193, 255, 244, 253 }, - new byte[] { 235, 168, 186, 248, 193, 255, 244, 253 }, - new byte[] { 236, 169, 187, 248, 194, 255, 244, 253 }, - new byte[] { 236, 169, 187, 248, 194, 255, 244, 253 }, - new byte[] { 236, 170, 188, 248, 195, 255, 245, 253 }, - new byte[] { 236, 170, 188, 248, 195, 255, 245, 253 }, - new byte[] { 237, 171, 189, 249, 196, 255, 245, 254 }, - new byte[] { 237, 172, 189, 249, 196, 255, 245, 254 }, - new byte[] { 238, 173, 190, 249, 197, 255, 245, 254 }, - new byte[] { 238, 173, 190, 249, 197, 255, 245, 254 }, - new byte[] { 239, 174, 191, 249, 198, 255, 245, 254 }, - new byte[] { 239, 174, 191, 249, 198, 255, 245, 254 }, - new byte[] { 240, 175, 192, 249, 199, 255, 246, 254 }, - new byte[] { 240, 176, 192, 249, 199, 255, 246, 254 }, - new byte[] { 240, 177, 193, 250, 200, 255, 246, 254 }, - new byte[] { 240, 177, 193, 250, 200, 255, 246, 254 }, - new byte[] { 241, 178, 194, 250, 201, 255, 246, 254 }, - new byte[] { 241, 178, 194, 250, 201, 255, 246, 254 }, - new byte[] { 242, 179, 195, 250, 202, 255, 246, 254 }, - new byte[] { 242, 180, 195, 250, 202, 255, 246, 254 }, - new byte[] { 242, 181, 196, 250, 203, 255, 247, 254 }, - new byte[] { 242, 181, 196, 250, 203, 255, 247, 254 }, - new byte[] { 243, 182, 197, 251, 204, 255, 247, 254 }, - new byte[] { 243, 183, 197, 251, 204, 255, 247, 254 }, - new byte[] { 244, 184, 198, 251, 205, 255, 247, 254 }, - new byte[] { 244, 184, 198, 251, 205, 255, 247, 254 }, - new byte[] { 244, 185, 199, 251, 206, 255, 247, 254 }, - new byte[] { 244, 185, 199, 251, 206, 255, 247, 254 }, - new byte[] { 245, 186, 200, 251, 207, 255, 247, 254 }, - new byte[] { 245, 187, 200, 251, 207, 255, 247, 254 }, - new byte[] { 246, 188, 201, 252, 207, 255, 248, 254 }, - new byte[] { 246, 188, 201, 252, 207, 255, 248, 254 }, - new byte[] { 246, 189, 202, 252, 208, 255, 248, 254 }, - new byte[] { 246, 190, 202, 252, 208, 255, 248, 254 }, - new byte[] { 247, 191, 203, 252, 209, 255, 248, 254 }, - new byte[] { 247, 191, 203, 252, 209, 255, 248, 254 }, - new byte[] { 247, 192, 204, 252, 210, 255, 248, 254 }, - new byte[] { 247, 193, 204, 252, 210, 255, 248, 254 }, - new byte[] { 248, 194, 205, 252, 211, 255, 248, 254 }, - new byte[] { 248, 194, 205, 252, 211, 255, 248, 254 }, - new byte[] { 248, 195, 206, 252, 212, 255, 249, 254 }, - new byte[] { 248, 196, 206, 252, 212, 255, 249, 254 }, - new byte[] { 249, 197, 207, 253, 213, 255, 249, 254 }, - new byte[] { 249, 197, 207, 253, 213, 255, 249, 254 }, - new byte[] { 249, 198, 208, 253, 214, 255, 249, 254 }, - new byte[] { 249, 199, 209, 253, 214, 255, 249, 254 }, - new byte[] { 250, 200, 210, 253, 215, 255, 249, 254 }, - new byte[] { 250, 200, 210, 253, 215, 255, 249, 254 }, - new byte[] { 250, 201, 211, 253, 215, 255, 249, 254 }, - new byte[] { 250, 202, 211, 253, 215, 255, 249, 254 }, - new byte[] { 250, 203, 212, 253, 216, 255, 249, 254 }, - new byte[] { 250, 203, 212, 253, 216, 255, 249, 254 }, - new byte[] { 251, 204, 213, 253, 217, 255, 250, 254 }, - new byte[] { 251, 205, 213, 253, 217, 255, 250, 254 }, - new byte[] { 251, 206, 214, 254, 218, 255, 250, 254 }, - new byte[] { 251, 206, 215, 254, 218, 255, 250, 254 }, - new byte[] { 252, 207, 216, 254, 219, 255, 250, 254 }, - new byte[] { 252, 208, 216, 254, 219, 255, 250, 254 }, - new byte[] { 252, 209, 217, 254, 220, 255, 250, 254 }, - new byte[] { 252, 210, 217, 254, 220, 255, 250, 254 }, - new byte[] { 252, 211, 218, 254, 221, 255, 250, 254 }, - new byte[] { 252, 212, 218, 254, 221, 255, 250, 254 }, - new byte[] { 253, 213, 219, 254, 222, 255, 250, 254 }, - new byte[] { 253, 213, 220, 254, 222, 255, 250, 254 }, - new byte[] { 253, 214, 221, 254, 223, 255, 250, 254 }, - new byte[] { 253, 215, 221, 254, 223, 255, 250, 254 }, - new byte[] { 253, 216, 222, 254, 224, 255, 251, 254 }, - new byte[] { 253, 217, 223, 254, 224, 255, 251, 254 }, - new byte[] { 253, 218, 224, 254, 225, 255, 251, 254 }, - new byte[] { 253, 219, 224, 254, 225, 255, 251, 254 }, - new byte[] { 254, 220, 225, 254, 225, 255, 251, 254 }, - new byte[] { 254, 221, 226, 254, 225, 255, 251, 254 }, - new byte[] { 254, 222, 227, 255, 226, 255, 251, 254 }, - new byte[] { 254, 223, 227, 255, 226, 255, 251, 254 }, - new byte[] { 254, 224, 228, 255, 227, 255, 251, 254 }, - new byte[] { 254, 225, 229, 255, 227, 255, 251, 254 }, - new byte[] { 254, 226, 230, 255, 228, 255, 251, 254 }, - new byte[] { 254, 227, 230, 255, 229, 255, 251, 254 }, - new byte[] { 255, 228, 231, 255, 230, 255, 251, 254 }, - new byte[] { 255, 229, 232, 255, 230, 255, 251, 254 }, - new byte[] { 255, 230, 233, 255, 231, 255, 252, 254 }, - new byte[] { 255, 231, 234, 255, 231, 255, 252, 254 }, - new byte[] { 255, 232, 235, 255, 232, 255, 252, 254 }, - new byte[] { 255, 233, 236, 255, 232, 255, 252, 254 }, - new byte[] { 255, 235, 237, 255, 233, 255, 252, 254 }, - new byte[] { 255, 236, 238, 255, 234, 255, 252, 254 }, - new byte[] { 255, 238, 240, 255, 235, 255, 252, 255 }, - new byte[] { 255, 239, 241, 255, 235, 255, 252, 254 }, - new byte[] { 255, 241, 243, 255, 236, 255, 252, 254 }, - new byte[] { 255, 243, 245, 255, 237, 255, 252, 254 }, - new byte[] { 255, 246, 247, 255, 239, 255, 253, 255 }, + public static readonly byte[][] Pareto8Full = new byte[][] + { + [3, 86, 128, 6, 86, 23, 88, 29], [6, 86, 128, 11, 87, 42, 91, 52], [9, 86, 129, 17, 88, 61, 94, 76], [12, 86, 129, 22, 88, 77, 97, 93 + ], + [15, 87, 129, 28, 89, 93, 100, 110], [17, 87, 129, 33, 90, 105, 103, 123], [20, 88, 130, 38, 91, 118, 106, 136 + ], + [23, 88, 130, 43, 91, 128, 108, 146], [26, 89, 131, 48, 92, 139, 111, 156], [28, 89, 131, 53, 93, 147, 114, 163 + ], + [31, 90, 131, 58, 94, 156, 117, 171], [34, 90, 131, 62, 94, 163, 119, 177], [37, 90, 132, 66, 95, 171, 122, 184 + ], + [39, 90, 132, 70, 96, 177, 124, 189], [42, 91, 132, 75, 97, 183, 127, 194], [44, 91, 132, 79, 97, 188, 129, 198 + ], + [47, 92, 133, 83, 98, 193, 132, 202], [49, 92, 133, 86, 99, 197, 134, 205], [52, 93, 133, 90, 100, 201, 137, 208 + ], + [54, 93, 133, 94, 100, 204, 139, 211], [57, 94, 134, 98, 101, 208, 142, 214], [59, 94, 134, 101, 102, 211, 144, 216 + ], + [62, 94, 135, 105, 103, 214, 146, 218], [64, 94, 135, 108, 103, 216, 148, 220], [66, 95, 135, 111, 104, 219, 151, 222 + ], + [68, 95, 135, 114, 105, 221, 153, 223], [71, 96, 136, 117, 106, 224, 155, 225], [73, 96, 136, 120, 106, 225, 157, 226 + ], + [76, 97, 136, 123, 107, 227, 159, 228], [78, 97, 136, 126, 108, 229, 160, 229], [80, 98, 137, 129, 109, 231, 162, 231 + ], + [82, 98, 137, 131, 109, 232, 164, 232], [84, 98, 138, 134, 110, 234, 166, 233], [86, 98, 138, 137, 111, 235, 168, 234 + ], + [89, 99, 138, 140, 112, 236, 170, 235], [91, 99, 138, 142, 112, 237, 171, 235], [93, 100, 139, 145, 113, 238, 173, 236 + ], + [95, 100, 139, 147, 114, 239, 174, 237], [97, 101, 140, 149, 115, 240, 176, 238], [99, 101, 140, 151, 115, 241, 177, 238 + ], + [101, 102, 140, 154, 116, 242, 179, 239], [103, 102, 140, 156, 117, 242, 180, 239], [105, 103, 141, 158, 118, 243, 182, 240 + ], + [107, 103, 141, 160, 118, 243, 183, 240], [109, 104, 141, 162, 119, 244, 185, 241], [111, 104, 141, 164, 119, 244, 186, 241 + ], + [113, 104, 142, 166, 120, 245, 187, 242], [114, 104, 142, 168, 121, 245, 188, 242], [116, 105, 143, 170, 122, 246, 190, 243 + ], + [118, 105, 143, 171, 122, 246, 191, 243], [120, 106, 143, 173, 123, 247, 192, 244], [121, 106, 143, 175, 124, 247, 193, 244 + ], + [123, 107, 144, 177, 125, 248, 195, 244], [125, 107, 144, 178, 125, 248, 196, 244], [127, 108, 145, 180, 126, 249, 197, 245 + ], + [128, 108, 145, 181, 127, 249, 198, 245], [130, 109, 145, 183, 128, 249, 199, 245], [132, 109, 145, 184, 128, 249, 200, 245 + ], + [134, 110, 146, 186, 129, 250, 201, 246], [135, 110, 146, 187, 130, 250, 202, 246], [137, 111, 147, 189, 131, 251, 203, 246 + ], + [138, 111, 147, 190, 131, 251, 204, 246], [140, 112, 147, 192, 132, 251, 205, 247], [141, 112, 147, 193, 132, 251, 206, 247 + ], + [143, 113, 148, 194, 133, 251, 207, 247], [144, 113, 148, 195, 134, 251, 207, 247], [146, 114, 149, 197, 135, 252, 208, 248 + ], + [147, 114, 149, 198, 135, 252, 209, 248], [149, 115, 149, 199, 136, 252, 210, 248], [150, 115, 149, 200, 137, 252, 210, 248 + ], + [152, 115, 150, 201, 138, 252, 211, 248], [153, 115, 150, 202, 138, 252, 212, 248], [155, 116, 151, 204, 139, 253, 213, 249 + ], + [156, 116, 151, 205, 139, 253, 213, 249], [158, 117, 151, 206, 140, 253, 214, 249], [159, 117, 151, 207, 141, 253, 215, 249 + ], + [161, 118, 152, 208, 142, 253, 216, 249], [162, 118, 152, 209, 142, 253, 216, 249], [163, 119, 153, 210, 143, 253, 217, 249 + ], + [164, 119, 153, 211, 143, 253, 217, 249], [166, 120, 153, 212, 144, 254, 218, 250], [167, 120, 153, 212, 145, 254, 219, 250 + ], + [168, 121, 154, 213, 146, 254, 220, 250], [169, 121, 154, 214, 146, 254, 220, 250], [171, 122, 155, 215, 147, 254, 221, 250 + ], + [172, 122, 155, 216, 147, 254, 221, 250], [173, 123, 155, 217, 148, 254, 222, 250], [174, 123, 155, 217, 149, 254, 222, 250 + ], + [176, 124, 156, 218, 150, 254, 223, 250], [177, 124, 156, 219, 150, 254, 223, 250], [178, 125, 157, 220, 151, 254, 224, 251 + ], + [179, 125, 157, 220, 151, 254, 224, 251], [180, 126, 157, 221, 152, 254, 225, 251], [181, 126, 157, 221, 152, 254, 225, 251 + ], + [183, 127, 158, 222, 153, 254, 226, 251], [184, 127, 158, 223, 154, 254, 226, 251], [185, 128, 159, 224, 155, 255, 227, 251 + ], + [186, 128, 159, 224, 155, 255, 227, 251], [187, 129, 160, 225, 156, 255, 228, 251], [188, 130, 160, 225, 156, 255, 228, 251 + ], + [189, 131, 160, 226, 157, 255, 228, 251], [190, 131, 160, 226, 158, 255, 228, 251], [191, 132, 161, 227, 159, 255, 229, 251 + ], + [192, 132, 161, 227, 159, 255, 229, 251], [193, 133, 162, 228, 160, 255, 230, 252], [194, 133, 162, 229, 160, 255, 230, 252 + ], + [195, 134, 163, 230, 161, 255, 231, 252], [196, 134, 163, 230, 161, 255, 231, 252], [197, 135, 163, 231, 162, 255, 231, 252 + ], + [198, 135, 163, 231, 162, 255, 231, 252], [199, 136, 164, 232, 163, 255, 232, 252], [200, 136, 164, 232, 164, 255, 232, 252 + ], + [201, 137, 165, 233, 165, 255, 233, 252], [201, 137, 165, 233, 165, 255, 233, 252], [202, 138, 166, 233, 166, 255, 233, 252 + ], + [203, 138, 166, 233, 166, 255, 233, 252], [204, 139, 166, 234, 167, 255, 234, 252], [205, 139, 166, 234, 167, 255, 234, 252 + ], + [206, 140, 167, 235, 168, 255, 235, 252], [206, 140, 167, 235, 168, 255, 235, 252], [207, 141, 168, 236, 169, 255, 235, 252 + ], + [208, 141, 168, 236, 170, 255, 235, 252], [209, 142, 169, 237, 171, 255, 236, 252], [209, 143, 169, 237, 171, 255, 236, 252 + ], + [210, 144, 169, 237, 172, 255, 236, 252], [211, 144, 169, 237, 172, 255, 236, 252], [212, 145, 170, 238, 173, 255, 237, 252 + ], + [213, 145, 170, 238, 173, 255, 237, 252], [214, 146, 171, 239, 174, 255, 237, 253], [214, 146, 171, 239, 174, 255, 237, 253 + ], + [215, 147, 172, 240, 175, 255, 238, 253], [215, 147, 172, 240, 175, 255, 238, 253], [216, 148, 173, 240, 176, 255, 238, 253 + ], + [217, 148, 173, 240, 176, 255, 238, 253], [218, 149, 173, 241, 177, 255, 239, 253], [218, 149, 173, 241, 178, 255, 239, 253 + ], + [219, 150, 174, 241, 179, 255, 239, 253], [219, 151, 174, 241, 179, 255, 239, 253], [220, 152, 175, 242, 180, 255, 240, 253 + ], + [221, 152, 175, 242, 180, 255, 240, 253], [222, 153, 176, 242, 181, 255, 240, 253], [222, 153, 176, 242, 181, 255, 240, 253 + ], + [223, 154, 177, 243, 182, 255, 240, 253], [223, 154, 177, 243, 182, 255, 240, 253], [224, 155, 178, 244, 183, 255, 241, 253 + ], + [224, 155, 178, 244, 183, 255, 241, 253], [225, 156, 178, 244, 184, 255, 241, 253], [225, 157, 178, 244, 184, 255, 241, 253 + ], + [226, 158, 179, 244, 185, 255, 242, 253], [227, 158, 179, 244, 185, 255, 242, 253], [228, 159, 180, 245, 186, 255, 242, 253 + ], + [228, 159, 180, 245, 186, 255, 242, 253], [229, 160, 181, 245, 187, 255, 242, 253], [229, 160, 181, 245, 187, 255, 242, 253 + ], + [230, 161, 182, 246, 188, 255, 243, 253], [230, 162, 182, 246, 188, 255, 243, 253], [231, 163, 183, 246, 189, 255, 243, 253 + ], + [231, 163, 183, 246, 189, 255, 243, 253], [232, 164, 184, 247, 190, 255, 243, 253], [232, 164, 184, 247, 190, 255, 243, 253 + ], + [233, 165, 185, 247, 191, 255, 244, 253], [233, 165, 185, 247, 191, 255, 244, 253], [234, 166, 185, 247, 192, 255, 244, 253 + ], + [234, 167, 185, 247, 192, 255, 244, 253], [235, 168, 186, 248, 193, 255, 244, 253], [235, 168, 186, 248, 193, 255, 244, 253 + ], + [236, 169, 187, 248, 194, 255, 244, 253], [236, 169, 187, 248, 194, 255, 244, 253], [236, 170, 188, 248, 195, 255, 245, 253 + ], + [236, 170, 188, 248, 195, 255, 245, 253], [237, 171, 189, 249, 196, 255, 245, 254], [237, 172, 189, 249, 196, 255, 245, 254 + ], + [238, 173, 190, 249, 197, 255, 245, 254], [238, 173, 190, 249, 197, 255, 245, 254], [239, 174, 191, 249, 198, 255, 245, 254 + ], + [239, 174, 191, 249, 198, 255, 245, 254], [240, 175, 192, 249, 199, 255, 246, 254], [240, 176, 192, 249, 199, 255, 246, 254 + ], + [240, 177, 193, 250, 200, 255, 246, 254], [240, 177, 193, 250, 200, 255, 246, 254], [241, 178, 194, 250, 201, 255, 246, 254 + ], + [241, 178, 194, 250, 201, 255, 246, 254], [242, 179, 195, 250, 202, 255, 246, 254], [242, 180, 195, 250, 202, 255, 246, 254 + ], + [242, 181, 196, 250, 203, 255, 247, 254], [242, 181, 196, 250, 203, 255, 247, 254], [243, 182, 197, 251, 204, 255, 247, 254 + ], + [243, 183, 197, 251, 204, 255, 247, 254], [244, 184, 198, 251, 205, 255, 247, 254], [244, 184, 198, 251, 205, 255, 247, 254 + ], + [244, 185, 199, 251, 206, 255, 247, 254], [244, 185, 199, 251, 206, 255, 247, 254], [245, 186, 200, 251, 207, 255, 247, 254 + ], + [245, 187, 200, 251, 207, 255, 247, 254], [246, 188, 201, 252, 207, 255, 248, 254], [246, 188, 201, 252, 207, 255, 248, 254 + ], + [246, 189, 202, 252, 208, 255, 248, 254], [246, 190, 202, 252, 208, 255, 248, 254], [247, 191, 203, 252, 209, 255, 248, 254 + ], + [247, 191, 203, 252, 209, 255, 248, 254], [247, 192, 204, 252, 210, 255, 248, 254], [247, 193, 204, 252, 210, 255, 248, 254 + ], + [248, 194, 205, 252, 211, 255, 248, 254], [248, 194, 205, 252, 211, 255, 248, 254], [248, 195, 206, 252, 212, 255, 249, 254 + ], + [248, 196, 206, 252, 212, 255, 249, 254], [249, 197, 207, 253, 213, 255, 249, 254], [249, 197, 207, 253, 213, 255, 249, 254 + ], + [249, 198, 208, 253, 214, 255, 249, 254], [249, 199, 209, 253, 214, 255, 249, 254], [250, 200, 210, 253, 215, 255, 249, 254 + ], + [250, 200, 210, 253, 215, 255, 249, 254], [250, 201, 211, 253, 215, 255, 249, 254], [250, 202, 211, 253, 215, 255, 249, 254 + ], + [250, 203, 212, 253, 216, 255, 249, 254], [250, 203, 212, 253, 216, 255, 249, 254], [251, 204, 213, 253, 217, 255, 250, 254 + ], + [251, 205, 213, 253, 217, 255, 250, 254], [251, 206, 214, 254, 218, 255, 250, 254], [251, 206, 215, 254, 218, 255, 250, 254 + ], + [252, 207, 216, 254, 219, 255, 250, 254], [252, 208, 216, 254, 219, 255, 250, 254], [252, 209, 217, 254, 220, 255, 250, 254 + ], + [252, 210, 217, 254, 220, 255, 250, 254], [252, 211, 218, 254, 221, 255, 250, 254], [252, 212, 218, 254, 221, 255, 250, 254 + ], + [253, 213, 219, 254, 222, 255, 250, 254], [253, 213, 220, 254, 222, 255, 250, 254], [253, 214, 221, 254, 223, 255, 250, 254 + ], + [253, 215, 221, 254, 223, 255, 250, 254], [253, 216, 222, 254, 224, 255, 251, 254], [253, 217, 223, 254, 224, 255, 251, 254 + ], + [253, 218, 224, 254, 225, 255, 251, 254], [253, 219, 224, 254, 225, 255, 251, 254], [254, 220, 225, 254, 225, 255, 251, 254 + ], + [254, 221, 226, 254, 225, 255, 251, 254], [254, 222, 227, 255, 226, 255, 251, 254], [254, 223, 227, 255, 226, 255, 251, 254 + ], + [254, 224, 228, 255, 227, 255, 251, 254], [254, 225, 229, 255, 227, 255, 251, 254], [254, 226, 230, 255, 228, 255, 251, 254 + ], + [254, 227, 230, 255, 229, 255, 251, 254], [255, 228, 231, 255, 230, 255, 251, 254], [255, 229, 232, 255, 230, 255, 251, 254 + ], + [255, 230, 233, 255, 231, 255, 252, 254], [255, 231, 234, 255, 231, 255, 252, 254], [255, 232, 235, 255, 232, 255, 252, 254 + ], + [255, 233, 236, 255, 232, 255, 252, 254], [255, 235, 237, 255, 233, 255, 252, 254], [255, 236, 238, 255, 234, 255, 252, 254 + ], + [255, 238, 240, 255, 235, 255, 252, 255], [255, 239, 241, 255, 235, 255, 252, 254], [255, 241, 243, 255, 236, 255, 252, 254 + ], + [255, 243, 245, 255, 237, 255, 252, 254], [255, 246, 247, 255, 239, 255, 253, 255], }; - // Array indices are identical to previously-existing INTRAMODECONTEXTNODES. - public static readonly sbyte[] Vp9IntraModeTree = { - -(sbyte)PredictionMode.DcPred, 2, // 0 = DC_NODE - -(sbyte)PredictionMode.TmPred, 4, // 1 = TM_NODE - -(sbyte)PredictionMode.VPred, 6, // 2 = V_NODE - 8, 12, // 3 = COM_NODE - -(sbyte)PredictionMode.HPred, 10, // 4 = H_NODE - -(sbyte)PredictionMode.D135Pred, -(sbyte)PredictionMode.D117Pred, // 5 = D135_NODE - -(sbyte)PredictionMode.D45Pred, 14, // 6 = D45_NODE - -(sbyte)PredictionMode.D63Pred, 16, // 7 = D63_NODE - -(sbyte)PredictionMode.D153Pred, -(sbyte)PredictionMode.D207Pred, // 8 = D153_NODE - }; + /* Array indices are identical to previously-existing INTRAMODECONTEXTNODES. */ + public static readonly sbyte[] IntraModeTree = + [ + -(sbyte)PredictionMode.DcPred, 2, /* 0 = DC_NODE */ + -(sbyte)PredictionMode.TmPred, 4, /* 1 = TM_NODE */ + -(sbyte)PredictionMode.VPred, 6, /* 2 = V_NODE */ + 8, 12, /* 3 = COM_NODE */ + -(sbyte)PredictionMode.HPred, 10, /* 4 = H_NODE */ + -(sbyte)PredictionMode.D135Pred, -(sbyte)PredictionMode.D117Pred, /* 5 = D135_NODE */ + -(sbyte)PredictionMode.D45Pred, 14, /* 6 = D45_NODE */ + -(sbyte)PredictionMode.D63Pred, 16, /* 7 = D63_NODE */ + -(sbyte)PredictionMode.D153Pred, -(sbyte)PredictionMode.D207Pred /* 8 = D153_NODE */ + ]; - public static readonly sbyte[] Vp9InterModeTree = { + public static readonly sbyte[] InterModeTree = + [ -((sbyte)PredictionMode.ZeroMv - (sbyte)PredictionMode. NearestMv), 2, -((sbyte)PredictionMode.NearestMv - (sbyte)PredictionMode.NearestMv), 4, -((sbyte)PredictionMode.NearMv - (sbyte)PredictionMode.NearestMv), - -((sbyte)PredictionMode.NewMv - (sbyte)PredictionMode.NearestMv), - }; + -((sbyte)PredictionMode.NewMv - (sbyte)PredictionMode.NearestMv) + ]; - public static readonly sbyte[] Vp9PartitionTree = { - -(sbyte)PartitionType.PartitionNone, 2, -(sbyte)PartitionType.PartitionHorz, 4, -(sbyte)PartitionType.PartitionVert, -(sbyte)PartitionType.PartitionSplit, - }; + public static readonly sbyte[] PartitionTree = + [ + -(sbyte)PartitionType.PartitionNone, 2, -(sbyte)PartitionType.PartitionHorz, 4, -(sbyte)PartitionType.PartitionVert, -(sbyte)PartitionType.PartitionSplit + ]; - public static readonly sbyte[] Vp9SwitchableInterpTree = { - -Constants.EightTap, 2, -Constants.EightTapSmooth, -Constants.EightTapSharp, - }; + public static readonly sbyte[] SwitchableInterpTree = + [ + -Constants.EightTap, 2, -Constants.EightTapSmooth, -Constants.EightTapSharp + ]; - public static readonly sbyte[] Vp9SegmentTree = { - 2, 4, 6, 8, 10, 12, 0, -1, -2, -3, -4, -5, -6, -7, - }; + public static readonly sbyte[] SegmentTree = + [ + 2, 4, 6, 8, 10, 12, 0, -1, -2, -3, -4, -5, -6, -7 + ]; // MV Ref @@ -1390,192 +1357,195 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // adding 9 for each intra block, 3 for each zero mv and 1 for each new // motion vector. This single number is then converted into a context // with a single lookup ( CounterToContext ). - public static readonly int[] Mode2Counter = { - 9, // DC_PRED - 9, // V_PRED - 9, // H_PRED - 9, // D45_PRED - 9, // D135_PRED - 9, // D117_PRED - 9, // D153_PRED - 9, // D207_PRED - 9, // D63_PRED - 9, // TM_PRED - 0, // NEARESTMV - 0, // NEARMV - 3, // ZEROMV - 1, // NEWMV - }; + public static readonly int[] Mode2Counter = + [ + 9, // DC_PRED + 9, // V_PRED + 9, // H_PRED + 9, // D45_PRED + 9, // D135_PRED + 9, // D117_PRED + 9, // D153_PRED + 9, // D207_PRED + 9, // D63_PRED + 9, // TM_PRED + 0, // NEARESTMV + 0, // NEARMV + 3, // ZEROMV + 1 // NEWMV + ]; // There are 3^3 different combinations of 3 counts that can be either 0,1 or // 2. However the actual count can never be greater than 2 so the highest // counter we need is 18. 9 is an invalid counter that's never used. - public static readonly MotionVectorContext[] CounterToContext = { - MotionVectorContext.BothPredicted, // 0 - MotionVectorContext.NewPlusNonIntra, // 1 - MotionVectorContext.BothNew, // 2 + public static readonly MotionVectorContext[] CounterToContext = + [ + MotionVectorContext.BothPredicted, // 0 + MotionVectorContext.NewPlusNonIntra, // 1 + MotionVectorContext.BothNew, // 2 MotionVectorContext.ZeroPlusPredicted, // 3 - MotionVectorContext.NewPlusNonIntra, // 4 - MotionVectorContext.InvalidCase, // 5 - MotionVectorContext.BothZero, // 6 - MotionVectorContext.InvalidCase, // 7 - MotionVectorContext.InvalidCase, // 8 + MotionVectorContext.NewPlusNonIntra, // 4 + MotionVectorContext.InvalidCase, // 5 + MotionVectorContext.BothZero, // 6 + MotionVectorContext.InvalidCase, // 7 + MotionVectorContext.InvalidCase, // 8 MotionVectorContext.IntraPlusNonIntra, // 9 MotionVectorContext.IntraPlusNonIntra, // 10 - MotionVectorContext.InvalidCase, // 11 + MotionVectorContext.InvalidCase, // 11 MotionVectorContext.IntraPlusNonIntra, // 12 - MotionVectorContext.InvalidCase, // 13 - MotionVectorContext.InvalidCase, // 14 - MotionVectorContext.InvalidCase, // 15 - MotionVectorContext.InvalidCase, // 16 - MotionVectorContext.InvalidCase, // 17 - MotionVectorContext.BothIntra, // 18 - }; + MotionVectorContext.InvalidCase, // 13 + MotionVectorContext.InvalidCase, // 14 + MotionVectorContext.InvalidCase, // 15 + MotionVectorContext.InvalidCase, // 16 + MotionVectorContext.InvalidCase, // 17 + MotionVectorContext.BothIntra // 18 + ]; - public static readonly Position[][] MvRefBlocks = { + public static readonly Position[][] MvRefBlocks = new Position[][] + { // 4X4 - new Position[] { - new(-1, 0), - new(0, -1), - new(-1, -1), - new(-2, 0), - new(0, -2), - new(-2, -1), - new(-1, -2), - new(-2, -2), - }, - // 4X8 - new Position[] { - new(-1, 0), - new(0, -1), - new(-1, -1), - new(-2, 0), - new(0, -2), - new(-2, -1), - new(-1, -2), - new(-2, -2), - }, - // 8X4 - new Position[] { - new(-1, 0), - new(0, -1), - new(-1, -1), - new(-2, 0), - new(0, -2), - new(-2, -1), - new(-1, -2), - new(-2, -2), - }, + [ + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, -1 ), + new Position( -2, 0 ), + new Position( 0, -2 ), + new Position( -2, -1 ), + new Position( -1, -2 ), + new Position( -2, -2 ) + ], + // 4x8 + [ + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, -1 ), + new Position( -2, 0 ), + new Position( 0, -2 ), + new Position( -2, -1 ), + new Position( -1, -2 ), + new Position( -2, -2 ) + ], + // 8x4 + [ + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, -1 ), + new Position( -2, 0 ), + new Position( 0, -2 ), + new Position( -2, -1 ), + new Position( -1, -2 ), + new Position( -2, -2 ) + ], // 8X8 - new Position[] { - new(-1, 0), - new(0, -1), - new(-1, -1), - new(-2, 0), - new(0, -2), - new(-2, -1), - new(-1, -2), - new(-2, -2), - }, - // 8X16 - new Position[] { - new(0, -1), - new(-1, 0), - new(1, -1), - new(-1, -1), - new(0, -2), - new(-2, 0), - new(-2, -1), - new(-1, -2), - }, - // 16X8 - new Position[] { - new(-1, 0), - new(0, -1), - new(-1, 1), - new(-1, -1), - new(-2, 0), - new(0, -2), - new(-1, -2), - new(-2, -1), - }, + [ + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, -1 ), + new Position( -2, 0 ), + new Position( 0, -2 ), + new Position( -2, -1 ), + new Position( -1, -2 ), + new Position( -2, -2 ) + ], + // 8x16 + [ + new Position( 0, -1 ), + new Position( -1, 0 ), + new Position( 1, -1 ), + new Position( -1, -1 ), + new Position( 0, -2 ), + new Position( -2, 0 ), + new Position( -2, -1 ), + new Position( -1, -2 ) + ], + // 16x8 + [ + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, 1 ), + new Position( -1, -1 ), + new Position( -2, 0 ), + new Position( 0, -2 ), + new Position( -1, -2 ), + new Position( -2, -1 ) + ], // 16X16 - new Position[] { - new(-1, 0), - new(0, -1), - new(-1, 1), - new(1, -1), - new(-1, -1), - new(-3, 0), - new(0, -3), - new(-3, -3), - }, - // 16X32 - new Position[] { - new(0, -1), - new(-1, 0), - new(2, -1), - new(-1, -1), - new(-1, 1), - new(0, -3), - new(-3, 0), - new(-3, -3), - }, - // 32X16 - new Position[] { - new(-1, 0), - new(0, -1), - new(-1, 2), - new(-1, -1), - new(1, -1), - new(-3, 0), - new(0, -3), - new(-3, -3), - }, + [ + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, 1 ), + new Position( 1, -1 ), + new Position( -1, -1 ), + new Position( -3, 0 ), + new Position( 0, -3 ), + new Position( -3, -3 ) + ], + // 16x32 + [ + new Position( 0, -1 ), + new Position( -1, 0 ), + new Position( 2, -1 ), + new Position( -1, -1 ), + new Position( -1, 1 ), + new Position( 0, -3 ), + new Position( -3, 0 ), + new Position( -3, -3 ) + ], + // 32x16 + [ + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, 2 ), + new Position( -1, -1 ), + new Position( 1, -1 ), + new Position( -3, 0 ), + new Position( 0, -3 ), + new Position( -3, -3 ) + ], // 32X32 - new Position[] { - new(-1, 1), - new(1, -1), - new(-1, 2), - new(2, -1), - new(-1, -1), - new(-3, 0), - new(0, -3), - new(-3, -3), - }, - // 32X64 - new Position[] { - new(0, -1), - new(-1, 0), - new(4, -1), - new(-1, 2), - new(-1, -1), - new(0, -3), - new(-3, 0), - new(2, -1), - }, - // 64X32 - new Position[] { - new(-1, 0), - new(0, -1), - new(-1, 4), - new(2, -1), - new(-1, -1), - new(-3, 0), - new(0, -3), - new(-1, 2), - }, - // 64X64 - new Position[] { - new(-1, 3), - new(3, -1), - new(-1, 4), - new(4, -1), - new(-1, -1), - new(-1, 0), - new(0, -1), - new(-1, 6), - }, + [ + new Position( -1, 1 ), + new Position( 1, -1 ), + new Position( -1, 2 ), + new Position( 2, -1 ), + new Position( -1, -1 ), + new Position( -3, 0 ), + new Position( 0, -3 ), + new Position( -3, -3 ) + ], + // 32x64 + [ + new Position( 0, -1 ), + new Position( -1, 0 ), + new Position( 4, -1 ), + new Position( -1, 2 ), + new Position( -1, -1 ), + new Position( 0, -3 ), + new Position( -3, 0 ), + new Position( 2, -1 ) + ], + // 64x32 + [ + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, 4 ), + new Position( 2, -1 ), + new Position( -1, -1 ), + new Position( -3, 0 ), + new Position( 0, -3 ), + new Position( -1, 2 ) + ], + // 64x64 + [ + new Position( -1, 3 ), + new Position( 3, -1 ), + new Position( -1, 4 ), + new Position( 4, -1 ), + new Position( -1, -1 ), + new Position( -1, 0 ), + new Position( 0, -1 ), + new Position( -1, 6 ) + ] }; } } diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/PredCommon.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/PredCommon.cs index 1f391f6eb..30cab3b60 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/PredCommon.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/PredCommon.cs @@ -1,4 +1,4 @@ -using Ryujinx.Graphics.Nvdec.Vp9.Types; +using Ryujinx.Graphics.Nvdec.Vp9.Types; using System.Diagnostics; namespace Ryujinx.Graphics.Nvdec.Vp9 @@ -13,7 +13,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // left of the entries corresponding to real macroblocks. // The prediction flags in these dummy entries are initialized to 0. if (!xd.AboveMi.IsNull && !xd.LeftMi.IsNull) - { // both edges available + { + // both edges available if (!xd.AboveMi.Value.HasSecondRef() && !xd.LeftMi.Value.HasSecondRef()) { // Neither edge uses comp pred (0/1) @@ -23,12 +24,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 else if (!xd.AboveMi.Value.HasSecondRef()) { // One of two edges uses comp pred (2/3) - ctx = 2 + (xd.AboveMi.Value.RefFrame[0] == cm.CompFixedRef || !xd.AboveMi.Value.IsInterBlock() ? 1 : 0); + ctx = 2 + (xd.AboveMi.Value.RefFrame[0] == cm.CompFixedRef || !xd.AboveMi.Value.IsInterBlock() + ? 1 + : 0); } else if (!xd.LeftMi.Value.HasSecondRef()) { // One of two edges uses comp pred (2/3) - ctx = 2 + (xd.LeftMi.Value.RefFrame[0] == cm.CompFixedRef || !xd.LeftMi.Value.IsInterBlock() ? 1 : 0); + ctx = 2 + + (xd.LeftMi.Value.RefFrame[0] == cm.CompFixedRef || !xd.LeftMi.Value.IsInterBlock() ? 1 : 0); } else // Both edges use comp pred (4) { @@ -36,7 +40,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } else if (!xd.AboveMi.IsNull || !xd.LeftMi.IsNull) - { // One edge available + { + // One edge available ref ModeInfo edgeMi = ref !xd.AboveMi.IsNull ? ref xd.AboveMi.Value : ref xd.LeftMi.Value; if (!edgeMi.HasSecondRef()) @@ -51,11 +56,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } else - { // No edges available (1) + { + // No edges available (1) ctx = 1; } - Debug.Assert(ctx >= 0 && ctx < Constants.CompInterContexts); + Debug.Assert(ctx >= 0 && ctx < Constants.CompInterContexts); return ctx; } @@ -71,29 +77,33 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int varRefIdx = fixRefIdx == 0 ? 1 : 0; if (!xd.AboveMi.IsNull && !xd.LeftMi.IsNull) - { // Both edges available + { + // Both edges available bool aboveIntra = !xd.AboveMi.Value.IsInterBlock(); bool leftIntra = !xd.LeftMi.Value.IsInterBlock(); if (aboveIntra && leftIntra) - { // Intra/Intra (2) + { + // Intra/Intra (2) predContext = 2; } else if (aboveIntra || leftIntra) - { // Intra/Inter + { + // Intra/Inter ref ModeInfo edgeMi = ref aboveIntra ? ref xd.LeftMi.Value : ref xd.AboveMi.Value; if (!edgeMi.HasSecondRef()) // single pred (1/3) { - predContext = 1 + 2 * (edgeMi.RefFrame[0] != cm.CompVarRef[1] ? 1 : 0); + predContext = 1 + (2 * (edgeMi.RefFrame[0] != cm.CompVarRef[1] ? 1 : 0)); } else // Comp pred (1/3) { - predContext = 1 + 2 * (edgeMi.RefFrame[varRefIdx] != cm.CompVarRef[1] ? 1 : 0); + predContext = 1 + (2 * (edgeMi.RefFrame[varRefIdx] != cm.CompVarRef[1] ? 1 : 0)); } } else - { // Inter/Inter + { + // Inter/Inter bool lSg = !xd.LeftMi.Value.HasSecondRef(); bool aSg = !xd.AboveMi.Value.HasSecondRef(); sbyte vrfa = aSg ? xd.AboveMi.Value.RefFrame[0] : xd.AboveMi.Value.RefFrame[varRefIdx]; @@ -104,7 +114,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 predContext = 0; } else if (lSg && aSg) - { // Single/Single + { + // Single/Single if ((vrfa == cm.CompFixedRef && vrfl == cm.CompVarRef[0]) || (vrfl == cm.CompFixedRef && vrfa == cm.CompVarRef[0])) { @@ -120,7 +131,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } else if (lSg || aSg) - { // Single/Comp + { + // Single/Comp sbyte vrfc = lSg ? vrfa : vrfl; sbyte rfs = aSg ? vrfa : vrfl; if (vrfc == cm.CompVarRef[1] && rfs != cm.CompVarRef[1]) @@ -137,7 +149,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } else if (vrfa == vrfl) - { // Comp/Comp + { + // Comp/Comp predContext = 4; } else @@ -147,7 +160,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } else if (!xd.AboveMi.IsNull || !xd.LeftMi.IsNull) - { // One edge available + { + // One edge available ref ModeInfo edgeMi = ref !xd.AboveMi.IsNull ? ref xd.AboveMi.Value : ref xd.LeftMi.Value; if (!edgeMi.IsInterBlock()) @@ -167,11 +181,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } else - { // No edges available (2) + { + // No edges available (2) predContext = 2; } - Debug.Assert(predContext >= 0 && predContext < Constants.RefContexts); + Debug.Assert(predContext >= 0 && predContext < Constants.RefContexts); return predContext; } @@ -183,16 +198,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // left of the entries corresponding to real macroblocks. // The prediction flags in these dummy entries are initialized to 0. if (!xd.AboveMi.IsNull && !xd.LeftMi.IsNull) - { // Both edges available + { + // Both edges available bool aboveIntra = !xd.AboveMi.Value.IsInterBlock(); bool leftIntra = !xd.LeftMi.Value.IsInterBlock(); if (aboveIntra && leftIntra) - { // Intra/Intra + { + // Intra/Intra predContext = 2; } else if (aboveIntra || leftIntra) - { // Intra/Inter or Inter/Intra + { + // Intra/Inter or Inter/Intra ref ModeInfo edgeMi = ref aboveIntra ? ref xd.LeftMi.Value : ref xd.AboveMi.Value; if (!edgeMi.HasSecondRef()) { @@ -201,11 +219,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 else { predContext = 1 + (edgeMi.RefFrame[0] == Constants.LastFrame || - edgeMi.RefFrame[1] == Constants.LastFrame ? 1 : 0); + edgeMi.RefFrame[1] == Constants.LastFrame + ? 1 + : 0); } } else - { // Inter/Inter + { + // Inter/Inter bool aboveHasSecond = xd.AboveMi.Value.HasSecondRef(); bool leftHasSecond = xd.LeftMi.Value.HasSecondRef(); sbyte above0 = xd.AboveMi.Value.RefFrame[0]; @@ -216,7 +237,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (aboveHasSecond && leftHasSecond) { predContext = 1 + (above0 == Constants.LastFrame || above1 == Constants.LastFrame || - left0 == Constants.LastFrame || left1 == Constants.LastFrame ? 1 : 0); + left0 == Constants.LastFrame || left1 == Constants.LastFrame + ? 1 + : 0); } else if (aboveHasSecond || leftHasSecond) { @@ -230,24 +253,28 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } else { - predContext = (crf1 == Constants.LastFrame || crf2 == Constants.LastFrame ? 1 : 0); + predContext = crf1 == Constants.LastFrame || crf2 == Constants.LastFrame ? 1 : 0; } } else { - predContext = 2 * (above0 == Constants.LastFrame ? 1 : 0) + 2 * (left0 == Constants.LastFrame ? 1 : 0); + predContext = (2 * (above0 == Constants.LastFrame ? 1 : 0)) + + (2 * (left0 == Constants.LastFrame ? 1 : 0)); } } } else if (!xd.AboveMi.IsNull || !xd.LeftMi.IsNull) - { // One edge available + { + // One edge available ref ModeInfo edgeMi = ref !xd.AboveMi.IsNull ? ref xd.AboveMi.Value : ref xd.LeftMi.Value; if (!edgeMi.IsInterBlock()) - { // Intra + { + // Intra predContext = 2; } else - { // Inter + { + // Inter if (!edgeMi.HasSecondRef()) { predContext = 4 * (edgeMi.RefFrame[0] == Constants.LastFrame ? 1 : 0); @@ -255,16 +282,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 else { predContext = 1 + (edgeMi.RefFrame[0] == Constants.LastFrame || - edgeMi.RefFrame[1] == Constants.LastFrame ? 1 : 0); + edgeMi.RefFrame[1] == Constants.LastFrame + ? 1 + : 0); } } } else - { // No edges available + { + // No edges available predContext = 2; } - Debug.Assert(predContext >= 0 && predContext < Constants.RefContexts); + Debug.Assert(predContext >= 0 && predContext < Constants.RefContexts); return predContext; } @@ -277,16 +307,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 // left of the entries corresponding to real macroblocks. // The prediction flags in these dummy entries are initialized to 0. if (!xd.AboveMi.IsNull && !xd.LeftMi.IsNull) - { // Both edges available + { + // Both edges available bool aboveIntra = !xd.AboveMi.Value.IsInterBlock(); bool leftIntra = !xd.LeftMi.Value.IsInterBlock(); if (aboveIntra && leftIntra) - { // Intra/Intra + { + // Intra/Intra predContext = 2; } else if (aboveIntra || leftIntra) - { // Intra/Inter or Inter/Intra + { + // Intra/Inter or Inter/Intra ref ModeInfo edgeMi = ref aboveIntra ? ref xd.LeftMi.Value : ref xd.AboveMi.Value; if (!edgeMi.HasSecondRef()) { @@ -301,12 +334,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } else { - predContext = 1 + 2 * (edgeMi.RefFrame[0] == Constants.GoldenFrame || - edgeMi.RefFrame[1] == Constants.GoldenFrame ? 1 : 0); + predContext = 1 + (2 * (edgeMi.RefFrame[0] == Constants.GoldenFrame || + edgeMi.RefFrame[1] == Constants.GoldenFrame + ? 1 + : 0)); } } else - { // Inter/Inter + { + // Inter/Inter bool aboveHasSecond = xd.AboveMi.Value.HasSecondRef(); bool leftHasSecond = xd.LeftMi.Value.HasSecondRef(); sbyte above0 = xd.AboveMi.Value.RefFrame[0]; @@ -319,7 +355,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (above0 == left0 && above1 == left1) { predContext = 3 * (above0 == Constants.GoldenFrame || above1 == Constants.GoldenFrame || - left0 == Constants.GoldenFrame || left1 == Constants.GoldenFrame ? 1 : 0); + left0 == Constants.GoldenFrame || left1 == Constants.GoldenFrame + ? 1 + : 0); } else { @@ -342,7 +380,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } else { - predContext = 1 + 2 * (crf1 == Constants.GoldenFrame || crf2 == Constants.GoldenFrame ? 1 : 0); + predContext = + 1 + (2 * (crf1 == Constants.GoldenFrame || crf2 == Constants.GoldenFrame ? 1 : 0)); } } else @@ -353,18 +392,20 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } else if (above0 == Constants.LastFrame || left0 == Constants.LastFrame) { - sbyte edge0 = (above0 == Constants.LastFrame) ? left0 : above0; + sbyte edge0 = above0 == Constants.LastFrame ? left0 : above0; predContext = 4 * (edge0 == Constants.GoldenFrame ? 1 : 0); } else { - predContext = 2 * (above0 == Constants.GoldenFrame ? 1 : 0) + 2 * (left0 == Constants.GoldenFrame ? 1 : 0); + predContext = (2 * (above0 == Constants.GoldenFrame ? 1 : 0)) + + (2 * (left0 == Constants.GoldenFrame ? 1 : 0)); } } } } else if (!xd.AboveMi.IsNull || !xd.LeftMi.IsNull) - { // One edge available + { + // One edge available ref ModeInfo edgeMi = ref !xd.AboveMi.IsNull ? ref xd.AboveMi.Value : ref xd.LeftMi.Value; if (!edgeMi.IsInterBlock() || (edgeMi.RefFrame[0] == Constants.LastFrame && !edgeMi.HasSecondRef())) @@ -378,16 +419,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 else { predContext = 3 * (edgeMi.RefFrame[0] == Constants.GoldenFrame || - edgeMi.RefFrame[1] == Constants.GoldenFrame ? 1 : 0); + edgeMi.RefFrame[1] == Constants.GoldenFrame + ? 1 + : 0); } } else - { // No edges available (2) + { + // No edges available (2) predContext = 2; } - Debug.Assert(predContext >= 0 && predContext < Constants.RefContexts); + Debug.Assert(predContext >= 0 && predContext < Constants.RefContexts); return predContext; } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Prob.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Prob.cs new file mode 100644 index 000000000..ca6fa351a --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Prob.cs @@ -0,0 +1,94 @@ +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Common; +using System; +using System.Diagnostics; + +namespace Ryujinx.Graphics.Nvdec.Vp9 +{ + public static class Prob + { + public const int MaxProb = 255; + + private static byte GetProb(uint num, uint den) + { + Debug.Assert(den != 0); + { + int p = (int)((((ulong)num * 256) + (den >> 1)) / den); + // (p > 255) ? 255 : (p < 1) ? 1 : p; + int clippedProb = p | ((255 - p) >> 23) | (p == 0 ? 1 : 0); + return (byte)clippedProb; + } + } + + private static byte GetBinaryProb(uint n0, uint n1) + { + uint den = n0 + n1; + if (den == 0) + { + return 128; + } + + return GetProb(n0, den); + } + + /* This function assumes prob1 and prob2 are already within [1,255] range. */ + public static byte WeightedProb(int prob1, int prob2, int factor) + { + return (byte)BitUtils.RoundPowerOfTwo((prob1 * (256 - factor)) + (prob2 * factor), 8); + } + + public static byte MergeProbs(byte preProb, ref Array2 ct, uint countSat, uint maxUpdateFactor) + { + byte prob = GetBinaryProb(ct[0], ct[1]); + uint count = Math.Min(ct[0] + ct[1], countSat); + uint factor = maxUpdateFactor * count / countSat; + return WeightedProb(preProb, prob, (int)factor); + } + + // MODE_MV_MAX_UPDATE_FACTOR (128) * count / MODE_MV_COUNT_SAT; + private static readonly uint[] _countToUpdateFactor = + [ + 0, 6, 12, 19, 25, 32, 38, 44, 51, 57, 64, 70, 76, 83, 89, 96, 102, 108, 115, 121, 128 + ]; + + private const int ModeMvCountSat = 20; + + public static byte ModeMvMergeProbs(byte preProb, ref Array2 ct) + { + uint den = ct[0] + ct[1]; + if (den == 0) + { + return preProb; + } + + uint count = Math.Min(den, ModeMvCountSat); + uint factor = _countToUpdateFactor[(int)count]; + byte prob = GetProb(ct[0], den); + return WeightedProb(preProb, prob, (int)factor); + } + + private static uint TreeMergeProbsImpl( + uint i, + sbyte[] tree, + ReadOnlySpan preProbs, + ReadOnlySpan counts, + Span probs) + { + int l = tree[i]; + uint leftCount = l <= 0 ? counts[-l] : TreeMergeProbsImpl((uint)l, tree, preProbs, counts, probs); + int r = tree[i + 1]; + uint rightCount = r <= 0 ? counts[-r] : TreeMergeProbsImpl((uint)r, tree, preProbs, counts, probs); + Array2 ct = new(); + ct[0] = leftCount; + ct[1] = rightCount; + probs[(int)(i >> 1)] = ModeMvMergeProbs(preProbs[(int)(i >> 1)], ref ct); + return leftCount + rightCount; + } + + public static void VpxTreeMergeProbs(sbyte[] tree, ReadOnlySpan preProbs, ReadOnlySpan counts, + Span probs) + { + TreeMergeProbsImpl(0, tree, preProbs, counts, probs); + } + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/QuantCommon.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/QuantCommon.cs index 8e8fafdb1..3542c90c4 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/QuantCommon.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/QuantCommon.cs @@ -1,172 +1,127 @@ -using Ryujinx.Graphics.Nvdec.Vp9.Types; -using System; +using System; using System.Diagnostics; namespace Ryujinx.Graphics.Nvdec.Vp9 { internal static class QuantCommon { - public const int MinQ = 0; public const int MaxQ = 255; + public const int QindexBits = 8; - private static readonly short[] _dcQlookup = { - 4, 8, 8, 9, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, - 19, 19, 20, 21, 22, 23, 24, 25, 26, 26, 27, 28, 29, 30, - 31, 32, 32, 33, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42, - 43, 43, 44, 45, 46, 47, 48, 48, 49, 50, 51, 52, 53, 53, - 54, 55, 56, 57, 57, 58, 59, 60, 61, 62, 62, 63, 64, 65, - 66, 66, 67, 68, 69, 70, 70, 71, 72, 73, 74, 74, 75, 76, - 77, 78, 78, 79, 80, 81, 81, 82, 83, 84, 85, 85, 87, 88, - 90, 92, 93, 95, 96, 98, 99, 101, 102, 104, 105, 107, 108, 110, - 111, 113, 114, 116, 117, 118, 120, 121, 123, 125, 127, 129, 131, 134, - 136, 138, 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 161, 164, - 166, 169, 172, 174, 177, 180, 182, 185, 187, 190, 192, 195, 199, 202, - 205, 208, 211, 214, 217, 220, 223, 226, 230, 233, 237, 240, 243, 247, - 250, 253, 257, 261, 265, 269, 272, 276, 280, 284, 288, 292, 296, 300, - 304, 309, 313, 317, 322, 326, 330, 335, 340, 344, 349, 354, 359, 364, - 369, 374, 379, 384, 389, 395, 400, 406, 411, 417, 423, 429, 435, 441, - 447, 454, 461, 467, 475, 482, 489, 497, 505, 513, 522, 530, 539, 549, - 559, 569, 579, 590, 602, 614, 626, 640, 654, 668, 684, 700, 717, 736, - 755, 775, 796, 819, 843, 869, 896, 925, 955, 988, 1022, 1058, 1098, 1139, - 1184, 1232, 1282, 1336, - }; + private static readonly short[] _dcQlookup = + [ + 4, 8, 8, 9, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 23, 24, 25, 26, 26, 27, 28, 29, + 30, 31, 32, 32, 33, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42, 43, 43, 44, 45, 46, 47, 48, 48, 49, 50, 51, + 52, 53, 53, 54, 55, 56, 57, 57, 58, 59, 60, 61, 62, 62, 63, 64, 65, 66, 66, 67, 68, 69, 70, 70, 71, 72, + 73, 74, 74, 75, 76, 77, 78, 78, 79, 80, 81, 81, 82, 83, 84, 85, 85, 87, 88, 90, 92, 93, 95, 96, 98, 99, + 101, 102, 104, 105, 107, 108, 110, 111, 113, 114, 116, 117, 118, 120, 121, 123, 125, 127, 129, 131, 134, + 136, 138, 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 161, 164, 166, 169, 172, 174, 177, 180, 182, + 185, 187, 190, 192, 195, 199, 202, 205, 208, 211, 214, 217, 220, 223, 226, 230, 233, 237, 240, 243, 247, + 250, 253, 257, 261, 265, 269, 272, 276, 280, 284, 288, 292, 296, 300, 304, 309, 313, 317, 322, 326, 330, + 335, 340, 344, 349, 354, 359, 364, 369, 374, 379, 384, 389, 395, 400, 406, 411, 417, 423, 429, 435, 441, + 447, 454, 461, 467, 475, 482, 489, 497, 505, 513, 522, 530, 539, 549, 559, 569, 579, 590, 602, 614, 626, + 640, 654, 668, 684, 700, 717, 736, 755, 775, 796, 819, 843, 869, 896, 925, 955, 988, 1022, 1058, 1098, + 1139, 1184, 1232, 1282, 1336 + ]; - private static readonly short[] _dcQlookup10 = { - 4, 9, 10, 13, 15, 17, 20, 22, 25, 28, 31, 34, 37, - 40, 43, 47, 50, 53, 57, 60, 64, 68, 71, 75, 78, 82, - 86, 90, 93, 97, 101, 105, 109, 113, 116, 120, 124, 128, 132, - 136, 140, 143, 147, 151, 155, 159, 163, 166, 170, 174, 178, 182, - 185, 189, 193, 197, 200, 204, 208, 212, 215, 219, 223, 226, 230, - 233, 237, 241, 244, 248, 251, 255, 259, 262, 266, 269, 273, 276, - 280, 283, 287, 290, 293, 297, 300, 304, 307, 310, 314, 317, 321, - 324, 327, 331, 334, 337, 343, 350, 356, 362, 369, 375, 381, 387, - 394, 400, 406, 412, 418, 424, 430, 436, 442, 448, 454, 460, 466, - 472, 478, 484, 490, 499, 507, 516, 525, 533, 542, 550, 559, 567, - 576, 584, 592, 601, 609, 617, 625, 634, 644, 655, 666, 676, 687, - 698, 708, 718, 729, 739, 749, 759, 770, 782, 795, 807, 819, 831, - 844, 856, 868, 880, 891, 906, 920, 933, 947, 961, 975, 988, 1001, - 1015, 1030, 1045, 1061, 1076, 1090, 1105, 1120, 1137, 1153, 1170, 1186, 1202, - 1218, 1236, 1253, 1271, 1288, 1306, 1323, 1342, 1361, 1379, 1398, 1416, 1436, - 1456, 1476, 1496, 1516, 1537, 1559, 1580, 1601, 1624, 1647, 1670, 1692, 1717, - 1741, 1766, 1791, 1817, 1844, 1871, 1900, 1929, 1958, 1990, 2021, 2054, 2088, - 2123, 2159, 2197, 2236, 2276, 2319, 2363, 2410, 2458, 2508, 2561, 2616, 2675, - 2737, 2802, 2871, 2944, 3020, 3102, 3188, 3280, 3375, 3478, 3586, 3702, 3823, - 3953, 4089, 4236, 4394, 4559, 4737, 4929, 5130, 5347, - }; + private static readonly short[] _dcQlookup10 = + [ + 4, 9, 10, 13, 15, 17, 20, 22, 25, 28, 31, 34, 37, 40, 43, 47, 50, 53, 57, 60, 64, 68, 71, 75, 78, 82, + 86, 90, 93, 97, 101, 105, 109, 113, 116, 120, 124, 128, 132, 136, 140, 143, 147, 151, 155, 159, 163, + 166, 170, 174, 178, 182, 185, 189, 193, 197, 200, 204, 208, 212, 215, 219, 223, 226, 230, 233, 237, 241, + 244, 248, 251, 255, 259, 262, 266, 269, 273, 276, 280, 283, 287, 290, 293, 297, 300, 304, 307, 310, 314, + 317, 321, 324, 327, 331, 334, 337, 343, 350, 356, 362, 369, 375, 381, 387, 394, 400, 406, 412, 418, 424, + 430, 436, 442, 448, 454, 460, 466, 472, 478, 484, 490, 499, 507, 516, 525, 533, 542, 550, 559, 567, 576, + 584, 592, 601, 609, 617, 625, 634, 644, 655, 666, 676, 687, 698, 708, 718, 729, 739, 749, 759, 770, 782, + 795, 807, 819, 831, 844, 856, 868, 880, 891, 906, 920, 933, 947, 961, 975, 988, 1001, 1015, 1030, 1045, + 1061, 1076, 1090, 1105, 1120, 1137, 1153, 1170, 1186, 1202, 1218, 1236, 1253, 1271, 1288, 1306, 1323, + 1342, 1361, 1379, 1398, 1416, 1436, 1456, 1476, 1496, 1516, 1537, 1559, 1580, 1601, 1624, 1647, 1670, + 1692, 1717, 1741, 1766, 1791, 1817, 1844, 1871, 1900, 1929, 1958, 1990, 2021, 2054, 2088, 2123, 2159, + 2197, 2236, 2276, 2319, 2363, 2410, 2458, 2508, 2561, 2616, 2675, 2737, 2802, 2871, 2944, 3020, 3102, + 3188, 3280, 3375, 3478, 3586, 3702, 3823, 3953, 4089, 4236, 4394, 4559, 4737, 4929, 5130, 5347 + ]; - private static readonly short[] _dcQlookup12 = { - 4, 12, 18, 25, 33, 41, 50, 60, 70, 80, 91, - 103, 115, 127, 140, 153, 166, 180, 194, 208, 222, 237, - 251, 266, 281, 296, 312, 327, 343, 358, 374, 390, 405, - 421, 437, 453, 469, 484, 500, 516, 532, 548, 564, 580, - 596, 611, 627, 643, 659, 674, 690, 706, 721, 737, 752, - 768, 783, 798, 814, 829, 844, 859, 874, 889, 904, 919, - 934, 949, 964, 978, 993, 1008, 1022, 1037, 1051, 1065, 1080, - 1094, 1108, 1122, 1136, 1151, 1165, 1179, 1192, 1206, 1220, 1234, - 1248, 1261, 1275, 1288, 1302, 1315, 1329, 1342, 1368, 1393, 1419, - 1444, 1469, 1494, 1519, 1544, 1569, 1594, 1618, 1643, 1668, 1692, - 1717, 1741, 1765, 1789, 1814, 1838, 1862, 1885, 1909, 1933, 1957, - 1992, 2027, 2061, 2096, 2130, 2165, 2199, 2233, 2267, 2300, 2334, - 2367, 2400, 2434, 2467, 2499, 2532, 2575, 2618, 2661, 2704, 2746, - 2788, 2830, 2872, 2913, 2954, 2995, 3036, 3076, 3127, 3177, 3226, - 3275, 3324, 3373, 3421, 3469, 3517, 3565, 3621, 3677, 3733, 3788, - 3843, 3897, 3951, 4005, 4058, 4119, 4181, 4241, 4301, 4361, 4420, - 4479, 4546, 4612, 4677, 4742, 4807, 4871, 4942, 5013, 5083, 5153, - 5222, 5291, 5367, 5442, 5517, 5591, 5665, 5745, 5825, 5905, 5984, - 6063, 6149, 6234, 6319, 6404, 6495, 6587, 6678, 6769, 6867, 6966, - 7064, 7163, 7269, 7376, 7483, 7599, 7715, 7832, 7958, 8085, 8214, - 8352, 8492, 8635, 8788, 8945, 9104, 9275, 9450, 9639, 9832, 10031, - 10245, 10465, 10702, 10946, 11210, 11482, 11776, 12081, 12409, 12750, 13118, - 13501, 13913, 14343, 14807, 15290, 15812, 16356, 16943, 17575, 18237, 18949, - 19718, 20521, 21387, - }; + private static readonly short[] _dcQlookup12 = + [ + 4, 12, 18, 25, 33, 41, 50, 60, 70, 80, 91, 103, 115, 127, 140, 153, 166, 180, 194, 208, 222, 237, 251, + 266, 281, 296, 312, 327, 343, 358, 374, 390, 405, 421, 437, 453, 469, 484, 500, 516, 532, 548, 564, 580, + 596, 611, 627, 643, 659, 674, 690, 706, 721, 737, 752, 768, 783, 798, 814, 829, 844, 859, 874, 889, 904, + 919, 934, 949, 964, 978, 993, 1008, 1022, 1037, 1051, 1065, 1080, 1094, 1108, 1122, 1136, 1151, 1165, + 1179, 1192, 1206, 1220, 1234, 1248, 1261, 1275, 1288, 1302, 1315, 1329, 1342, 1368, 1393, 1419, 1444, + 1469, 1494, 1519, 1544, 1569, 1594, 1618, 1643, 1668, 1692, 1717, 1741, 1765, 1789, 1814, 1838, 1862, + 1885, 1909, 1933, 1957, 1992, 2027, 2061, 2096, 2130, 2165, 2199, 2233, 2267, 2300, 2334, 2367, 2400, + 2434, 2467, 2499, 2532, 2575, 2618, 2661, 2704, 2746, 2788, 2830, 2872, 2913, 2954, 2995, 3036, 3076, + 3127, 3177, 3226, 3275, 3324, 3373, 3421, 3469, 3517, 3565, 3621, 3677, 3733, 3788, 3843, 3897, 3951, + 4005, 4058, 4119, 4181, 4241, 4301, 4361, 4420, 4479, 4546, 4612, 4677, 4742, 4807, 4871, 4942, 5013, + 5083, 5153, 5222, 5291, 5367, 5442, 5517, 5591, 5665, 5745, 5825, 5905, 5984, 6063, 6149, 6234, 6319, + 6404, 6495, 6587, 6678, 6769, 6867, 6966, 7064, 7163, 7269, 7376, 7483, 7599, 7715, 7832, 7958, 8085, + 8214, 8352, 8492, 8635, 8788, 8945, 9104, 9275, 9450, 9639, 9832, 10031, 10245, 10465, 10702, 10946, + 11210, 11482, 11776, 12081, 12409, 12750, 13118, 13501, 13913, 14343, 14807, 15290, 15812, 16356, 16943, + 17575, 18237, 18949, 19718, 20521, 21387 + ]; - private static readonly short[] _acQlookup = { - 4, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 104, 106, 108, 110, 112, 114, 116, 118, - 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 142, 144, - 146, 148, 150, 152, 155, 158, 161, 164, 167, 170, 173, 176, 179, - 182, 185, 188, 191, 194, 197, 200, 203, 207, 211, 215, 219, 223, - 227, 231, 235, 239, 243, 247, 251, 255, 260, 265, 270, 275, 280, - 285, 290, 295, 300, 305, 311, 317, 323, 329, 335, 341, 347, 353, - 359, 366, 373, 380, 387, 394, 401, 408, 416, 424, 432, 440, 448, - 456, 465, 474, 483, 492, 501, 510, 520, 530, 540, 550, 560, 571, - 582, 593, 604, 615, 627, 639, 651, 663, 676, 689, 702, 715, 729, - 743, 757, 771, 786, 801, 816, 832, 848, 864, 881, 898, 915, 933, - 951, 969, 988, 1007, 1026, 1046, 1066, 1087, 1108, 1129, 1151, 1173, 1196, - 1219, 1243, 1267, 1292, 1317, 1343, 1369, 1396, 1423, 1451, 1479, 1508, 1537, - 1567, 1597, 1628, 1660, 1692, 1725, 1759, 1793, 1828, - }; + private static readonly short[] _acQlookup = + [ + 4, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 104, 106, 108, 110, 112, 114, + 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 142, 144, 146, 148, 150, 152, 155, 158, + 161, 164, 167, 170, 173, 176, 179, 182, 185, 188, 191, 194, 197, 200, 203, 207, 211, 215, 219, 223, 227, + 231, 235, 239, 243, 247, 251, 255, 260, 265, 270, 275, 280, 285, 290, 295, 300, 305, 311, 317, 323, 329, + 335, 341, 347, 353, 359, 366, 373, 380, 387, 394, 401, 408, 416, 424, 432, 440, 448, 456, 465, 474, 483, + 492, 501, 510, 520, 530, 540, 550, 560, 571, 582, 593, 604, 615, 627, 639, 651, 663, 676, 689, 702, 715, + 729, 743, 757, 771, 786, 801, 816, 832, 848, 864, 881, 898, 915, 933, 951, 969, 988, 1007, 1026, 1046, + 1066, 1087, 1108, 1129, 1151, 1173, 1196, 1219, 1243, 1267, 1292, 1317, 1343, 1369, 1396, 1423, 1451, + 1479, 1508, 1537, 1567, 1597, 1628, 1660, 1692, 1725, 1759, 1793, 1828 + ]; - private static readonly short[] _acQlookup10 = { - 4, 9, 11, 13, 16, 18, 21, 24, 27, 30, 33, 37, 40, - 44, 48, 51, 55, 59, 63, 67, 71, 75, 79, 83, 88, 92, - 96, 100, 105, 109, 114, 118, 122, 127, 131, 136, 140, 145, 149, - 154, 158, 163, 168, 172, 177, 181, 186, 190, 195, 199, 204, 208, - 213, 217, 222, 226, 231, 235, 240, 244, 249, 253, 258, 262, 267, - 271, 275, 280, 284, 289, 293, 297, 302, 306, 311, 315, 319, 324, - 328, 332, 337, 341, 345, 349, 354, 358, 362, 367, 371, 375, 379, - 384, 388, 392, 396, 401, 409, 417, 425, 433, 441, 449, 458, 466, - 474, 482, 490, 498, 506, 514, 523, 531, 539, 547, 555, 563, 571, - 579, 588, 596, 604, 616, 628, 640, 652, 664, 676, 688, 700, 713, - 725, 737, 749, 761, 773, 785, 797, 809, 825, 841, 857, 873, 889, - 905, 922, 938, 954, 970, 986, 1002, 1018, 1038, 1058, 1078, 1098, 1118, - 1138, 1158, 1178, 1198, 1218, 1242, 1266, 1290, 1314, 1338, 1362, 1386, 1411, - 1435, 1463, 1491, 1519, 1547, 1575, 1603, 1631, 1663, 1695, 1727, 1759, 1791, - 1823, 1859, 1895, 1931, 1967, 2003, 2039, 2079, 2119, 2159, 2199, 2239, 2283, - 2327, 2371, 2415, 2459, 2507, 2555, 2603, 2651, 2703, 2755, 2807, 2859, 2915, - 2971, 3027, 3083, 3143, 3203, 3263, 3327, 3391, 3455, 3523, 3591, 3659, 3731, - 3803, 3876, 3952, 4028, 4104, 4184, 4264, 4348, 4432, 4516, 4604, 4692, 4784, - 4876, 4972, 5068, 5168, 5268, 5372, 5476, 5584, 5692, 5804, 5916, 6032, 6148, - 6268, 6388, 6512, 6640, 6768, 6900, 7036, 7172, 7312, - }; + private static readonly short[] _acQlookup10 = + [ + 4, 9, 11, 13, 16, 18, 21, 24, 27, 30, 33, 37, 40, 44, 48, 51, 55, 59, 63, 67, 71, 75, 79, 83, 88, 92, + 96, 100, 105, 109, 114, 118, 122, 127, 131, 136, 140, 145, 149, 154, 158, 163, 168, 172, 177, 181, 186, + 190, 195, 199, 204, 208, 213, 217, 222, 226, 231, 235, 240, 244, 249, 253, 258, 262, 267, 271, 275, 280, + 284, 289, 293, 297, 302, 306, 311, 315, 319, 324, 328, 332, 337, 341, 345, 349, 354, 358, 362, 367, 371, + 375, 379, 384, 388, 392, 396, 401, 409, 417, 425, 433, 441, 449, 458, 466, 474, 482, 490, 498, 506, 514, + 523, 531, 539, 547, 555, 563, 571, 579, 588, 596, 604, 616, 628, 640, 652, 664, 676, 688, 700, 713, 725, + 737, 749, 761, 773, 785, 797, 809, 825, 841, 857, 873, 889, 905, 922, 938, 954, 970, 986, 1002, 1018, + 1038, 1058, 1078, 1098, 1118, 1138, 1158, 1178, 1198, 1218, 1242, 1266, 1290, 1314, 1338, 1362, 1386, + 1411, 1435, 1463, 1491, 1519, 1547, 1575, 1603, 1631, 1663, 1695, 1727, 1759, 1791, 1823, 1859, 1895, + 1931, 1967, 2003, 2039, 2079, 2119, 2159, 2199, 2239, 2283, 2327, 2371, 2415, 2459, 2507, 2555, 2603, + 2651, 2703, 2755, 2807, 2859, 2915, 2971, 3027, 3083, 3143, 3203, 3263, 3327, 3391, 3455, 3523, 3591, + 3659, 3731, 3803, 3876, 3952, 4028, 4104, 4184, 4264, 4348, 4432, 4516, 4604, 4692, 4784, 4876, 4972, + 5068, 5168, 5268, 5372, 5476, 5584, 5692, 5804, 5916, 6032, 6148, 6268, 6388, 6512, 6640, 6768, 6900, + 7036, 7172, 7312 + ]; - private static readonly short[] _acQlookup12 = { - 4, 13, 19, 27, 35, 44, 54, 64, 75, 87, 99, - 112, 126, 139, 154, 168, 183, 199, 214, 230, 247, 263, - 280, 297, 314, 331, 349, 366, 384, 402, 420, 438, 456, - 475, 493, 511, 530, 548, 567, 586, 604, 623, 642, 660, - 679, 698, 716, 735, 753, 772, 791, 809, 828, 846, 865, - 884, 902, 920, 939, 957, 976, 994, 1012, 1030, 1049, 1067, - 1085, 1103, 1121, 1139, 1157, 1175, 1193, 1211, 1229, 1246, 1264, - 1282, 1299, 1317, 1335, 1352, 1370, 1387, 1405, 1422, 1440, 1457, - 1474, 1491, 1509, 1526, 1543, 1560, 1577, 1595, 1627, 1660, 1693, - 1725, 1758, 1791, 1824, 1856, 1889, 1922, 1954, 1987, 2020, 2052, - 2085, 2118, 2150, 2183, 2216, 2248, 2281, 2313, 2346, 2378, 2411, - 2459, 2508, 2556, 2605, 2653, 2701, 2750, 2798, 2847, 2895, 2943, - 2992, 3040, 3088, 3137, 3185, 3234, 3298, 3362, 3426, 3491, 3555, - 3619, 3684, 3748, 3812, 3876, 3941, 4005, 4069, 4149, 4230, 4310, - 4390, 4470, 4550, 4631, 4711, 4791, 4871, 4967, 5064, 5160, 5256, - 5352, 5448, 5544, 5641, 5737, 5849, 5961, 6073, 6185, 6297, 6410, - 6522, 6650, 6778, 6906, 7034, 7162, 7290, 7435, 7579, 7723, 7867, - 8011, 8155, 8315, 8475, 8635, 8795, 8956, 9132, 9308, 9484, 9660, - 9836, 10028, 10220, 10412, 10604, 10812, 11020, 11228, 11437, 11661, 11885, - 12109, 12333, 12573, 12813, 13053, 13309, 13565, 13821, 14093, 14365, 14637, - 14925, 15213, 15502, 15806, 16110, 16414, 16734, 17054, 17390, 17726, 18062, - 18414, 18766, 19134, 19502, 19886, 20270, 20670, 21070, 21486, 21902, 22334, - 22766, 23214, 23662, 24126, 24590, 25070, 25551, 26047, 26559, 27071, 27599, - 28143, 28687, 29247, - }; + private static readonly short[] _acQlookup12 = + [ + 4, 13, 19, 27, 35, 44, 54, 64, 75, 87, 99, 112, 126, 139, 154, 168, 183, 199, 214, 230, 247, 263, 280, + 297, 314, 331, 349, 366, 384, 402, 420, 438, 456, 475, 493, 511, 530, 548, 567, 586, 604, 623, 642, 660, + 679, 698, 716, 735, 753, 772, 791, 809, 828, 846, 865, 884, 902, 920, 939, 957, 976, 994, 1012, 1030, + 1049, 1067, 1085, 1103, 1121, 1139, 1157, 1175, 1193, 1211, 1229, 1246, 1264, 1282, 1299, 1317, 1335, + 1352, 1370, 1387, 1405, 1422, 1440, 1457, 1474, 1491, 1509, 1526, 1543, 1560, 1577, 1595, 1627, 1660, + 1693, 1725, 1758, 1791, 1824, 1856, 1889, 1922, 1954, 1987, 2020, 2052, 2085, 2118, 2150, 2183, 2216, + 2248, 2281, 2313, 2346, 2378, 2411, 2459, 2508, 2556, 2605, 2653, 2701, 2750, 2798, 2847, 2895, 2943, + 2992, 3040, 3088, 3137, 3185, 3234, 3298, 3362, 3426, 3491, 3555, 3619, 3684, 3748, 3812, 3876, 3941, + 4005, 4069, 4149, 4230, 4310, 4390, 4470, 4550, 4631, 4711, 4791, 4871, 4967, 5064, 5160, 5256, 5352, + 5448, 5544, 5641, 5737, 5849, 5961, 6073, 6185, 6297, 6410, 6522, 6650, 6778, 6906, 7034, 7162, 7290, + 7435, 7579, 7723, 7867, 8011, 8155, 8315, 8475, 8635, 8795, 8956, 9132, 9308, 9484, 9660, 9836, 10028, + 10220, 10412, 10604, 10812, 11020, 11228, 11437, 11661, 11885, 12109, 12333, 12573, 12813, 13053, 13309, + 13565, 13821, 14093, 14365, 14637, 14925, 15213, 15502, 15806, 16110, 16414, 16734, 17054, 17390, 17726, + 18062, 18414, 18766, 19134, 19502, 19886, 20270, 20670, 21070, 21486, 21902, 22334, 22766, 23214, 23662, + 24126, 24590, 25070, 25551, 26047, 26559, 27071, 27599, 28143, 28687, 29247 + ]; public static short DcQuant(int qindex, int delta, BitDepth bitDepth) { switch (bitDepth) { - case BitDepth.Bits8: - return _dcQlookup[Math.Clamp(qindex + delta, 0, MaxQ)]; - case BitDepth.Bits10: - return _dcQlookup10[Math.Clamp(qindex + delta, 0, MaxQ)]; - case BitDepth.Bits12: - return _dcQlookup12[Math.Clamp(qindex + delta, 0, MaxQ)]; + case BitDepth.Bits8: return _dcQlookup[Math.Clamp(qindex + delta, 0, MaxQ)]; + case BitDepth.Bits10: return _dcQlookup10[Math.Clamp(qindex + delta, 0, MaxQ)]; + case BitDepth.Bits12: return _dcQlookup12[Math.Clamp(qindex + delta, 0, MaxQ)]; default: - Debug.Assert(false, "bit_depth should be VPX_BITS_8, VPX_BITS_10 or VPX_BITS_12"); - + Debug.Assert(false, "bitDepth should be Bits8, Bits10 or Bits12"); return -1; } } @@ -175,30 +130,13 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { switch (bitDepth) { - case BitDepth.Bits8: - return _acQlookup[Math.Clamp(qindex + delta, 0, MaxQ)]; - case BitDepth.Bits10: - return _acQlookup10[Math.Clamp(qindex + delta, 0, MaxQ)]; - case BitDepth.Bits12: - return _acQlookup12[Math.Clamp(qindex + delta, 0, MaxQ)]; + case BitDepth.Bits8: return _acQlookup[Math.Clamp(qindex + delta, 0, MaxQ)]; + case BitDepth.Bits10: return _acQlookup10[Math.Clamp(qindex + delta, 0, MaxQ)]; + case BitDepth.Bits12: return _acQlookup12[Math.Clamp(qindex + delta, 0, MaxQ)]; default: - Debug.Assert(false, "bit_depth should be VPX_BITS_8, VPX_BITS_10 or VPX_BITS_12"); - + Debug.Assert(false, "bitDepth should be Bits8, Bits10 or Bits12"); return -1; } } - - public static int GetQIndex(ref Segmentation seg, int segmentId, int baseQIndex) - { - if (seg.IsSegFeatureActive(segmentId, SegLvlFeatures.SegLvlAltQ) != 0) - { - int data = seg.GetSegData(segmentId, SegLvlFeatures.SegLvlAltQ); - int segQIndex = seg.AbsDelta == Constants.SegmentAbsData ? data : baseQIndex + data; - - return Math.Clamp(segQIndex, 0, MaxQ); - } - - return baseQIndex; - } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/ReadBitBuffer.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/ReadBitBuffer.cs new file mode 100644 index 000000000..a4e07a1c0 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/ReadBitBuffer.cs @@ -0,0 +1,84 @@ +using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Types; +using System; + +namespace Ryujinx.Graphics.Nvdec.Vp9 +{ + public ref struct ReadBitBuffer + { + public ReadOnlySpan BitBuffer; + public ulong BitOffset; + public object ErrorHandlerData; + + public int DecodeUnsignedMax(int max) + { + int data = ReadLiteral(BitUtils.GetUnsignedBits((uint)max)); + return data > max ? max : data; + } + + public ulong BytesRead() + { + return (BitOffset + 7) >> 3; + } + + public int ReadBit() + { + ulong off = BitOffset; + ulong p = off >> 3; + int q = 7 - (int)(off & 0x7); + if (p < (ulong)BitBuffer.Length) + { + int bit = (BitBuffer[(int)p] >> q) & 1; + BitOffset = off + 1; + return bit; + } + + return 0; + } + + public int ReadLiteral(int bits) + { + int value = 0, bit; + for (bit = bits - 1; bit >= 0; bit--) + { + value |= ReadBit() << bit; + } + + return value; + } + + public int ReadSignedLiteral(int bits) + { + int value = ReadLiteral(bits); + return ReadBit() != 0 ? -value : value; + } + + public int ReadInvSignedLiteral(int bits) + { + return ReadSignedLiteral(bits); + } + + public int ReadDeltaQ() + { + return ReadBit() != 0 ? ReadSignedLiteral(4) : 0; + } + + public void ReadFrameSize(out int width, out int height) + { + width = ReadLiteral(16) + 1; + height = ReadLiteral(16) + 1; + } + + public BitstreamProfile ReadProfile() + { + int profile = ReadBit(); + profile |= ReadBit() << 1; + if (profile > 2) + { + profile += ReadBit(); + } + + return (BitstreamProfile)profile; + } + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/ReconInter.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/ReconInter.cs index fdb68291a..35dbf1cab 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/ReconInter.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/ReconInter.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Types; using System; using System.Diagnostics; @@ -77,65 +77,38 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 bd); } - private static int RoundMvCompQ4(int value) + public static int RoundMvCompQ4(int value) { return (value < 0 ? value - 2 : value + 2) / 4; } - private static Mv MiMvPredQ4(ref ModeInfo mi, int idx) - { - return new Mv - { - Row = (short)RoundMvCompQ4( - mi.Bmi[0].Mv[idx].Row + mi.Bmi[1].Mv[idx].Row + - mi.Bmi[2].Mv[idx].Row + mi.Bmi[3].Mv[idx].Row), - Col = (short)RoundMvCompQ4( - mi.Bmi[0].Mv[idx].Col + mi.Bmi[1].Mv[idx].Col + - mi.Bmi[2].Mv[idx].Col + mi.Bmi[3].Mv[idx].Col), - }; - } - - private static int RoundMvCompQ2(int value) + public static int RoundMvCompQ2(int value) { return (value < 0 ? value - 1 : value + 1) / 2; } - private static Mv MiMvPredQ2(ref ModeInfo mi, int idx, int block0, int block1) - { - return new Mv - { - Row = (short)RoundMvCompQ2( - mi.Bmi[block0].Mv[idx].Row + - mi.Bmi[block1].Mv[idx].Row), - Col = (short)RoundMvCompQ2( - mi.Bmi[block0].Mv[idx].Col + - mi.Bmi[block1].Mv[idx].Col), - }; - } - public static Mv ClampMvToUmvBorderSb(ref MacroBlockD xd, ref Mv srcMv, int bw, int bh, int ssX, int ssY) { // If the MV points so far into the UMV border that no visible pixels // are used for reconstruction, the subpel part of the MV can be // discarded and the MV limited to 16 pixels with equivalent results. - int spelLeft = (Constants.Vp9InterpExtend + bw) << SubpelBits; + int spelLeft = (Constants.InterpExtend + bw) << SubpelBits; int spelRight = spelLeft - SubpelShifts; - int spelTop = (Constants.Vp9InterpExtend + bh) << SubpelBits; + int spelTop = (Constants.InterpExtend + bh) << SubpelBits; int spelBottom = spelTop - SubpelShifts; Mv clampedMv = new() { - Row = (short)(srcMv.Row * (1 << (1 - ssY))), - Col = (short)(srcMv.Col * (1 << (1 - ssX))), + Row = (short)(srcMv.Row * (1 << (1 - ssY))), Col = (short)(srcMv.Col * (1 << (1 - ssX))) }; Debug.Assert(ssX <= 1); Debug.Assert(ssY <= 1); - clampedMv.ClampMv( - xd.MbToLeftEdge * (1 << (1 - ssX)) - spelLeft, - xd.MbToRightEdge * (1 << (1 - ssX)) + spelRight, - xd.MbToTopEdge * (1 << (1 - ssY)) - spelTop, - xd.MbToBottomEdge * (1 << (1 - ssY)) + spelBottom); + clampedMv.Clamp( + (xd.MbToLeftEdge * (1 << (1 - ssX))) - spelLeft, + (xd.MbToRightEdge * (1 << (1 - ssX))) + spelRight, + (xd.MbToTopEdge * (1 << (1 - ssY))) - spelTop, + (xd.MbToBottomEdge * (1 << (1 - ssY))) + spelBottom); return clampedMv; } @@ -150,18 +123,19 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 res = mi.Bmi[block].Mv[refr]; break; case 1: - res = MiMvPredQ2(ref mi, refr, block, block + 2); + res = mi.MvPredQ2(refr, block, block + 2); break; case 2: - res = MiMvPredQ2(ref mi, refr, block, block + 1); + res = mi.MvPredQ2(refr, block, block + 1); break; case 3: - res = MiMvPredQ4(ref mi, refr); + res = mi.MvPredQ4(refr); break; default: Debug.Assert(ssIdx <= 3 && ssIdx >= 0); break; } + return res; } @@ -169,8 +143,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { int x = !sf.IsNull ? sf.Value.ScaleValueX(xOffset) : xOffset; int y = !sf.IsNull ? sf.Value.ScaleValueY(yOffset) : yOffset; - - return y * stride + x; + return (y * stride) + x; } private static void SetupPredPlanes( @@ -203,12 +176,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 strides[0] = src.Stride; strides[1] = src.UvStride; strides[2] = src.UvStride; - int i; - for (i = 0; i < Constants.MaxMbPlane; ++i) + for (int i = 0; i < Constants.MaxMbPlane; ++i) { ref MacroBlockDPlane pd = ref planes[i]; - SetupPredPlanes(ref pd.Dst, buffers[i], strides[i], miRow, miCol, Ptr.Null, pd.SubsamplingX, pd.SubsamplingY); + SetupPredPlanes(ref pd.Dst, buffers[i], strides[i], miRow, miCol, Ptr.Null, + pd.SubsamplingX, pd.SubsamplingY); } } @@ -230,14 +203,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 strides[0] = src.Stride; strides[1] = src.UvStride; strides[2] = src.UvStride; - int i; - for (i = 0; i < Constants.MaxMbPlane; ++i) + for (int i = 0; i < Constants.MaxMbPlane; ++i) { ref MacroBlockDPlane pd = ref xd.Plane[i]; - SetupPredPlanes(ref pd.Pre[idx], buffers[i], strides[i], miRow, miCol, sf, pd.SubsamplingX, pd.SubsamplingY); + SetupPredPlanes(ref pd.Pre[idx], buffers[i], strides[i], miRow, miCol, sf, pd.SubsamplingX, + pd.SubsamplingY); } } } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/ReconIntra.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/ReconIntra.cs index 768c9acf4..877469787 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/ReconIntra.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/ReconIntra.cs @@ -1,4 +1,4 @@ -using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Common; using Ryujinx.Graphics.Nvdec.Vp9.Types; using System; using static Ryujinx.Graphics.Nvdec.Vp9.Dsp.IntraPred; @@ -7,7 +7,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { internal static class ReconIntra { - public static readonly TxType[] IntraModeToTxTypeLookup = { + public static readonly TxType[] IntraModeToTxTypeLookup = + [ TxType.DctDct, // DC TxType.AdstDct, // V TxType.DctAdst, // H @@ -17,15 +18,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 TxType.DctAdst, // D153 TxType.DctAdst, // D207 TxType.AdstDct, // D63 - TxType.AdstAdst, // TM - }; + TxType.AdstAdst // TM + ]; private const int NeedLeft = 1 << 1; private const int NeedAbove = 1 << 2; private const int NeedAboveRight = 1 << 3; - private static ReadOnlySpan ExtendModes => new byte[] - { + private static ReadOnlySpan ExtendModes => + [ NeedAbove | NeedLeft, // DC NeedAbove, // V NeedLeft, // H @@ -35,232 +36,104 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 NeedLeft | NeedAbove, // D153 NeedLeft, // D207 NeedAboveRight, // D63 - NeedLeft | NeedAbove, // TM - }; + NeedLeft | NeedAbove // TM + ]; private unsafe delegate void IntraPredFn(byte* dst, int stride, byte* above, byte* left); - private static readonly unsafe IntraPredFn[][] _pred = { - new IntraPredFn[] - { - null, - null, - null, - null, - }, - new IntraPredFn[] - { - VPredictor4x4, - VPredictor8x8, - VPredictor16x16, - VPredictor32x32, - }, - new IntraPredFn[] - { - HPredictor4x4, - HPredictor8x8, - HPredictor16x16, - HPredictor32x32, - }, - new IntraPredFn[] - { - D45Predictor4x4, - D45Predictor8x8, - D45Predictor16x16, - D45Predictor32x32, - }, - new IntraPredFn[] - { - D135Predictor4x4, - D135Predictor8x8, - D135Predictor16x16, - D135Predictor32x32, - }, - new IntraPredFn[] - { - D117Predictor4x4, - D117Predictor8x8, - D117Predictor16x16, - D117Predictor32x32, - }, - new IntraPredFn[] - { - D153Predictor4x4, - D153Predictor8x8, - D153Predictor16x16, - D153Predictor32x32, - }, - new IntraPredFn[] - { - D207Predictor4x4, - D207Predictor8x8, - D207Predictor16x16, - D207Predictor32x32, - }, - new IntraPredFn[] - { - D63Predictor4x4, - D63Predictor8x8, - D63Predictor16x16, - D63Predictor32x32, - }, - new IntraPredFn[] - { - TMPredictor4x4, - TMPredictor8x8, - TMPredictor16x16, - TMPredictor32x32, - }, - }; + private static readonly unsafe IntraPredFn[][] _pred = + [ + [null, null, null, null], + [VPredictor4X4, VPredictor8X8, VPredictor16X16, VPredictor32X32], + [HPredictor4X4, HPredictor8X8, HPredictor16X16, HPredictor32X32], + [D45Predictor4X4, D45Predictor8X8, D45Predictor16X16, D45Predictor32X32], + [D135Predictor4X4, D135Predictor8X8, D135Predictor16X16, D135Predictor32X32], + [D117Predictor4X4, D117Predictor8X8, D117Predictor16X16, D117Predictor32X32], + [D153Predictor4X4, D153Predictor8X8, D153Predictor16X16, D153Predictor32X32], + [D207Predictor4X4, D207Predictor8X8, D207Predictor16X16, D207Predictor32X32], + [D63Predictor4X4, D63Predictor8X8, D63Predictor16X16, D63Predictor32X32], + [TmPredictor4X4, TmPredictor8X8, TmPredictor16X16, TmPredictor32X32] + ]; - private static readonly unsafe IntraPredFn[][][] _dcPred = { - new[] - { - new IntraPredFn[] - { - Dc128Predictor4x4, - Dc128Predictor8x8, - Dc128Predictor16x16, - Dc128Predictor32x32, - }, - new IntraPredFn[] - { - DcTopPredictor4x4, - DcTopPredictor8x8, - DcTopPredictor16x16, - DcTopPredictor32x32, - }, - }, - new[] - { - new IntraPredFn[] - { - DcLeftPredictor4x4, - DcLeftPredictor8x8, - DcLeftPredictor16x16, - DcLeftPredictor32x32, - }, - new IntraPredFn[] - { - DcPredictor4x4, - DcPredictor8x8, - DcPredictor16x16, - DcPredictor32x32, - }, - }, - }; + private static readonly unsafe IntraPredFn[][][] _dcPred = + [ + [ + [ + Dc128Predictor4X4, Dc128Predictor8X8, Dc128Predictor16X16, Dc128Predictor32X32 + ], + [ + DcTopPredictor4X4, DcTopPredictor8X8, DcTopPredictor16X16, DcTopPredictor32X32 + ] + ], + [ + [ + DcLeftPredictor4X4, DcLeftPredictor8X8, DcLeftPredictor16X16, DcLeftPredictor32X32 + ], + [DcPredictor4X4, DcPredictor8X8, DcPredictor16X16, DcPredictor32X32] + ] + ]; private unsafe delegate void IntraHighPredFn(ushort* dst, int stride, ushort* above, ushort* left, int bd); - private static readonly unsafe IntraHighPredFn[][] _predHigh = { - new IntraHighPredFn[] - { - null, - null, - null, - null, - }, - new IntraHighPredFn[] - { - HighbdVPredictor4x4, - HighbdVPredictor8x8, - HighbdVPredictor16x16, - HighbdVPredictor32x32, - }, - new IntraHighPredFn[] - { - HighbdHPredictor4x4, - HighbdHPredictor8x8, - HighbdHPredictor16x16, - HighbdHPredictor32x32, - }, - new IntraHighPredFn[] - { - HighbdD45Predictor4x4, - HighbdD45Predictor8x8, - HighbdD45Predictor16x16, - HighbdD45Predictor32x32, - }, - new IntraHighPredFn[] - { - HighbdD135Predictor4x4, - HighbdD135Predictor8x8, - HighbdD135Predictor16x16, - HighbdD135Predictor32x32, - }, - new IntraHighPredFn[] - { - HighbdD117Predictor4x4, - HighbdD117Predictor8x8, - HighbdD117Predictor16x16, - HighbdD117Predictor32x32, - }, - new IntraHighPredFn[] - { - HighbdD153Predictor4x4, - HighbdD153Predictor8x8, - HighbdD153Predictor16x16, - HighbdD153Predictor32x32, - }, - new IntraHighPredFn[] - { - HighbdD207Predictor4x4, - HighbdD207Predictor8x8, - HighbdD207Predictor16x16, - HighbdD207Predictor32x32, - }, - new IntraHighPredFn[] - { - HighbdD63Predictor4x4, - HighbdD63Predictor8x8, - HighbdD63Predictor16x16, - HighbdD63Predictor32x32, - }, - new IntraHighPredFn[] - { - HighbdTMPredictor4x4, - HighbdTMPredictor8x8, - HighbdTMPredictor16x16, - HighbdTMPredictor32x32, - }, - }; + private static readonly unsafe IntraHighPredFn[][] _predHigh = + [ + [null, null, null, null], + [ + HighbdVPredictor4X4, HighbdVPredictor8X8, HighbdVPredictor16X16, HighbdVPredictor32X32 + ], + [ + HighbdHPredictor4X4, HighbdHPredictor8X8, HighbdHPredictor16X16, HighbdHPredictor32X32 + ], + [ + HighbdD45Predictor4X4, HighbdD45Predictor8X8, HighbdD45Predictor16X16, HighbdD45Predictor32X32 + ], + [ + HighbdD135Predictor4X4, HighbdD135Predictor8X8, HighbdD135Predictor16X16, + HighbdD135Predictor32X32 + ], + [ + HighbdD117Predictor4X4, HighbdD117Predictor8X8, HighbdD117Predictor16X16, + HighbdD117Predictor32X32 + ], + [ + HighbdD153Predictor4X4, HighbdD153Predictor8X8, HighbdD153Predictor16X16, + HighbdD153Predictor32X32 + ], + [ + HighbdD207Predictor4X4, HighbdD207Predictor8X8, HighbdD207Predictor16X16, + HighbdD207Predictor32X32 + ], + [ + HighbdD63Predictor4X4, HighbdD63Predictor8X8, HighbdD63Predictor16X16, HighbdD63Predictor32X32 + ], + [ + HighbdTmPredictor4X4, HighbdTmPredictor8X8, HighbdTmPredictor16X16, HighbdTmPredictor32X32 + ] + ]; - private static readonly unsafe IntraHighPredFn[][][] _dcPredHigh = { - new[] - { - new IntraHighPredFn[] - { - HighbdDc128Predictor4x4, - HighbdDc128Predictor8x8, - HighbdDc128Predictor16x16, - HighbdDc128Predictor32x32, - }, - new IntraHighPredFn[] - { - HighbdDcTopPredictor4x4, - HighbdDcTopPredictor8x8, - HighbdDcTopPredictor16x16, - HighbdDcTopPredictor32x32, - }, - }, - new[] - { - new IntraHighPredFn[] - { - HighbdDcLeftPredictor4x4, - HighbdDcLeftPredictor8x8, - HighbdDcLeftPredictor16x16, - HighbdDcLeftPredictor32x32, - }, - new IntraHighPredFn[] - { - HighbdDcPredictor4x4, - HighbdDcPredictor8x8, - HighbdDcPredictor16x16, - HighbdDcPredictor32x32, - }, - }, - }; + private static readonly unsafe IntraHighPredFn[][][] _dcPredHigh = + [ + [ + [ + HighbdDc128Predictor4X4, HighbdDc128Predictor8X8, HighbdDc128Predictor16X16, + HighbdDc128Predictor32X32 + ], + [ + HighbdDcTopPredictor4X4, HighbdDcTopPredictor8X8, HighbdDcTopPredictor16X16, + HighbdDcTopPredictor32X32 + ] + ], + [ + [ + HighbdDcLeftPredictor4X4, HighbdDcLeftPredictor8X8, HighbdDcLeftPredictor16X16, + HighbdDcLeftPredictor32X32 + ], + [ + HighbdDcPredictor4X4, HighbdDcPredictor8X8, HighbdDcPredictor16X16, + HighbdDcPredictor32X32 + ] + ] + ]; private static unsafe void BuildIntraPredictorsHigh( ref MacroBlockD xd, @@ -327,7 +200,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { for (i = 0; i < bs; ++i) { - leftCol[i] = refr[i * refStride - 1]; + leftCol[i] = refr[(i * refStride) - 1]; } } else @@ -335,12 +208,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int extendBottom = frameHeight - y0; for (i = 0; i < extendBottom; ++i) { - leftCol[i] = refr[i * refStride - 1]; + leftCol[i] = refr[(i * refStride) - 1]; } for (; i < bs; ++i) { - leftCol[i] = refr[(extendBottom - 1) * refStride - 1]; + leftCol[i] = refr[((extendBottom - 1) * refStride) - 1]; } } } @@ -349,7 +222,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 /* faster path if the block does not need extension */ for (i = 0; i < bs; ++i) { - leftCol[i] = refr[i * refStride - 1]; + leftCol[i] = refr[(i * refStride) - 1]; } } } @@ -391,6 +264,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 MemoryUtil.Copy(aboveRow, aboveRef, bs); } } + aboveRow[-1] = leftAvailable != 0 ? aboveRef[-1] : (ushort)(baseVal + 1); } else @@ -409,7 +283,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (xd.MbToRightEdge < 0) { /* slower path if the block needs border extension */ - if (x0 + 2 * bs <= frameWidth) + if (x0 + (2 * bs) <= frameWidth) { if (rightAvailable != 0 && bs == 4) { @@ -427,7 +301,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (rightAvailable != 0 && bs == 4) { MemoryUtil.Copy(aboveRow, aboveRef, r); - MemoryUtil.Fill(aboveRow + r, aboveRow[r - 1], x0 + 2 * bs - frameWidth); + MemoryUtil.Fill(aboveRow + r, aboveRow[r - 1], x0 + (2 * bs) - frameWidth); } else { @@ -439,8 +313,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { int r = frameWidth - x0; MemoryUtil.Copy(aboveRow, aboveRef, r); - MemoryUtil.Fill(aboveRow + r, aboveRow[r - 1], x0 + 2 * bs - frameWidth); + MemoryUtil.Fill(aboveRow + r, aboveRow[r - 1], x0 + (2 * bs) - frameWidth); } + aboveRow[-1] = leftAvailable != 0 ? aboveRef[-1] : (ushort)(baseVal + 1); } else @@ -544,7 +419,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { for (i = 0; i < bs; ++i) { - leftCol[i] = refr[i * refStride - 1]; + leftCol[i] = refr[(i * refStride) - 1]; } } else @@ -552,12 +427,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int extendBottom = frameHeight - y0; for (i = 0; i < extendBottom; ++i) { - leftCol[i] = refr[i * refStride - 1]; + leftCol[i] = refr[(i * refStride) - 1]; } for (; i < bs; ++i) { - leftCol[i] = refr[(extendBottom - 1) * refStride - 1]; + leftCol[i] = refr[((extendBottom - 1) * refStride) - 1]; } } } @@ -566,7 +441,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 /* Faster path if the block does not need extension */ for (i = 0; i < bs; ++i) { - leftCol[i] = refr[i * refStride - 1]; + leftCol[i] = refr[(i * refStride) - 1]; } } } @@ -608,6 +483,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 MemoryUtil.Copy(aboveRow, aboveRef, bs); } } + aboveRow[-1] = leftAvailable != 0 ? aboveRef[-1] : (byte)129; } else @@ -626,7 +502,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (xd.MbToRightEdge < 0) { /* Slower path if the block needs border extension */ - if (x0 + 2 * bs <= frameWidth) + if (x0 + (2 * bs) <= frameWidth) { if (rightAvailable != 0 && bs == 4) { @@ -644,7 +520,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 if (rightAvailable != 0 && bs == 4) { MemoryUtil.Copy(aboveRow, aboveRef, r); - MemoryUtil.Fill(aboveRow + r, aboveRow[r - 1], x0 + 2 * bs - frameWidth); + MemoryUtil.Fill(aboveRow + r, aboveRow[r - 1], x0 + (2 * bs) - frameWidth); } else { @@ -656,7 +532,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 { int r = frameWidth - x0; MemoryUtil.Copy(aboveRow, aboveRef, r); - MemoryUtil.Fill(aboveRow + r, aboveRow[r - 1], x0 + 2 * bs - frameWidth); + MemoryUtil.Fill(aboveRow + r, aboveRow[r - 1], x0 + (2 * bs) - frameWidth); } } else @@ -679,6 +555,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 } } } + aboveRow[-1] = leftAvailable != 0 ? aboveRef[-1] : (byte)129; } else @@ -716,7 +593,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 int txw = 1 << (int)txSize; int haveTop = loff != 0 || !xd.AboveMi.IsNull ? 1 : 0; int haveLeft = aoff != 0 || !xd.LeftMi.IsNull ? 1 : 0; - int haveRight = (aoff + txw) < bw ? 1 : 0; + int haveRight = aoff + txw < bw ? 1 : 0; int x = aoff * 4; int y = loff * 4; @@ -736,9 +613,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 x, y, plane); - return; } + BuildIntraPredictors( ref xd, refr, @@ -755,4 +632,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 plane); } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/TileBuffer.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/TileBuffer.cs index b6adb95ff..18b9d7f47 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/TileBuffer.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/TileBuffer.cs @@ -8,4 +8,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 public ArrayPtr Data; public int Size; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/TileWorkerData.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/TileWorkerData.cs index a9a7d566e..8c62dca75 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/TileWorkerData.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/TileWorkerData.cs @@ -12,9 +12,20 @@ namespace Ryujinx.Graphics.Nvdec.Vp9 public int BufEnd; public Reader BitReader; public Vp9BackwardUpdates Counts; + public MacroBlockD Xd; + /* dqcoeff are shared by all the planes. So planes must be decoded serially */ public Array32> Dqcoeff; public InternalErrorInfo ErrorInfo; + + public int DecPartitionPlaneContext(int miRow, int miCol, int bsl) + { + ref sbyte aboveCtx = ref Xd.AboveSegContext[miCol]; + ref sbyte leftCtx = ref Xd.LeftSegContext[miRow & Constants.MiMask]; + int above = (aboveCtx >> bsl) & 1, left = (leftCtx >> bsl) & 1; + + return (left * 2) + above + (bsl * Constants.PartitionPloffset); + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BModeInfo.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BModeInfo.cs index 4ff82820e..a9d32d0b4 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BModeInfo.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BModeInfo.cs @@ -7,4 +7,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public PredictionMode Mode; public Array2 Mv; // First, second inter predictor motion vectors } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BitstreamProfile.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BitstreamProfile.cs new file mode 100644 index 000000000..13293f460 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BitstreamProfile.cs @@ -0,0 +1,11 @@ +namespace Ryujinx.Graphics.Nvdec.Vp9.Types +{ + public enum BitstreamProfile + { + Profile0, + Profile1, + Profile2, + Profile3, + MaxProfiles + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BlockSize.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BlockSize.cs index c7d4f7cc4..cee162ab7 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BlockSize.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BlockSize.cs @@ -1,21 +1,21 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9.Types +namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal enum BlockSize { - Block4x4 = 0, - Block4x8 = 1, - Block8x4 = 2, - Block8x8 = 3, - Block8x16 = 4, - Block16x8 = 5, - Block16x16 = 6, - Block16x32 = 7, - Block32x16 = 8, - Block32x32 = 9, - Block32x64 = 10, - Block64x32 = 11, - Block64x64 = 12, - BlockSizes = 13, - BlockInvalid = BlockSizes, + Block4X4, + Block4X8, + Block8X4, + Block8X8, + Block8X16, + Block16X8, + Block16X16, + Block16X32, + Block32X16, + Block32X32, + Block32X64, + Block64X32, + Block64X64, + BlockSizes, + BlockInvalid = BlockSizes } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Buf2D.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Buf2D.cs index 1313a2e1f..575189490 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Buf2D.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Buf2D.cs @@ -7,4 +7,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public ArrayPtr Buf; public int Stride; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BufferPool.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BufferPool.cs new file mode 100644 index 000000000..bfe87d5a5 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/BufferPool.cs @@ -0,0 +1,18 @@ +using Ryujinx.Common.Memory; + +namespace Ryujinx.Graphics.Nvdec.Vp9.Types +{ + internal struct BufferPool + { + // Private data associated with the frame buffer callbacks. + public Ptr CbPriv; + + // vpx_get_frame_buffer_cb_fn_t get_fb_cb; + // vpx_release_frame_buffer_cb_fn_t release_fb_cb; + + public Array12 FrameBufs; + + // Frame buffers allocated internally by the codec. + public InternalFrameBufferList IntFrameBuffers; + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/FrameType.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/FrameType.cs index 21f021c5b..8b0935e29 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/FrameType.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/FrameType.cs @@ -5,4 +5,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types KeyFrame = 0, InterFrame = 1, } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilter.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilter.cs index d2b295476..4207c54d7 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilter.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilter.cs @@ -23,5 +23,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public ArrayPtr Lfm; public int LfmStride; + + public void SetDefaultLfDeltas() + { + ModeRefDeltaEnabled = true; + ModeRefDeltaUpdate = true; + + RefDeltas[Constants.IntraFrame] = 1; + RefDeltas[Constants.LastFrame] = 0; + RefDeltas[Constants.GoldenFrame] = -1; + RefDeltas[Constants.AltRefFrame] = -1; + ModeDeltas[0] = 0; + ModeDeltas[1] = 0; + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterInfoN.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterInfoN.cs index be6243071..2a88df3e1 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterInfoN.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterInfoN.cs @@ -7,4 +7,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public Array64 Lfthr; public Array8>> Lvl; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterMask.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterMask.cs index 879cbe15b..4aea49425 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterMask.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterMask.cs @@ -15,10 +15,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { public Array4 LeftY; public Array4 AboveY; - public ulong Int4x4Y; + public ulong Int4X4Y; public Array4 LeftUv; public Array4 AboveUv; - public ushort Int4x4Uv; + public ushort Int4X4Uv; public Array64 LflY; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterThresh.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterThresh.cs index 546213215..7fa3c6355 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterThresh.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/LoopFilterThresh.cs @@ -12,4 +12,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public Array16 HevThr; #pragma warning restore CS0649 } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MacroBlockD.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MacroBlockD.cs index 6305664df..bc6b7be32 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MacroBlockD.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MacroBlockD.cs @@ -1,4 +1,5 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Common; using Ryujinx.Graphics.Video; namespace Ryujinx.Graphics.Nvdec.Vp9.Types @@ -54,7 +55,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public Ptr ErrorInfo; - public readonly int GetPredContextSegId() + public int GetPredContextSegId() { sbyte aboveSip = !AboveMi.IsNull ? AboveMi.Value.SegIdPredicted : (sbyte)0; sbyte leftSip = !LeftMi.IsNull ? LeftMi.Value.SegIdPredicted : (sbyte)0; @@ -62,15 +63,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types return aboveSip + leftSip; } - public readonly int GetSkipContext() + public int GetSkipContext() { int aboveSkip = !AboveMi.IsNull ? AboveMi.Value.Skip : 0; int leftSkip = !LeftMi.IsNull ? LeftMi.Value.Skip : 0; - return aboveSkip + leftSkip; } - public readonly int GetPredContextSwitchableInterp() + public int GetPredContextSwitchableInterp() { // Note: // The mode info data structure has a one element border above and to the @@ -83,18 +83,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { return leftType; } - else if (leftType == Constants.SwitchableFilters) + + if (leftType == Constants.SwitchableFilters) { return aboveType; } - else if (aboveType == Constants.SwitchableFilters) + + if (aboveType == Constants.SwitchableFilters) { return leftType; } - else - { - return Constants.SwitchableFilters; - } + + return Constants.SwitchableFilters; } // The mode info data structure has a one element border above and to the @@ -104,20 +104,22 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types // 1 - intra/inter, inter/intra // 2 - intra/--, --/intra // 3 - intra/intra - public readonly int GetIntraInterContext() + public int GetIntraInterContext() { if (!AboveMi.IsNull && !LeftMi.IsNull) - { // Both edges available + { + // Both edges available bool aboveIntra = !AboveMi.Value.IsInterBlock(); bool leftIntra = !LeftMi.Value.IsInterBlock(); - - return leftIntra && aboveIntra ? 3 : (leftIntra || aboveIntra ? 1 : 0); + return leftIntra && aboveIntra ? 3 : leftIntra || aboveIntra ? 1 : 0; } if (!AboveMi.IsNull || !LeftMi.IsNull) - { // One edge available + { + // One edge available return 2 * (!(!AboveMi.IsNull ? AboveMi.Value : LeftMi.Value).IsInterBlock() ? 1 : 0); } + return 0; } @@ -125,11 +127,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types // The mode info data structure has a one element border above and to the // left of the entries corresponding to real blocks. // The prediction flags in these dummy entries are initialized to 0. - public readonly int GetTxSizeContext() + public int GetTxSizeContext() { int maxTxSize = (int)Luts.MaxTxSizeLookup[(int)Mi[0].Value.SbType]; - int aboveCtx = (!AboveMi.IsNull && AboveMi.Value.Skip == 0) ? (int)AboveMi.Value.TxSize : maxTxSize; - int leftCtx = (!LeftMi.IsNull && LeftMi.Value.Skip == 0) ? (int)LeftMi.Value.TxSize : maxTxSize; + int aboveCtx = !AboveMi.IsNull && AboveMi.Value.Skip == 0 ? (int)AboveMi.Value.TxSize : maxTxSize; + int leftCtx = !LeftMi.IsNull && LeftMi.Value.Skip == 0 ? (int)LeftMi.Value.TxSize : maxTxSize; if (LeftMi.IsNull) { leftCtx = aboveCtx; @@ -140,14 +142,12 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types aboveCtx = leftCtx; } - return (aboveCtx + leftCtx) > maxTxSize ? 1 : 0; + return aboveCtx + leftCtx > maxTxSize ? 1 : 0; } public void SetupBlockPlanes(int ssX, int ssY) { - int i; - - for (i = 0; i < Constants.MaxMbPlane; i++) + for (int i = 0; i < Constants.MaxMbPlane; i++) { Plane[i].SubsamplingX = i != 0 ? ssX : 0; Plane[i].SubsamplingY = i != 0 ? ssY : 0; @@ -158,25 +158,36 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { int aboveIdx = miCol * 2; int leftIdx = (miRow * 2) & 15; - int i; - for (i = 0; i < Constants.MaxMbPlane; ++i) + + for (int i = 0; i < Constants.MaxMbPlane; ++i) { ref MacroBlockDPlane pd = ref Plane[i]; pd.AboveContext = AboveContext[i].Slice(aboveIdx >> pd.SubsamplingX); - pd.LeftContext = new ArrayPtr(ref LeftContext[i][leftIdx >> pd.SubsamplingY], 16 - (leftIdx >> pd.SubsamplingY)); + pd.LeftContext = new ArrayPtr(ref LeftContext[i][leftIdx >> pd.SubsamplingY], + 16 - (leftIdx >> pd.SubsamplingY)); } } internal void SetMiRowCol(ref TileInfo tile, int miRow, int bh, int miCol, int bw, int miRows, int miCols) { - MbToTopEdge = -((miRow * Constants.MiSize) * 8); - MbToBottomEdge = ((miRows - bh - miRow) * Constants.MiSize) * 8; - MbToLeftEdge = -((miCol * Constants.MiSize) * 8); - MbToRightEdge = ((miCols - bw - miCol) * Constants.MiSize) * 8; + MbToTopEdge = -(miRow * Constants.MiSize * 8); + MbToBottomEdge = (miRows - bh - miRow) * Constants.MiSize * 8; + MbToLeftEdge = -(miCol * Constants.MiSize * 8); + MbToRightEdge = (miCols - bw - miCol) * Constants.MiSize * 8; // Are edges available for intra prediction? - AboveMi = (miRow != 0) ? Mi[-MiStride] : Ptr.Null; - LeftMi = (miCol > tile.MiColStart) ? Mi[-1] : Ptr.Null; + AboveMi = miRow != 0 ? Mi[-MiStride] : Ptr.Null; + LeftMi = miCol > tile.MiColStart ? Mi[-1] : Ptr.Null; + } + + public unsafe void DecResetSkipContext() + { + for (int i = 0; i < Constants.MaxMbPlane; i++) + { + ref MacroBlockDPlane pd = ref Plane[i]; + MemoryUtil.Fill(pd.AboveContext.ToPointer(), (sbyte)0, pd.N4W); + MemoryUtil.Fill(pd.LeftContext.ToPointer(), (sbyte)0, pd.N4H); + } } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MacroBlockDPlane.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MacroBlockDPlane.cs index df21a8d49..d5b64f078 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MacroBlockDPlane.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MacroBlockDPlane.cs @@ -15,7 +15,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types // Number of 4x4s in current block public ushort N4W, N4H; + // Log2 of N4W, N4H public byte N4Wl, N4Hl; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ModeInfo.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ModeInfo.cs index e97ed424c..39f545a76 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ModeInfo.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ModeInfo.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using System.Diagnostics; namespace Ryujinx.Graphics.Nvdec.Vp9.Types @@ -29,14 +29,13 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public PredictionMode GetYMode(int block) { - return SbType < BlockSize.Block8x8 ? Bmi[block].Mode : Mode; + return SbType < BlockSize.Block8X8 ? Bmi[block].Mode : Mode; } - public readonly TxSize GetUvTxSize(ref MacroBlockDPlane pd) + public TxSize GetUvTxSize(ref MacroBlockDPlane pd) { - Debug.Assert(SbType < BlockSize.Block8x8 || - Luts.SsSizeLookup[(int)SbType][pd.SubsamplingX][pd.SubsamplingY] != BlockSize.BlockInvalid); - + Debug.Assert(SbType < BlockSize.Block8X8 || + Luts.SsSizeLookup[(int)SbType][pd.SubsamplingX][pd.SubsamplingY] != BlockSize.BlockInvalid); return Luts.UvTxsizeLookup[(int)SbType][(int)TxSize][pd.SubsamplingX][pd.SubsamplingY]; } @@ -50,17 +49,59 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types return RefFrame[1] > Constants.IntraFrame; } - private static readonly int[][] _idxNColumnToSubblock = { - new[] { 1, 2 }, new[] { 1, 3 }, new[] { 3, 2 }, new[] { 3, 3 }, - }; + private static readonly int[][] _idxNColumnToSubblock = + [ + [1, 2], [1, 3], [3, 2], [3, 3] + ]; // This function returns either the appropriate sub block or block's mv // on whether the block_size < 8x8 and we have check_sub_blocks set. public Mv GetSubBlockMv(int whichMv, int searchCol, int blockIdx) { - return blockIdx >= 0 && SbType < BlockSize.Block8x8 + return blockIdx >= 0 && SbType < BlockSize.Block8X8 ? Bmi[_idxNColumnToSubblock[blockIdx][searchCol == 0 ? 1 : 0]].Mv[whichMv] : Mv[whichMv]; } + + public Mv MvPredQ4(int idx) + { + Mv res = new() + { + Row = (short)ReconInter.RoundMvCompQ4( + Bmi[0].Mv[idx].Row + Bmi[1].Mv[idx].Row + + Bmi[2].Mv[idx].Row + Bmi[3].Mv[idx].Row), + Col = (short)ReconInter.RoundMvCompQ4( + Bmi[0].Mv[idx].Col + Bmi[1].Mv[idx].Col + + Bmi[2].Mv[idx].Col + Bmi[3].Mv[idx].Col) + }; + return res; + } + + public Mv MvPredQ2(int idx, int block0, int block1) + { + Mv res = new() + { + Row = (short)ReconInter.RoundMvCompQ2( + Bmi[block0].Mv[idx].Row + + Bmi[block1].Mv[idx].Row), + Col = (short)ReconInter.RoundMvCompQ2( + Bmi[block0].Mv[idx].Col + + Bmi[block1].Mv[idx].Col) + }; + return res; + } + + // Performs mv sign inversion if indicated by the reference frame combination. + public Mv ScaleMv(int refr, sbyte thisRefFrame, ref Array4 refSignBias) + { + Mv mv = Mv[refr]; + if (refSignBias[RefFrame[refr]] != refSignBias[thisRefFrame]) + { + mv.Row *= -1; + mv.Col *= -1; + } + + return mv; + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MotionVectorContext.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MotionVectorContext.cs index bad5af280..138b8a0ee 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MotionVectorContext.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MotionVectorContext.cs @@ -11,4 +11,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types BothIntra = 6, InvalidCase = 9, } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Mv.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Mv.cs index 9ccb51503..6e0accfb3 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Mv.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Mv.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Video; using System; using System.Diagnostics; @@ -10,98 +10,88 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public short Row; public short Col; - private static ReadOnlySpan LogInBase2 => new byte[] - { - 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, - }; + private static ReadOnlySpan LogInBase2 => + [ + 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 10 + ]; - public readonly bool UseMvHp() + public bool UseHp() { const int KMvRefThresh = 64; // Threshold for use of high-precision 1/8 mv return Math.Abs(Row) < KMvRefThresh && Math.Abs(Col) < KMvRefThresh; } - public static bool MvJointVertical(MvJointType type) + public static bool JointVertical(MvJointType type) { - return type == MvJointType.MvJointHzvnz || type == MvJointType.MvJointHnzvnz; + return type == MvJointType.Hzvnz || type == MvJointType.Hnzvnz; } - public static bool MvJointHorizontal(MvJointType type) + public static bool JointHorizontal(MvJointType type) { - return type == MvJointType.MvJointHnzvz || type == MvJointType.MvJointHnzvnz; + return type == MvJointType.Hnzvz || type == MvJointType.Hnzvnz; } - private static int MvClassBase(MvClassType c) + private static int ClassBase(MvClassType c) { return c != 0 ? Constants.Class0Size << ((int)c + 2) : 0; } - private static MvClassType GetMvClass(int z, Ptr offset) + private static MvClassType GetClass(int z, Ptr offset) { - MvClassType c = (z >= Constants.Class0Size * 4096) ? MvClassType.MvClass10 : (MvClassType)LogInBase2[z >> 3]; + MvClassType c = z >= Constants.Class0Size * 4096 ? MvClassType.Class10 : (MvClassType)LogInBase2[z >> 3]; if (!offset.IsNull) { - offset.Value = z - MvClassBase(c); + offset.Value = z - ClassBase(c); } return c; } - private static void IncMvComponent(int v, ref Vp9BackwardUpdates counts, int comp, int incr, int usehp) + private static void IncComponent(int v, ref Vp9BackwardUpdates counts, int comp, int incr, int usehp) { - int s, z, c, o = 0, d, e, f; + int o = 0; Debug.Assert(v != 0); /* Should not be zero */ - s = v < 0 ? 1 : 0; + int s = v < 0 ? 1 : 0; counts.Sign[comp][s] += (uint)incr; - z = (s != 0 ? -v : v) - 1; /* Magnitude - 1 */ + int z = (s != 0 ? -v : v) - 1 /* Magnitude - 1 */; - c = (int)GetMvClass(z, new Ptr(ref o)); + int c = (int)GetClass(z, new Ptr(ref o)); counts.Classes[comp][c] += (uint)incr; - d = (o >> 3); /* Int mv data */ - f = (o >> 1) & 3; /* Fractional pel mv data */ - e = (o & 1); /* High precision mv data */ + int d = o >> 3 /* Int mv data */; + int f = (o >> 1) & 3 /* Fractional pel mv data */; + int e = o & 1 /* High precision mv data */; - if (c == (int)MvClassType.MvClass0) + if (c == (int)MvClassType.Class0) { counts.Class0[comp][d] += (uint)incr; counts.Class0Fp[comp][d][f] += (uint)incr; @@ -109,11 +99,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types } else { - int i; int b = c + Constants.Class0Bits - 1; // Number of bits - for (i = 0; i < b; ++i) + for (int i = 0; i < b; ++i) { - counts.Bits[comp][i][((d >> i) & 1)] += (uint)incr; + counts.Bits[comp][i][(d >> i) & 1] += (uint)incr; } counts.Fp[comp][f] += (uint)incr; @@ -121,56 +110,56 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types } } - private readonly MvJointType GetMvJoint() + public MvJointType GetJoint() { if (Row == 0) { - return Col == 0 ? MvJointType.MvJointZero : MvJointType.MvJointHnzvz; + return Col == 0 ? MvJointType.Zero : MvJointType.Hnzvz; } - return Col == 0 ? MvJointType.MvJointHzvnz : MvJointType.MvJointHnzvnz; + return Col == 0 ? MvJointType.Hzvnz : MvJointType.Hnzvnz; } - internal readonly void IncMv(Ptr counts) + internal void Inc(Ptr counts) { if (!counts.IsNull) { - MvJointType j = GetMvJoint(); + MvJointType j = GetJoint(); ++counts.Value.Joints[(int)j]; - if (MvJointVertical(j)) + if (JointVertical(j)) { - IncMvComponent(Row, ref counts.Value, 0, 1, 1); + IncComponent(Row, ref counts.Value, 0, 1, 1); } - if (MvJointHorizontal(j)) + if (JointHorizontal(j)) { - IncMvComponent(Col, ref counts.Value, 1, 1, 1); + IncComponent(Col, ref counts.Value, 1, 1, 1); } } } - public void ClampMv(int minCol, int maxCol, int minRow, int maxRow) + public void Clamp(int minCol, int maxCol, int minRow, int maxRow) { Col = (short)Math.Clamp(Col, minCol, maxCol); Row = (short)Math.Clamp(Row, minRow, maxRow); } - private const int MvBorder = (16 << 3); // Allow 16 pels in 1/8th pel units + private const int Border = 16 << 3; // Allow 16 pels in 1/8th pel units - public void ClampMvRef(ref MacroBlockD xd) + public void ClampRef(ref MacroBlockD xd) { - ClampMv( - xd.MbToLeftEdge - MvBorder, - xd.MbToRightEdge + MvBorder, - xd.MbToTopEdge - MvBorder, - xd.MbToBottomEdge + MvBorder); + Clamp( + xd.MbToLeftEdge - Border, + xd.MbToRightEdge + Border, + xd.MbToTopEdge - Border, + xd.MbToBottomEdge + Border); } - public void LowerMvPrecision(bool allowHP) + public void LowerPrecision(bool allowHp) { - bool useHP = allowHP && UseMvHp(); - if (!useHP) + bool useHp = allowHp && UseHp(); + if (!useHp) { if ((Row & 1) != 0) { @@ -183,5 +172,11 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types } } } + + public bool IsValid() + { + return Row is > Constants.MvLow and < Constants.MvUpp && + Col is > Constants.MvLow and < Constants.MvUpp; + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Mv32.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Mv32.cs index 5231ca6a6..d3561fe58 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Mv32.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Mv32.cs @@ -5,4 +5,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public int Row; public int Col; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvClassType.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvClassType.cs index 188eee0b0..0e233b2f2 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvClassType.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvClassType.cs @@ -2,16 +2,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal enum MvClassType { - MvClass0 = 0, /* (0, 2] integer pel */ - MvClass1 = 1, /* (2, 4] integer pel */ - MvClass2 = 2, /* (4, 8] integer pel */ - MvClass3 = 3, /* (8, 16] integer pel */ - MvClass4 = 4, /* (16, 32] integer pel */ - MvClass5 = 5, /* (32, 64] integer pel */ - MvClass6 = 6, /* (64, 128] integer pel */ - MvClass7 = 7, /* (128, 256] integer pel */ - MvClass8 = 8, /* (256, 512] integer pel */ - MvClass9 = 9, /* (512, 1024] integer pel */ - MvClass10 = 10, /* (1024,2048] integer pel */ + Class0, /* (0, 2] integer pel */ + Class1, /* (2, 4] integer pel */ + Class2, /* (4, 8] integer pel */ + Class3, /* (8, 16] integer pel */ + Class4, /* (16, 32] integer pel */ + Class5, /* (32, 64] integer pel */ + Class6, /* (64, 128] integer pel */ + Class7, /* (128, 256] integer pel */ + Class8, /* (256, 512] integer pel */ + Class9, /* (512, 1024] integer pel */ + Class10 /* (1024,2048] integer pel */ } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvJointType.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvJointType.cs index 8cccf90cd..499c50c68 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvJointType.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvJointType.cs @@ -2,9 +2,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal enum MvJointType { - MvJointZero = 0, /* Zero vector */ - MvJointHnzvz = 1, /* Vert zero, hor nonzero */ - MvJointHzvnz = 2, /* Hor zero, vert nonzero */ - MvJointHnzvnz = 3, /* Both components nonzero */ + Zero, /* Zero vector */ + Hnzvz, /* Vert zero, hor nonzero */ + Hzvnz, /* Hor zero, vert nonzero */ + Hnzvnz /* Both components nonzero */ } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvRef.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvRef.cs index 1d32a0927..06b082800 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvRef.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/MvRef.cs @@ -7,4 +7,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public Array2 Mv; public Array2 RefFrame; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PartitionType.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PartitionType.cs index c47557abf..8042071e4 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PartitionType.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PartitionType.cs @@ -9,4 +9,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types PartitionTypes, PartitionInvalid = PartitionTypes, } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PlaneType.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PlaneType.cs index 8b01cf3a1..ced1646e9 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PlaneType.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PlaneType.cs @@ -1,9 +1,9 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9.Types +namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal enum PlaneType { - Y = 0, - Uv = 1, - PlaneTypes, + Y, + Uv, + PlaneTypes } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Position.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Position.cs index cee2fbe83..d055f225e 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Position.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Position.cs @@ -11,4 +11,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types Col = col; } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PredictionMode.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PredictionMode.cs index 2d81b547e..a0f15905d 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PredictionMode.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/PredictionMode.cs @@ -1,21 +1,21 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9.Types +namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal enum PredictionMode { - DcPred = 0, // Average of above and left pixels - VPred = 1, // Vertical - HPred = 2, // Horizontal - D45Pred = 3, // Directional 45 deg = round(arctan(1 / 1) * 180 / pi) - D135Pred = 4, // Directional 135 deg = 180 - 45 - D117Pred = 5, // Directional 117 deg = 180 - 63 - D153Pred = 6, // Directional 153 deg = 180 - 27 - D207Pred = 7, // Directional 207 deg = 180 + 27 - D63Pred = 8, // Directional 63 deg = round(arctan(2 / 1) * 180 / pi) - TmPred = 9, // True-motion - NearestMv = 10, - NearMv = 11, - ZeroMv = 12, - NewMv = 13, - MbModeCount = 14, + DcPred, // Average of above and left pixels + VPred, // Vertical + HPred, // Horizontal + D45Pred, // Directional 45 deg = round(arctan(1 / 1) * 180 / pi) + D135Pred, // Directional 135 deg = 180 - 45 + D117Pred, // Directional 117 deg = 180 - 63 + D153Pred, // Directional 153 deg = 180 - 27 + D207Pred, // Directional 207 deg = 180 + 27 + D63Pred, // Directional 63 deg = round(arctan(2 / 1) * 180 / pi) + TmPred, // True-motion + NearestMv, + NearMv, + ZeroMv, + NewMv, + MbModeCount } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/RefBuffer.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/RefBuffer.cs index 0fbb84514..4b45f2c02 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/RefBuffer.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/RefBuffer.cs @@ -2,7 +2,10 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal struct RefBuffer { + public const int InvalidIdx = -1; // Invalid buffer index. + + public int Idx; public Surface Buf; public ScaleFactors Sf; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/RefCntBuffer.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/RefCntBuffer.cs new file mode 100644 index 000000000..47febf38d --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/RefCntBuffer.cs @@ -0,0 +1,12 @@ +namespace Ryujinx.Graphics.Nvdec.Vp9.Types +{ + internal struct RefCntBuffer + { + public int RefCount; + public int MiRows; + public int MiCols; + public byte Released; + public VpxCodecFrameBuffer RawFrameBuffer; + public Surface Buf; + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ReferenceMode.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ReferenceMode.cs index aff3cbb07..a678f8181 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ReferenceMode.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ReferenceMode.cs @@ -1,10 +1,10 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9.Types +namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal enum ReferenceMode { - SingleReference = 0, - CompoundReference = 1, - ReferenceModeSelect = 2, - ReferenceModes = 3, + Single, + Compound, + Select, + ReferenceModes } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ScaleFactors.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ScaleFactors.cs index 8e2ec4249..212571311 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ScaleFactors.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/ScaleFactors.cs @@ -1,4 +1,4 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using System.Runtime.CompilerServices; using static Ryujinx.Graphics.Nvdec.Vp9.Dsp.Convolve; using static Ryujinx.Graphics.Nvdec.Vp9.Dsp.Filter; @@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types internal struct ScaleFactors { private const int RefScaleShift = 14; - private const int RefNoScale = (1 << RefScaleShift); + private const int RefNoScale = 1 << RefScaleShift; private const int RefInvalidScale = -1; private unsafe delegate void ConvolveFn( @@ -38,255 +38,103 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types int h, int bd); - private static readonly unsafe ConvolveFn[][][] _predictX16Y16 = { - new[] - { - new ConvolveFn[] - { - ConvolveCopy, - ConvolveAvg, - }, - new ConvolveFn[] - { - Convolve8Vert, - Convolve8AvgVert, - }, - }, - new[] - { - new ConvolveFn[] - { - Convolve8Horiz, - Convolve8AvgHoriz, - }, - new ConvolveFn[] - { - Convolve8, - Convolve8Avg, - }, - }, - }; + private static readonly unsafe ConvolveFn[][][] _predictX16Y16 = + [ + [ + [ConvolveCopy, ConvolveAvg], + [Convolve8Vert, Convolve8AvgVert] + ], + [ + [Convolve8Horiz, Convolve8AvgHoriz], + [Convolve8, Convolve8Avg] + ] + ]; - private static readonly unsafe ConvolveFn[][][] _predictX16 = { - new[] - { - new ConvolveFn[] - { - ScaledVert, - ScaledAvgVert, - }, - new ConvolveFn[] - { - ScaledVert, - ScaledAvgVert, - }, - }, - new[] - { - new ConvolveFn[] - { - Scaled2D, - ScaledAvg2D, - }, - new ConvolveFn[] - { - Scaled2D, - ScaledAvg2D, - }, - }, - }; + private static readonly unsafe ConvolveFn[][][] _predictX16 = + [ + [ + [ScaledVert, ScaledAvgVert], [ScaledVert, ScaledAvgVert] + ], + [[Scaled2D, ScaledAvg2D], [Scaled2D, ScaledAvg2D]] + ]; - private static readonly unsafe ConvolveFn[][][] _predictY16 = { - new[] - { - new ConvolveFn[] - { - ScaledHoriz, - ScaledAvgHoriz, - }, - new ConvolveFn[] - { - Scaled2D, - ScaledAvg2D, - }, - }, - new[] - { - new ConvolveFn[] - { - ScaledHoriz, - ScaledAvgHoriz, - }, - new ConvolveFn[] - { - Scaled2D, - ScaledAvg2D, - }, - }, - }; + private static readonly unsafe ConvolveFn[][][] _predictY16 = + [ + [[ScaledHoriz, ScaledAvgHoriz], [Scaled2D, ScaledAvg2D]], + [[ScaledHoriz, ScaledAvgHoriz], [Scaled2D, ScaledAvg2D]] + ]; - private static readonly unsafe ConvolveFn[][][] _predict = { - new[] - { - new ConvolveFn[] - { - Scaled2D, - ScaledAvg2D, - }, - new ConvolveFn[] - { - Scaled2D, - ScaledAvg2D, - }, - }, - new[] - { - new ConvolveFn[] - { - Scaled2D, - ScaledAvg2D, - }, - new ConvolveFn[] - { - Scaled2D, - ScaledAvg2D, - }, - }, - }; + private static readonly unsafe ConvolveFn[][][] _predict = + [ + [[Scaled2D, ScaledAvg2D], [Scaled2D, ScaledAvg2D]], + [[Scaled2D, ScaledAvg2D], [Scaled2D, ScaledAvg2D]] + ]; - private static readonly unsafe HighbdConvolveFn[][][] _highbdPredictX16Y16 = { - new[] - { - new HighbdConvolveFn[] - { - HighbdConvolveCopy, - HighbdConvolveAvg, - }, - new HighbdConvolveFn[] - { - HighbdConvolve8Vert, - HighbdConvolve8AvgVert, - }, - }, - new[] - { - new HighbdConvolveFn[] - { - HighbdConvolve8Horiz, - HighbdConvolve8AvgHoriz, - }, - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - }, - }; + private static readonly unsafe HighbdConvolveFn[][][] _highbdPredictX16Y16 = + [ + [ + [HighbdConvolveCopy, HighbdConvolveAvg], + [HighbdConvolve8Vert, HighbdConvolve8AvgVert] + ], + [ + [HighbdConvolve8Horiz, HighbdConvolve8AvgHoriz], + [HighbdConvolve8, HighbdConvolve8Avg] + ] + ]; - private static readonly unsafe HighbdConvolveFn[][][] _highbdPredictX16 = { - new[] - { - new HighbdConvolveFn[] - { - HighbdConvolve8Vert, - HighbdConvolve8AvgVert, - }, - new HighbdConvolveFn[] - { - HighbdConvolve8Vert, - HighbdConvolve8AvgVert, - }, - }, - new[] - { - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - }, - }; + private static readonly unsafe HighbdConvolveFn[][][] _highbdPredictX16 = + [ + [ + [HighbdConvolve8Vert, HighbdConvolve8AvgVert], + [HighbdConvolve8Vert, HighbdConvolve8AvgVert] + ], + [ + [HighbdConvolve8, HighbdConvolve8Avg], + [HighbdConvolve8, HighbdConvolve8Avg] + ] + ]; - private static readonly unsafe HighbdConvolveFn[][][] _highbdPredictY16 = { - new[] - { - new HighbdConvolveFn[] - { - HighbdConvolve8Horiz, - HighbdConvolve8AvgHoriz, - }, - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - }, - new[] - { - new HighbdConvolveFn[] - { - HighbdConvolve8Horiz, - HighbdConvolve8AvgHoriz, - }, - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - }, - }; + private static readonly unsafe HighbdConvolveFn[][][] _highbdPredictY16 = + [ + [ + [HighbdConvolve8Horiz, HighbdConvolve8AvgHoriz], + [HighbdConvolve8, HighbdConvolve8Avg] + ], + [ + [HighbdConvolve8Horiz, HighbdConvolve8AvgHoriz], + [HighbdConvolve8, HighbdConvolve8Avg] + ] + ]; - private static readonly unsafe HighbdConvolveFn[][][] _highbdPredict = { - new[] - { - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - }, - new[] - { - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - new HighbdConvolveFn[] - { - HighbdConvolve8, - HighbdConvolve8Avg, - }, - }, - }; + private static readonly unsafe HighbdConvolveFn[][][] _highbdPredict = + [ + [ + [HighbdConvolve8, HighbdConvolve8Avg], + [HighbdConvolve8, HighbdConvolve8Avg] + ], + [ + [HighbdConvolve8, HighbdConvolve8Avg], + [HighbdConvolve8, HighbdConvolve8Avg] + ] + ]; - public int XScaleFP; // Horizontal fixed point scale factor - public int YScaleFP; // Vertical fixed point scale factor + public int XScaleFp; // Horizontal fixed point scale factor + public int YScaleFp; // Vertical fixed point scale factor public int XStepQ4; public int YStepQ4; - public readonly int ScaleValueX(int val) + public int ScaleValueX(int val) { return IsScaled() ? ScaledX(val) : val; } - public readonly int ScaleValueY(int val) + public int ScaleValueY(int val) { return IsScaled() ? ScaledY(val) : val; } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public readonly unsafe void InterPredict( + public unsafe void InterPredict( int horiz, int vert, int avg, @@ -307,12 +155,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types if (YStepQ4 == 16) { // No scaling in either direction. - _predictX16Y16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, h); + _predictX16Y16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, + h); } else { // No scaling in x direction. Must always scale in the y direction. - _predictX16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, h); + _predictX16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, + h); } } else @@ -320,7 +170,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types if (YStepQ4 == 16) { // No scaling in the y direction. Must always scale in the x direction. - _predictY16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, h); + _predictY16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, + h); } else { @@ -331,7 +182,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public readonly unsafe void HighbdInterPredict( + public unsafe void HighbdInterPredict( int horiz, int vert, int avg, @@ -353,12 +204,14 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types if (YStepQ4 == 16) { // No scaling in either direction. - _highbdPredictX16Y16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, h, bd); + _highbdPredictX16Y16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, + ys, w, h, bd); } else { // No scaling in x direction. Must always scale in the y direction. - _highbdPredictX16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, h, bd); + _highbdPredictX16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, + w, h, bd); } } else @@ -366,24 +219,26 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types if (YStepQ4 == 16) { // No scaling in the y direction. Must always scale in the x direction. - _highbdPredictY16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, h, bd); + _highbdPredictY16[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, + w, h, bd); } else { // Must always scale in both directions. - _highbdPredict[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, h, bd); + _highbdPredict[horiz][vert][avg](src, srcStride, dst, dstStride, kernel, subpelX, xs, subpelY, ys, w, + h, bd); } } } - private readonly int ScaledX(int val) + private int ScaledX(int val) { - return (int)((long)val * XScaleFP >> RefScaleShift); + return (int)(((long)val * XScaleFp) >> RefScaleShift); } - private readonly int ScaledY(int val) + private int ScaledY(int val) { - return (int)((long)val * YScaleFP >> RefScaleShift); + return (int)(((long)val * YScaleFp) >> RefScaleShift); } private static int GetFixedPointScaleFactor(int otherSize, int thisSize) @@ -399,23 +254,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { int xOffQ4 = ScaledX(x << SubpelBits) & SubpelMask; int yOffQ4 = ScaledY(y << SubpelBits) & SubpelMask; - Mv32 res = new() - { - Row = ScaledY(mv.Row) + yOffQ4, - Col = ScaledX(mv.Col) + xOffQ4, - }; - + Mv32 res = new() { Row = ScaledY(mv.Row) + yOffQ4, Col = ScaledX(mv.Col) + xOffQ4 }; return res; } - public readonly bool IsValidScale() + public bool IsValidScale() { - return XScaleFP != RefInvalidScale && YScaleFP != RefInvalidScale; + return XScaleFp != RefInvalidScale && YScaleFp != RefInvalidScale; } - public readonly bool IsScaled() + public bool IsScaled() { - return IsValidScale() && (XScaleFP != RefNoScale || YScaleFP != RefNoScale); + return IsValidScale() && (XScaleFp != RefNoScale || YScaleFp != RefNoScale); } public static bool ValidRefFrameSize(int refWidth, int refHeight, int thisWidth, int thisHeight) @@ -430,16 +280,15 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { if (!ValidRefFrameSize(otherW, otherH, thisW, thisH)) { - XScaleFP = RefInvalidScale; - YScaleFP = RefInvalidScale; - + XScaleFp = RefInvalidScale; + YScaleFp = RefInvalidScale; return; } - XScaleFP = GetFixedPointScaleFactor(otherW, thisW); - YScaleFP = GetFixedPointScaleFactor(otherH, thisH); + XScaleFp = GetFixedPointScaleFactor(otherW, thisW); + YScaleFp = GetFixedPointScaleFactor(otherH, thisH); XStepQ4 = ScaledX(16); YStepQ4 = ScaledY(16); } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/SegLvlFeatures.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/SegLvlFeatures.cs index eb47abdfd..21d57d1d7 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/SegLvlFeatures.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/SegLvlFeatures.cs @@ -1,11 +1,11 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9.Types +namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal enum SegLvlFeatures { - SegLvlAltQ = 0, // Use alternate Quantizer .... - SegLvlAltLf = 1, // Use alternate loop filter value... - SegLvlRefFrame = 2, // Optional Segment reference frame - SegLvlSkip = 3, // Optional Segment (0,0) + skip mode - SegLvlMax = 4, // Number of features supported + AltQ, // Use alternate Quantizer .... + AltLf, // Use alternate loop filter value... + RefFrame, // Optional Segment reference frame + Skip, // Optional Segment (0,0) + skip mode + Max // Number of features supported } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Segmentation.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Segmentation.cs index f2415fc09..726476d96 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Segmentation.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Segmentation.cs @@ -1,4 +1,6 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Video; +using System; using System.Diagnostics; using System.Runtime.InteropServices; @@ -6,8 +8,16 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal struct Segmentation { - private static readonly int[] _segFeatureDataSigned = { 1, 1, 0, 0 }; - private static readonly int[] _segFeatureDataMax = { QuantCommon.MaxQ, Vp9.LoopFilter.MaxLoopFilter, 3, 0 }; + public const int SegmentDeltadata = 0; + public const int SegmentAbsdata = 1; + + public const int MaxSegments = 8; + public const int SegTreeProbs = MaxSegments - 1; + + public const int PredictionProbs = 3; + + private static readonly int[] _segFeatureDataSigned = [1, 1, 0, 0]; + private static readonly int[] _segFeatureDataMax = [QuantCommon.MaxQ, Vp9.LoopFilter.MaxLoopFilter, 3, 0]; public bool Enabled; public bool UpdateMap; @@ -67,5 +77,88 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { return FeatureData[segmentId][(int)featureId]; } + + public int GetQIndex(int segmentId, int baseQIndex) + { + if (IsSegFeatureActive(segmentId, SegLvlFeatures.AltQ) != 0) + { + int data = GetSegData(segmentId, SegLvlFeatures.AltQ); + int segQIndex = AbsDelta == Constants.SegmentAbsData ? data : baseQIndex + data; + return Math.Clamp(segQIndex, 0, QuantCommon.MaxQ); + } + + return baseQIndex; + } + + public void SetupSegmentation(ref Vp9EntropyProbs fc, ref ReadBitBuffer rb) + { + UpdateMap = false; + UpdateData = 0; + + Enabled = rb.ReadBit() != 0; + if (!Enabled) + { + return; + } + + // Segmentation map update + UpdateMap = rb.ReadBit() != 0; + if (UpdateMap) + { + for (int i = 0; i < SegTreeProbs; i++) + { + fc.SegTreeProb[i] = rb.ReadBit() != 0 + ? (byte)rb.ReadLiteral(8) + : (byte)Prob.MaxProb; + } + + TemporalUpdate = rb.ReadBit() != 0; + if (TemporalUpdate) + { + for (int i = 0; i < PredictionProbs; i++) + { + fc.SegPredProb[i] = rb.ReadBit() != 0 + ? (byte)rb.ReadLiteral(8) + : (byte)Prob.MaxProb; + } + } + else + { + for (int i = 0; i < PredictionProbs; i++) + { + fc.SegPredProb[i] = Prob.MaxProb; + } + } + } + + // Segmentation data update + UpdateData = (byte)rb.ReadBit(); + if (UpdateData != 0) + { + AbsDelta = (byte)rb.ReadBit(); + + ClearAllSegFeatures(); + + for (int i = 0; i < Constants.MaxSegments; i++) + { + for (int j = 0; j < (int)SegLvlFeatures.Max; j++) + { + int data = 0; + int featureEnabled = rb.ReadBit(); + if (featureEnabled != 0) + { + EnableSegFeature(i, (SegLvlFeatures)j); + data = rb.DecodeUnsignedMax(FeatureDataMax((SegLvlFeatures)j)); + if (IsSegFeatureSigned((SegLvlFeatures)j) != 0) + { + data = rb.ReadBit() != 0 ? -data : data; + } + } + + SetSegData(i, (SegLvlFeatures)j, data); + } + } + } + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Surface.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Surface.cs index 6bab536d1..33741f85f 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Surface.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Surface.cs @@ -1,11 +1,23 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Common; using Ryujinx.Graphics.Video; +using System.Diagnostics; using System.Runtime.InteropServices; namespace Ryujinx.Graphics.Nvdec.Vp9.Types { + internal delegate int VpxGetFrameBufferCbFnT(MemoryAllocator allocator, Ptr cbPriv, + ulong minSize, ref VpxCodecFrameBuffer fb); + internal struct Surface : ISurface { + public const int Innerborderinpixels = 96; + public const int InterpExtend = 4; + public const int EncBorderInPixels = 160; + public const int DecBorderInPixels = 32; + + public const int Yv12FlagHighbitdepth = 8; + public ArrayPtr YBuffer; public ArrayPtr UBuffer; public ArrayPtr VBuffer; @@ -14,43 +26,62 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public readonly unsafe Plane UPlane => new((nint)UBuffer.ToPointer(), UBuffer.Length); public readonly unsafe Plane VPlane => new((nint)VBuffer.ToPointer(), VBuffer.Length); - public readonly FrameField Field => FrameField.Progressive; + public FrameField Field => FrameField.Progressive; - public int Width { get; } - public int Height { get; } - public int AlignedWidth { get; } - public int AlignedHeight { get; } - public int Stride { get; } - public int UvWidth { get; } - public int UvHeight { get; } - public int UvAlignedWidth { get; } - public int UvAlignedHeight { get; } - public int UvStride { get; } + public int Width { get; private set; } + public int Height { get; private set; } + public int AlignedWidth { get; private set; } + public int AlignedHeight { get; private set; } + public int Stride { get; private set; } + public int UvWidth { get; private set; } + public int UvHeight { get; private set; } + public int UvAlignedWidth { get; private set; } + public int UvAlignedHeight { get; private set; } + public int UvStride { get; private set; } + public bool HighBd { get; private set; } - public bool HighBd { get; } + public int FrameSize { get; private set; } + public int Border { get; private set; } + + public int YCropWidth => Width; + public int YCropHeight => Height; + public int UvCropWidth => UvWidth; + public int UvCropHeight => UvHeight; + + public ArrayPtr BufferAlloc; + public int BufferAllocSz; + public int SubsamplingX; + public int SubsamplingY; + public uint BitDepth; + public VpxColorSpace ColorSpace; + public VpxColorRange ColorRange; + public int RenderWidth; + public int RenderHeight; + + public int Corrupted; + public int Flags; private readonly nint _pointer; public Surface(int width, int height) { - HighBd = false; - const int Border = 32; const int SsX = 1; const int SsY = 1; + const bool Highbd = false; int alignedWidth = (width + 7) & ~7; int alignedHeight = (height + 7) & ~7; - int yStride = ((alignedWidth + 2 * Border) + 31) & ~31; - int yplaneSize = (alignedHeight + 2 * Border) * yStride; + int yStride = (alignedWidth + (2 * Border) + 31) & ~31; + int yplaneSize = (alignedHeight + (2 * Border)) * yStride; int uvWidth = alignedWidth >> SsX; int uvHeight = alignedHeight >> SsY; int uvStride = yStride >> SsX; int uvBorderW = Border >> SsX; int uvBorderH = Border >> SsY; - int uvplaneSize = (uvHeight + 2 * uvBorderH) * uvStride; + int uvplaneSize = (uvHeight + (2 * uvBorderH)) * uvStride; - int frameSize = (HighBd ? 2 : 1) * (yplaneSize + 2 * uvplaneSize); + int frameSize = (Highbd ? 2 : 1) * (yplaneSize + (2 * uvplaneSize)); nint pointer = Marshal.AllocHGlobal(frameSize); _pointer = pointer; @@ -65,9 +96,9 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types UvAlignedHeight = uvHeight; UvStride = uvStride; - ArrayPtr NewPlane(int start, int size, int planeBorder) + ArrayPtr NewPlane(int start, int size, int border) { - return new ArrayPtr(pointer + start + planeBorder, size - planeBorder); + return new ArrayPtr(pointer + start + border, size - border); } YBuffer = NewPlane(0, yplaneSize, (Border * yStride) + Border); @@ -75,7 +106,132 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types VBuffer = NewPlane(yplaneSize + uvplaneSize, uvplaneSize, (uvBorderH * uvStride) + uvBorderW); } - public readonly void Dispose() + public unsafe int ReallocFrameBuffer( + MemoryAllocator allocator, + int width, + int height, + int ssX, + int ssY, + bool useHighbitdepth, + int border, + int byteAlignment, + Ptr fb, + VpxGetFrameBufferCbFnT cb, + Ptr cbPriv) + { + int byteAlign = byteAlignment == 0 ? 1 : byteAlignment; // TODO: Is it safe to ignore the alignment? + int alignedWidth = (width + 7) & ~7; + int alignedHeight = (height + 7) & ~7; + int yStride = (alignedWidth + (2 * border) + 31) & ~31; + ulong yplaneSize = + ((ulong)(alignedHeight + (2 * border)) * (ulong)yStride) + (ulong)byteAlignment; + int uvWidth = alignedWidth >> ssX; + int uvHeight = alignedHeight >> ssY; + int uvStride = yStride >> ssX; + int uvBorderW = border >> ssX; + int uvBorderH = border >> ssY; + ulong uvplaneSize = + ((ulong)(uvHeight + (2 * uvBorderH)) * (ulong)uvStride) + (ulong)byteAlignment; + + ulong frameSize = (ulong)(1 + (useHighbitdepth ? 1 : 0)) * (yplaneSize + (2 * uvplaneSize)); + + ArrayPtr buf = ArrayPtr.Null; + + // frame_size is stored in buffer_alloc_sz, which is an int. If it won't + // fit, fail early. + if (frameSize > int.MaxValue) + { + return -1; + } + + if (cb != null) + { + const int AlignAddrExtraSize = 31; + ulong externalFrameSize = frameSize + AlignAddrExtraSize; + + Debug.Assert(!fb.IsNull); + + // Allocation to hold larger frame, or first allocation. + if (cb(allocator, cbPriv, externalFrameSize, ref fb.Value) < 0) + { + return -1; + } + + if (fb.Value.Data.IsNull || (ulong)fb.Value.Data.Length < externalFrameSize) + { + return -1; + } + + BufferAlloc = fb.Value.Data; + } + else if (frameSize > (ulong)BufferAllocSz) + { + // Allocation to hold larger frame, or first allocation. + allocator.Free(BufferAlloc); + BufferAlloc = ArrayPtr.Null; + + BufferAlloc = allocator.Allocate((int)frameSize); + if (BufferAlloc.IsNull) + { + return -1; + } + + BufferAllocSz = (int)frameSize; + + // This memset is needed for fixing valgrind error from C loop filter + // due to access uninitialized memory in frame border. It could be + // removed if border is totally removed. + MemoryUtil.Fill(BufferAlloc.ToPointer(), (byte)0, BufferAllocSz); + } + + /* Only support allocating buffers that have a border that's a multiple + * of 32. The border restriction is required to get 16-byte alignment of + * the start of the chroma rows without introducing an arbitrary gap + * between planes, which would break the semantics of things like + * vpx_img_set_rect(). */ + if ((border & 0x1f) != 0) + { + return -3; + } + + Width = width; + Height = height; + AlignedWidth = alignedWidth; + AlignedHeight = alignedHeight; + Stride = yStride; + + UvWidth = (width + ssX) >> ssX; + UvHeight = (height + ssY) >> ssY; + UvAlignedWidth = uvWidth; + UvAlignedHeight = uvHeight; + UvStride = uvStride; + + Border = border; + FrameSize = (int)frameSize; + SubsamplingX = ssX; + SubsamplingY = ssY; + + buf = BufferAlloc; + if (useHighbitdepth) + { + // Store uint16 addresses when using 16bit framebuffers + buf = BufferAlloc; + Flags = Yv12FlagHighbitdepth; + } + else + { + Flags = 0; + } + + YBuffer = buf.Slice((border * yStride) + border); + UBuffer = buf.Slice((int)yplaneSize + (uvBorderH * uvStride) + uvBorderW); + VBuffer = buf.Slice((int)yplaneSize + (int)uvplaneSize + (uvBorderH * uvStride) + uvBorderW); + + Corrupted = 0; /* assume not corrupted by errors */ + return 0; + } + + public void Dispose() { Marshal.FreeHGlobal(_pointer); } diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TileInfo.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TileInfo.cs index a3eea81a2..7d4350d3c 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TileInfo.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TileInfo.cs @@ -56,7 +56,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types private static int GetMinLog2TileCols(int sb64Cols) { int minLog2 = 0; - while ((MaxTileWidthB64 << minLog2) < sb64Cols) + while (MaxTileWidthB64 << minLog2 < sb64Cols) { ++minLog2; } @@ -67,7 +67,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types private static int GetMaxLog2TileCols(int sb64Cols) { int maxLog2 = 1; - while ((sb64Cols >> maxLog2) >= MinTileWidthB64) + while (sb64Cols >> maxLog2 >= MinTileWidthB64) { ++maxLog2; } @@ -75,7 +75,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types return maxLog2 - 1; } - public static void GetTileNBits(int miCols, ref int minLog2TileCols, ref int maxLog2TileCols) + public static void GetTileNBits(int miCols, out int minLog2TileCols, out int maxLog2TileCols) { int sb64Cols = MiColsAlignedToSb(miCols) >> Constants.MiBlockSizeLog2; minLog2TileCols = GetMinLog2TileCols(sb64Cols); @@ -83,4 +83,4 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types Debug.Assert(minLog2TileCols <= maxLog2TileCols); } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxMode.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxMode.cs index b3a05ed9a..d6a4fb843 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxMode.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxMode.cs @@ -1,12 +1,12 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9.Types +namespace Ryujinx.Graphics.Nvdec.Vp9.Types { public enum TxMode { - Only4X4 = 0, // Only 4x4 transform used - Allow8X8 = 1, // Allow block transform size up to 8x8 - Allow16X16 = 2, // Allow block transform size up to 16x16 - Allow32X32 = 3, // Allow block transform size up to 32x32 - TxModeSelect = 4, // Transform specified for each block - TxModes = 5, + Only4X4, // Only 4x4 transform used + Allow8X8, // Allow block transform size up to 8x8 + Allow16X16, // Allow block transform size up to 16x16 + Allow32X32, // Allow block transform size up to 32x32 + TxModeSelect, // Transform specified for each block + TxModes } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxSize.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxSize.cs index 0342087b8..72908a00c 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxSize.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxSize.cs @@ -1,11 +1,11 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9.Types +namespace Ryujinx.Graphics.Nvdec.Vp9.Types { public enum TxSize { - Tx4x4 = 0, // 4x4 transform - Tx8x8 = 1, // 8x8 transform - Tx16x16 = 2, // 16x16 transform - Tx32x32 = 3, // 32x32 transform - TxSizes = 4, + Tx4X4, // 4x4 transform + Tx8X8, // 8x8 transform + Tx16X16, // 16x16 transform + Tx32X32, // 32x32 transform + TxSizes } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxType.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxType.cs index e7b37c925..60c5c9a44 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxType.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/TxType.cs @@ -1,11 +1,11 @@ -namespace Ryujinx.Graphics.Nvdec.Vp9.Types +namespace Ryujinx.Graphics.Nvdec.Vp9.Types { internal enum TxType { - DctDct = 0, // DCT in both horizontal and vertical - AdstDct = 1, // ADST in vertical, DCT in horizontal - DctAdst = 2, // DCT in vertical, ADST in horizontal - AdstAdst = 3, // ADST in both directions - TxTypes = 4, + DctDct, // DCT in both horizontal and vertical + AdstDct, // ADST in vertical, DCT in horizontal + DctAdst, // DCT in vertical, ADST in horizontal + AdstAdst, // ADST in both directions + TxTypes } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Common.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Common.cs index 2456e9068..5669e8574 100644 --- a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Common.cs +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Common.cs @@ -1,6 +1,8 @@ -using Ryujinx.Common.Memory; +using Ryujinx.Common.Memory; using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Nvdec.Vp9.Dsp; using Ryujinx.Graphics.Video; +using System; namespace Ryujinx.Graphics.Nvdec.Vp9.Types { @@ -9,27 +11,62 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public MacroBlockD Mb; public ArrayPtr TileWorkerData; + public int TotalTiles; public InternalErrorInfo Error; + public VpxColorSpace ColorSpace; + public VpxColorRange ColorRange; + public int Width; public int Height; + public int RenderWidth; + public int RenderHeight; + + public int LastWidth; + public int LastHeight; + public int SubsamplingX; public int SubsamplingY; + public bool UseHighBitDepth; + public ArrayPtr PrevFrameMvs; public ArrayPtr CurFrameMvs; + public Ptr FrameToShow; + public Ptr PrevFrame; + + public Ptr CurFrame; + + public Array8 RefFrameMap; /* maps fb_idx to reference slot */ + + // Prepare ref_frame_map for the next frame. + // Only used in frame parallel decode. + public Array8 NextRefFrameMap; + public Array3 FrameRefs; + public int NewFbIdx; + + public int CurShowFrameFbIdx; + + public FrameType LastFrameType; public FrameType FrameType; + public int ShowFrame; + public int LastShowFrame; + public int ShowExistingFrame; + // Flag signaling that the frame is encoded using only Intra modes. public bool IntraOnly; + public bool LastIntraOnly; public bool AllowHighPrecisionMv; + public int ResetFrameContext; + // MBs, MbRows/Cols is in 16-pixel units; MiRows/Cols is in // ModeInfo (8-pixel) units. public int MBs; @@ -49,8 +86,13 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types /* We allocate a ModeInfo struct for each macroblock, together with an extra row on top and column on the left to simplify prediction. */ + public int MiAllocSize; public ArrayPtr Mip; /* Base of allocated array */ - public ArrayPtr Mi; /* Corresponds to upper left visible macroblock */ + public ArrayPtr Mi; /* Corresponds to upper left visible macroblock */ + + // prev_mip and prev_mi will only be allocated in VP9 encoder. + public Ptr PrevMip; /* MODE_INFO array 'mip' from last decoded frame */ + public Ptr PrevMi; /* 'mi' from last frame (points into prev_mip) */ public ArrayPtr> MiGridBase; public ArrayPtr> MiGridVisible; @@ -70,6 +112,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public LoopFilterInfoN LfInfo; + public int RefreshFrameContext; /* Two state 0 = NO, 1 = YES */ + public Array4 RefFrameSignBias; /* Two state 0, 1 */ public LoopFilter Lf; @@ -81,22 +125,37 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public ReferenceMode ReferenceMode; public Ptr Fc; + public ArrayPtr FrameContexts; // FRAME_CONTEXTS + public uint FrameContextIdx; /* Context to use/update */ public Ptr Counts; + public uint CurrentVideoFrame; + public BitstreamProfile Profile; + + public BitDepth BitDepth; + public BitDepth DequantBitDepth; // bit_depth of current dequantizer + + public int ErrorResilientMode; + public int FrameParallelDecodingMode; + public int Log2TileCols, Log2TileRows; + public int ByteAlignment; + public int SkipLoopFilter; + + public Ptr BufferPool; + public ArrayPtr AboveSegContext; public ArrayPtr AboveContext; - public readonly bool FrameIsIntraOnly() + public bool FrameIsIntraOnly() { return FrameType == FrameType.KeyFrame || IntraOnly; } public bool CompoundReferenceAllowed() { - int i; - for (i = 1; i < Constants.RefsPerFrame; ++i) + for (int i = 1; i < Constants.RefsPerFrame; ++i) { if (RefFrameSignBias[i + 1] != RefFrameSignBias[1]) { @@ -107,6 +166,47 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types return false; } + public ref Surface GetFrameNewBuffer() + { + return ref BufferPool.Value.FrameBufs[NewFbIdx].Buf; + } + + public int GetFreeFb() + { + ref Array12 frameBufs = ref BufferPool.Value.FrameBufs; + + int i; + + for (i = 0; i < Constants.FrameBuffers; ++i) + { + if (frameBufs[i].RefCount == 0) + { + break; + } + } + + if (i != Constants.FrameBuffers) + { + frameBufs[i].RefCount = 1; + } + else + { + // Reset i to be INVALID_IDX to indicate no free buffer found. + i = RefBuffer.InvalidIdx; + } + + return i; + } + + public void SwapCurrentAndLastSegMap() + { + // Swap indices. + (SegMapIdx, PrevSegMapIdx) = (PrevSegMapIdx, SegMapIdx); + + CurrentFrameSegMap = SegMapArray[SegMapIdx]; + LastFrameSegMap = SegMapArray[PrevSegMapIdx]; + } + private static int CalcMiSize(int len) { // Len is in mi units. @@ -129,19 +229,18 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public void AllocTileWorkerData(MemoryAllocator allocator, int tileCols, int tileRows, int maxThreads) { - TileWorkerData = allocator.Allocate(tileCols * tileRows + (maxThreads > 1 ? maxThreads : 0)); + TileWorkerData = + allocator.Allocate((tileCols * tileRows) + (maxThreads > 1 ? maxThreads : 0)); } - public readonly void FreeTileWorkerData(MemoryAllocator allocator) + public void FreeTileWorkerData(MemoryAllocator allocator) { allocator.Free(TileWorkerData); } private void AllocSegMap(MemoryAllocator allocator, int segMapSize) { - int i; - - for (i = 0; i < Constants.NumPingPongBuffers; ++i) + for (int i = 0; i < Constants.NumPingPongBuffers; ++i) { SegMapArray[i] = allocator.Allocate(segMapSize); } @@ -156,9 +255,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types private void FreeSegMap(MemoryAllocator allocator) { - int i; - - for (i = 0; i < Constants.NumPingPongBuffers; ++i) + for (int i = 0; i < Constants.NumPingPongBuffers; ++i) { allocator.Free(SegMapArray[i]); SegMapArray[i] = ArrayPtr.Null; @@ -194,6 +291,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types Lf.Lfm = ArrayPtr.Null; allocator.Free(CurFrameMvs); CurFrameMvs = ArrayPtr.Null; + if (UsePrevFrameMvs) { allocator.Free(PrevFrameMvs); @@ -209,7 +307,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types Lf.Lfm = allocator.Allocate(((MiRows + (Constants.MiBlockSize - 1)) >> 3) * Lf.LfmStride); } - public void AllocContextBuffers(MemoryAllocator allocator, int width, int height) + public bool AllocContextBuffers(MemoryAllocator allocator, int width, int height) { SetMbMi(width, height); int newMiSize = MiStride * CalcMiSize(MiRows); @@ -239,6 +337,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { PrevFrameMvs = allocator.Allocate(MiRows * MiCols); } + + return false; } private unsafe void DecSetupMi() @@ -257,7 +357,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types } } - private readonly void SetPartitionProbs(ref MacroBlockD xd) + private void SetPartitionProbs(ref MacroBlockD xd) { xd.PartitionProbs = FrameIsIntraOnly() ? new ArrayPtr>(ref Fc.Value.KfPartitionProb[0], 16) @@ -266,9 +366,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types internal void InitMacroBlockD(ref MacroBlockD xd, ArrayPtr dqcoeff) { - int i; - - for (i = 0; i < Constants.MaxMbPlane; ++i) + for (int i = 0; i < Constants.MaxMbPlane; ++i) { xd.Plane[i].DqCoeff = dqcoeff; xd.AboveContext[i] = AboveContext.Slice(i * 2 * TileInfo.MiColsAlignedToSb(MiCols)); @@ -281,6 +379,7 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types { MemoryUtil.Copy(ref xd.Plane[i].SegDequant, ref UvDequant); } + xd.Fc = new Ptr(ref Fc.Value); } @@ -293,29 +392,27 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types public void SetupSegmentationDequant() { - const BitDepth BitDepth = BitDepth.Bits8; // TODO: Configurable // Build y/uv dequant values based on segmentation. if (Seg.Enabled) { - int i; - for (i = 0; i < Constants.MaxSegments; ++i) + for (int i = 0; i < Constants.MaxSegments; ++i) { - int qIndex = QuantCommon.GetQIndex(ref Seg, i, BaseQindex); - YDequant[i][0] = QuantCommon.DcQuant(qIndex, YDcDeltaQ, BitDepth); - YDequant[i][1] = QuantCommon.AcQuant(qIndex, 0, BitDepth); - UvDequant[i][0] = QuantCommon.DcQuant(qIndex, UvDcDeltaQ, BitDepth); - UvDequant[i][1] = QuantCommon.AcQuant(qIndex, UvAcDeltaQ, BitDepth); + int qindex = Seg.GetQIndex(i, BaseQindex); + YDequant[i][0] = QuantCommon.DcQuant(qindex, YDcDeltaQ, BitDepth); + YDequant[i][1] = QuantCommon.AcQuant(qindex, 0, BitDepth); + UvDequant[i][0] = QuantCommon.DcQuant(qindex, UvDcDeltaQ, BitDepth); + UvDequant[i][1] = QuantCommon.AcQuant(qindex, UvAcDeltaQ, BitDepth); } } else { - int qIndex = BaseQindex; + int qindex = BaseQindex; // When segmentation is disabled, only the first value is used. The // remaining are don't cares. - YDequant[0][0] = QuantCommon.DcQuant(qIndex, YDcDeltaQ, BitDepth); - YDequant[0][1] = QuantCommon.AcQuant(qIndex, 0, BitDepth); - UvDequant[0][0] = QuantCommon.DcQuant(qIndex, UvDcDeltaQ, BitDepth); - UvDequant[0][1] = QuantCommon.AcQuant(qIndex, UvAcDeltaQ, BitDepth); + YDequant[0][0] = QuantCommon.DcQuant(qindex, YDcDeltaQ, BitDepth); + YDequant[0][1] = QuantCommon.AcQuant(qindex, 0, BitDepth); + UvDequant[0][0] = QuantCommon.DcQuant(qindex, UvDcDeltaQ, BitDepth); + UvDequant[0][1] = QuantCommon.AcQuant(qindex, UvAcDeltaQ, BitDepth); } } @@ -327,5 +424,576 @@ namespace Ryujinx.Graphics.Nvdec.Vp9.Types refBuf.Sf.SetupScaleFactorsForFrame(refBuf.Buf.Width, refBuf.Buf.Height, Width, Height); } } + + public void ReadFrameReferenceModeProbs(ref Reader r) + { + ref Vp9EntropyProbs fc = ref Fc.Value; + + + if (ReferenceMode == ReferenceMode.Select) + { + for (int i = 0; i < Constants.CompInterContexts; ++i) + { + r.DiffUpdateProb(ref fc.CompInterProb[i]); + } + } + + if (ReferenceMode != ReferenceMode.Compound) + { + for (int i = 0; i < Constants.RefContexts; ++i) + { + r.DiffUpdateProb(ref fc.SingleRefProb[i][0]); + r.DiffUpdateProb(ref fc.SingleRefProb[i][1]); + } + } + + if (ReferenceMode != ReferenceMode.Single) + { + for (int i = 0; i < Constants.RefContexts; ++i) + { + r.DiffUpdateProb(ref fc.CompRefProb[i]); + } + } + } + + public ReferenceMode ReadFrameReferenceMode(ref Reader r) + { + if (CompoundReferenceAllowed()) + { + return r.ReadBit() != 0 + ? r.ReadBit() != 0 ? ReferenceMode.Select : ReferenceMode.Compound + : ReferenceMode.Single; + } + + return ReferenceMode.Single; + } + + public void SetupCompoundReferenceMode() + { + if (RefFrameSignBias[Constants.LastFrame] == RefFrameSignBias[Constants.GoldenFrame]) + { + CompFixedRef = Constants.AltRefFrame; + CompVarRef[0] = Constants.LastFrame; + CompVarRef[1] = Constants.GoldenFrame; + } + else if (RefFrameSignBias[Constants.LastFrame] == RefFrameSignBias[Constants.AltRefFrame]) + { + CompFixedRef = Constants.GoldenFrame; + CompVarRef[0] = Constants.LastFrame; + CompVarRef[1] = Constants.AltRefFrame; + } + else + { + CompFixedRef = Constants.LastFrame; + CompVarRef[0] = Constants.GoldenFrame; + CompVarRef[1] = Constants.AltRefFrame; + } + } + + public void InitMvProbs() + { + Fc.Value.Joints[0] = 32; + Fc.Value.Joints[1] = 64; + Fc.Value.Joints[2] = 96; + + Fc.Value.Sign[0] = 128; + Fc.Value.Classes[0][0] = 224; + Fc.Value.Classes[0][1] = 144; + Fc.Value.Classes[0][2] = 192; + Fc.Value.Classes[0][3] = 168; + Fc.Value.Classes[0][4] = 192; + Fc.Value.Classes[0][5] = 176; + Fc.Value.Classes[0][6] = 192; + Fc.Value.Classes[0][7] = 198; + Fc.Value.Classes[0][8] = 198; + Fc.Value.Classes[0][9] = 245; + Fc.Value.Class0[0][0] = 216; + Fc.Value.Bits[0][0] = 136; + Fc.Value.Bits[0][1] = 140; + Fc.Value.Bits[0][2] = 148; + Fc.Value.Bits[0][3] = 160; + Fc.Value.Bits[0][4] = 176; + Fc.Value.Bits[0][5] = 192; + Fc.Value.Bits[0][6] = 224; + Fc.Value.Bits[0][7] = 234; + Fc.Value.Bits[0][8] = 234; + Fc.Value.Bits[0][9] = 240; + Fc.Value.Class0Fp[0][0][0] = 128; + Fc.Value.Class0Fp[0][0][1] = 128; + Fc.Value.Class0Fp[0][0][2] = 64; + Fc.Value.Class0Fp[0][1][0] = 96; + Fc.Value.Class0Fp[0][1][1] = 112; + Fc.Value.Class0Fp[0][1][2] = 64; + Fc.Value.Fp[0][0] = 64; + Fc.Value.Fp[0][1] = 96; + Fc.Value.Fp[0][2] = 64; + Fc.Value.Class0Hp[0] = 160; + Fc.Value.Hp[0] = 128; + + Fc.Value.Sign[1] = 128; + Fc.Value.Classes[1][0] = 216; + Fc.Value.Classes[1][1] = 128; + Fc.Value.Classes[1][2] = 176; + Fc.Value.Classes[1][3] = 160; + Fc.Value.Classes[1][4] = 176; + Fc.Value.Classes[1][5] = 176; + Fc.Value.Classes[1][6] = 192; + Fc.Value.Classes[1][7] = 198; + Fc.Value.Classes[1][8] = 198; + Fc.Value.Classes[1][9] = 208; + Fc.Value.Class0[1][0] = 208; + Fc.Value.Bits[1][0] = 136; + Fc.Value.Bits[1][1] = 140; + Fc.Value.Bits[1][2] = 148; + Fc.Value.Bits[1][3] = 160; + Fc.Value.Bits[1][4] = 176; + Fc.Value.Bits[1][5] = 192; + Fc.Value.Bits[1][6] = 224; + Fc.Value.Bits[1][7] = 234; + Fc.Value.Bits[1][8] = 234; + Fc.Value.Bits[1][9] = 240; + Fc.Value.Class0Fp[1][0][0] = 128; + Fc.Value.Class0Fp[1][0][1] = 128; + Fc.Value.Class0Fp[1][0][2] = 64; + Fc.Value.Class0Fp[1][1][0] = 96; + Fc.Value.Class0Fp[1][1][1] = 112; + Fc.Value.Class0Fp[1][1][2] = 64; + Fc.Value.Fp[1][0] = 64; + Fc.Value.Fp[1][1] = 96; + Fc.Value.Fp[1][2] = 64; + Fc.Value.Class0Hp[1] = 160; + Fc.Value.Hp[1] = 128; + } + + public void AdaptMvProbs(bool allowHp) + { + ref Vp9EntropyProbs fc = ref Fc.Value; + ref Vp9EntropyProbs preFc = ref FrameContexts[(int)FrameContextIdx]; + ref Vp9BackwardUpdates counts = ref Counts.Value; + + Prob.VpxTreeMergeProbs( + EntropyMv.JointTree, + preFc.Joints.AsSpan(), + counts.Joints.AsSpan(), + fc.Joints.AsSpan()); + + for (int i = 0; i < 2; ++i) + { + fc.Sign[i] = Prob.ModeMvMergeProbs(preFc.Sign[i], ref counts.Sign[i]); + Prob.VpxTreeMergeProbs( + EntropyMv.ClassTree, + preFc.Classes[i].AsSpan(), + counts.Classes[i].AsSpan(), + fc.Classes[i].AsSpan()); + Prob.VpxTreeMergeProbs( + EntropyMv.Class0Tree, + preFc.Class0[i].AsSpan(), + counts.Class0[i].AsSpan(), + fc.Class0[i].AsSpan()); + + for (int j = 0; j < EntropyMv.OffsetBits; ++j) + { + fc.Bits[i][j] = Prob.ModeMvMergeProbs(preFc.Bits[i][j], ref counts.Bits[i][j]); + } + + for (int j = 0; j < EntropyMv.Class0Size; ++j) + { + Prob.VpxTreeMergeProbs( + EntropyMv.FpTree, + preFc.Class0Fp[i][j].AsSpan(), + counts.Class0Fp[i][j].AsSpan(), + fc.Class0Fp[i][j].AsSpan()); + } + + Prob.VpxTreeMergeProbs(EntropyMv.FpTree, preFc.Fp[i].AsSpan(), counts.Fp[i].AsSpan(), + fc.Fp[i].AsSpan()); + + if (allowHp) + { + fc.Class0Hp[i] = Prob.ModeMvMergeProbs(preFc.Class0Hp[i], ref counts.Class0Hp[i]); + fc.Hp[i] = Prob.ModeMvMergeProbs(preFc.Hp[i], ref counts.Hp[i]); + } + } + } + + public void ResizeContextBuffers(MemoryAllocator allocator, int width, int height) + { + if (Width != width || Height != height) + { + int newMiRows = BitUtils.AlignPowerOfTwo(height, Constants.MiSizeLog2) >> Constants.MiSizeLog2; + int newMiCols = BitUtils.AlignPowerOfTwo(width, Constants.MiSizeLog2) >> Constants.MiSizeLog2; + + // Allocations in AllocContextBuffers() depend on individual + // dimensions as well as the overall size. + if (newMiCols > MiCols || newMiRows > MiRows) + { + if (AllocContextBuffers(allocator, width, height)) + { + // The Mi* values have been cleared and any existing context + // buffers have been freed. Clear Width and Height to be + // consistent and to force a realloc next time. + Width = 0; + Height = 0; + Error.InternalError(CodecErr.MemError, "Failed to allocate context buffers"); + } + } + else + { + SetMbMi(width, height); + } + + InitContextBuffers(); + Width = width; + Height = height; + } + + if (CurFrameMvs.IsNull || + MiRows > CurFrame.Value.MiRows || + MiCols > CurFrame.Value.MiCols) + { + ResizeMvBuffer(allocator); + } + } + + public void CheckMemError(ref ArrayPtr lval, ArrayPtr expr) + where T : unmanaged + { + lval = expr; + if (lval.IsNull) + { + Error.InternalError(CodecErr.MemError, "Failed to allocate"); + } + } + + private void ResizeMvBuffer(MemoryAllocator allocator) + { + allocator.Free(CurFrameMvs); + CurFrame.Value.MiRows = MiRows; + CurFrame.Value.MiCols = MiCols; + CheckMemError(ref CurFrameMvs, allocator.Allocate(MiRows * MiCols)); + } + + public void CheckMemError(ref Ptr lval, Ptr expr) where T : unmanaged + { + lval = expr; + if (lval.IsNull) + { + Error.InternalError(CodecErr.MemError, "Failed to allocate"); + } + } + + public void SetupTileInfo(ref ReadBitBuffer rb) + { + int minLog2TileCols = 0, maxLog2TileCols = 0, maxOnes; + TileInfo.GetTileNBits(MiCols, out minLog2TileCols, out maxLog2TileCols); + + // columns + maxOnes = maxLog2TileCols - minLog2TileCols; + Log2TileCols = minLog2TileCols; + while (maxOnes-- != 0 && rb.ReadBit() != 0) + { + Log2TileCols++; + } + + if (Log2TileCols > 6) + { + Error.InternalError(CodecErr.CorruptFrame, "Invalid number of tile columns"); + } + + // rows + Log2TileRows = rb.ReadBit(); + if (Log2TileRows != 0) + { + Log2TileRows += rb.ReadBit(); + } + } + + public void ReadBitdepthColorspaceSampling(ref ReadBitBuffer rb) + { + if (Profile >= BitstreamProfile.Profile2) + { + BitDepth = rb.ReadBit() != 0 ? BitDepth.Bits12 : BitDepth.Bits10; + UseHighBitDepth = true; + } + else + { + BitDepth = BitDepth.Bits8; + UseHighBitDepth = false; + } + + ColorSpace = (VpxColorSpace)rb.ReadLiteral(3); + if (ColorSpace != VpxColorSpace.Srgb) + { + ColorRange = (VpxColorRange)rb.ReadBit(); + if (Profile == BitstreamProfile.Profile1 || Profile == BitstreamProfile.Profile3) + { + SubsamplingX = rb.ReadBit(); + SubsamplingY = rb.ReadBit(); + if (SubsamplingX == 1 && SubsamplingY == 1) + { + Error.InternalError(CodecErr.UnsupBitstream, + "4:2:0 color not supported in profile 1 or 3"); + } + + if (rb.ReadBit() != 0) + { + Error.InternalError(CodecErr.UnsupBitstream, "Reserved bit set"); + } + } + else + { + SubsamplingY = SubsamplingX = 1; + } + } + else + { + ColorRange = VpxColorRange.Full; + if (Profile == BitstreamProfile.Profile1 || Profile == BitstreamProfile.Profile3) + { + // Note if colorspace is SRGB then 4:4:4 chroma sampling is assumed. + // 4:2:2 or 4:4:0 chroma sampling is not allowed. + SubsamplingY = SubsamplingX = 0; + if (rb.ReadBit() != 0) + { + Error.InternalError(CodecErr.UnsupBitstream, "Reserved bit set"); + } + } + else + { + Error.InternalError(CodecErr.UnsupBitstream, "4:4:4 color not supported in profile 0 or 2"); + } + } + } + + public void AdaptModeProbs() + { + ref Vp9EntropyProbs fc = ref Fc.Value; + ref Vp9EntropyProbs preFc = ref FrameContexts[(int)FrameContextIdx]; + ref Vp9BackwardUpdates counts = ref Counts.Value; + + for (int i = 0; i < Constants.IntraInterContexts; i++) + { + fc.IntraInterProb[i] = Prob.ModeMvMergeProbs(preFc.IntraInterProb[i], ref counts.IntraInter[i]); + } + + for (int i = 0; i < Constants.CompInterContexts; i++) + { + fc.CompInterProb[i] = Prob.ModeMvMergeProbs(preFc.CompInterProb[i], ref counts.CompInter[i]); + } + + for (int i = 0; i < Constants.RefContexts; i++) + { + fc.CompRefProb[i] = Prob.ModeMvMergeProbs(preFc.CompRefProb[i], ref counts.CompRef[i]); + } + + for (int i = 0; i < Constants.RefContexts; i++) + { + for (int j = 0; j < 2; j++) + { + fc.SingleRefProb[i][j] = + Prob.ModeMvMergeProbs(preFc.SingleRefProb[i][j], ref counts.SingleRef[i][j]); + } + } + + for (int i = 0; i < Constants.InterModeContexts; i++) + { + Prob.VpxTreeMergeProbs( + EntropyMode.InterModeTree, + preFc.InterModeProb[i].AsSpan(), + counts.InterMode[i].AsSpan(), + fc.InterModeProb[i].AsSpan()); + } + + for (int i = 0; i < EntropyMode.BlockSizeGroups; i++) + { + Prob.VpxTreeMergeProbs( + EntropyMode.IntraModeTree, + preFc.YModeProb[i].AsSpan(), + counts.YMode[i].AsSpan(), + fc.YModeProb[i].AsSpan()); + } + + for (int i = 0; i < Constants.IntraModes; ++i) + { + Prob.VpxTreeMergeProbs( + EntropyMode.IntraModeTree, + preFc.UvModeProb[i].AsSpan(), + counts.UvMode[i].AsSpan(), + fc.UvModeProb[i].AsSpan()); + } + + for (int i = 0; i < Constants.PartitionContexts; i++) + { + Prob.VpxTreeMergeProbs( + EntropyMode.PartitionTree, + preFc.PartitionProb[i].AsSpan(), + counts.Partition[i].AsSpan(), + fc.PartitionProb[i].AsSpan()); + } + + if (InterpFilter == Constants.Switchable) + { + for (int i = 0; i < Constants.SwitchableFilterContexts; i++) + { + Prob.VpxTreeMergeProbs( + EntropyMode.SwitchableInterpTree, + preFc.SwitchableInterpProb[i].AsSpan(), + counts.SwitchableInterp[i].AsSpan(), + fc.SwitchableInterpProb[i].AsSpan()); + } + } + + if (TxMode == TxMode.TxModeSelect) + { + Array1> branchCt8X8P = new(); + Array2> branchCt16X16P = new(); + Array3> branchCt32X32P = new(); + + for (int i = 0; i < EntropyMode.TxSizeContexts; ++i) + { + EntropyMode.TxCountsToBranchCounts8X8(counts.Tx8x8[i].AsSpan(), ref branchCt8X8P); + for (int j = 0; j < (int)TxSize.TxSizes - 3; ++j) + { + fc.Tx8x8Prob[i][j] = Prob.ModeMvMergeProbs(preFc.Tx8x8Prob[i][j], ref branchCt8X8P[j]); + } + + EntropyMode.TxCountsToBranchCounts16X16(counts.Tx16x16[i].AsSpan(), ref branchCt16X16P); + for (int j = 0; j < (int)TxSize.TxSizes - 2; ++j) + { + fc.Tx16x16Prob[i][j] = + Prob.ModeMvMergeProbs(preFc.Tx16x16Prob[i][j], ref branchCt16X16P[j]); + } + + EntropyMode.TxCountsToBranchCounts32X32(counts.Tx32x32[i].AsSpan(), ref branchCt32X32P); + for (int j = 0; j < (int)TxSize.TxSizes - 1; ++j) + { + fc.Tx32x32Prob[i][j] = + Prob.ModeMvMergeProbs(preFc.Tx32x32Prob[i][j], ref branchCt32X32P[j]); + } + } + } + + for (int i = 0; i < Constants.SkipContexts; ++i) + { + fc.SkipProb[i] = Prob.ModeMvMergeProbs(preFc.SkipProb[i], ref counts.Skip[i]); + } + } + + public void AdaptCoefProbs() + { + byte t; + uint countSat, updateFactor; + + if (FrameIsIntraOnly()) + { + updateFactor = Entropy.CoefMaxUpdateFactorKey; + countSat = Entropy.CoefCountSatKey; + } + else if (LastFrameType == FrameType.KeyFrame) + { + updateFactor = Entropy.CoefMaxUpdateFactorAfterKey; /* adapt quickly */ + countSat = Entropy.CoefCountSatAfterKey; + } + else + { + updateFactor = Entropy.CoefMaxUpdateFactor; + countSat = Entropy.CoefCountSat; + } + + for (t = (int)TxSize.Tx4X4; t <= (int)TxSize.Tx32X32; t++) + { + AdaptCoefProbs(t, countSat, updateFactor); + } + } + + public void SetMvs(ReadOnlySpan mvs) + { + if (mvs.Length > PrevFrameMvs.Length) + { + throw new ArgumentException( + $"Size mismatch, expected: {PrevFrameMvs.Length}, but got: {mvs.Length}."); + } + + for (int i = 0; i < mvs.Length; i++) + { + ref MvRef mv = ref PrevFrameMvs[i]; + + mv.Mv[0].Row = mvs[i].Mvs[0].Row; + mv.Mv[0].Col = mvs[i].Mvs[0].Col; + mv.Mv[1].Row = mvs[i].Mvs[1].Row; + mv.Mv[1].Col = mvs[i].Mvs[1].Col; + + mv.RefFrame[0] = (sbyte)mvs[i].RefFrames[0]; + mv.RefFrame[1] = (sbyte)mvs[i].RefFrames[1]; + } + } + + public void GetMvs(Span mvs) + { + if (mvs.Length > CurFrameMvs.Length) + { + throw new ArgumentException( + $"Size mismatch, expected: {CurFrameMvs.Length}, but got: {mvs.Length}."); + } + + for (int i = 0; i < mvs.Length; i++) + { + ref MvRef mv = ref CurFrameMvs[i]; + + mvs[i].Mvs[0].Row = mv.Mv[0].Row; + mvs[i].Mvs[0].Col = mv.Mv[0].Col; + mvs[i].Mvs[1].Row = mv.Mv[1].Row; + mvs[i].Mvs[1].Col = mv.Mv[1].Col; + + mvs[i].RefFrames[0] = mv.RefFrame[0]; + mvs[i].RefFrames[1] = mv.RefFrame[1]; + } + } + + private void AdaptCoefProbs(byte txSize, uint countSat, uint updateFactor) + { + ref Vp9EntropyProbs preFc = ref FrameContexts[(int)FrameContextIdx]; + ref Array2>>>> probs = ref Fc.Value.CoefProbs[txSize]; + ref Array2>>>> preProbs = ref preFc.CoefProbs[txSize]; + ref Array2>>>> counts = ref Counts.Value.Coef[txSize]; + ref Array2>>> eobCounts = ref Counts.Value.EobBranch[txSize]; + + for (int i = 0; i < Constants.PlaneTypes; ++i) + { + for (int j = 0; j < Entropy.RefTypes; ++j) + { + for (int k = 0; k < Entropy.CoefBands; ++k) + { + for (int l = 0; l < Entropy.BAND_COEFF_CONTEXTS(k); ++l) + { + int n0 = (int)counts[i][j][k][l][Entropy.ZeroToken]; + int n1 = (int)counts[i][j][k][l][Entropy.OneToken]; + int n2 = (int)counts[i][j][k][l][Entropy.TwoToken]; + int neob = (int)counts[i][j][k][l][Entropy.EobModelToken]; + Array3> branchCt = new(); + branchCt[0][0] = (uint)neob; + branchCt[0][1] = (uint)(eobCounts[i][j][k][l] - neob); + branchCt[1][0] = (uint)n0; + branchCt[1][1] = (uint)(n1 + n2); + branchCt[2][0] = (uint)n1; + branchCt[2][1] = (uint)n2; + for (int m = 0; m < Entropy.UnconstrainedNodes; ++m) + { + probs[i][j][k][l][m] = Prob.MergeProbs(preProbs[i][j][k][l][m], ref branchCt[m], + countSat, updateFactor); + } + } + } + } + } + } + + public void DefaultCoefProbs() + { + Entropy.CopyProbs(ref Fc.Value.CoefProbs[(int)TxSize.Tx4X4], Entropy.DefaultCoefProbs4X4); + Entropy.CopyProbs(ref Fc.Value.CoefProbs[(int)TxSize.Tx8X8], Entropy.DefaultCoefProbs8X8); + Entropy.CopyProbs(ref Fc.Value.CoefProbs[(int)TxSize.Tx16X16], Entropy.DefaultCoefProbs16X16); + Entropy.CopyProbs(ref Fc.Value.CoefProbs[(int)TxSize.Tx32X32], Entropy.DefaultCoefProbs32X32); + } } -} +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Decoder.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Decoder.cs new file mode 100644 index 000000000..11c121cfe --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/Vp9Decoder.cs @@ -0,0 +1,410 @@ +using Ryujinx.Common.Memory; +using Ryujinx.Graphics.Nvdec.Vp9.Common; +using Ryujinx.Graphics.Video; +using System.Diagnostics; + +namespace Ryujinx.Graphics.Nvdec.Vp9.Types +{ + internal struct Vp9Decoder + { + public Vp9Common Common; + + public int ReadyForNewData; + + public int RefreshFrameFlags; + + public int NeedResync; // Wait for key/intra-only frame. + public int HoldRefBuf; // Hold the reference buffer. + + private static void DecreaseRefCount(int idx, ref Array12 frameBufs, ref BufferPool pool) + { + if (idx >= 0 && frameBufs[idx].RefCount > 0) + { + --frameBufs[idx].RefCount; + // A worker may only get a free framebuffer index when calling GetFreeFb. + // But the private buffer is not set up until finish decoding header. + // So any error happens during decoding header, the frame_bufs will not + // have valid priv buffer. + if (frameBufs[idx].Released == 0 && frameBufs[idx].RefCount == 0 && + !frameBufs[idx].RawFrameBuffer.Priv.IsNull) + { + FrameBuffers.ReleaseFrameBuffer(pool.CbPriv, ref frameBufs[idx].RawFrameBuffer); + frameBufs[idx].Released = 1; + } + } + } + + public void Create(MemoryAllocator allocator, ref BufferPool pool) + { + ref Vp9Common cm = ref Common; + + cm.CheckMemError(ref cm.Fc, + new Ptr(ref allocator.Allocate(1)[0])); + cm.CheckMemError(ref cm.FrameContexts, + allocator.Allocate(Constants.FrameContexts)); + + for (int i = 0; i < EntropyMode.KfYModeProb.Length; i++) + { + for (int j = 0; j < EntropyMode.KfYModeProb[i].Length; j++) + { + for (int k = 0; k < EntropyMode.KfYModeProb[i][j].Length; k++) + { + cm.Fc.Value.KfYModeProb[i][j][k] = EntropyMode.KfYModeProb[i][j][k]; + } + } + } + + for (int i = 0; i < EntropyMode.KfUvModeProb.Length; i++) + { + for (int j = 0; j < EntropyMode.KfUvModeProb[i].Length; j++) + { + cm.Fc.Value.KfUvModeProb[i][j] = EntropyMode.KfUvModeProb[i][j]; + } + } + + byte[][] kfPartitionProbs = + [ + // 8x8 . 4x4 + [158, 97, 94], // a/l both not split + [93, 24, 99], // a split, l not split + [85, 119, 44], // l split, a not split + [62, 59, 67], // a/l both split + + // 16x16 . 8x8 + [149, 53, 53], // a/l both not split + [94, 20, 48], // a split, l not split + [83, 53, 24], // l split, a not split + [52, 18, 18], // a/l both split + + // 32x32 . 16x16 + [150, 40, 39], // a/l both not split + [78, 12, 26], // a split, l not split + [67, 33, 11], // l split, a not split + [24, 7, 5], // a/l both split + + // 64x64 . 32x32 + [174, 35, 49], // a/l both not split + [68, 11, 27], // a split, l not split + [57, 15, 9], // l split, a not split + [12, 3, 3] // a/l both split + ]; + + for (int i = 0; i < kfPartitionProbs.Length; i++) + { + for (int j = 0; j < kfPartitionProbs[i].Length; j++) + { + cm.Fc.Value.KfPartitionProb[i][j] = kfPartitionProbs[i][j]; + } + } + + cm.Counts = new Ptr(ref allocator.Allocate(1)[0]); + + NeedResync = 1; + + // Initialize the references to not point to any frame buffers. + for (int i = 0; i < 8; i++) + { + cm.RefFrameMap[i] = -1; + cm.NextRefFrameMap[i] = -1; + } + + cm.CurrentVideoFrame = 0; + ReadyForNewData = 1; + Common.BufferPool = new Ptr(ref pool); + + cm.BitDepth = BitDepth.Bits8; + cm.DequantBitDepth = BitDepth.Bits8; + + // vp9_loop_filter_init(ref cm); + } + + /* If any buffer updating is signaled it should be done here. */ + private void SwapFrameBuffers() + { + int refIndex = 0, mask; + ref Vp9Common cm = ref Common; + ref BufferPool pool = ref cm.BufferPool.Value; + ref Array12 frameBufs = ref cm.BufferPool.Value.FrameBufs; + + for (mask = RefreshFrameFlags; mask != 0; mask >>= 1) + { + int oldIdx = cm.RefFrameMap[refIndex]; + // Current thread releases the holding of reference frame. + DecreaseRefCount(oldIdx, ref frameBufs, ref pool); + + // Release the reference frame in reference map. + if ((mask & 1) != 0) + { + DecreaseRefCount(oldIdx, ref frameBufs, ref pool); + } + + cm.RefFrameMap[refIndex] = cm.NextRefFrameMap[refIndex]; + ++refIndex; + } + + // Current thread releases the holding of reference frame. + for (; refIndex < Constants.RefFrames && cm.ShowExistingFrame == 0; ++refIndex) + { + int oldIdx = cm.RefFrameMap[refIndex]; + DecreaseRefCount(oldIdx, ref frameBufs, ref pool); + cm.RefFrameMap[refIndex] = cm.NextRefFrameMap[refIndex]; + } + + HoldRefBuf = 0; + cm.FrameToShow = new Ptr(ref cm.GetFrameNewBuffer()); + + --frameBufs[cm.NewFbIdx].RefCount; + + // Invalidate these references until the next frame starts. + for (refIndex = 0; refIndex < 3; refIndex++) + { + cm.FrameRefs[refIndex].Idx = RefBuffer.InvalidIdx; + } + } + + public CodecErr ReceiveCompressedData(MemoryAllocator allocator, ulong size, ref ArrayPtr psource) + { + ref Vp9Common cm = ref Common; + ref BufferPool pool = ref cm.BufferPool.Value; + ref Array12 frameBufs = ref cm.BufferPool.Value.FrameBufs; + ArrayPtr source = psource; + CodecErr retcode = 0; + cm.Error.ErrorCode = CodecErr.Ok; + + if (size == 0) + { + // This is used to signal that we are missing frames. + // We do not know if the missing frame(s) was supposed to update + // any of the reference buffers, but we act conservative and + // mark only the last buffer as corrupted. + + if (cm.FrameRefs[0].Idx > 0) + { + cm.FrameRefs[0].Buf.Corrupted = 1; + } + } + + ReadyForNewData = 0; + + // Check if the previous frame was a frame without any references to it. + if (cm.NewFbIdx >= 0 && frameBufs[cm.NewFbIdx].RefCount == 0 && + frameBufs[cm.NewFbIdx].Released == 0) + { + FrameBuffers.ReleaseFrameBuffer(pool.CbPriv, ref frameBufs[cm.NewFbIdx].RawFrameBuffer); + frameBufs[cm.NewFbIdx].Released = 1; + } + + // Find a free frame buffer. Return error if can not find any. + cm.NewFbIdx = cm.GetFreeFb(); + if (cm.NewFbIdx == RefBuffer.InvalidIdx) + { + ReadyForNewData = 1; + cm.Error.InternalError(CodecErr.MemError, "Unable to find free frame buffer"); + + return cm.Error.ErrorCode; + } + + // Assign a MV array to the frame buffer. + cm.CurFrame = new Ptr(ref pool.FrameBufs[cm.NewFbIdx]); + + HoldRefBuf = 0; + + DecodeFrame.Decode(allocator, ref this, new ArrayPtr(ref source[0], (int)size), out psource); + + SwapFrameBuffers(); + + // vpx_clear_system_state(); + + if (cm.ShowExistingFrame == 0) + { + cm.LastShowFrame = cm.ShowFrame; + cm.PrevFrame = cm.CurFrame; + + if (cm.PrevFrameMvs.IsNull || cm.PrevFrameMvs.Length != cm.CurFrameMvs.Length) + { + allocator.Free(cm.PrevFrameMvs); + cm.PrevFrameMvs = allocator.Allocate(cm.CurFrameMvs.Length); + } + + cm.CurFrameMvs.AsSpan().CopyTo(cm.PrevFrameMvs.AsSpan()); + if (cm.Seg.Enabled) + { + cm.SwapCurrentAndLastSegMap(); + } + } + + if (cm.ShowFrame != 0) + { + cm.CurShowFrameFbIdx = cm.NewFbIdx; + } + + // Update progress in frame parallel decode. + cm.LastWidth = cm.Width; + cm.LastHeight = cm.Height; + if (cm.ShowFrame != 0) + { + cm.CurrentVideoFrame++; + } + + return retcode; + } + + public int GetRawFrame(ref Surface sd) + { + ref Vp9Common cm = ref Common; + int ret = -1; + + if (ReadyForNewData == 1) + { + return ret; + } + + ReadyForNewData = 1; + + if (cm.ShowFrame == 0) + { + return ret; + } + + ReadyForNewData = 1; + + sd = cm.FrameToShow.Value; + ret = 0; + + return ret; + } + + public CodecErr Decode(MemoryAllocator allocator, ArrayPtr data) + { + ArrayPtr dataStart = data; + CodecErr res; + Array8 frameSizes = new(); + int frameCount = 0; + + res = Decoder.ParseSuperframeIndex(data, (ulong)data.Length, ref frameSizes, out frameCount); + if (res != CodecErr.Ok) + { + return res; + } + + // Decode in serial mode. + if (frameCount > 0) + { + for (int i = 0; i < frameCount; ++i) + { + ArrayPtr dataStartCopy = dataStart; + uint frameSize = frameSizes[i]; + if (frameSize > (uint)dataStart.Length) + { + return CodecErr.CorruptFrame; + } + + res = ReceiveCompressedData(allocator, frameSize, ref dataStartCopy); + if (res != CodecErr.Ok) + { + return res; + } + + dataStart = dataStart.Slice((int)frameSize); + } + } + else + { + while (dataStart.Length != 0) + { + uint frameSize = (uint)dataStart.Length; + res = ReceiveCompressedData(allocator, frameSize, ref dataStart); + if (res != CodecErr.Ok) + { + return res; + } + + // Account for suboptimal termination by the encoder. + while (dataStart.Length != 0) + { + byte marker = Decoder.ReadMarker(dataStart); + if (marker != 0) + { + break; + } + + dataStart = dataStart.Slice(1); + } + } + } + + return res; + } + } + + internal static class Decoder + { + public static byte ReadMarker(ArrayPtr data) + { + return data[0]; + } + + public static CodecErr ParseSuperframeIndex(ArrayPtr data, ulong dataSz, ref Array8 sizes, out int count) + { + // A chunk ending with a byte matching 0xc0 is an invalid chunk unless + // it is a super frame index. If the last byte of real video compression + // data is 0xc0 the encoder must add a 0 byte. If we have the marker but + // not the associated matching marker byte at the front of the index we have + // an invalid bitstream and need to return an error. + + byte marker; + + Debug.Assert(dataSz != 0); + marker = ReadMarker(data.Slice((int)dataSz - 1)); + count = 0; + + if ((marker & 0xe0) == 0xc0) + { + uint frames = (uint)(marker & 0x7) + 1; + uint mag = (uint)((marker >> 3) & 0x3) + 1; + ulong indexSz = 2 + (mag * frames); + + // This chunk is marked as having a superframe index but doesn't have + // enough data for it, thus it's an invalid superframe index. + if (dataSz < indexSz) + { + return CodecErr.CorruptFrame; + } + + { + byte marker2 = ReadMarker(data.Slice((int)(dataSz - indexSz))); + + // This chunk is marked as having a superframe index but doesn't have + // the matching marker byte at the front of the index therefore it's an + // invalid chunk. + if (marker != marker2) + { + return CodecErr.CorruptFrame; + } + } + + { + // Found a valid superframe index. + ArrayPtr x = data.Slice((int)(dataSz - indexSz + 1)); + + for (int i = 0; i < frames; ++i) + { + uint thisSz = 0; + + for (int j = 0; j < mag; ++j) + { + thisSz |= (uint)x[0] << j * 8; + x = x.Slice(1); + } + + sizes[i] = thisSz; + } + + count = (int)frames; + } + } + + return CodecErr.Ok; + } + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxCodecFrameBuffer.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxCodecFrameBuffer.cs new file mode 100644 index 000000000..358de79dd --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxCodecFrameBuffer.cs @@ -0,0 +1,10 @@ +using Ryujinx.Common.Memory; + +namespace Ryujinx.Graphics.Nvdec.Vp9.Types +{ + internal struct VpxCodecFrameBuffer + { + public ArrayPtr Data; + public Ptr Priv; + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxColorRange.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxColorRange.cs new file mode 100644 index 000000000..9f8c7c53d --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxColorRange.cs @@ -0,0 +1,11 @@ +namespace Ryujinx.Graphics.Nvdec.Vp9.Types +{ + internal enum VpxColorRange + { + // Y [16..235], UV [16..240] + Studio, + + // YUV/RGB [0..255] + Full + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxColorSpace.cs b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxColorSpace.cs new file mode 100644 index 000000000..a1706c0d0 --- /dev/null +++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Types/VpxColorSpace.cs @@ -0,0 +1,29 @@ +namespace Ryujinx.Graphics.Nvdec.Vp9.Types +{ + internal enum VpxColorSpace + { + // Unknown + Unknown, + + // BT.601 + Bt601, + + // BT.709 + Bt709, + + // SMPTE.170 + Smpte170, + + // SMPTE.240 + Smpte240, + + // BT.2020 + Bt2020, + + // Reserved + Reserved, + + // sRGB + Srgb + } +} \ No newline at end of file diff --git a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs index 24c18b94c..9da64bfab 100644 --- a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs +++ b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs @@ -59,6 +59,8 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9 Flags.HasFlag(FrameFlags.LastShowFrame) && !Flags.HasFlag(FrameFlags.LastFrameIsKeyFrame), RefFrameSignBias = RefFrameSignBias, + LoopFilterLevel = FirstLevel, + LoopFilterSharpnessLevel = SharpnessLevel, BaseQIndex = BaseQIndex, YDcDeltaQ = YDcDeltaQ, UvDcDeltaQ = UvDcDeltaQ, diff --git a/src/Ryujinx.Graphics.Video/Vp9PictureInfo.cs b/src/Ryujinx.Graphics.Video/Vp9PictureInfo.cs index bcdaf0dfc..09f6e6664 100644 --- a/src/Ryujinx.Graphics.Video/Vp9PictureInfo.cs +++ b/src/Ryujinx.Graphics.Video/Vp9PictureInfo.cs @@ -10,6 +10,8 @@ namespace Ryujinx.Graphics.Video public bool IsKeyFrame; public bool IntraOnly; public Array4 RefFrameSignBias; + public int LoopFilterLevel; + public int LoopFilterSharpnessLevel; public int BaseQIndex; public int YDcDeltaQ; public int UvDcDeltaQ; @@ -36,4 +38,4 @@ namespace Ryujinx.Graphics.Video public Vp9EntropyProbs Entropy; public Vp9BackwardUpdates BackwardUpdateCounts; } -} +} \ No newline at end of file diff --git a/src/Ryujinx.HLE/HOS/Applets/Browser/BrowserApplet.cs b/src/Ryujinx.HLE/HOS/Applets/Browser/BrowserApplet.cs index 33d00cf34..488eca291 100644 --- a/src/Ryujinx.HLE/HOS/Applets/Browser/BrowserApplet.cs +++ b/src/Ryujinx.HLE/HOS/Applets/Browser/BrowserApplet.cs @@ -41,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Applets.Browser { List result = [ - new BrowserOutput(BrowserOutputType.ExitReason, (uint)WebExitReason.ExitButton) + new(BrowserOutputType.ExitReason, (uint)WebExitReason.ExitButton) ]; _normalSession.Push(BuildResponseNew(result)); diff --git a/src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs b/src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs index 2faff6e61..47bfadc4c 100644 --- a/src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs +++ b/src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs @@ -158,13 +158,15 @@ namespace Ryujinx.HLE.HOS.Applets.Error string[] buttons = GetButtonsText(module, description, "DlgBtn"); - bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons); + (uint Module, uint Description) errorCodeTuple = (module, uint.Parse(description.ToString("0000"))); + + bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple); if (showDetails) { message = GetMessageText(module, description, "FlvMsg"); buttons = GetButtonsText(module, description, "FlvBtn"); - _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons); + _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple); } } diff --git a/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs b/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs index 4a217b88b..5e2f59d18 100644 --- a/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs +++ b/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs @@ -113,7 +113,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy public async Task NatPunch() { NatDiscoverer discoverer = new(); - CancellationTokenSource cts = new(5000); + CancellationTokenSource cts = new(2500); NatDevice device; diff --git a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs index 8475424ce..0a592d542 100644 --- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs +++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs @@ -34,6 +34,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd { if (errorCode != LinuxError.SUCCESS) { + if (errorCode != LinuxError.EWOULDBLOCK) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Operation failed with error {errorCode}."); + } result = -1; } @@ -66,6 +70,8 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd BsdSocketType type = (BsdSocketType)context.RequestData.ReadInt32(); ProtocolType protocol = (ProtocolType)context.RequestData.ReadInt32(); + Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Creating socket with domain={domain}, type={type}, protocol={protocol}"); + BsdSocketCreationFlags creationFlags = (BsdSocketCreationFlags)((int)type >> (int)BsdSocketCreationFlags.FlagsShift); type &= BsdSocketType.TypeMask; @@ -95,12 +101,21 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd } } - ISocket newBsdSocket = new ManagedSocket(netDomain, (SocketType)type, protocol, context.Device.Configuration.MultiplayerLanInterfaceId) - { - Blocking = !creationFlags.HasFlag(BsdSocketCreationFlags.NonBlocking), - }; - LinuxError errno = LinuxError.SUCCESS; + ISocket newBsdSocket; + + try + { + newBsdSocket = new ManagedSocket(netDomain, (SocketType)type, protocol, context.Device.Configuration.MultiplayerLanInterfaceId) + { + Blocking = !creationFlags.HasFlag(BsdSocketCreationFlags.NonBlocking), + }; + } + catch (SocketException exception) + { + LinuxError errNo = WinSockHelper.ConvertError((WsaError)exception.ErrorCode); + return WriteBsdResult(context, 0, errNo); + } int newSockFd = _context.RegisterFileDescriptor(newBsdSocket); @@ -111,6 +126,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd if (exempt) { + Logger.Info?.Print(LogClass.ServiceBsd, "Disconnecting exempt socket."); newBsdSocket.Disconnect(); } @@ -797,7 +813,11 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd { errno = socket.Listen(backlog); } - + else + { + Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"Invalid socket fd '{socketFd}'."); + } + return WriteBsdResult(context, 0, errno); } diff --git a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs index 981fe0a8f..3c367660a 100644 --- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs +++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs @@ -92,18 +92,30 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl { newSocket = new ManagedSocket(Socket.Accept()); + IPEndPoint remoteEndPoint = newSocket.RemoteEndPoint; + bool isPrivateIp = remoteEndPoint.Address.ToString().StartsWith("192.168."); + Logger.Info?.PrintMsg(LogClass.ServiceBsd, + isPrivateIp + ? $"Accepted connection from {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}" + : $"Accepted connection from {ProtocolType}/***:{remoteEndPoint.Port}"); + return LinuxError.SUCCESS; } catch (SocketException exception) { newSocket = null; + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } public LinuxError Bind(IPEndPoint localEndPoint) { + Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket binding to: {ProtocolType}/{localEndPoint.Port}"); try { Socket.Bind(localEndPoint); @@ -112,6 +124,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } @@ -123,6 +139,15 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl public LinuxError Connect(IPEndPoint remoteEndPoint) { + bool isLDNPrivateIP = remoteEndPoint.Address.ToString().StartsWith("192.168."); + if (isLDNPrivateIP) + { + Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Connecting to: {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}"); + } + else + { + Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Connecting to: {ProtocolType}/***:{remoteEndPoint.Port}"); + } try { Socket.Connect(remoteEndPoint); @@ -137,6 +162,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } else { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } @@ -144,11 +173,13 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl public void Disconnect() { + Logger.Info?.Print(LogClass.ServiceBsd, "Socket disconnecting"); Socket.Disconnect(true); } public void Dispose() { + Logger.Info?.Print(LogClass.ServiceBsd, "Socket closed"); Socket.Close(); Socket.Dispose(); } @@ -159,10 +190,16 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl { Socket.Listen(backlog); + Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket listening: {ProtocolType}/{(Socket.LocalEndPoint as IPEndPoint).Port}"); + return LinuxError.SUCCESS; } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } @@ -182,11 +219,15 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } - bool hasEmittedBlockingWarning = false; + private bool _hasEmittedBlockingWarning; public LinuxError Receive(out int receiveSize, Span buffer, BsdSocketFlags flags) { @@ -202,10 +243,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl shouldBlockAfterOperation = true; } - if (Blocking && !hasEmittedBlockingWarning) + if (Blocking && !_hasEmittedBlockingWarning) { Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors."); - hasEmittedBlockingWarning = true; + _hasEmittedBlockingWarning = true; } receiveSize = Socket.Receive(buffer, ConvertBsdSocketFlags(flags)); @@ -214,6 +255,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } receiveSize = -1; result = WinSockHelper.ConvertError((WsaError)exception.ErrorCode); @@ -245,10 +290,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl shouldBlockAfterOperation = true; } - if (Blocking && !hasEmittedBlockingWarning) + if (Blocking && !_hasEmittedBlockingWarning) { Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors."); - hasEmittedBlockingWarning = true; + _hasEmittedBlockingWarning = true; } if (!Socket.IsBound) @@ -265,6 +310,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } receiveSize = -1; result = WinSockHelper.ConvertError((WsaError)exception.ErrorCode); @@ -288,6 +337,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } sendSize = -1; return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); @@ -304,6 +357,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } sendSize = -1; return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); @@ -341,6 +398,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } @@ -387,6 +448,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } @@ -519,6 +584,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } @@ -557,6 +626,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl } catch (SocketException exception) { + if (exception.SocketErrorCode != SocketError.WouldBlock) + { + Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}"); + } return WinSockHelper.ConvertError((WsaError)exception.ErrorCode); } } diff --git a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs index 9f206176d..b442cf802 100644 --- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs +++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs @@ -1,4 +1,6 @@ +using Ryujinx.Common.Logging; using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy; +using Ryujinx.HLE.HOS.Services.Sockets.Bsd.Types; using System; using System.Collections.Generic; using System.Linq; @@ -64,10 +66,18 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Proxy { if (_proxy.Supported(domain, type, protocol)) { + Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket is using LDN proxy"); return new LdnProxySocket(domain, type, protocol, _proxy); } + else + { + Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"LDN proxy does not support socket {domain}, {type}, {protocol}"); + } + } + else + { + Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Opening socket using host networking stack"); } - return new DefaultSocket(domain, type, protocol, lanInterfaceId); } } diff --git a/src/Ryujinx.HLE/UI/IHostUIHandler.cs b/src/Ryujinx.HLE/UI/IHostUIHandler.cs index 8ccb5cf89..3748eef39 100644 --- a/src/Ryujinx.HLE/UI/IHostUIHandler.cs +++ b/src/Ryujinx.HLE/UI/IHostUIHandler.cs @@ -45,10 +45,12 @@ namespace Ryujinx.HLE.UI /// The value associated to the . void ExecuteProgram(Switch device, ProgramSpecifyKind kind, ulong value); + /// /// Displays a Message Dialog box specific to Error Applet and blocks until it is closed. /// /// False when OK is pressed, True when another button (Details) is pressed. - bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText); + // ReSharper disable once UnusedParameter.Global + bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText, (uint Module, uint Description)? errorCode = null); /// /// Creates a handler to process keyboard inputs into text strings. diff --git a/src/Ryujinx.Input/HLE/NpadManager.cs b/src/Ryujinx.Input/HLE/NpadManager.cs index c8902b9bc..c1910746e 100644 --- a/src/Ryujinx.Input/HLE/NpadManager.cs +++ b/src/Ryujinx.Input/HLE/NpadManager.cs @@ -190,6 +190,15 @@ namespace Ryujinx.Input.HLE } } + public bool InputUpdatesBlocked + { + get + { + lock (_lock) + return _blockInputUpdates; + } + } + public void BlockInputUpdates() { lock (_lock) diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs index a8b1f3bfc..fa72fb8d0 100644 --- a/src/Ryujinx/AppHost.cs +++ b/src/Ryujinx/AppHost.cs @@ -515,7 +515,7 @@ namespace Ryujinx.Ava Device?.System.ChangeDockedModeState(e.NewValue); } - private void UpdateAudioVolumeState(object sender, ReactiveEventArgs e) + public void UpdateAudioVolumeState(object sender, ReactiveEventArgs e) { Device?.SetVolume(e.NewValue); @@ -1028,6 +1028,7 @@ namespace Ryujinx.Ava if (_viewModel.StartGamesInFullscreen) { _viewModel.WindowState = WindowState.FullScreen; + _viewModel.Window.TitleBar.ExtendsContentIntoTitleBar = true; } if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI) diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json index 3fdac425f..48fc32281 100644 --- a/src/Ryujinx/Assets/locales.json +++ b/src/Ryujinx/Assets/locales.json @@ -76,7 +76,7 @@ "ID": "MenuBarFileOpenAppletOpenMiiApplet", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Mii-Bearbeitungsapplet", "el_GR": "", "en_US": "Mii Edit Applet", "es_ES": "Applet Editor Mii", @@ -87,7 +87,7 @@ "ko_KR": "Mii 편집 애플릿", "no_NO": "Mii-redigeringsapplet", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Editor de Mii", "ru_RU": "Апплет Mii Editor", "sv_SE": "Redigera Mii-applet", "th_TH": "", @@ -112,7 +112,7 @@ "ko_KR": "독립 실행형 모드로 Mii 편집기 애플릿 열기", "no_NO": "Åpne Mii Redigerings program i eget vindu", "pl_PL": "Otwórz aplet Mii Editor w trybie indywidualnym", - "pt_BR": "Abrir editor Mii em modo avulso", + "pt_BR": "Abrir Editor de Mii em Modo Independente", "ru_RU": "Открывает апплет Mii Editor в автономном режиме", "sv_SE": "Öppna Mii Editor Applet i fristående läge", "th_TH": "เปิดโปรแกรม Mii Editor Applet", @@ -137,7 +137,7 @@ "ko_KR": "마우스 직접 접근", "no_NO": "Direkte tilgang med Mus", "pl_PL": "Bezpośredni dostęp do myszy", - "pt_BR": "Acesso direto ao mouse", + "pt_BR": "Acesso Direto ao Mouse", "ru_RU": "Прямой ввод мыши", "sv_SE": "Direkt musåtkomst", "th_TH": "เข้าถึงเมาส์ได้โดยตรง", @@ -162,7 +162,7 @@ "ko_KR": "메모리 관리자 모드 :", "no_NO": "Memory Manager-modus", "pl_PL": "Tryb menedżera pamięci:", - "pt_BR": "Modo de gerenciamento de memória:", + "pt_BR": "Modo de Gerenciamento da Memória:", "ru_RU": "Режим менеджера памяти:", "sv_SE": "Läge för minnehanterare:", "th_TH": "โหมดจัดการหน่วยความจำ:", @@ -176,7 +176,7 @@ "ID": "SettingsTabSystemMemoryManagerModeSoftware", "Translations": { "ar_SA": "البرنامج", - "de_DE": "", + "de_DE": "Programme", "el_GR": "Λογισμικό", "en_US": "Software", "es_ES": "", @@ -237,7 +237,7 @@ "ko_KR": "호스트 확인 안함(가장 빠르나 위험)", "no_NO": "Vert Ukontrollert (raskets, utrygt)", "pl_PL": "Gospodarza (NIESPRAWDZONY, najszybszy, niebezpieczne)", - "pt_BR": "Hóspede sem verificação (mais rápido, inseguro)", + "pt_BR": "Hóspede sem Verificação (mais rápido, inseguro)", "ru_RU": "Хост не установлен (самый быстрый, небезопасный)", "sv_SE": "Värd inte kontrollerad (snabbaste, osäkert)", "th_TH": "ไม่ได้ตรวจสอบโฮสต์ (เร็วที่สุด, แต่ไม่ปลอดภัย)", @@ -312,7 +312,7 @@ "ko_KR": "파일에서 앱 불러오기(_L)", "no_NO": "_Last inn program fra fil", "pl_PL": "_Załaduj aplikację z pliku", - "pt_BR": "_Abrir ROM do jogo...", + "pt_BR": "_Abrir ROM do Jogo", "ru_RU": "_Добавить приложение из файла", "sv_SE": "_Läs in applikation från fil", "th_TH": "โหลดแอปพลิเคชั่นจากไฟล์", @@ -326,7 +326,7 @@ "ID": "MenuBarFileOpenFromFileError", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Keine Anwendungen im ausgewählten Datei gefunden.", "el_GR": "", "en_US": "No applications found in selected file.", "es_ES": "No se encontraron aplicaciones en el archivo seleccionado.", @@ -362,7 +362,7 @@ "ko_KR": "압축 푼 게임 불러오기(_U)", "no_NO": "Last inn _Upakket spill", "pl_PL": "Załaduj _rozpakowaną grę", - "pt_BR": "Abrir jogo _extraído...", + "pt_BR": "Abrir Jogo _Extraído", "ru_RU": "Добавить _распакованную игру", "sv_SE": "Läs in _uppackat spel", "th_TH": "โหลดเกมที่แตกไฟล์แล้ว", @@ -376,7 +376,7 @@ "ID": "MenuBarFileLoadDlcFromFolder", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "DLC aus Ordner laden", "el_GR": "", "en_US": "Load DLC From Folder", "es_ES": "Cargar DLC Desde Carpeta", @@ -401,7 +401,7 @@ "ID": "MenuBarFileLoadTitleUpdatesFromFolder", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Titel-Updates aus Ordner laden", "el_GR": "", "en_US": "Load Title Updates From Folder", "es_ES": "Cargar Actualizaciones de Títulos Desde Carpeta", @@ -437,7 +437,7 @@ "ko_KR": "Ryujinx 폴더 열기", "no_NO": "Åpne Ryujinx mappe", "pl_PL": "Otwórz folder Ryujinx", - "pt_BR": "Abrir diretório do e_mulador...", + "pt_BR": "Abrir Pasta do Ryujinx", "ru_RU": "Открыть папку Ryujinx", "sv_SE": "Öppna Ryujinx-mapp", "th_TH": "เปิดโฟลเดอร์ Ryujinx", @@ -447,6 +447,31 @@ "zh_TW": "開啟 Ryujinx 資料夾" } }, + { + "ID": "MenuBarFileOpenScreenshotsFolder", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Open Screenshots Folder", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "Abrir Pasta de Capturas de Tela", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" + } + }, { "ID": "MenuBarFileOpenLogsFolder", "Translations": { @@ -462,7 +487,7 @@ "ko_KR": "로그 폴더 열기", "no_NO": "Åpne Logg mappen", "pl_PL": "Otwórz folder plików dziennika zdarzeń", - "pt_BR": "Abrir diretório de _logs...", + "pt_BR": "Abrir Pasta de _Logs", "ru_RU": "Открыть папку с логами", "sv_SE": "Öppna loggmapp", "th_TH": "เปิดโฟลเดอร์ Logs", @@ -537,7 +562,7 @@ "ko_KR": "전체 화면 전환", "no_NO": "Fullskjermsvisning av/på", "pl_PL": "Przełącz na tryb pełnoekranowy", - "pt_BR": "_Mudar para tela cheia", + "pt_BR": "_Mudar para Tela Cheia", "ru_RU": "Включить полноэкранный режим", "sv_SE": "Växla helskärm", "th_TH": "สลับเป็นโหมดเต็มหน้าจอ", @@ -562,7 +587,7 @@ "ko_KR": "전체 화면 모드로 게임 시작", "no_NO": "Start spill i Fullskjermmodus", "pl_PL": "Uruchamiaj gry w trybie pełnoekranowym", - "pt_BR": "Iniciar jogos em tela cheia", + "pt_BR": "Iniciar Jogos em Tela Cheia", "ru_RU": "Запускать игры в полноэкранном режиме", "sv_SE": "Starta spel i helskärmsläge", "th_TH": "เริ่มเกมในโหมดเต็มหน้าจอ", @@ -576,7 +601,7 @@ "ID": "MenuBarOptionsStartGamesWithoutUI", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Spiele ohne Benutzeroberfläche starten", "el_GR": "", "en_US": "Start Games with UI Hidden", "es_ES": "", @@ -585,11 +610,11 @@ "it_IT": "", "ja_JP": "", "ko_KR": "UI를 숨긴 상태에서 게임 시작", - "no_NO": "", + "no_NO": "Start Spillet med UI Gjemt", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Iniciar Jogos Ocultando a Interface", "ru_RU": "", - "sv_SE": "", + "sv_SE": "Starta spel med dolt användargränssnitt", "th_TH": "", "tr_TR": "", "uk_UA": "", @@ -612,7 +637,7 @@ "ko_KR": "에뮬레이션 중지", "no_NO": "Stopp Emulering", "pl_PL": "Zatrzymaj emulację", - "pt_BR": "_Encerrar emulação", + "pt_BR": "_Parar a Emulação", "ru_RU": "Остановить эмуляцию", "sv_SE": "Stoppa emulering", "th_TH": "หยุดการจำลอง", @@ -662,7 +687,7 @@ "ko_KR": "사용자 프로필 관리(_M)", "no_NO": "_Administrere Brukerprofiler", "pl_PL": "_Zarządzaj profilami użytkowników", - "pt_BR": "_Gerenciar perfis de usuário", + "pt_BR": "_Gerenciar Perfis de Usuário", "ru_RU": "_Менеджер учетных записей", "sv_SE": "_Hantera användarprofiler", "th_TH": "_จัดการโปรไฟล์ผู้ใช้งาน", @@ -712,7 +737,7 @@ "ko_KR": "웨이크업 메시지 시뮬레이션", "no_NO": "Simuler oppvåknings-melding", "pl_PL": "Symuluj wiadomość wybudzania", - "pt_BR": "_Simular mensagem de acordar console", + "pt_BR": "_Simular Mensagem de Acordar o Console", "ru_RU": "Имитировать сообщение пробуждения", "sv_SE": "Simulera uppvakningsmeddelande", "th_TH": "จำลองข้อความปลุก", @@ -751,7 +776,7 @@ "ID": "MenuBarActionsScanAmiiboBin", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Amiibo scannen (aus Bin-Datei)", "el_GR": "", "en_US": "Scan An Amiibo (From Bin)", "es_ES": "", @@ -762,7 +787,7 @@ "ko_KR": "Amiibo 스캔(빈에서)", "no_NO": "Skann en Amiibo (fra bin fil)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Escaneie um Amiibo (de um .bin)", "ru_RU": "Сканировать Amiibo (из папки Bin)", "sv_SE": "Skanna en Amiibo (från bin-fil)", "th_TH": "", @@ -787,7 +812,7 @@ "ko_KR": "펌웨어 설치", "no_NO": "Installer fastvare", "pl_PL": "Zainstaluj oprogramowanie", - "pt_BR": "_Instalar firmware", + "pt_BR": "_Instalar Firmware", "ru_RU": "Установка прошивки", "sv_SE": "Installera firmware", "th_TH": "ติดตั้งเฟิร์มแวร์", @@ -851,7 +876,7 @@ "ID": "MenuBarActionsInstallKeys", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Schlüssel installieren", "el_GR": "", "en_US": "Install Keys", "es_ES": "", @@ -862,7 +887,7 @@ "ko_KR": "설치 키", "no_NO": "Installere nøkler", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Instalar Chaves", "ru_RU": "Установить ключи", "sv_SE": "Installera nycklar", "th_TH": "", @@ -876,7 +901,7 @@ "ID": "MenuBarFileActionsInstallKeysFromFile", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Schlüssel aus KEYS oder ZIP installieren", "el_GR": "", "en_US": "Install keys from KEYS or ZIP", "es_ES": "Instalar keys de KEYS o ZIP", @@ -887,7 +912,7 @@ "ko_KR": "키나 ZIP에서 키 설치", "no_NO": "Installer nøkler fra KEYS eller ZIP", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Instalar chaves de CHAVES ou ZIP", "ru_RU": "Установить ключи из файла KEYS или ZIP", "sv_SE": "Installera nycklar från KEYS eller ZIP", "th_TH": "", @@ -901,7 +926,7 @@ "ID": "MenuBarFileActionsInstallKeysFromFolder", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Schlüssel aus einem Verzeichnis installieren", "el_GR": "", "en_US": "Install keys from a directory", "es_ES": "Instalar keys de un directorio", @@ -912,7 +937,7 @@ "ko_KR": "디렉터리에서 키 설치", "no_NO": "Installer nøkler fra en mappe", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Instalar chaves de um diretório", "ru_RU": "Установить ключи из папки", "sv_SE": "Installera nycklar från en katalog", "th_TH": "", @@ -937,7 +962,7 @@ "ko_KR": "파일 형식 관리", "no_NO": "Behandle filtyper", "pl_PL": "Zarządzaj rodzajami plików", - "pt_BR": "Gerenciar tipos de arquivo", + "pt_BR": "Gerenciar Tipos de Arquivos", "ru_RU": "Управление типами файлов", "sv_SE": "Hantera filtyper", "th_TH": "จัดการประเภทไฟล์", @@ -962,7 +987,7 @@ "ko_KR": "파일 형식 설치", "no_NO": "Installer filtyper", "pl_PL": "Typy plików instalacyjnych", - "pt_BR": "Instalar tipos de arquivo", + "pt_BR": "Instalar tipos de arquivos", "ru_RU": "Установить типы файлов", "sv_SE": "Installera filtyper", "th_TH": "ติดตั้งประเภทไฟล์", @@ -1001,7 +1026,7 @@ "ID": "MenuBarActionsXCITrimmer", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "XCI-Dateien trimmen", "el_GR": "", "en_US": "Trim XCI Files", "es_ES": "Recortar archivos XCI", @@ -1012,7 +1037,7 @@ "ko_KR": "XCI 파일 트리머", "no_NO": "Trim XCI-filer", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Reduzir Arquivos XCI", "ru_RU": "Уменьшить размер XCI файлов", "sv_SE": "Optimera XCI-filer", "th_TH": "", @@ -1037,7 +1062,7 @@ "ko_KR": "보기(_V)", "no_NO": "_Vis", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Ver", "ru_RU": "_Вид", "sv_SE": "_Visa", "th_TH": "_มุมมอง", @@ -1062,7 +1087,7 @@ "ko_KR": "윈도 창", "no_NO": "Vindu størrelse", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Tamanho da Janela", "ru_RU": "Размер окна", "sv_SE": "Fönsterstorlek", "th_TH": "ขนาดหน้าต่าง", @@ -1212,7 +1237,7 @@ "ko_KR": "업데이트 확인", "no_NO": "Se etter oppdateringer", "pl_PL": "Sprawdź aktualizacje", - "pt_BR": "_Verificar se há atualizações", + "pt_BR": "_Verificar Atualizações", "ru_RU": "Проверить наличие обновлений", "sv_SE": "Leta efter uppdateringar", "th_TH": "ตรวจสอบอัปเดต", @@ -1226,7 +1251,7 @@ "ID": "MenuBarHelpFaqAndGuides", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "FAQ & Anleitungen", "el_GR": "", "en_US": "FAQ & Guides", "es_ES": "", @@ -1237,7 +1262,7 @@ "ko_KR": "자주 묻는 질문(FAQ) 및 안내", "no_NO": "Vanlige spørsmål og veiledninger", "pl_PL": "", - "pt_BR": "", + "pt_BR": "FAQ & Guias", "ru_RU": "FAQ и Руководства", "sv_SE": "Frågor, svar och guider", "th_TH": "", @@ -1251,7 +1276,7 @@ "ID": "MenuBarHelpFaq", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "FAQ & Fehlerbehebung Seite", "el_GR": "", "en_US": "FAQ & Troubleshooting Page", "es_ES": "", @@ -1262,7 +1287,7 @@ "ko_KR": "자주 묻는 질문(FAQ) 및 문제해결 페이지", "no_NO": "FAQ- og feilsøkingsside", "pl_PL": "", - "pt_BR": "", + "pt_BR": "FAQ e Solução de Problemas", "ru_RU": "FAQ & Устранение неполадок", "sv_SE": "Frågor, svar och felsökningssida", "th_TH": "", @@ -1276,7 +1301,7 @@ "ID": "MenuBarHelpFaqTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Öffnet die FAQ- und Fehlerbehebungsseite im offiziellen Ryujinx-Wiki", "el_GR": "", "en_US": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki", "es_ES": "", @@ -1287,7 +1312,7 @@ "ko_KR": "공식 Ryujinx 위키에서 자주 묻는 질문(FAQ) 및 문제 해결 페이지 열기", "no_NO": "Åpner FAQ- og feilsøkingssiden på den offisielle Ryujinx-wikien", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Abre a página de FAQ e solução de problemas no wiki oficial do Ryujinx", "ru_RU": "Открывает страницы с FAQ и Устранением неполадок на официальной странице вики Ryujinx", "sv_SE": "Öppnar Frågor, svar och felsökningssidan på den officiella Ryujinx-wikin", "th_TH": "", @@ -1301,7 +1326,7 @@ "ID": "MenuBarHelpSetup", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Setup- und Konfigurationsanleitung", "el_GR": "", "en_US": "Setup & Configuration Guide", "es_ES": "", @@ -1312,7 +1337,7 @@ "ko_KR": "설치 및 구성 안내", "no_NO": "Oppsett- og konfigurasjonsveiledning", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Guia de Instalação e Configuração", "ru_RU": "Руководство по установке и настройке", "sv_SE": "Konfigurationsguide", "th_TH": "", @@ -1326,7 +1351,7 @@ "ID": "MenuBarHelpSetupTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Öffnet die Setup- und Konfigurationsanleitung im offiziellen Ryujinx-Wiki", "el_GR": "", "en_US": "Opens the Setup & Configuration guide on the official Ryujinx wiki", "es_ES": "", @@ -1337,7 +1362,7 @@ "ko_KR": "공식 Ryujinx 위키에서 설정 및 구성 안내 열기", "no_NO": "Åpner oppsett- og konfigurasjonsveiledningen på den offisielle Ryujinx-wikien", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Abre o guia de instalação e configuração no wiki oficial do Ryujinx", "ru_RU": "Открывает страницу Руководство по установке и настройке на официальной странице вики Ryujinx", "sv_SE": "Öppnar konfigurationsguiden på den officiella Ryujinx-wikin", "th_TH": "", @@ -1351,7 +1376,7 @@ "ID": "MenuBarHelpMultiplayer", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Multiplayer (LDN/LAN) Anleitung", "el_GR": "", "en_US": "Multiplayer (LDN/LAN) Guide", "es_ES": "", @@ -1362,7 +1387,7 @@ "ko_KR": "멀티플레이어(LDN/LAN) 안내", "no_NO": "Flerspillerveiledning (LDN/LAN)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Guia Multijogador (LDN/LAN)", "ru_RU": "Гайд по мультиплееру (LDN/LAN)", "sv_SE": "Flerspelarguide (LDN/LAN)", "th_TH": "", @@ -1376,7 +1401,7 @@ "ID": "MenuBarHelpMultiplayerTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Öffnet die Multiplayer-Anleitung im offiziellen Ryujinx-Wiki", "el_GR": "", "en_US": "Opens the Multiplayer guide on the official Ryujinx wiki", "es_ES": "", @@ -1387,7 +1412,7 @@ "ko_KR": "공식 Ryujinx 위키에서 멀티플레이어 안내 열기", "no_NO": "Åpner flerspillerveiledningen på den offisielle Ryujinx-wikien", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Abre o guia multijogador no wiki oficial do Ryujinx", "ru_RU": "Открывает гайд по мультиплееру на официальной странице вики Ryujinx", "sv_SE": "Öppnar flerspelarguiden på den officiella Ryujinx-wikin", "th_TH": "", @@ -1526,7 +1551,7 @@ "ID": "GameListHeaderDeveloper", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Entwickelt von {0}", "el_GR": "", "en_US": "Developed by {0}", "es_ES": "", @@ -1535,9 +1560,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Utviklet av {0}", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Desenvolvido por {0}", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -1587,7 +1612,7 @@ "ko_KR": "플레이 타임:", "no_NO": "Spilletid:", "pl_PL": "Czas w grze:", - "pt_BR": "Tempo de jogo:", + "pt_BR": "Tempo de Jogo:", "ru_RU": "Время в игре:", "sv_SE": "Speltid:", "th_TH": "เล่นไปแล้ว:", @@ -1612,7 +1637,7 @@ "ko_KR": "마지막 플레이:", "no_NO": "Sist Spilt:", "pl_PL": "Ostatnio grane:", - "pt_BR": "Último jogo:", + "pt_BR": "Última vez Jogado:", "ru_RU": "Последний запуск:", "sv_SE": "Senast spelad:", "th_TH": "เล่นล่าสุด:", @@ -1712,7 +1737,7 @@ "ko_KR": "플레이 타임", "no_NO": "Spilletid", "pl_PL": "Czas w grze:", - "pt_BR": "Tempo de jogo", + "pt_BR": "Tempo de Jogo", "ru_RU": "Время в игре", "sv_SE": "Speltid", "th_TH": "เล่นไปแล้ว", @@ -1737,7 +1762,7 @@ "ko_KR": "마지막 플레이", "no_NO": "Sist Spilt", "pl_PL": "Ostatnio grane", - "pt_BR": "Último jogo", + "pt_BR": "Última vez Jogado", "ru_RU": "Последний запуск", "sv_SE": "Senast spelad", "th_TH": "เล่นล่าสุด", @@ -1826,7 +1851,7 @@ "ID": "GameListHeaderCompatibilityStatus", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Kompatibilität:", "el_GR": "", "en_US": "Compatibility:", "es_ES": "", @@ -1835,9 +1860,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Kompatibilitet", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Compatibilidade:", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -1860,9 +1885,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Tittel ID:", "pl_PL": "", - "pt_BR": "", + "pt_BR": "ID do Título:", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -1885,9 +1910,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Spill som Arrangeres: {0}", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Jogos Hospedados: {0}", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -1910,9 +1935,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Online-spillere: {0}", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Jogadores Online: {0}", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -1937,7 +1962,7 @@ "ko_KR": "사용자 저장 디렉터리 열기", "no_NO": "Åpne bruker lagrings mappe", "pl_PL": "Otwórz katalog zapisów użytkownika", - "pt_BR": "Abrir diretório de saves do usuário", + "pt_BR": "Abrir Diretório de Saves do Usuário", "ru_RU": "Открыть папку с сохранениями", "sv_SE": "Öppna användarkatalog för sparningar", "th_TH": "เปิดไดเร็กทอรี่บันทึกของผู้ใช้", @@ -1987,7 +2012,7 @@ "ko_KR": "기기 저장 디렉터리 열기", "no_NO": "Åpne lagringsmappe for enheten", "pl_PL": "Otwórz katalog zapisów urządzenia", - "pt_BR": "Abrir diretório de saves de dispositivo do usuário", + "pt_BR": "Abrir Diretório de Saves de Dispositivo do Usuário", "ru_RU": "Открыть папку сохраненных устройств", "sv_SE": "Öppna enhetens katalog för sparade spel", "th_TH": "เปิดไดเร็กทอรี่บันทึกของอุปกรณ์", @@ -2037,7 +2062,7 @@ "ko_KR": "BCAT 저장 디렉터리 열기", "no_NO": "Åpne BCAT lagringsmappe", "pl_PL": "Otwórz katalog zapisu BCAT obecnego użytkownika", - "pt_BR": "Abrir diretório de saves BCAT do usuário", + "pt_BR": "Abrir Diretório de Saves BCAT do Usuário", "ru_RU": "Открыть папку сохраненных BCAT", "sv_SE": "Öppna katalog för BCAT-sparningar", "th_TH": "เปิดไดเรกทอรี่บันทึกของ BCAT", @@ -2087,7 +2112,7 @@ "ko_KR": "타이틀 업데이트 관리", "no_NO": "Administrer titteloppdateringer", "pl_PL": "Zarządzaj aktualizacjami", - "pt_BR": "Gerenciar atualizações do jogo", + "pt_BR": "Gerenciar Atualizações do Jogo", "ru_RU": "Управление обновлениями", "sv_SE": "Hantera speluppdateringar", "th_TH": "จัดการเวอร์ชั่นอัปเดต", @@ -2187,7 +2212,7 @@ "ko_KR": "캐시 관리", "no_NO": "Cache administrasjon", "pl_PL": "Zarządzanie Cache", - "pt_BR": "Gerenciamento de cache", + "pt_BR": "Gerenciamento de Cache", "ru_RU": "Управление кэшем", "sv_SE": "Cachehantering", "th_TH": "จัดการแคช", @@ -2212,7 +2237,7 @@ "ko_KR": "대기열 PPTC 재구성", "no_NO": "Start PPTC gjenoppbygging", "pl_PL": "Zakolejkuj rekompilację PPTC", - "pt_BR": "Limpar cache PPTC", + "pt_BR": "Reconstruir Cache PPTC", "ru_RU": "Перестроить очередь PPTC", "sv_SE": "Kölägg PPTC Rebuild", "th_TH": "เพิ่มคิวการสร้าง PPTC ใหม่", @@ -2237,7 +2262,7 @@ "ko_KR": "다음 게임 실행 부팅 시, PPTC를 트리거하여 다시 구성", "no_NO": "Utløs PPTC for å gjenoppbygge ved oppstart av neste spill-start", "pl_PL": "Zainicjuj Rekompilację PPTC przy następnym uruchomieniu gry", - "pt_BR": "Deleta o cache PPTC armazenado em disco do jogo", + "pt_BR": "Aciona o PPTC para reconstruir o cache no momento da próxima inicialização do jogo", "ru_RU": "Запускает перестройку PPTC во время следующего запуска игры.", "sv_SE": "Gör så att PPTC bygger om vid uppstart när nästa spel startas", "th_TH": "ให้ PPTC สร้างใหม่ในเวลาบูตเมื่อเปิดเกมครั้งถัดไป", @@ -2260,9 +2285,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "PPTC 캐시 제거", - "no_NO": "", + "no_NO": "Tøm PPTC-bufferen", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Limpar Cache PPTC", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -2285,9 +2310,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "앱의 모든 PPTC 캐시 파일 삭제", - "no_NO": "", + "no_NO": "Sletter alle PPTC-cache-filer for applikasjonen", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Apaga os arquivos de cache PPTC do aplicativo", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -2312,7 +2337,7 @@ "ko_KR": "퍼지 셰이더 캐시", "no_NO": "Tøm shader cache", "pl_PL": "Wyczyść pamięć podręczną cieni", - "pt_BR": "Limpar cache de Shader", + "pt_BR": "Limpar Cache de Shader", "ru_RU": "Очистить кэш шейдеров", "sv_SE": "Töm shader cache", "th_TH": "ล้างแคช แสงเงา", @@ -2337,7 +2362,7 @@ "ko_KR": "앱의 셰이더 캐시 삭제", "no_NO": "Sletter applikasjonens shader cache", "pl_PL": "Usuwa pamięć podręczną cieni danej aplikacji", - "pt_BR": "Deleta o cache de Shader armazenado em disco do jogo", + "pt_BR": "Deleta o cache de Shader do jogo armazenado em disco", "ru_RU": "Удаляет кеш шейдеров приложения", "sv_SE": "Tar bort applikationens shader cache", "th_TH": "ลบแคช แสงเงา ของแอปพลิเคชัน", @@ -2362,7 +2387,7 @@ "ko_KR": "PPTC 디렉터리 열기", "no_NO": "Åpne PPTC mappe", "pl_PL": "Otwórz katalog PPTC", - "pt_BR": "Abrir diretório do cache PPTC", + "pt_BR": "Abrir Diretório de PPTC Cache", "ru_RU": "Открыть папку PPTC", "sv_SE": "Öppna PPTC-katalog", "th_TH": "เปิดไดเรกทอรี่ PPTC", @@ -2412,7 +2437,7 @@ "ko_KR": "셰이더 캐시 디렉터리 열기", "no_NO": "Åpne Shader Cache-mappen", "pl_PL": "Otwórz katalog pamięci podręcznej cieni", - "pt_BR": "Abrir diretório do cache de Shader", + "pt_BR": "Abrir Diretório de Shader Cache", "ru_RU": "Открыть папку с кэшем шейдеров", "sv_SE": "Öppna katalog för shader cache", "th_TH": "เปิดไดเรกทอรี่ แคช แสงเงา", @@ -2462,7 +2487,7 @@ "ko_KR": "데이터 추출", "no_NO": "Hent ut data", "pl_PL": "Wypakuj dane", - "pt_BR": "Extrair dados", + "pt_BR": "Extrair Dados", "ru_RU": "Извлечь данные", "sv_SE": "Extrahera data", "th_TH": "แยกส่วนข้อมูล", @@ -2612,9 +2637,9 @@ "ko_KR": "선택한 DLC 파일에서 RomFS 추출", "no_NO": "Pakk ut RomFS filene fra valgt DLC fil", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Extraia o RomFS de um arquivo DLC selecionado", "ru_RU": "", - "sv_SE": "", + "sv_SE": "Extrahera RomFS från en vald DLC-fil", "th_TH": "", "tr_TR": "", "uk_UA": "", @@ -2637,7 +2662,7 @@ "ko_KR": "로고", "no_NO": "", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Logotipo", "ru_RU": "Лого", "sv_SE": "Logotyp", "th_TH": "โลโก้", @@ -2687,7 +2712,7 @@ "ko_KR": "바로 가기 만들기", "no_NO": "Lag programsnarvei", "pl_PL": "Utwórz skrót aplikacji", - "pt_BR": "Criar atalho da aplicação", + "pt_BR": "Criar Atalho da Aplicação", "ru_RU": "Создать ярлык приложения", "sv_SE": "Skapa genväg till applikation", "th_TH": "สร้างทางลัดของแอปพลิเคชัน", @@ -2712,7 +2737,7 @@ "ko_KR": "선택한 앱을 실행하는 바탕 화면에 바로 가기를 생성", "no_NO": "Lag en snarvei på skrivebordet som starter den valgte Applikasjonen", "pl_PL": "Utwórz skrót na pulpicie, który uruchamia wybraną aplikację", - "pt_BR": "Criar um atalho de área de trabalho que inicia o aplicativo selecionado", + "pt_BR": "Criar um atalho na área de trabalho que inicia o aplicativo selecionado", "ru_RU": "Создает ярлык на рабочем столе, с помощью которого можно запустить игру или приложение", "sv_SE": "Skapa en skrivbordsgenväg som startar vald applikation", "th_TH": "สร้างทางลัดบนเดสก์ท็อปสำหรับใช้แอปพลิเคชันที่เลือก", @@ -2760,9 +2785,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "호환성 항목 표시", - "no_NO": "", + "no_NO": "Vis kompatibilitetsoppføring", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Mostrar Dados de Compatibilidade", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -2785,9 +2810,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "일반적으로 도움말 메뉴를 통해 접근할 수 있는 호환성 목록에 선택한 게임을 표시합니다.", - "no_NO": "", + "no_NO": "Vis det valgte spillet i kompatibilitetslisten, som du vanligvis får tilgang til via Hjelp-menyen.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Exibe o jogo selecionado na Lista de Compatibilidade, que normalmente pode ser acessada pelo menu Ajuda.", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -2810,9 +2835,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "게임 통계 표시", - "no_NO": "", + "no_NO": "Vis Spill Info", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Mostrar Informações do Jogo", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -2835,9 +2860,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "그리드 보기 레이아웃에서 누락된 현재 선택된 게임에 대한 다양한 정보를 표시합니다.", - "no_NO": "", + "no_NO": "Vis statistikk og detaljer om det valgte spillet.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Exibe estatísticas e detalhes sobre o jogo selecionado.", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -2862,7 +2887,7 @@ "ko_KR": "모드 디렉터리 열기", "no_NO": "Åpne Modifikasjonsmappen", "pl_PL": "Otwórz katalog modów", - "pt_BR": "Abrir pasta de Mods", + "pt_BR": "Abrir Pasta de Mods", "ru_RU": "Открыть папку с модами", "sv_SE": "Öppna Mods-katalog", "th_TH": "เปิดไดเร็กทอรี่ Mods", @@ -2912,7 +2937,7 @@ "ko_KR": "Atmosphere 모드 디렉터리 열기", "no_NO": "Åpne Atmosfære modifikasjons mappen", "pl_PL": "Otwórz katalog modów Atmosphere", - "pt_BR": "Abrir diretório de mods Atmosphere", + "pt_BR": "Abrir Diretório de Mods Atmosphere", "ru_RU": "Открыть папку с модами Atmosphere", "sv_SE": "Öppna Atmosphere Mods-katalogen", "th_TH": "เปิดไดเร็กทอรี่ Mods Atmosphere", @@ -2937,7 +2962,7 @@ "ko_KR": "해당 게임의 모드가 포함된 대체 SD 카드 Atmosphere 디렉터리를 엽니다. 실제 하드웨어용으로 패키징된 모드에 유용합니다.", "no_NO": "Åpner den alternative SD-kortets Atmosfære-mappe som inneholder programmoduser. Nyttig for modifikasjoner som er pakket for ekte maskinvare.", "pl_PL": "Otwiera alternatywny katalog Atmosphere na karcie SD, który zawiera mody danej aplikacji. Przydatne dla modów przygotowanych pod prawdziwy sprzęt.", - "pt_BR": "", + "pt_BR": "Abre o diretório Atmosphere do cartão SD alternativo que contém os Mods do aplicativo. Útil para mods que são empacotados para hardware real.", "ru_RU": "Открывает папку Atmosphere на альтернативной SD-карте, которая содержит моды для приложений и игр. Полезно для модов, сделанных для реальной консоли.", "sv_SE": "Öppnar den alternativa Atmosphere-katalogen på SD-kort som innehåller applikationens Mods. Användbart för Mods som är paketerade för riktig hårdvara.", "th_TH": "เปิดไดเร็กทอรี่ Atmosphere ของการ์ด SD สำรองซึ่งมี Mods ของแอปพลิเคชัน ซึ่งมีประโยชน์สำหรับ Mods ที่บรรจุมากับฮาร์ดแวร์จริง", @@ -2962,7 +2987,7 @@ "ko_KR": "XCI 파일 확인 및 트림", "no_NO": "Kontroller og trim XCI-filen", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Verificar e Reduzir o Arquivo XCI", "ru_RU": "Проверить и обрезать XCI файл", "sv_SE": "Kontrollera och optimera XCI-fil", "th_TH": "", @@ -2987,7 +3012,7 @@ "ko_KR": "디스크 공간을 절약하기 위해 XCI 파일 확인 및 트림", "no_NO": "Kontroller og trimm XCI-filen for å spare diskplass", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Verifique e reduza o arquivo XCI para economizar espaço em disco", "ru_RU": "Проверить и обрезать XCI файл для уменьшения его размера", "sv_SE": "Kontrollera och optimera XCI-fil för att spara diskutrymme", "th_TH": "", @@ -3012,7 +3037,7 @@ "ko_KR": "{0}/{1}개의 게임 불러옴", "no_NO": "{0}/{1} Spill Lastet", "pl_PL": "{0}/{1} Załadowane gry", - "pt_BR": "{0}/{1} jogos carregados", + "pt_BR": "{0}/{1} Jogos Carregados", "ru_RU": "{0}/{1} игр загружено", "sv_SE": "{0}/{1} spel inlästa", "th_TH": "เกมส์โหลดแล้ว {0}/{1}", @@ -3037,7 +3062,7 @@ "ko_KR": "펌웨어 버전 : {0}", "no_NO": "Fastvareversjon: {0}", "pl_PL": "", - "pt_BR": "Versão do firmware: {0}", + "pt_BR": "Versão do Firmware: {0}", "ru_RU": "Версия прошивки: {0}", "sv_SE": "Firmware-version: {0}", "th_TH": "", @@ -3062,7 +3087,7 @@ "ko_KR": "XCI 파일 '{0}' 트리밍", "no_NO": "Trimming av XCI-filen '{0}'", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Reduzindo o Arquivo XCI '{0}'", "ru_RU": "Обрезается XCI файл '{0}'", "sv_SE": "Optimerar XCI-filen '{0}'", "th_TH": "", @@ -3087,7 +3112,7 @@ "ko_KR": "메모리 매핑 한계 감지", "no_NO": "Lav grense for minnetildelinger oppdaget", "pl_PL": "Wykryto niski limit dla przypisań pamięci", - "pt_BR": "Limite baixo para mapeamentos de memória detectado", + "pt_BR": "Detectado limite baixo para mapeamentos de memória", "ru_RU": "Обнаружен низкий лимит разметки памяти", "sv_SE": "Låg gräns för minnesmappningar upptäcktes", "th_TH": "การตั้งค่าหน่วยความถึงขีดจำกัดต่ำสุดแล้ว", @@ -3287,7 +3312,7 @@ "ko_KR": "사용자 인터페이스", "no_NO": "Brukergrensesnitt", "pl_PL": "Interfejs użytkownika", - "pt_BR": "Geral", + "pt_BR": "Interface do Usuário", "ru_RU": "Интерфейс", "sv_SE": "Användargränssnitt", "th_TH": "หน้าจอผู้ใช้", @@ -3337,7 +3362,7 @@ "ko_KR": "디스코드 활동 상태 활성화", "no_NO": "Aktiver Discord Rik Tilstedeværelse", "pl_PL": "Włącz Bogatą Obecność Discord", - "pt_BR": "Habilitar Rich Presence do Discord", + "pt_BR": "Habilitar Presença no Discord", "ru_RU": "Статус активности в Discord", "sv_SE": "Aktivera Discord Rich Presence", "th_TH": "เปิดใช้งาน Discord Rich Presence", @@ -3350,26 +3375,251 @@ { "ID": "SettingsTabGeneralCheckUpdatesOnLaunch", "Translations": { - "ar_SA": "التحقق من وجود تحديثات عند التشغيل", - "de_DE": "Beim Start nach Updates suchen", - "el_GR": "Έλεγχος για Ενημερώσεις στην Εκκίνηση", - "en_US": "Check for Updates on Launch", - "es_ES": "Buscar actualizaciones al iniciar", - "fr_FR": "Vérifier les mises à jour au démarrage", - "he_IL": "בדוק אם קיימים עדכונים בהפעלה", - "it_IT": "Controlla aggiornamenti all'avvio", - "ja_JP": "起動時にアップデートを確認する", - "ko_KR": "시작 시, 업데이트 확인", - "no_NO": "Se etter oppdateringer ved oppstart", - "pl_PL": "Sprawdzaj aktualizacje przy uruchomieniu", - "pt_BR": "Verificar se há atualizações ao iniciar", - "ru_RU": "Проверять наличие обновлений при запуске", - "sv_SE": "Leta efter uppdatering vid uppstart", - "th_TH": "ตรวจหาการอัปเดตเมื่อเปิดโปรแกรม", - "tr_TR": "Her Açılışta Güncellemeleri Denetle", - "uk_UA": "Перевіряти наявність оновлень під час запуску", - "zh_CN": "启动时检查更新", - "zh_TW": "啟動時檢查更新" + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Check for Updates:", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Se etter Oppdateringer:", + "pl_PL": "", + "pt_BR": "Verificar Atualizações:", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "检查更新", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralCheckUpdatesOnLaunchOff", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Off", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Av", + "pl_PL": "", + "pt_BR": "Desligado", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "关闭", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Prompt", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Spør", + "pl_PL": "", + "pt_BR": "Ao Abrir", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "提示", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralCheckUpdatesOnLaunchBackground", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Background", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Bakgrunn", + "pl_PL": "", + "pt_BR": "2° Plano", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "背景", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralFocusLossType", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "On Emulator Focus Lost:", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "På Emulator Fokus Tapt:", + "pl_PL": "", + "pt_BR": "Ao Perder o Foco:", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "当模拟器在后台时：", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralFocusLossTypeDoNothing", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Do Nothing", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Gjør Ingenting", + "pl_PL": "", + "pt_BR": "Não Fazer Nada", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "什么事情也不做", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralFocusLossTypeBlockInput", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Block Input", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Blokkinngang", + "pl_PL": "", + "pt_BR": "Bloquear Controles", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "禁用输入", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralFocusLossTypeMuteAudio", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Mute Volume", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Demp Lyd", + "pl_PL": "", + "pt_BR": "Ficar Mudo", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "静音", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Block Input & Mute Volume", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Blokker Inputs og demp Volumet", + "pl_PL": "", + "pt_BR": "Bloquear Controles & Ficar Mudo", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "阻止输入且静音", + "zh_TW": "" + } + }, + { + "ID": "SettingsTabGeneralFocusLossTypePauseEmulation", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Pause Emulation", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Pause Emulatoren", + "pl_PL": "", + "pt_BR": "Pausar a Emulação", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "暂停模拟", + "zh_TW": "" } }, { @@ -3387,7 +3637,7 @@ "ko_KR": "\"종료 확인\" 대화 상자 표시", "no_NO": "Vis \"Bekreft Avslutt\" vinduet", "pl_PL": "Pokazuj okno dialogowe \"Potwierdź wyjście\"", - "pt_BR": "Exibir diálogo de confirmação ao sair", + "pt_BR": "Exibir \"Diálogo de confirmação\" ao Sair", "ru_RU": "Подтверждать выход из приложения", "sv_SE": "Visa \"Bekräfta avslut\"-dialog", "th_TH": "แสดง \"ปุ่มยืนยันการออก\" เมื่อออกเกม", @@ -3412,7 +3662,7 @@ "ko_KR": "창 크기/위치 기억", "no_NO": "Husk vinduets størrelse/posisjon", "pl_PL": "", - "pt_BR": "Lembrar tamanho/posição da Janela", + "pt_BR": "Lembrar Tamanho e Posição da Janela", "ru_RU": "Запомнить размер/положение окна", "sv_SE": "Kom ihåg fönstrets storlek/position", "th_TH": "จดจำ ขนาดหน้าต่างแอพพลิเคชั่น/คำแหน่ง", @@ -3422,6 +3672,31 @@ "zh_TW": "記住視窗大小/位置" } }, + { + "ID": "SettingsTabGeneralDisableInputWhenOutOfFocus", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Disable Input when Out of Focus", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Deaktiver inndata når vinduet er ute av fokus", + "pl_PL": "", + "pt_BR": "Desativar Controles Quando Estiver Fora de Foco", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "在后台时禁用输入", + "zh_TW": "" + } + }, { "ID": "SettingsTabGeneralShowTitleBar", "Translations": { @@ -3437,7 +3712,7 @@ "ko_KR": "제목 표시줄 표시(다시 시작해야 함)", "no_NO": "Vis tittellinje (krever omstart)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Mostrar Barra de Título (Requer reinicialização)", "ru_RU": "Показать строку заголовка (требуется перезапуск)", "sv_SE": "Visa titelrad (kräver omstart)", "th_TH": "", @@ -3462,7 +3737,7 @@ "ko_KR": "커서 숨기기 :", "no_NO": "Skjul musepeker:", "pl_PL": "Ukryj kursor:", - "pt_BR": "Esconder o cursor do mouse:", + "pt_BR": "Esconder Cursor do Mouse:", "ru_RU": "Скрывать курсор", "sv_SE": "Dölj markör:", "th_TH": "ซ่อน เคอร์เซอร์:", @@ -3512,7 +3787,7 @@ "ko_KR": "유휴 상태", "no_NO": "Når inaktiv", "pl_PL": "Gdy bezczynny", - "pt_BR": "Esconder o cursor quando ocioso", + "pt_BR": "Quando Ocioso", "ru_RU": "В простое", "sv_SE": "Vid overksam", "th_TH": "เมื่อไม่ได้ใช้งาน", @@ -3562,7 +3837,7 @@ "ko_KR": "게임 데릭터리", "no_NO": "Spillmapper", "pl_PL": "Katalogi gier", - "pt_BR": "Diretórios de jogo", + "pt_BR": "Pasta de Jogos", "ru_RU": "Папки с играми", "sv_SE": "Spelkataloger", "th_TH": "ไดเรกทอรี่ของเกม", @@ -3587,7 +3862,7 @@ "ko_KR": "DLC/업데이트 디렉터리 자동 불러오기", "no_NO": "Autoload DLC/Updates-mapper", "pl_PL": "", - "pt_BR": "Carregar Automaticamente Diretórios de DLC/Atualizações", + "pt_BR": "Carregar Automaticamente Pasta de DLC e Atualizações", "ru_RU": "Автозагрузка папки с DLC/Обновлениями", "sv_SE": "Läs automatisk in DLC/speluppdateringar", "th_TH": "โหลดไดเรกทอรี DLC/ไฟล์อัปเดต อัตโนมัติ", @@ -3612,7 +3887,7 @@ "ko_KR": "누락된 파일을 참조하는 DLC 및 업데이트가 자동으로 불러오기 취소", "no_NO": "DLC og oppdateringer som henviser til manglende filer, vil bli lastet ned automatisk", "pl_PL": "", - "pt_BR": "DLCs e Atualizações que se referem a arquivos ausentes serão descarregadas automaticamente", + "pt_BR": "DLCs e Atualizações que se referem a arquivos ausentes serão desabilitados automaticamente", "ru_RU": "DLC и обновления, которые ссылаются на отсутствующие файлы, будут выгружаться автоматически", "sv_SE": "DLC och speluppdateringar som refererar till saknade filer kommer inte att läsas in automatiskt", "th_TH": "", @@ -3737,7 +4012,7 @@ "ko_KR": "시스템 지역 :", "no_NO": "System region:", "pl_PL": "Region systemu:", - "pt_BR": "Região do sistema:", + "pt_BR": "Região do Sistema:", "ru_RU": "Регион прошивки:", "sv_SE": "Systemregion:", "th_TH": "ภูมิภาคของระบบ:", @@ -3937,7 +4212,7 @@ "ko_KR": "시스템 언어 :", "no_NO": "Systemspråk", "pl_PL": "Język systemu:", - "pt_BR": "Idioma do sistema:", + "pt_BR": "Idioma do Sistema:", "ru_RU": "Язык системы:", "sv_SE": "Systemspråk:", "th_TH": "ภาษาของระบบ:", @@ -3987,7 +4262,7 @@ "ko_KR": "미국 영어", "no_NO": "Amerikansk engelsk", "pl_PL": "Angielski (Stany Zjednoczone)", - "pt_BR": "Inglês americano", + "pt_BR": "Inglês Americano", "ru_RU": "Английский (США)", "sv_SE": "Amerikansk engelska", "th_TH": "อังกฤษ (อเมริกัน)", @@ -4262,7 +4537,7 @@ "ko_KR": "영국 영어", "no_NO": "Britisk engelsk", "pl_PL": "Angielski (Wielka Brytania)", - "pt_BR": "Inglês britânico", + "pt_BR": "Inglês Britânico", "ru_RU": "Английский (Великобритания)", "sv_SE": "Brittisk engelska", "th_TH": "อังกฤษ (บริติช)", @@ -4287,7 +4562,7 @@ "ko_KR": "캐나다 프랑스어", "no_NO": "Canadisk Fransk", "pl_PL": "Kanadyjski Francuski", - "pt_BR": "Francês canadense", + "pt_BR": "Francês Canadense", "ru_RU": "Французский (Канада)", "sv_SE": "Kanadensisk franska", "th_TH": "ฝรั่งเศส (แคนาดา)", @@ -4312,7 +4587,7 @@ "ko_KR": "남미 스페인어", "no_NO": "Latinamerikansk spansk", "pl_PL": "Hiszpański (Ameryka Łacińska)", - "pt_BR": "Espanhol latino", + "pt_BR": "Espanhol Latino", "ru_RU": "Испанский (Латинская Америка)", "sv_SE": "Latinamerikansk spanska", "th_TH": "สเปน (ลาตินอเมริกา)", @@ -4337,7 +4612,7 @@ "ko_KR": "중국어 간체", "no_NO": "Forenklet kinesisk", "pl_PL": "Chiński (Uproszczony)", - "pt_BR": "Chinês simplificado", + "pt_BR": "Chinês Simplificado", "ru_RU": "Китайский (упрощённый)", "sv_SE": "Förenklad kinesiska", "th_TH": "จีน (ตัวย่อ)", @@ -4362,7 +4637,7 @@ "ko_KR": "중국어 번체", "no_NO": "Tradisjonell Kinesisk", "pl_PL": "Chiński (Tradycyjny)", - "pt_BR": "Chinês tradicional", + "pt_BR": "Chinês Tradicional", "ru_RU": "Китайский (традиционный)", "sv_SE": "Traditionell kinesiska", "th_TH": "จีน (ดั้งเดิม)", @@ -4385,15 +4660,15 @@ "it_IT": "", "ja_JP": "", "ko_KR": "스웨덴어", - "no_NO": "", + "no_NO": "Svensk", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Sueco", "ru_RU": "", "sv_SE": "Svenska", "th_TH": "", "tr_TR": "", "uk_UA": "", - "zh_CN": "", + "zh_CN": "瑞典语", "zh_TW": "" } }, @@ -4412,13 +4687,13 @@ "ko_KR": "노르웨이어", "no_NO": "Norsk", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Norueguês", "ru_RU": "", "sv_SE": "Norska", "th_TH": "", "tr_TR": "", "uk_UA": "", - "zh_CN": "", + "zh_CN": "挪威语", "zh_TW": "" } }, @@ -4437,7 +4712,7 @@ "ko_KR": "시스템 시간대 :", "no_NO": "System Tidssone:", "pl_PL": "Strefa czasowa systemu:", - "pt_BR": "Fuso horário do sistema:", + "pt_BR": "Fuso Horário do Sistema:", "ru_RU": "Часовой пояс системы:", "sv_SE": "Systemets tidszon:", "th_TH": "เขตเวลาของระบบ:", @@ -4462,7 +4737,7 @@ "ko_KR": "시스템 시간 :", "no_NO": "System tid:", "pl_PL": "Czas systemu:", - "pt_BR": "Hora do sistema:", + "pt_BR": "Data e Hora do Sistema:", "ru_RU": "Системное время:", "sv_SE": "Systemtid:", "th_TH": "เวลาของระบบ:", @@ -4485,9 +4760,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "매치 시스템 시간", - "no_NO": "", + "no_NO": "Match systemtid", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Sincronizar com o Sistema PC", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -4512,7 +4787,7 @@ "ko_KR": "PPTC(프로파일된 영구 번역 캐시)", "no_NO": "PPTC (Profilert Vedvarende Oversettelseshurtigbuffer)", "pl_PL": "PPTC (Profilowana pamięć podręczna trwałych łłumaczeń)", - "pt_BR": "Habilitar PPTC (Profiled Persistent Translation Cache)", + "pt_BR": "PPTC (Cache de Tradução Persistente de Perfil)", "ru_RU": "Использовать PPTC (Profiled Persistent Translation Cache)", "sv_SE": "PPTC (Profilerad bestående översättningscache)", "th_TH": "PPTC (แคชโปรไฟล์การแปลแบบถาวร)", @@ -4537,7 +4812,7 @@ "ko_KR": "저전력 PPTC 캐시", "no_NO": "PPTC med lavt strømforbruk", "pl_PL": "Low-power PPTC", - "pt_BR": "Low-power PPTC", + "pt_BR": "Cache PPTC com Baixo Consumo de Energia", "ru_RU": "PPTC с низким электропотреблением", "sv_SE": "PPTC med låg strömförbrukning", "th_TH": "PPTC แบบพลังงานตํ่า", @@ -4562,7 +4837,7 @@ "ko_KR": "파일 시스템 무결성 검사", "no_NO": "FS Integritetssjekk", "pl_PL": "Sprawdzanie integralności systemu plików", - "pt_BR": "Habilitar verificação de integridade do sistema de arquivos", + "pt_BR": "Verificações de Integridade do FS", "ru_RU": "Проверка целостности файловой системы", "sv_SE": "Integritetskontroller av filsystem", "th_TH": "ตรวจสอบความถูกต้องของ FS", @@ -4587,7 +4862,7 @@ "ko_KR": "음향 후단부 :", "no_NO": "Lyd Backend:", "pl_PL": "Backend Dżwięku:", - "pt_BR": "Biblioteca de saída de áudio:", + "pt_BR": "Módulo de Áudio:", "ru_RU": "Аудио бэкенд:", "sv_SE": "Ljudbakände:", "th_TH": "ระบบเสียงเบื้องหลัง:", @@ -4612,7 +4887,7 @@ "ko_KR": "더미", "no_NO": "", "pl_PL": "Atrapa", - "pt_BR": "Nenhuma", + "pt_BR": "Nenhum", "ru_RU": "Без звука", "sv_SE": "", "th_TH": "", @@ -4737,7 +5012,7 @@ "ko_KR": "불안정성을 유발할 수 있음", "no_NO": "Kan forårsake ustabilitet", "pl_PL": " (mogą powodować niestabilność)", - "pt_BR": " (Pode causar instabilidade)", + "pt_BR": "Pode causar instabilidade", "ru_RU": "Возможна нестабильная работа", "sv_SE": "Kan orsaka instabilitet", "th_TH": "อาจทำให้เกิดข้อผิดพลาดได้", @@ -4787,7 +5062,7 @@ "ko_KR": "4GB", "no_NO": "4GB", "pl_PL": "", - "pt_BR": "", + "pt_BR": "4GB", "ru_RU": "4ГиБ", "sv_SE": "", "th_TH": "", @@ -4812,7 +5087,7 @@ "ko_KR": "6GB", "no_NO": "6GB", "pl_PL": "", - "pt_BR": "", + "pt_BR": "6GB", "ru_RU": "6ГиБ", "sv_SE": "", "th_TH": "", @@ -4837,7 +5112,7 @@ "ko_KR": "8GB", "no_NO": "8GB", "pl_PL": "", - "pt_BR": "", + "pt_BR": "8GB", "ru_RU": "8ГиБ", "sv_SE": "", "th_TH": "", @@ -4862,7 +5137,7 @@ "ko_KR": "12GB", "no_NO": "12GB", "pl_PL": "", - "pt_BR": "", + "pt_BR": "12GB", "ru_RU": "12ГиБ", "sv_SE": "", "th_TH": "", @@ -4887,7 +5162,7 @@ "ko_KR": "누락된 서비스 무시", "no_NO": "Ignorer manglende tjenester", "pl_PL": "Ignoruj Brakujące Usługi", - "pt_BR": "Ignorar serviços não implementados", + "pt_BR": "Ignorar Serviços Ausentes", "ru_RU": "Игнорировать отсутствующие службы", "sv_SE": "Ignorera saknade tjänster", "th_TH": "เมินเฉยบริการที่หายไป", @@ -4898,28 +5173,28 @@ } }, { - "ID": "SettingsTabSystemIgnoreApplet", + "ID": "SettingsTabSystemIgnoreControllerApplet", "Translations": { "ar_SA": "", - "de_DE": "Applet ignorieren", - "el_GR": "Αγνοήστε το Applet", - "en_US": "Ignore Applet", - "es_ES": "Ignorar el Applet", - "fr_FR": "Ignorer la déconnexion de la manette", + "de_DE": "", + "el_GR": "", + "en_US": "Ignore Controller Applet", + "es_ES": "", + "fr_FR": "", "he_IL": "", - "it_IT": "Ignora l'applet", - "ja_JP": "アプレットを無視する", - "ko_KR": "애플릿 무시", - "no_NO": "Ignorer appleten", - "pl_PL": "Ignoruj ​​aplet", - "pt_BR": "Ignorar applet", - "ru_RU": "Игнорировать Апплет", - "sv_SE": "Ignorera applet", - "th_TH": "เมินเฉย Applet", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "Ignorar Applet do Controlador", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", "tr_TR": "", - "uk_UA": "Ігнорувати Аплет", - "zh_CN": "忽略小程序", - "zh_TW": "忽略小程式" + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" } }, { @@ -4987,7 +5262,7 @@ "ko_KR": "셰이더 캐시 활성화", "no_NO": "Aktiver Shader Cachen", "pl_PL": "Włącz pamięć podręczną cieni", - "pt_BR": "Habilitar cache de shader", + "pt_BR": "Habilitar Cache de Shader", "ru_RU": "Кэшировать шейдеры", "sv_SE": "Aktivera Shader Cache", "th_TH": "เปิดใช้งาน แคชแสงเงา", @@ -5012,7 +5287,7 @@ "ko_KR": "이방성 필터링 :", "no_NO": "Anisotropisk filtrering:", "pl_PL": "Filtrowanie anizotropowe:", - "pt_BR": "Filtragem anisotrópica:", + "pt_BR": "Filtro Anisotrópico:", "ru_RU": "Анизотропная фильтрация:", "sv_SE": "Anisotropisk filtrering:", "th_TH": "ตัวกรองแบบ Anisotropic:", @@ -5162,7 +5437,7 @@ "ko_KR": "해상도 배율 :", "no_NO": "Oppløsnings skala:", "pl_PL": "Skalowanie rozdzielczości:", - "pt_BR": "Escala de resolução:", + "pt_BR": "Escala de Resolução:", "ru_RU": "Масштабирование:", "sv_SE": "Upplösningsskalning:", "th_TH": "อัตราส่วนความละเอียด:", @@ -5187,7 +5462,7 @@ "ko_KR": "사용자 정의(권장하지 않음)", "no_NO": "Egendefinert (anbefales ikke)", "pl_PL": "Niestandardowa (Niezalecane)", - "pt_BR": "Customizada (não recomendado)", + "pt_BR": "Customizada (Não recomendado)", "ru_RU": "Пользовательское (не рекомендуется)", "sv_SE": "Anpassad (rekommenderas inte)", "th_TH": "กำหนดเอง (ไม่แนะนำ)", @@ -5287,7 +5562,7 @@ "ko_KR": "4배(2880p/4320p) (권장하지 않음)", "no_NO": "4x (2880p/4320p) (anbefales ikke)", "pl_PL": "4x (2880p/4320p) (niezalecane)", - "pt_BR": "4x (2880p/4320p) (não recomendado)", + "pt_BR": "4x (2880p/4320p) (Não recomendado)", "ru_RU": "4x (2880p/4320p) (не рекомендуется)", "sv_SE": "4x (2880p/4320p) (rekommenderas inte)", "th_TH": "4x (2880p/4320p) (ไม่แนะนำ)", @@ -5312,7 +5587,7 @@ "ko_KR": "종횡비 :", "no_NO": "Bildeformat", "pl_PL": "Format obrazu:", - "pt_BR": "Proporção:", + "pt_BR": "Proporção da Tela:", "ru_RU": "Соотношение сторон:", "sv_SE": "Bildförhållande:", "th_TH": "อัตราส่วนภาพ:", @@ -5462,7 +5737,7 @@ "ko_KR": "창에 맞춰 늘리기", "no_NO": "Strekk for og Tilpasse vindu", "pl_PL": "Rozciągnij do Okna", - "pt_BR": "Esticar até caber", + "pt_BR": "Esticar até Caber", "ru_RU": "Растянуть до размеров окна", "sv_SE": "Sträck ut för att passa fönster", "th_TH": "ยืดภาพเพื่อให้พอดีกับหน้าต่าง", @@ -5512,7 +5787,7 @@ "ko_KR": "그래픽 셰이더 덤프 경로 :", "no_NO": "Grafikk Shader Dump bane:", "pl_PL": "Ścieżka do zgranych cieni graficznych:", - "pt_BR": "Diretório para despejo de shaders:", + "pt_BR": "Diretório para Despejo de Shaders:", "ru_RU": "Путь дампа графических шейдеров", "sv_SE": "Sökväg för Graphics Shader Dump:", "th_TH": "ที่เก็บ ดัมพ์ไฟล์ แสงเงา:", @@ -5587,7 +5862,7 @@ "ko_KR": "파일에 로그 기록 활성화", "no_NO": "Aktiver logging til fil", "pl_PL": "Włącz rejestrowanie zdarzeń do pliku", - "pt_BR": "Salvar logs em arquivo", + "pt_BR": "Salvar Logs em Arquivo", "ru_RU": "Включить запись в файл", "sv_SE": "Aktivera loggning till fil", "th_TH": "เปิดใช้งานการบันทึกประวัติ ไปยังไฟล์", @@ -5612,7 +5887,7 @@ "ko_KR": "조각 기록 활성화", "no_NO": "Aktiver Stub-logger", "pl_PL": "Wlącz Skróty Logów", - "pt_BR": "Habilitar logs de stub", + "pt_BR": "Habilitar logs de Stub", "ru_RU": "Включить журнал-заглушку", "sv_SE": "Aktivera stubbloggar", "th_TH": "เปิดใช้งานการบันทึกประวัติ", @@ -5637,7 +5912,7 @@ "ko_KR": "정보 기록 활성화", "no_NO": "Aktiver informasjonslogger", "pl_PL": "Włącz Logi Informacyjne", - "pt_BR": "Habilitar logs de informação", + "pt_BR": "Habilitar logs de Informação", "ru_RU": "Включить информационный журнал", "sv_SE": "Aktivera informationsloggar", "th_TH": "เปิดใช้งานการบันทึกประวัติการใช้งาน", @@ -5662,7 +5937,7 @@ "ko_KR": "경고 기록 활성화", "no_NO": "Aktiver varsellogger", "pl_PL": "Włącz Logi Ostrzeżeń", - "pt_BR": "Habilitar logs de alerta", + "pt_BR": "Habilitar Logs de Alerta", "ru_RU": "Включить журнал предупреждений", "sv_SE": "Aktivera varningsloggar", "th_TH": "เปิดใช้งานการบันทึกประวัติคำเตือน", @@ -5687,7 +5962,7 @@ "ko_KR": "오류 기록 활성화", "no_NO": "Aktiver feillogger", "pl_PL": "Włącz Logi Błędów", - "pt_BR": "Habilitar logs de erro", + "pt_BR": "Habilitar Logs de Erro", "ru_RU": "Включить журнал ошибок", "sv_SE": "Aktivera felloggar", "th_TH": "เปิดใช้งานการบันทึกประวัติข้อผิดพลาด", @@ -5712,7 +5987,7 @@ "ko_KR": "추적 기록 활성화", "no_NO": "Aktiver spor logger", "pl_PL": "Włącz Logi Śledzenia", - "pt_BR": "Habilitar logs de rastreamento", + "pt_BR": "Habilitar Logs de Rastreamento", "ru_RU": "Включить журнал трассировки", "sv_SE": "Aktivera spårloggar", "th_TH": "เปิดใช้งานการบันทึกประวัติการติดตาม", @@ -5737,7 +6012,7 @@ "ko_KR": "방문 기록 활성화", "no_NO": "Aktiver gjestelogger", "pl_PL": "Włącz Logi Gości", - "pt_BR": "Habilitar logs do programa convidado", + "pt_BR": "Habilitar Logs de Convidados", "ru_RU": "Включить гостевые журналы", "sv_SE": "Aktivera gästloggar", "th_TH": "เปิดใช้งานการบันทึกประวัติผู้เยี่ยมชม", @@ -5760,15 +6035,15 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Aktivere UI-logger", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Habilitar Logs da IU", "ru_RU": "", "sv_SE": "", "th_TH": "", "tr_TR": "", "uk_UA": "", - "zh_CN": "", + "zh_CN": "启用 UI 日志", "zh_TW": "" } }, @@ -5787,7 +6062,7 @@ "ko_KR": "파일 시스템 접속 기록 활성화", "no_NO": "Aktiver Fs tilgangslogger", "pl_PL": "Włącz Logi Dostępu do Systemu Plików", - "pt_BR": "Habilitar logs de acesso ao sistema de arquivos", + "pt_BR": "Habilitar Logs de Acesso Fs", "ru_RU": "Включить журналы доступа файловой системы", "sv_SE": "Aktivera loggar för filsystemsåtkomst", "th_TH": "เปิดใช้งานการบันทึกประวัติการเข้าถึง Fs", @@ -5812,7 +6087,7 @@ "ko_KR": "파일 시스템 전역 접속 로그 모드 :", "no_NO": "Fs Global Access-logg-modus:", "pl_PL": "Tryb globalnego dziennika zdarzeń systemu plików:", - "pt_BR": "Modo global de logs do sistema de arquivos:", + "pt_BR": "Modo de Log de Acesso Global Fs:", "ru_RU": "Режим журнала глобального доступа файловой системы:", "sv_SE": "Loggläge för global filsystemsåtkomst:", "th_TH": "โหมด การเข้าถึงประวัติส่วนกลาง:", @@ -5837,7 +6112,7 @@ "ko_KR": "개발자 옵션", "no_NO": "Utvikleralternativer", "pl_PL": "Opcje programisty (UWAGA: wpływa na wydajność)", - "pt_BR": "Opções do desenvolvedor (AVISO: Vai reduzir a performance)", + "pt_BR": "Opções do desenvolvedor", "ru_RU": "Параметры разработчика", "sv_SE": "Utvecklarinställningar", "th_TH": "ตัวเลือกนักพัฒนา", @@ -5887,7 +6162,7 @@ "ko_KR": "그래픽 후단부 기록 레벨 :", "no_NO": "Grafikk Backend-loggnivå:", "pl_PL": "Poziom rejestrowania do dziennika zdarzeń Backendu Graficznego:", - "pt_BR": "Nível de log do backend gráfico:", + "pt_BR": "Nível de Log do Renderizador Gráfico:", "ru_RU": "Уровень журнала бэкенда графики:", "sv_SE": "Loggnivå för grafikbakände:", "th_TH": "ระดับการบันทึกประวัติ กราฟิกเบื้องหลัง:", @@ -6012,7 +6287,7 @@ "ko_KR": "디버그 기록 활성화", "no_NO": "Aktiver feilsøkingslogger", "pl_PL": "Włącz dzienniki zdarzeń do debugowania", - "pt_BR": "Habilitar logs de depuração", + "pt_BR": "Habilitar Logs de Depuração", "ru_RU": "Включить журнал отладки", "sv_SE": "Aktivera felsökningsloggar", "th_TH": "เปิดใช้งาน ประวัติข้อบกพร่อง", @@ -6062,7 +6337,7 @@ "ko_KR": "도킹 모드", "no_NO": "Forankret modus", "pl_PL": "Tryb zadokowany", - "pt_BR": "Habilitar modo TV", + "pt_BR": "Modo TV", "ru_RU": "Стационарный режим", "sv_SE": "Dockat läge", "th_TH": "ด็อกโหมด", @@ -6087,7 +6362,7 @@ "ko_KR": "키보드 직접 접속", "no_NO": "Direkte tastaturtilgang", "pl_PL": "Bezpośredni dostęp do klawiatury", - "pt_BR": "Acesso direto ao teclado", + "pt_BR": "Acesso Direto ao Teclado", "ru_RU": "Прямой ввод клавиатуры", "sv_SE": "Direkt tangentbordsåtkomst", "th_TH": "เข้าถึงคีย์บอร์ดโดยตรง", @@ -6160,9 +6435,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Tilbakestill innstillinger", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Redefinir Configurações", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -6185,9 +6460,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Jeg vil tilbakestille innstillingene mine.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Quero redefinir minhas configurações.", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -6214,7 +6489,7 @@ "pl_PL": "", "pt_BR": "", "ru_RU": "", - "sv_SE": "", + "sv_SE": "Ok", "th_TH": "ตกลง", "tr_TR": "Tamam", "uk_UA": "", @@ -6537,7 +6812,7 @@ "ko_KR": "입력 장치", "no_NO": "Inndataenhet", "pl_PL": "Urządzenie wejściowe", - "pt_BR": "Dispositivo de entrada", + "pt_BR": "Dispositivo de Entrada", "ru_RU": "Устройство ввода", "sv_SE": "Inmatningsenhet", "th_TH": "อุปกรณ์ป้อนข้อมูล", @@ -6612,7 +6887,7 @@ "ko_KR": "컨트롤러 유형", "no_NO": "Kontrollertype", "pl_PL": "Typ kontrolera", - "pt_BR": "Tipo do controle", + "pt_BR": "Tipo de Controle", "ru_RU": "Тип контроллера", "sv_SE": "Kontrollertyp", "th_TH": "ประเภทคอนโทรลเลอร์", @@ -6712,7 +6987,7 @@ "ko_KR": "좌측 조이콘", "no_NO": "JoyCon venstre", "pl_PL": "Lewy JoyCon", - "pt_BR": "JoyCon esquerdo", + "pt_BR": "JoyCon Esquerdo", "ru_RU": "JoyCon (левый)", "sv_SE": "JoyCon vänster", "th_TH": "จอยคอน ด้านซ้าย", @@ -6737,7 +7012,7 @@ "ko_KR": "우측 조이콘", "no_NO": "JoyCon høyre", "pl_PL": "Prawy JoyCon", - "pt_BR": "JoyCon direito", + "pt_BR": "JoyCon Direito", "ru_RU": "JoyCon (правый)", "sv_SE": "JoyCon höger", "th_TH": "จอยคอน ด้านขวา", @@ -7062,7 +7337,7 @@ "ko_KR": "방향키", "no_NO": "Retningsfelt", "pl_PL": "Krzyżak (D-Pad)", - "pt_BR": "Direcional", + "pt_BR": "Direcional (D-Pad)", "ru_RU": "Кнопки направления (D-pad)", "sv_SE": "Riktningsknappar", "th_TH": "ปุ่มลูกศร", @@ -7337,7 +7612,7 @@ "ko_KR": "스틱 X축 반전", "no_NO": "Inverter Styrespak X", "pl_PL": "Odwróć gałkę X", - "pt_BR": "Inverter eixo X", + "pt_BR": "Inverter Eixo X", "ru_RU": "Инвертировать ось X", "sv_SE": "Invertera Spak X", "th_TH": "กลับทิศทางของแกน X", @@ -7362,7 +7637,7 @@ "ko_KR": "스틱 Y축 반전", "no_NO": "Inverter Styrespak Y", "pl_PL": "Odwróć gałkę Y", - "pt_BR": "Inverter eixo Y", + "pt_BR": "Inverter Eixo Y", "ru_RU": "Инвертировать ось Y", "sv_SE": "Invertera Spak Y", "th_TH": "กลับทิศทางของแกน Y", @@ -7387,7 +7662,7 @@ "ko_KR": "데드존 :", "no_NO": "Død sone:", "pl_PL": "Martwa strefa:", - "pt_BR": "Zona morta:", + "pt_BR": "Zona Morta:", "ru_RU": "Мёртвая зона:", "sv_SE": "Dödläge:", "th_TH": "โซนที่ไม่ทำงานของ จอยสติ๊ก:", @@ -7412,7 +7687,7 @@ "ko_KR": "좌측 스틱", "no_NO": "Venstre styrespak", "pl_PL": "Lewa Gałka", - "pt_BR": "Analógico esquerdo", + "pt_BR": "Analógico Esquerdo", "ru_RU": "Левый стик", "sv_SE": "Vänster spak", "th_TH": "จอยสติ๊ก ด้านซ้าย", @@ -7437,7 +7712,7 @@ "ko_KR": "우측 스틱", "no_NO": "Høyre styrespak", "pl_PL": "Prawa Gałka", - "pt_BR": "Analógico direito", + "pt_BR": "Analógico Direito", "ru_RU": "Правый стик", "sv_SE": "Höger spak", "th_TH": "จอยสติ๊ก ด้านขวา", @@ -7462,7 +7737,7 @@ "ko_KR": "좌측 트리거", "no_NO": "Utløsere venstre", "pl_PL": "Lewe Triggery", - "pt_BR": "Gatilhos esquerda", + "pt_BR": "Gatilho Esquerda", "ru_RU": "Триггеры слева", "sv_SE": "Avtryckare vänster", "th_TH": "ทริกเกอร์ ด้านซ้าย", @@ -7487,7 +7762,7 @@ "ko_KR": "우측 트리거", "no_NO": "Utløsere høyre", "pl_PL": "Prawe Triggery", - "pt_BR": "Gatilhos direita", + "pt_BR": "Gatilho Direita", "ru_RU": "Триггеры справа", "sv_SE": "Avtryckare höger", "th_TH": "ทริกเกอร์ ด้านขวา", @@ -7512,7 +7787,7 @@ "ko_KR": "좌측 트리거 버튼", "no_NO": "Utløserknapper Venstre", "pl_PL": "Lewe Przyciski Triggerów", - "pt_BR": "Botões de gatilho esquerda", + "pt_BR": "Botões de Gatilho da Esquerda", "ru_RU": "Триггерные кнопки слева", "sv_SE": "Avtryckare knappar vänster", "th_TH": "ปุ่มทริกเกอร์ ด้านซ้าย", @@ -7537,7 +7812,7 @@ "ko_KR": "우측 트리거 버튼", "no_NO": "Utløserknapper høyre", "pl_PL": "Prawe Przyciski Triggerów", - "pt_BR": "Botões de gatilho direita", + "pt_BR": "Botões de Gatilho da Direita", "ru_RU": "Триггерные кнопки справа", "sv_SE": "Avtryckare knappar höger", "th_TH": "ปุ่มทริกเกอร์ ด้านขวา", @@ -7787,7 +8062,7 @@ "ko_KR": "좌측 버튼", "no_NO": "Knapper til venstre", "pl_PL": "Lewe Przyciski", - "pt_BR": "Botões esquerda", + "pt_BR": "Botões da Esquerda", "ru_RU": "Левые кнопки", "sv_SE": "Knappar vänster", "th_TH": "ปุ่มกดเสริม ด้านซ้าย", @@ -7812,7 +8087,7 @@ "ko_KR": "우측 버튼", "no_NO": "Knapper til høyre", "pl_PL": "Prawe Przyciski", - "pt_BR": "Botões direita", + "pt_BR": "Botões da Direita", "ru_RU": "Правые кнопки", "sv_SE": "Knappar höger", "th_TH": "ปุ่มกดเสริม ด้านขวา", @@ -7862,7 +8137,7 @@ "ko_KR": "트리거 임계값 :", "no_NO": "Utløser terskel:", "pl_PL": "Próg Triggerów:", - "pt_BR": "Sensibilidade do gatilho:", + "pt_BR": "Sensibilidade do Gatilho:", "ru_RU": "Порог срабатывания:", "sv_SE": "Tröskelvärde avtryckare:", "th_TH": "ตั้งค่าขีดจำกัดการกด:", @@ -7887,7 +8162,7 @@ "ko_KR": "모션", "no_NO": "Bevegelse", "pl_PL": "Ruch", - "pt_BR": "Sensor de movimento", + "pt_BR": "Sensor de Movimento", "ru_RU": "Движение", "sv_SE": "Rörelse", "th_TH": "การเคลื่อนไหว", @@ -7912,7 +8187,7 @@ "ko_KR": "CemuHook 호환 모션 사용", "no_NO": "Bruk CemuHook kompatibel bevegelse", "pl_PL": "Użyj ruchu zgodnego z CemuHook", - "pt_BR": "Usar sensor compatível com CemuHook", + "pt_BR": "Usar Sensor Compatível com CemuHook", "ru_RU": "Включить совместимость с CemuHook", "sv_SE": "Använd CemuHook-kompatibel rörelse", "th_TH": "ใช้การเคลื่อนไหวที่เข้ากันได้กับ CemuHook", @@ -7937,7 +8212,7 @@ "ko_KR": "컨트롤러 슬롯 :", "no_NO": "Kontrollertype:", "pl_PL": "Slot Kontrolera:", - "pt_BR": "Slot do controle:", + "pt_BR": "Slot do Controle:", "ru_RU": "Слот контроллера:", "sv_SE": "Kontrollerplats:", "th_TH": "ช่องเสียบ คอนโทรลเลอร์:", @@ -7962,7 +8237,7 @@ "ko_KR": "미러 입력", "no_NO": "Speilvend", "pl_PL": "Odzwierciedlaj Sterowanie", - "pt_BR": "Espelhar movimento", + "pt_BR": "Espelhar Movimento", "ru_RU": "Зеркальный ввод", "sv_SE": "Spegla inmatning", "th_TH": "นำเข้าการสะท้อน การควบคุม", @@ -7987,7 +8262,7 @@ "ko_KR": "우측 조이콘 슬롯:", "no_NO": "Høyre JoyCon set:", "pl_PL": "Prawy Slot JoyCon:", - "pt_BR": "Slot do JoyCon direito:", + "pt_BR": "Slot do JoyCon Direito:", "ru_RU": "Слот правого JoyCon:", "sv_SE": "Höger JoyCon-plats:", "th_TH": "ช่องเสียบ จอยคอน ด้านขวา:", @@ -8012,7 +8287,7 @@ "ko_KR": "서버 호스트 :", "no_NO": "Server Vert:", "pl_PL": "Host Serwera:", - "pt_BR": "Endereço do servidor:", + "pt_BR": "Endereço do Servidor:", "ru_RU": "Хост сервера:", "sv_SE": "Servervärd:", "th_TH": "เจ้าของเซิร์ฟเวอร์:", @@ -8037,7 +8312,7 @@ "ko_KR": "자이로 감도 :", "no_NO": "Gyro følsomhet:", "pl_PL": "Czułość Żyroskopu:", - "pt_BR": "Sensibilidade do giroscópio:", + "pt_BR": "Sensibilidade do Giroscópio:", "ru_RU": "Чувствительность гироскопа:", "sv_SE": "Känslighet för gyro:", "th_TH": "ความไวของ Gyro:", @@ -8062,7 +8337,7 @@ "ko_KR": "자이로 데드존 :", "no_NO": "Gyro Dødsone:", "pl_PL": "Deadzone Żyroskopu:", - "pt_BR": "Zona morta do giroscópio:", + "pt_BR": "Zona Morta do Giroscópio:", "ru_RU": "Мертвая зона гироскопа:", "sv_SE": "Dödläge för gyro:", "th_TH": "ส่วนไม่ทำงานของ Gyro:", @@ -8110,11 +8385,11 @@ "it_IT": "", "ja_JP": "", "ko_KR": "비활성화", - "no_NO": "", + "no_NO": "Deaktiver", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Desabilitar", "ru_RU": "", - "sv_SE": "", + "sv_SE": "Inaktivera", "th_TH": "", "tr_TR": "", "uk_UA": "", @@ -8135,11 +8410,11 @@ "it_IT": "", "ja_JP": "", "ko_KR": "레인보우", - "no_NO": "", + "no_NO": "Regnbue", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Arco-íris", "ru_RU": "", - "sv_SE": "", + "sv_SE": "Regnbåge", "th_TH": "", "tr_TR": "", "uk_UA": "", @@ -8160,9 +8435,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "레인보우 속도", - "no_NO": "", + "no_NO": "Regnbue Hastighet", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Velocidade do Arco-íris", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -8185,11 +8460,11 @@ "it_IT": "", "ja_JP": "", "ko_KR": "색상", - "no_NO": "", + "no_NO": "Farge", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Cor", "ru_RU": "", - "sv_SE": "", + "sv_SE": "Färg", "th_TH": "", "tr_TR": "", "uk_UA": "", @@ -8262,7 +8537,7 @@ "ko_KR": "알 수 없음", "no_NO": "Ukjent", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Desconhecido", "ru_RU": "Неизвестно", "sv_SE": "Okänd", "th_TH": "ไม่รู้จัก", @@ -8287,7 +8562,7 @@ "ko_KR": "좌측 Shift", "no_NO": "Skift venstre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Shift Esquerdo", "ru_RU": "Левый Shift", "sv_SE": "Skift vänster", "th_TH": "", @@ -8312,7 +8587,7 @@ "ko_KR": "우측 Shift", "no_NO": "Skift høyre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Shift Direito", "ru_RU": "Правый Shift", "sv_SE": "Skift höger", "th_TH": "", @@ -8337,7 +8612,7 @@ "ko_KR": "좌측 Ctrl", "no_NO": "Ctrl venstre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Ctrl Esquerdo", "ru_RU": "Левый Ctrl", "sv_SE": "Ctrl vänster", "th_TH": "", @@ -8362,7 +8637,7 @@ "ko_KR": "좌측 ⌃", "no_NO": "⌃ Venstre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "⌃ Esquerda", "ru_RU": "Левый ⌃", "sv_SE": "^ Vänster", "th_TH": "", @@ -8387,7 +8662,7 @@ "ko_KR": "우측 Ctrl", "no_NO": "Ctrl høyre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Ctrl Direito", "ru_RU": "Правый Ctrl", "sv_SE": "Ctrl höger", "th_TH": "", @@ -8412,7 +8687,7 @@ "ko_KR": "우측 ⌃", "no_NO": "⌃ Høyre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "⌃ Direito", "ru_RU": "Правый ⌃", "sv_SE": "^ Höger", "th_TH": "", @@ -8437,7 +8712,7 @@ "ko_KR": "좌측 Alt", "no_NO": "Alt Venstre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Alt Esquerdo", "ru_RU": "Левый Alt", "sv_SE": "Alt vänster", "th_TH": "", @@ -8462,7 +8737,7 @@ "ko_KR": "좌측 ⌥", "no_NO": "⌥ Venstre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "⌥ Esquerda", "ru_RU": "Левый ⌥", "sv_SE": "⌥ vänster", "th_TH": "", @@ -8487,7 +8762,7 @@ "ko_KR": "우측 Alt", "no_NO": "Alt høyre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Alt Direito", "ru_RU": "Правый Alt", "sv_SE": "Alt höger", "th_TH": "", @@ -8512,7 +8787,7 @@ "ko_KR": "우측 ⌥", "no_NO": "⌥ Høyre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "⌥ Direito", "ru_RU": "Правый ⌥", "sv_SE": "⌥ höger", "th_TH": "", @@ -8537,7 +8812,7 @@ "ko_KR": "좌측 ⊞", "no_NO": "⊞ Venstre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "⊞ Esquerdo", "ru_RU": "Левый ⊞", "sv_SE": "⊞ vänster", "th_TH": "", @@ -8562,7 +8837,7 @@ "ko_KR": "좌측 ⌘", "no_NO": "⌘ Venstre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "⌘ Esquerdo", "ru_RU": "Левый ⌘", "sv_SE": "⌘ vänster", "th_TH": "", @@ -8587,7 +8862,7 @@ "ko_KR": "우측 ⊞", "no_NO": "⊞ Høyre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "⊞ Direito", "ru_RU": "Правый ⊞", "sv_SE": "⊞ höger", "th_TH": "", @@ -8612,7 +8887,7 @@ "ko_KR": "우측 ⌘", "no_NO": "⌘ Høyre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "⌘ Direito", "ru_RU": "Правый ⌘", "sv_SE": "⌘ höger", "th_TH": "", @@ -8662,7 +8937,7 @@ "ko_KR": "↑", "no_NO": "Opp", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Cima", "ru_RU": "Вверх", "sv_SE": "Upp", "th_TH": "", @@ -8687,7 +8962,7 @@ "ko_KR": "↓", "no_NO": "Ned", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Baixo", "ru_RU": "Вниз", "sv_SE": "Ner", "th_TH": "", @@ -8712,7 +8987,7 @@ "ko_KR": "←", "no_NO": "Venstre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Esquerda", "ru_RU": "Влево", "sv_SE": "Vänster", "th_TH": "", @@ -8737,7 +9012,7 @@ "ko_KR": "→", "no_NO": "Høyre", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Direita", "ru_RU": "Вправо", "sv_SE": "Höger", "th_TH": "", @@ -8787,7 +9062,7 @@ "ko_KR": "Esc", "no_NO": "Esc-tast", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Esc", "ru_RU": "Esc", "sv_SE": "", "th_TH": "", @@ -8812,7 +9087,7 @@ "ko_KR": "스페이스", "no_NO": "Mellomrom", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Espaço", "ru_RU": "Пробел", "sv_SE": "Blanksteg", "th_TH": "", @@ -10137,7 +10412,7 @@ "ko_KR": "연동 해제", "no_NO": "Ikke bundet", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Não Atribuído", "ru_RU": "Не привязано", "sv_SE": "Obunden", "th_TH": "", @@ -10787,7 +11062,7 @@ "ko_KR": "선택된 사용자 프로필 :", "no_NO": "Valgt brukerprofil:", "pl_PL": "Wybrany profil użytkownika:", - "pt_BR": "Perfil de usuário selecionado:", + "pt_BR": "Perfil de Usuário Selecionado:", "ru_RU": "Выбранный пользовательский профиль:", "sv_SE": "Vald användarprofil:", "th_TH": "เลือกโปรไฟล์ผู้ใช้งาน:", @@ -10812,7 +11087,7 @@ "ko_KR": "프로필 이름 저장", "no_NO": "Lagre profilnavnet", "pl_PL": "Zapisz nazwę profilu", - "pt_BR": "Salvar nome de perfil", + "pt_BR": "Salvar Nome de Perfil", "ru_RU": "Сохранить пользовательский профиль", "sv_SE": "Spara profilnamn", "th_TH": "บันทึกชื่อโปรไฟล์", @@ -10837,7 +11112,7 @@ "ko_KR": "프로필 이미지 변경", "no_NO": "Endre profilbilde", "pl_PL": "Zmień obrazek profilu", - "pt_BR": "Mudar imagem de perfil", + "pt_BR": "Mudar Imagem de Perfil", "ru_RU": "Изменить аватар", "sv_SE": "Byt profilbild", "th_TH": "เปลี่ยนรูปโปรไฟล์", @@ -10862,7 +11137,7 @@ "ko_KR": "사용 가능한 사용자 프로필 :", "no_NO": "Tilgjengelige brukerprofiler:", "pl_PL": "Dostępne profile użytkownika:", - "pt_BR": "Perfis de usuário disponíveis:", + "pt_BR": "Perfis de Usuário Disponíveis:", "ru_RU": "Доступные профили пользователей:", "sv_SE": "Tillgängliga användarprofiler:", "th_TH": "โปรไฟล์ผู้ใช้ที่ใช้งานได้:", @@ -10887,7 +11162,7 @@ "ko_KR": "프로필 만들기", "no_NO": "Opprett Profil", "pl_PL": "Utwórz profil", - "pt_BR": "Adicionar novo perfil", + "pt_BR": "Criar Perfil", "ru_RU": "Добавить новый профиль", "sv_SE": "Skapa profil", "th_TH": "สร้างโปรไฟล์ใหม่", @@ -10962,7 +11237,7 @@ "ko_KR": "별명 선택", "no_NO": "Velg ett kallenavn", "pl_PL": "Wybierz pseudonim", - "pt_BR": "Escolha um apelido", + "pt_BR": "Escolha um Apelido", "ru_RU": "Введите никнейм", "sv_SE": "Välj ett smeknamn", "th_TH": "เลือก ชื่อเล่น", @@ -10987,7 +11262,7 @@ "ko_KR": "프로필 이미지 선택", "no_NO": "Valg av profilbilde", "pl_PL": "Wybór Obrazu Profilu", - "pt_BR": "Seleção da imagem de perfil", + "pt_BR": "Seleção da Imagem de Perfil", "ru_RU": "Выбор изображения профиля", "sv_SE": "Välj profilbild", "th_TH": "เลือก รูปโปรไฟล์ ของคุณ", @@ -11012,7 +11287,7 @@ "ko_KR": "프로필 이미지를 선택", "no_NO": "Velg et profilbilde", "pl_PL": "Wybierz zdjęcie profilowe", - "pt_BR": "Escolha uma imagem de perfil", + "pt_BR": "Escolha uma Imagem de Perfil", "ru_RU": "Выбор аватара", "sv_SE": "Välj en profilbild", "th_TH": "เลือก รูปโปรไฟล์", @@ -11062,7 +11337,7 @@ "ko_KR": "이미지 파일 가져오기", "no_NO": "Importer bildefil", "pl_PL": "Importuj Plik Obrazu", - "pt_BR": "Importar arquivo de imagem", + "pt_BR": "Importar Arquivo de Imagem", "ru_RU": "Импорт изображения", "sv_SE": "Importera bildfil", "th_TH": "นำเข้า ไฟล์รูปภาพ", @@ -11087,7 +11362,7 @@ "ko_KR": "펌웨어 아바타 선택", "no_NO": "Velg fastvare profilbilde", "pl_PL": "Wybierz domyślny awatar z oprogramowania konsoli", - "pt_BR": "Selecionar avatar do firmware", + "pt_BR": "Selecionar Avatar do Firmware", "ru_RU": "Встроенные аватары", "sv_SE": "Välj avatar från firmware", "th_TH": "เลือก รูปอวาต้า จากระบบ", @@ -11187,7 +11462,7 @@ "ko_KR": "취소하기", "no_NO": "Kansellerer", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Cancelando", "ru_RU": "Отмена", "sv_SE": "Avbryter", "th_TH": "", @@ -11212,7 +11487,7 @@ "ko_KR": "닫기", "no_NO": "Lukk", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Fechar", "ru_RU": "Закрыть", "sv_SE": "Stäng", "th_TH": "", @@ -11237,7 +11512,7 @@ "ko_KR": "프로필 이름 선택", "no_NO": "Velg profilnavnet", "pl_PL": "Wybierz nazwę profilu", - "pt_BR": "Escolha o nome de perfil", + "pt_BR": "Escolha o Nome de Perfil", "ru_RU": "Выберите никнейм", "sv_SE": "Välj ett profilnamn", "th_TH": "เลือก ชื่อโปรไฟล์", @@ -11262,7 +11537,7 @@ "ko_KR": "프로필 이름을 입력", "no_NO": "Vennligst skriv inn et profilnavn", "pl_PL": "Wprowadź nazwę profilu", - "pt_BR": "Escreva o nome do perfil", + "pt_BR": "Escreva o Nome do Perfil", "ru_RU": "Пожалуйста, введите никнейм", "sv_SE": "Ange ett profilnamn", "th_TH": "กรุณาใส่ชื่อโปรไฟล์", @@ -11287,7 +11562,7 @@ "ko_KR": "(최대 길이 : {0})", "no_NO": "(Maks lengde: {0})", "pl_PL": "(Maksymalna długość: {0})", - "pt_BR": "(Máximo de caracteres: {0})", + "pt_BR": "(Máximo de Caracteres: {0})", "ru_RU": "(Максимальная длина: {0})", "sv_SE": "(Max längd: {0})", "th_TH": "(ความยาวสูงสุด: {0})", @@ -11312,7 +11587,7 @@ "ko_KR": "아바타 선택", "no_NO": "Velg profilbilde", "pl_PL": "Wybierz awatar", - "pt_BR": "Escolher", + "pt_BR": "Escolha o Avatar", "ru_RU": "Выбрать аватар", "sv_SE": "Välj avatar", "th_TH": "เลือก รูปอวาต้า ของคุณ", @@ -11337,7 +11612,7 @@ "ko_KR": "배경색 설정", "no_NO": "Angi bakgrunnsfarge", "pl_PL": "Ustaw kolor tła", - "pt_BR": "Definir cor de fundo", + "pt_BR": "Definir cor de Fundo", "ru_RU": "Установить цвет фона", "sv_SE": "Välj bakgrundsfärg", "th_TH": "ตั้งค่าสีพื้นหลัง", @@ -11387,7 +11662,7 @@ "ko_KR": "프로필 불러오기", "no_NO": "Last inn profil", "pl_PL": "Wczytaj profil", - "pt_BR": "Carregar perfil", + "pt_BR": "Carregar Perfil", "ru_RU": "Загрузить профиль", "sv_SE": "Läs in profil", "th_TH": "โหลด โปรไฟล์", @@ -11412,7 +11687,7 @@ "ko_KR": "프로필 보기", "no_NO": "Se Profil", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Ver Perfil", "ru_RU": "Показать профиль", "sv_SE": "Visa profil", "th_TH": "", @@ -11437,7 +11712,7 @@ "ko_KR": "프로필 추가", "no_NO": "Legg til profil", "pl_PL": "Dodaj profil", - "pt_BR": "Adicionar perfil", + "pt_BR": "Adicionar Perfil", "ru_RU": "Добавить профиль", "sv_SE": "Lägg till profil", "th_TH": "เพิ่ม โปรไฟล์", @@ -11462,7 +11737,7 @@ "ko_KR": "프로필 삭제", "no_NO": "Fjern profil", "pl_PL": "Usuń profil", - "pt_BR": "Remover perfil", + "pt_BR": "Remover Perfil", "ru_RU": "Удалить профиль", "sv_SE": "Ta bort profil", "th_TH": "ลบ โปรไฟล์", @@ -11487,7 +11762,7 @@ "ko_KR": "프로필 추가", "no_NO": "Lagre Profil", "pl_PL": "Zapisz profil", - "pt_BR": "Salvar perfil", + "pt_BR": "Salvar Perfil", "ru_RU": "Сохранить профиль", "sv_SE": "Spara profil", "th_TH": "บันทึก โปรไฟล์", @@ -11512,7 +11787,7 @@ "ko_KR": "스크린샷 찍기", "no_NO": "Ta skjermbilde", "pl_PL": "Zrób zrzut ekranu", - "pt_BR": "Salvar captura de tela", + "pt_BR": "Tirar Captura de tela", "ru_RU": "Сделать снимок экрана", "sv_SE": "Ta skärmbild", "th_TH": "ถ่ายภาพหน้าจอ", @@ -11587,7 +11862,7 @@ "ko_KR": "즐겨찾기 전환", "no_NO": "Vis/Skjul favoritter", "pl_PL": "Przełącz na ulubione", - "pt_BR": "Alternar favorito", + "pt_BR": "Marcar como Favorito", "ru_RU": "Добавить в избранное", "sv_SE": "Växla som favorit", "th_TH": "สลับรายการโปรด", @@ -11612,7 +11887,7 @@ "ko_KR": "게임의 즐겨찾기 상태 전환", "no_NO": "Vis/Skjul favorittstatus for spillet", "pl_PL": "Przełącz status Ulubionej Gry", - "pt_BR": "Marca ou desmarca jogo como favorito", + "pt_BR": "Marca ou desmarca o jogo como favorito", "ru_RU": "Добавляет игру в избранное и помечает звездочкой", "sv_SE": "Växla favoritstatus för spelet", "th_TH": "สลับสถานะเกมที่ชื่นชอบ", @@ -11787,7 +12062,7 @@ "ko_KR": "강력한 진동 증폭기", "no_NO": "Sterk Vibrasjon multiplikator", "pl_PL": "Mnożnik mocnych wibracji", - "pt_BR": "Multiplicador de vibração forte", + "pt_BR": "Multiplicador de Vibração Forte", "ru_RU": "Множитель сильной вибрации", "sv_SE": "Försvaga stark vibration", "th_TH": "เพิ่มความแรงการสั่น", @@ -11812,7 +12087,7 @@ "ko_KR": "약한 진동 증폭기", "no_NO": "Svak Vibrasjon multiplikator", "pl_PL": "Mnożnik słabych wibracji", - "pt_BR": "Multiplicador de vibração fraca", + "pt_BR": "Multiplicador de Vibração Fraca", "ru_RU": "Множитель слабой вибрации", "sv_SE": "Förstärk svag vibration", "th_TH": "ลดความแรงการสั่น", @@ -11862,7 +12137,7 @@ "ko_KR": "이 게임의 저장 데이터를 만들겠습니까?", "no_NO": "Vil du lage lagrede data for dette spillet", "pl_PL": "Czy chcesz utworzyć zapis danych dla tej gry?", - "pt_BR": "Gostaria de criar o diretório de salvamento para esse jogo?", + "pt_BR": "Você gostaria de criar dados salvos para este jogo?", "ru_RU": "Создать сохранение для этой игры?", "sv_SE": "Vill du skapa sparat spel för detta spel?", "th_TH": "คุณต้องการสร้างบันทึกข้อมูลสำหรับเกมนี้หรือไม่?", @@ -12087,7 +12362,7 @@ "ko_KR": "지정된 저장 데이터를 생성하는 동안 오류가 발생 : {0}", "no_NO": "Det oppstod en feil under oppretting av den angitte lagredata: {0}", "pl_PL": "Wystąpił błąd podczas tworzenia określonych zapisanych danych: {0}", - "pt_BR": "Ocorreu um erro ao criar o diretório de salvamento: {0}", + "pt_BR": "Ocorreu um erro ao criar os dados salvos especificados: {0}", "ru_RU": "Произошла ошибка при создании указанных данных сохранения: {0}", "sv_SE": "Det inträffade ett fel vid skapandet av angivet sparat spel: {0}", "th_TH": "มีข้อผิดพลาดในการสร้างข้อมูลบันทึกที่ระบุ: {0}", @@ -12112,7 +12387,7 @@ "ko_KR": "지정된 저장 데이터를 찾는 중 오류가 발생 : {0}", "no_NO": "Det oppstod en feil under oppretting av den angitte lagredata: {0}", "pl_PL": "Wystąpił błąd podczas próby znalezienia określonych zapisanych danych: {0}", - "pt_BR": "Ocorreu um erro ao tentar encontrar o diretório de salvamento: {0}", + "pt_BR": "Ocorreu um erro ao encontrar os dados salvos especificados: {0}", "ru_RU": "Произошла ошибка при поиске указанных данных сохранения: {0}", "sv_SE": "Det inträffade ett fel vid sökandet av angivet sparat spel: {0}", "th_TH": "มีข้อผิดพลาดในการค้นหาข้อมูลบันทึกที่ระบุไว้: {0}", @@ -12137,7 +12412,7 @@ "ko_KR": "압축을 풀 폴더를 선택", "no_NO": "Velg mappen å pakke ut i", "pl_PL": "Wybierz folder, do którego chcesz rozpakować", - "pt_BR": "Escolha o diretório onde os arquivos serão extraídos", + "pt_BR": "Escolha a pasta para extrair", "ru_RU": "Выберите папку для извлечения", "sv_SE": "Välj en mapp att extrahera till", "th_TH": "เลือกโฟลเดอร์ที่จะแตกไฟล์เข้าไป", @@ -12187,7 +12462,7 @@ "ko_KR": "NCA 단면 추출기", "no_NO": "Ryujinx - NCA Seksjon Ekstraktor", "pl_PL": "Asystent wypakowania sekcji NCA", - "pt_BR": "Extrator de seções NCA", + "pt_BR": "Extrator de Seções NCA", "ru_RU": "Извлечение разделов NCA", "sv_SE": "Ryujinx - Extrahera NCA-sektion", "th_TH": "เครื่องมือแตกไฟล์ของ NCA", @@ -12387,7 +12662,7 @@ "ko_KR": "GitHub에서 받은 Ryujinx 버전을 변환하지 못했습니다.", "no_NO": "Kan ikke konvertere mottatt Ryujinx-versjon fra GitHub Utgivelse.", "pl_PL": "Nie udało się przekonwertować otrzymanej wersji Ryujinx z Github Release.", - "pt_BR": "Falha ao converter a versão do Ryujinx recebida do AppVeyor.", + "pt_BR": "Falha ao converter a versão Ryujinx recebida do GitHub.", "ru_RU": "Не удалось преобразовать полученную версию Ryujinx из GitHub Release.", "sv_SE": "Misslyckades med att konvertera mottagen Ryujinx-version från GitHub.", "th_TH": "ไม่สามารถแปลงเวอร์ชั่น Ryujinx ที่ได้รับจาก GitHub Release", @@ -12412,7 +12687,7 @@ "ko_KR": "업데이트 내려받는 중...", "no_NO": "Laster ned oppdatering...", "pl_PL": "Pobieranie aktualizacji...", - "pt_BR": "Baixando atualização...", + "pt_BR": "Baixando Atualização...", "ru_RU": "Загрузка обновления...", "sv_SE": "Hämtar uppdatering...", "th_TH": "กำลังดาวน์โหลดอัปเดต...", @@ -12437,7 +12712,7 @@ "ko_KR": "업데이트 추출 중...", "no_NO": "Pakker ut oppdatering...", "pl_PL": "Wypakowywanie Aktualizacji...", - "pt_BR": "Extraindo atualização...", + "pt_BR": "Extraindo Atualização...", "ru_RU": "Извлечение обновления...", "sv_SE": "Extraherar uppdatering...", "th_TH": "กำลังแตกไฟล์อัปเดต...", @@ -12462,7 +12737,7 @@ "ko_KR": "이름 변경 업데이트...", "no_NO": "Endrer navn på oppdatering...", "pl_PL": "Zmiana Nazwy Aktualizacji...", - "pt_BR": "Renomeando atualização...", + "pt_BR": "Renomeando Atualização...", "ru_RU": "Переименование обновления...", "sv_SE": "Byter namn på uppdatering...", "th_TH": "กำลังลบไฟล์เก่า...", @@ -12487,7 +12762,7 @@ "ko_KR": "새 업데이트 추가 중...", "no_NO": "Legger til ny oppdatering...", "pl_PL": "Dodawanie Nowej Aktualizacji...", - "pt_BR": "Adicionando nova atualização...", + "pt_BR": "Adicionando Nova Atualização...", "ru_RU": "Добавление нового обновления...", "sv_SE": "Lägger till ny uppdatering...", "th_TH": "กำลังเพิ่มไฟล์อัปเดตใหม่...", @@ -12512,7 +12787,7 @@ "ko_KR": "변경 로그 보기", "no_NO": "Vis endringslogg", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Ver Registro de Alterações", "ru_RU": "Показать список изменений", "sv_SE": "Visa ändringslogg", "th_TH": "", @@ -12537,7 +12812,7 @@ "ko_KR": "업데이트가 완료되었습니다!", "no_NO": "Oppdateringen er fullført!", "pl_PL": "Aktualizacja Zakończona!", - "pt_BR": "Atualização concluída!", + "pt_BR": "Atualização Concluída!", "ru_RU": "Обновление завершено", "sv_SE": "Uppdatering färdig!", "th_TH": "อัปเดตเสร็จสมบูรณ์แล้ว!", @@ -12687,7 +12962,7 @@ "ko_KR": "다시 시작 필요", "no_NO": "Omstart Kreves", "pl_PL": "Wymagane Ponowne Uruchomienie", - "pt_BR": "Reinicialização necessária", + "pt_BR": "Reinicialização Necessária", "ru_RU": "Требуется перезапуск", "sv_SE": "Omstart krävs", "th_TH": "จำเป็นต้องรีสตาร์ทเพื่อให้การอัพเดตสามารถให้งานได้", @@ -12812,7 +13087,7 @@ "ko_KR": "펌웨어가 설치되어 있지 않음", "no_NO": "Ingen fastvare installert", "pl_PL": "Brak Zainstalowanego Firmware'u", - "pt_BR": "Firmware não foi instalado", + "pt_BR": "Nenhum Firmware Instalado", "ru_RU": "Прошивка не установлена", "sv_SE": "Inget firmware installerat", "th_TH": "ไม่มีการติดตั้งเฟิร์มแวร์", @@ -12962,7 +13237,7 @@ "ko_KR": "설정 창 열기", "no_NO": "Åpne innstillinger-vinduet", "pl_PL": "Otwórz Okno Ustawień", - "pt_BR": "Abrir janela de configurações", + "pt_BR": "Abrir Janela de Configurações", "ru_RU": "Открывает окно параметров", "sv_SE": "Öppna inställningar", "th_TH": "เปิดหน้าต่างการตั้งค่า", @@ -12987,7 +13262,7 @@ "ko_KR": "XCI 트리머 창", "no_NO": "XCI Trimmervindu", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Janela de Redução XCI", "ru_RU": "Окно триммера XCI", "sv_SE": "XCI-optimerare", "th_TH": "", @@ -13012,7 +13287,7 @@ "ko_KR": "컨트롤러 애플릿", "no_NO": "Kontroller Applet", "pl_PL": "Aplet Kontrolera", - "pt_BR": "Applet de controle", + "pt_BR": "Applet de Controle", "ru_RU": "Апплет контроллера", "sv_SE": "Handkontroller-applet", "th_TH": "คอนโทรลเลอร์ Applet", @@ -13312,7 +13587,7 @@ "ko_KR": "프로필 삭제하기", "no_NO": "Sletter profil", "pl_PL": "Usuwanie Profilu", - "pt_BR": "Apagando perfil", + "pt_BR": "Apagando Perfil", "ru_RU": "Удаление профиля", "sv_SE": "Tar bort profilen", "th_TH": "กำลังลบโปรไฟล์", @@ -13387,7 +13662,7 @@ "ko_KR": "다음에 부팅할 때, PPTC 재구축을 대기열에 추가하려고 합니다.\n\n{0}\n\n계속하시겠습니까?", "no_NO": "Du er i ferd med å bygge en PPTC i køen ved neste oppstart av:\n\n{0}\n\nEr du sikker på at du vil fortsette?", "pl_PL": "Masz zamiar umieścić w kolejce rekompilację PPTC przy następnym uruchomieniu:\n\n{0}\n\nCzy na pewno chcesz kontynuować?", - "pt_BR": "Você está prestes a apagar o cache PPTC para :\n\n{0}\n\nTem certeza que deseja continuar?", + "pt_BR": "Você está prestes a enfileirar uma reconstrução PPTC na próxima inicialização de:\n\n{0}\n\nTem certeza de que deseja continuar?", "ru_RU": "Вы собираетесь перестроить кэш PPTC при следующем запуске для:\n\n{0}\n\nВы уверены, что хотите продолжить?", "sv_SE": "Du är på väg att kölägga en PPTC rebuild vid nästa uppstart av:\n\n{0}\n\nÄr du säker på att du vill fortsätta?", "th_TH": "คุณกำลังตั้งค่าให้มีการสร้าง PPTC ใหม่ในการบูตครั้งถัดไป:\n\n{0}\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อหรือไม่?", @@ -13412,7 +13687,7 @@ "ko_KR": "{0}에서 PPTC 캐시를 지우는 중 오류 발생 : {1}", "no_NO": "Feil under rensing av PPTC cache ved {0}: {1}", "pl_PL": "Błąd czyszczenia cache PPTC w {0}: {1}", - "pt_BR": "Erro apagando cache PPTC em {0}: {1}", + "pt_BR": "Erro ao limpar cache PPTC em {0}: {1}", "ru_RU": "Ошибка очистки кэша PPTC в {0}: {1}", "sv_SE": "Fel vid tömning av PPTC-cache i {0}: {1}", "th_TH": "มีข้อผิดพลาดในการล้างแคช PPTC {0}: {1}", @@ -13435,9 +13710,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "다음에서 모든 PPTC 데이터를 제거하려고 합니다:\n\n{0}\n\n계속하시겠습니까?", - "no_NO": "", + "no_NO": "Du er i ferd med å slette alle PPTC-data fra:\n\n{0}\n\n\nEr du sikker på at du vil fortsette?", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Você está prestes a limpar todos os dados PPTC de:\n\n{0}\n\nTem certeza de que deseja continuar?", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -13487,7 +13762,7 @@ "ko_KR": "{0}에서 셰이더 캐시를 삭제하는 중 오류 발생 : {1}", "no_NO": "Feil under tømming av Shader cache ved {0}: {1}", "pl_PL": "Błąd czyszczenia cache Shaderów w {0}: {1}", - "pt_BR": "Erro apagando o cache de Shader em {0}: {1}", + "pt_BR": "Erro ao limpar o cache do Shader em {0}: {1}", "ru_RU": "Ошибка очистки кэша шейдеров в {0}: {1}", "sv_SE": "Fel vid tömning av shader cache i {0}: {1}", "th_TH": "เกิดข้อผิดพลาดในการล้าง แคชแสงเงา {0}: {1}", @@ -13587,7 +13862,7 @@ "ko_KR": "펌웨어 {0} 설치", "no_NO": "Installer fastvare {0}", "pl_PL": "Zainstaluj Firmware {0}", - "pt_BR": "Instalar firmware {0}", + "pt_BR": "Instalar Firmware {0}", "ru_RU": "Установить прошивку {0}", "sv_SE": "Installera firmware {0}", "th_TH": "ติดตั้งเฟิร์มแวร์ {0}", @@ -13737,7 +14012,7 @@ "ko_KR": "{0}에서 잘못된 키 파일이 발견", "no_NO": "En ugyldig Keys-fil ble funnet i {0}.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Um arquivo Chaves inválido foi encontrado em {0}", "ru_RU": "В {0} были найдены некорректные ключи", "sv_SE": "En ogiltig nyckelfil hittades i {0}", "th_TH": "", @@ -13762,7 +14037,7 @@ "ko_KR": "설치 키", "no_NO": "Installere nøkler", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Instalar Chaves", "ru_RU": "Установить ключи", "sv_SE": "Installera nycklar", "th_TH": "", @@ -13787,7 +14062,7 @@ "ko_KR": "새로운 키 파일이 설치됩니다.", "no_NO": "Ny Keys-fil vil bli installert.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O novo arquivo Chaves será instalado", "ru_RU": "Будут установлены новые ключи.", "sv_SE": "Ny nyckelfil kommer att installeras.", "th_TH": "", @@ -13812,7 +14087,7 @@ "ko_KR": "\n\n이로 인해 현재 설치된 키 중 일부가 대체될 수 있습니다.", "no_NO": "\n\nDette kan erstatte noen av de nåværende installerte nøklene.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "\n\nIsso pode substituir algumas das chaves instaladas atualmente.", "ru_RU": "\n\nЭто действие может перезаписать установленные ключи.", "sv_SE": "\n\nDetta kan ersätta några av de redan installerade nycklarna.", "th_TH": "", @@ -13837,7 +14112,7 @@ "ko_KR": "\n\n계속하시겠습니까?", "no_NO": "\n\nVil du fortsette?", "pl_PL": "", - "pt_BR": "", + "pt_BR": "\n\nVocê quer continuar?", "ru_RU": "\n\nХотите продолжить?", "sv_SE": "\n\nVill du fortsätta?", "th_TH": "", @@ -13862,7 +14137,7 @@ "ko_KR": "키 설치 중...", "no_NO": "Installere nøkler...", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Instalando Chaves...", "ru_RU": "Установка ключей...", "sv_SE": "Installerar nycklar...", "th_TH": "", @@ -13887,7 +14162,7 @@ "ko_KR": "새로운 키 파일이 성공적으로 설치되었습니다.", "no_NO": "Ny Keys -fil installert.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Novo arquivo de chaves instalado com sucesso.", "ru_RU": "Новые ключи были успешно установлены.", "sv_SE": "Ny nyckelfil installerades.", "th_TH": "", @@ -14387,7 +14662,7 @@ "ko_KR": "경고 - 후단부 스레딩", "no_NO": "Advarsel - Backend Tråd", "pl_PL": "Ostrzeżenie — Wątki Backend", - "pt_BR": "Alerta - Threading da API gráfica", + "pt_BR": "Alerta - Enfileiramento do Renderizador Gráfico", "ru_RU": "Предупреждение: многопоточность в бэкенде", "sv_SE": "Varning - Backend Threading", "th_TH": "คำเตือน - การทำเธรดแบ็กเอนด์", @@ -14512,7 +14787,7 @@ "ko_KR": "그래픽 후단부 다중 스레딩 :", "no_NO": "Grafikk Backend Fleroppgavekjøring", "pl_PL": "Wielowątkowość Backendu Graficznego:", - "pt_BR": "Multithreading da API gráfica:", + "pt_BR": "Multi Enfileiramento do Renderizador Gráfico:", "ru_RU": "Многопоточность графического бэкенда:", "sv_SE": "Multithreading för grafikbakände:", "th_TH": "มัลติเธรด กราฟิกเบื้องหลัง:", @@ -14887,7 +15162,7 @@ "ko_KR": "Ryujinx는 Nintendo Switch™용 에뮬레이터입니다.\n모든 최신 소식을 Discord에서 확인하세요.\n기여에 관심이 있는 개발자는 GitHub 또는 Discord에서 자세한 내용을 확인할 수 있습니다.", "no_NO": "Ryujinx er en emulator for Nintendo SwitchTM.\nVennligst støtt oss på Patreon.\nFå alle de siste nyhetene på vår Twitter eller Discord.\nUtviklere som er interessert i å bidra kan finne ut mer på GitHub eller Discord.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Ryujinx é um emulador de Nintendo Switch™.\nReceba todas as últimas notícias em nosso Discord.\nDesenvolvedores interessados em contribuir podem descobrir mais em nosso GitHub ou Discord.", "ru_RU": "Ryujinx - это эмулятор для Nintendo Switch™.\nПолучайте все последние новости разработки в нашем Discord.\nРазработчики, заинтересованные в участии, могут узнать больше на нашем GitHub или Discord.", "sv_SE": "Ryujinx är en emulator för Nintendo Switch™.\nFå de senaste nyheterna via vår Discord.\nUtvecklare som är intresserade att bidra kan hitta mer info på vår GitHub eller Discord.", "th_TH": "", @@ -14937,7 +15212,7 @@ "ko_KR": "이전 관리자 :", "no_NO": "Tidligere vedlikeholdt av:", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Anteriormente mantido por:", "ru_RU": "Поддержка:", "sv_SE": "Underhölls tidigare av:", "th_TH": "", @@ -14989,7 +15264,7 @@ "pl_PL": "Seria Amiibo", "pt_BR": "Franquia Amiibo", "ru_RU": "Серия Amiibo", - "sv_SE": "", + "sv_SE": "Amiibo-serie", "th_TH": "", "tr_TR": "Amiibo Serisi", "uk_UA": "Серія Amiibo", @@ -15062,7 +15337,7 @@ "ko_KR": "모든 Amiibo 표시", "no_NO": "Vis alle Amiibo", "pl_PL": "Pokaż Wszystkie Amiibo", - "pt_BR": "Exibir todos os Amiibos", + "pt_BR": "Exibir Todos os Amiibos", "ru_RU": "Показать все Amiibo", "sv_SE": "Visa alla Amiibo", "th_TH": "แสดง Amiibo ทั้งหมด", @@ -15087,7 +15362,7 @@ "ko_KR": "핵 : 무작위 태그 Uuid 사용", "no_NO": "Hack: Bruk tilfeldig tag-Uuid", "pl_PL": "Hack: Użyj losowego UUID tagu", - "pt_BR": "Hack: Usar Uuid de tag aleatório", + "pt_BR": "Hack: Usar Uuid de tag Aleatório", "ru_RU": "Хак: Использовать случайный тег Uuid", "sv_SE": "Hack: Använd slumpmässig tagg för Uuid", "th_TH": "แฮ็ค: สุ่มแท็ก Uuid", @@ -15137,7 +15412,7 @@ "ko_KR": "타이틀 ID", "no_NO": "Tittel ID", "pl_PL": "ID Tytułu", - "pt_BR": "ID do título", + "pt_BR": "ID do Título", "ru_RU": "ID приложения", "sv_SE": "Titel-ID", "th_TH": "ชื่อไอดี", @@ -15162,7 +15437,7 @@ "ko_KR": "컨테이너 경로", "no_NO": "Beholder bane", "pl_PL": "Ścieżka Kontenera", - "pt_BR": "Caminho do container", + "pt_BR": "Caminho do Contêiner", "ru_RU": "Путь к контейнеру", "sv_SE": "Container-sökväg", "th_TH": "คอนเทนเนอร์เก็บไฟล์", @@ -15187,7 +15462,7 @@ "ko_KR": "전체 경로", "no_NO": "Fullstendig bane", "pl_PL": "Pełna Ścieżka", - "pt_BR": "Caminho completo", + "pt_BR": "Caminho Completo", "ru_RU": "Полный путь", "sv_SE": "Fullständig sökväg", "th_TH": "ที่เก็บไฟล์แบบเต็ม", @@ -15212,7 +15487,7 @@ "ko_KR": "모두 제거", "no_NO": "Fjern alle", "pl_PL": "Usuń Wszystkie", - "pt_BR": "Remover todos", + "pt_BR": "Remover Todos", "ru_RU": "Удалить все", "sv_SE": "Ta bort allt", "th_TH": "ลบทั้งหมด", @@ -15237,7 +15512,7 @@ "ko_KR": "모두 활성화", "no_NO": "Aktiver alle", "pl_PL": "Włącz Wszystkie", - "pt_BR": "Habilitar todos", + "pt_BR": "Habilitar Todos", "ru_RU": "Включить все", "sv_SE": "Aktivera allt", "th_TH": "เปิดใช้งานทั้งหมด", @@ -15262,7 +15537,7 @@ "ko_KR": "모두 비활성화", "no_NO": "Deaktiver alle", "pl_PL": "Wyłącz Wszystkie", - "pt_BR": "Desabilitar todos", + "pt_BR": "Desabilitar Todos", "ru_RU": "Отключить все", "sv_SE": "Inaktivera allt", "th_TH": "ปิดใช้งานทั้งหมด", @@ -15312,7 +15587,7 @@ "ko_KR": "언어 변경", "no_NO": "Endre språk", "pl_PL": "Zmień język", - "pt_BR": "Mudar idioma", + "pt_BR": "Mudar Idioma", "ru_RU": "Сменить язык", "sv_SE": "Byt språk", "th_TH": "เปลี่ยนภาษา", @@ -15337,7 +15612,7 @@ "ko_KR": "파일 형식 표시", "no_NO": "Vis Filtyper", "pl_PL": "Pokaż typy plików", - "pt_BR": "Mostrar tipos de arquivo", + "pt_BR": "Mostrar Tipos de Arquivo", "ru_RU": "Показывать форматы файлов", "sv_SE": "Visa filtyper", "th_TH": "แสดงประเภทของไฟล์", @@ -15387,7 +15662,7 @@ "ko_KR": "이름 표시", "no_NO": "Vis navn", "pl_PL": "Pokaż Nazwy", - "pt_BR": "Exibir nomes", + "pt_BR": "Exibir Nomes", "ru_RU": "Показывать названия", "sv_SE": "Visa namn", "th_TH": "แสดงชื่อ", @@ -15512,7 +15787,7 @@ "ko_KR": "오류 창", "no_NO": "Feilvindu", "pl_PL": "Okno Błędu", - "pt_BR": "Janela de erro", + "pt_BR": "Janela de Erro", "ru_RU": "Окно ошибки", "sv_SE": "Felfönster", "th_TH": "หน้าต่างแสดงข้อผิดพลาด", @@ -15537,7 +15812,7 @@ "ko_KR": "\"현재 진행 중인\" 디스코드 활동에 Ryujinx를 표시할지 여부를 선택", "no_NO": "Velg om Ryujinx skal vises på din \"spillende\" Discord aktivitet eller ikke", "pl_PL": "Wybierz, czy chcesz wyświetlać Ryujinx w swojej \"aktualnie grane\" aktywności Discord", - "pt_BR": "Habilita ou desabilita Discord Rich Presence", + "pt_BR": "Escolha se deseja mostrar Ryujinx ou não na sua atividade do Discord quando estiver usando-o", "ru_RU": "Включает или отключает отображение статуса \"Играет в игру\" в Discord", "sv_SE": "Välj huruvida Ryujinx ska visas på din \"spelar för tillfället\" Discord-aktivitet", "th_TH": "เลือกว่าจะแสดง Ryujinx ในกิจกรรม Discord \"ที่กำลังเล่นอยู่\" ของคุณหรือไม่?", @@ -15712,7 +15987,7 @@ "ko_KR": "GUI용 사용자 정의 Avalonia 테마를 사용하여 에뮬레이터 메뉴의 모양 변경", "no_NO": "Bruk et egendefinert Avalonia tema for GUI for å endre utseende til emulatormenyene", "pl_PL": "Użyj niestandardowego motywu Avalonia dla GUI, aby zmienić wygląd menu emulatora", - "pt_BR": "Habilita ou desabilita temas customizados na interface gráfica", + "pt_BR": "Use um tema Avalonia personalizado para a GUI para alterar a aparência dos menus do emulador", "ru_RU": "Включить или отключить пользовательские темы", "sv_SE": "Använd ett anpassat Avalonia-tema för gränssnittet för att ändra utseendet i emulatormenyerna", "th_TH": "ใช้ธีม Avalonia แบบกำหนดเองสำหรับ GUI เพื่อเปลี่ยนรูปลักษณ์ของเมนูโปรแกรมจำลอง", @@ -15862,7 +16137,7 @@ "ko_KR": "시스템 지역 변경", "no_NO": "Endre systemregion", "pl_PL": "Zmień Region Systemu", - "pt_BR": "Mudar a região do sistema", + "pt_BR": "Mudar a Região do Sistema", "ru_RU": "Сменяет регион системы", "sv_SE": "Ändra systemets region", "th_TH": "เปลี่ยนภูมิภาคของระบบ", @@ -15887,7 +16162,7 @@ "ko_KR": "시스템 언어 변경", "no_NO": "Endre systemspråk", "pl_PL": "Zmień język systemu", - "pt_BR": "Mudar o idioma do sistema", + "pt_BR": "Mudar o Idioma do Sistema", "ru_RU": "Меняет язык системы", "sv_SE": "Ändra systemets språk", "th_TH": "เปลี่ยนภาษาของระบบ", @@ -15912,7 +16187,7 @@ "ko_KR": "시스템 시간대 변경", "no_NO": "Endre systemtidssone", "pl_PL": "Zmień Strefę Czasową Systemu", - "pt_BR": "Mudar o fuso-horário do sistema", + "pt_BR": "Mudar o Fuso-Horário do Sistema", "ru_RU": "Меняет часовой пояс системы", "sv_SE": "Ändra systemets tidszon", "th_TH": "เปลี่ยนโซนเวลาของระบบ", @@ -15937,7 +16212,7 @@ "ko_KR": "시스템 시간 변경", "no_NO": "Endre systemtid", "pl_PL": "Zmień czas systemowy", - "pt_BR": "Mudar a hora do sistema", + "pt_BR": "Mudar a Data e Hora do Sistema", "ru_RU": "Меняет системное время системы", "sv_SE": "Ändra systemtid", "th_TH": "เปลี่ยนเวลาของระบบ", @@ -15962,7 +16237,7 @@ "ko_KR": "시스템 시간을 PC의 현재 날짜 및 시간과 일치하도록 다시 동기화합니다.", "no_NO": "Resynkroniser systemtiden slik at den samsvarer med PC-ens gjeldende dato og klokkeslett.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Sincroniza a data e hora do emulador com seu sistema PC", "ru_RU": "Повторно синхронизирует системное время, чтобы оно соответствовало текущей дате и времени вашего компьютера.", "sv_SE": "Återsynkronisera systemtiden för att matcha din dators aktuella datum och tid.", "th_TH": "", @@ -16012,7 +16287,7 @@ "ko_KR": "번역된 JIT 함수를 저장하여 게임을 불러올 때마다 번역할 필요가 없도록 합니다.\n\n게임을 처음 부팅한 후 끊김 현상을 줄이고 부팅 시간을 크게 단축합니다.\n\n모르면 켬으로 두세요.", "no_NO": "Lagrer oversatte JIT funksjoner så de ikke trenger og bli oversatt hver gang spillet laster.\n\nKan redusere hakkete spilling og gjør at spillet starter opp raskere ved første oppstart.\n\nLa være PÅ om usikker.", "pl_PL": "Zapisuje przetłumaczone funkcje JIT, dzięki czemu nie muszą być tłumaczone za każdym razem, gdy gra się ładuje.\n\nZmniejsza zacinanie się i znacznie przyspiesza uruchamianie po pierwszym uruchomieniu gry.\n\nJeśli nie masz pewności, pozostaw WŁĄCZONE", - "pt_BR": "Habilita ou desabilita PPTC", + "pt_BR": "Salva funções JIT traduzidas para que elas não precisem ser traduzidas toda vez que o jogo for carregado.\n\nReduz a trepidação e acelera significativamente os tempos de inicialização após a primeira inicialização de um jogo.\n\nDeixe LIGADO se não tiver certeza.", "ru_RU": "Сохраняет скомпилированные JIT-функции для того, чтобы не преобразовывать их по новой каждый раз при запуске игры.\n\nУменьшает статтеры и значительно ускоряет последующую загрузку игр.\n\nРекомендуется оставить включенным.", "sv_SE": "Sparar översatta JIT-funktioner så att de inte behöver översättas varje gång som spelet läses in.\n\nMinskar stuttering och snabbare på uppstartstiden väsentligt efter första uppstarten av ett spel.\n\nLämna PÅ om du är osäker.", "th_TH": "บันทึกฟังก์ชั่น JIT ที่แปลแล้ว ดังนั้นจึงไม่จำเป็นต้องแปลทุกครั้งที่โหลดเกม\n\nลดอาการกระตุกและเร่งความเร็วการบูตได้อย่างมากหลังจากการบูตครั้งแรกของเกม\n\nเปิดทิ้งไว้หากคุณไม่แน่ใจ", @@ -16037,7 +16312,7 @@ "ko_KR": "코어의 3분의 1을 사용하여 PPTC를 불러옵니다.", "no_NO": "Last inn PPTC med en tredjedel av antall kjerner.", "pl_PL": "", - "pt_BR": "Carregar o PPTC usando um terço da quantidade de núcleos.", + "pt_BR": "Carrega o PPTC usando um terço da quantidade de núcleos.", "ru_RU": "Загрузить PPTC, используя треть от количества ядер.", "sv_SE": "Läs in PPTC med en tredjedel av mängden kärnor.", "th_TH": "โหลด PPTC โดยใช้หนึ่งในสามของจำนวนคอร์", @@ -16062,7 +16337,7 @@ "ko_KR": "게임을 부팅할 때 손상된 파일을 확인하고, 손상된 파일이 감지되면 로그에 해시 오류를 표시합니다.\n\n성능에 영향을 미치지 않으며 문제 해결에 도움이 됩니다.\n\n모르면 켬으로 두세요.", "no_NO": "Sjekker for korrupte filer ved oppstart av et spill, og dersom korrupte filer oppdages, viser en hashfeil i loggen.\n\nhar ingen innvirkning på ytelsen og er ment å hjelpe med feilsøking.\n\nLa være PÅ hvis usikker.", "pl_PL": "Sprawdza pliki podczas uruchamiania gry i jeśli zostaną wykryte uszkodzone pliki, wyświetla w dzienniku błąd hash.\n\nNie ma wpływu na wydajność i ma pomóc w rozwiązywaniu problemów.\n\nPozostaw WŁĄCZONE, jeśli nie masz pewności.", - "pt_BR": "Habilita ou desabilita verificação de integridade dos arquivos do jogo", + "pt_BR": "Verifica se há arquivos corrompidos ao inicializar um jogo e, se forem detectados, exibe um erro de hash no log.\n\nNão tem impacto no desempenho e tem como objetivo ajudar na solução de problemas.\n\nDeixe LIGADO se não tiver certeza.", "ru_RU": "Проверяет файлы при загрузке игры и если обнаружены поврежденные файлы, выводит сообщение о поврежденном хэше в журнале.\n\nНе влияет на производительность и необходим для помощи в устранении неполадок.\n\nРекомендуется оставить включенным.", "sv_SE": "Letar efter skadade filer när ett spel startas upp, och om skadade filer hittas, visas ett kontrollsummefel i loggen.\n\nHar ingen påverkan på prestandan och är tänkt att hjälpa felsökningen.\n\nLämna PÅ om du är osäker.", "th_TH": "ตรวจสอบไฟล์ที่เสียหายเมื่อบูตเกม และหากตรวจพบไฟล์ที่เสียหาย จะแสดงข้อผิดพลาดของแฮชในบันทึก\n\nไม่มีผลกระทบต่อประสิทธิภาพการทำงานและมีไว้เพื่อช่วยในการแก้ไขปัญหา\n\nเปิดทิ้งไว้หากคุณไม่แน่ใจ", @@ -16087,7 +16362,7 @@ "ko_KR": "오디오 렌더링에 사용되는 백엔드를 변경합니다.\n\nSDL3가 선호되는 반면 OpenAL 및 SoundIO는 대체 수단으로 사용됩니다. 더미에는 소리가 나지 않습니다.\n\n모르면 SDL3로 설정하세요.", "no_NO": "Endrer backend brukt til å gjengi lyd.\n\nSDL3 er foretrukket, mens OpenAL og SoundIO brukes som reserveløsning. Dummy kommer ikke til å ha lyd.\n\nSett til SDL3 hvis usikker.", "pl_PL": "Zmienia backend używany do renderowania dźwięku.\n\nSDL3 jest preferowany, podczas gdy OpenAL i SoundIO są używane jako rezerwy. Dummy nie będzie odtwarzać dźwięku.\n\nW razie wątpliwości ustaw SDL3.", - "pt_BR": "Mudar biblioteca de áudio", + "pt_BR": "Altera o módulo usado para renderizar áudio.\n\nSDL3 é o preferido, enquanto OpenAL e SoundIO são usados como fallbacks. Dummy não terá som.\n\nDefina como SDL3 se não tiver certeza.", "ru_RU": "Изменяет используемый аудио бэкенд для рендера звука.\n\nSDL3 является предпочтительным вариантом, в то время как OpenAL и SoundIO используются в качестве резервных.\n\nРекомендуется использование SDL3.", "sv_SE": "Ändrar bakänden som används för att rendera ljud.\n\nSDL3 är den föredragna, men OpenAL och SoundIO används för att falla tillbaka på. Dummy har inget ljud.\n\nStäll in till SDL3 om du är osäker.", "th_TH": "เปลี่ยนแบ็กเอนด์ที่ใช้ในการเรนเดอร์เสียง\n\nแนะนำเป็น SDL3 ในขณะที่ OpenAL และ SoundIO ถูกใช้เป็นทางเลือกสำรอง ดัมมี่จะไม่มีเสียง\n\nตั้งค่าเป็น SDL3 หากคุณไม่แน่ใจ", @@ -16112,7 +16387,7 @@ "ko_KR": "게스트 메모리 매핑 및 접속 방법을 변경합니다. 에뮬레이트된 CPU 성능에 큰 영향을 미칩니다.\n\n모르면 호스트 확인 안 함으로 설정합니다.", "no_NO": "Endre hvordan gjesteminne tilordnes og åpnes. Påvirker emulator CPU-ytelsen veldig mye.\n\nSett til HOST UNCHECKED hvis usikker.", "pl_PL": "Zmień sposób mapowania i uzyskiwania dostępu do pamięci gości. Znacznie wpływa na wydajność emulowanego procesora.\n\nUstaw na HOST UNCHECKED, jeśli nie masz pewności.", - "pt_BR": "Muda como a memória do sistema convidado é acessada. Tem um grande impacto na performance da CPU emulada.", + "pt_BR": "Altera como a memória do convidado é mapeada e acessada. Afeta muito o desempenho da CPU emulada.\n\nDefina como HÓSPEDE SEM VERIFICAÇÃO se não tiver certeza.", "ru_RU": "Меняет разметку и доступ к гостевой памяти. Значительно влияет на производительность процессора.\n\nРекомендуется оставить \"Хост не установлен\"", "sv_SE": "Ändra hur gästminne mappas och ges åtkomst till. Påverkar emulerad CPU-prestanda mycket.\n\nStäll in till \"Värd inte kontrollerad\" om du är osäker.", "th_TH": "เปลี่ยนวิธีการเข้าถึงหน่วยความจำของผู้เยี่ยมชม ส่งผลอย่างมากต่อประสิทธิภาพการทำงานของ CPU ที่จำลอง\n\nตั้งค่าเป็น ไม่ได้ตรวจสอบโฮสต์ หากคุณไม่แน่ใจ", @@ -16237,7 +16512,7 @@ "ko_KR": "Switch 개발 모델을 모방하기 위해 8GB DRAM이 포함된 대체 메모리 모드를 활용합니다.\n\n이는 고해상도 텍스처 팩 또는 4K 해상도 모드에만 유용합니다. 성능을 개선하지 않습니다.\n\n모르면 끔으로 두세요.", "no_NO": "Bruker en alternativ minnemodus med 8GiB i DRAM for og etterligne Switch utvikler modeller.\n\nDette er bare nyttig for teksturpakker eller 4k oppløsningsmoduler. Forbedrer IKKE ytelsen.\n\nLa AV hvis usikker.", "pl_PL": "Wykorzystuje alternatywny układ MemoryMode, aby naśladować model rozwojowy Switcha.\n\nJest to przydatne tylko w przypadku pakietów tekstur o wyższej rozdzielczości lub modów w rozdzielczości 4k. NIE poprawia wydajności.\n\nW razie wątpliwości pozostaw WYŁĄCZONE.", - "pt_BR": "Expande a memória do sistema emulado de 4GiB para 6GiB", + "pt_BR": "Utiliza um modo de memória alternativo com 6, 8 ou 12 GB de DRAM para imitar um modelo de desenvolvimento do Switch.\n\nIsso só é útil para pacotes de textura de alta resolução ou mods de resolução 4k. NÃO melhora o desempenho.\n\nDeixe em 4 GB se não tiver certeza.", "ru_RU": "Использует альтернативный макет MemoryMode для имитации использования Nintendo Switch в режиме разработчика.\n\nПолезно только для пакетов текстур с высоким разрешением или модов добавляющих разрешение 4К. Не улучшает производительность.\n\nРекомендуется оставить выключенным.", "sv_SE": "Använder ett alternativt minnesläge med 8GiB av DRAM för att efterlikna en utvecklingsmodell av Switch.\n\nDetta är endast användbart för texturpaket med högre upplösning eller moddar för 4k-upplösning. Det förbättrar INTE prestandan.\n\nLämna AV om du är osäker.", "th_TH": "ใช้รูปแบบ MemoryMode ทางเลือกเพื่อเลียนแบบโมเดลการพัฒนาสวิตช์\n\nสิ่งนี้มีประโยชน์สำหรับแพ็กพื้นผิวที่มีความละเอียดสูงกว่าหรือม็อดที่มีความละเอียด 4k เท่านั้น\n\nปล่อยให้ปิดหากคุณไม่แน่ใจ", @@ -16262,7 +16537,7 @@ "ko_KR": "구현되지 않은 Horizon OS 서비스는 무시됩니다. 특정 게임을 부팅할 때, 발생하는 충돌을 우회하는 데 도움이 될 수 있습니다.\n\n모르면 끔으로 두세요.", "no_NO": "Ignorerer ikke implementerte Horisont OS-tjenester. Dette kan hjelpe med å omgå krasj ved oppstart av enkelte spill.\n\nLa AV hvis du er usikker.", "pl_PL": "Ignoruje niezaimplementowane usługi Horizon OS. Może to pomóc w ominięciu awarii podczas uruchamiania niektórych gier.\n\nW razie wątpliwości pozostaw WYŁĄCZONE.", - "pt_BR": "Habilita ou desabilita a opção de ignorar serviços não implementados", + "pt_BR": "Ignora serviços não implementados do Horizon OS. Isso pode ajudar a contornar travamentos ao inicializar certos jogos.\n\nDeixe OFF se não tiver certeza.", "ru_RU": "Игнорирует нереализованные сервисы Horizon в новых прошивках. Эта настройка поможет избежать вылеты при запуске определенных игр.\n\nРекомендуется оставить выключенным.", "sv_SE": "Ignorerar Horizon OS-tjänster som inte har implementerats. Detta kan avhjälpa krascher när vissa spel startar upp.\n\nLämna AV om du är osäker.", "th_TH": "ละเว้นบริการ Horizon OS ที่ยังไม่ได้ใช้งาน วิธีนี้อาจช่วยในการหลีกเลี่ยงข้อผิดพลาดเมื่อบูตเกมบางเกม\n\nปล่อยให้ปิดหากคุณไม่แน่ใจ", @@ -16273,28 +16548,28 @@ } }, { - "ID": "IgnoreAppletTooltip", + "ID": "IgnoreControllerAppletTooltip", "Translations": { - "ar_SA": "لن يظهر مربع الحوار الخارجي \"تطبيق وحدة التحكم\" إذا تم فصل لوحة الألعاب أثناء اللعب. ولن تظهر مطالبة بإغلاق مربع الحوار أو إعداد وحدة تحكم جديدة. وبمجرد إعادة توصيل وحدة التحكم التي تم فصلها سابقًا، ستستأنف اللعبة تلقائيًا.", - "de_DE": "Der externe Dialog \"Controller-Applet\" wird nicht angezeigt, wenn das Gamepad während des Spiels getrennt wird. Es erfolgt keine Aufforderung, den Dialog zu schließen oder einen neuen Controller einzurichten. Sobald der zuvor getrennte Controller wieder angeschlossen wird, wird das Spiel automatisch fortgesetzt.", - "el_GR": "Το εξωτερικό παράθυρο διαλόγου \"Ελεγκτής μικροεφαρμογής\" δεν θα εμφανιστεί εάν το gamepad αποσυνδεθεί κατά τη διάρκεια του παιχνιδιού. Δεν θα σας ζητηθεί να κλείσετε το παράθυρο διαλόγου ή να ρυθμίσετε έναν νέο ελεγκτή. Μόλις επανασυνδεθεί το χειριστήριο που είχε αποσυνδεθεί προηγουμένως, το παιχνίδι θα συνεχιστεί αυτόματα.", - "en_US": "The external dialog \"Controller Applet\" will not appear if the gamepad is disconnected during gameplay. There will be no prompt to close the dialog or set up a new controller. Once the previously disconnected controller is reconnected, the game will automatically resume.", - "es_ES": "El cuadro de diálogo externo \"Applet del controlador\" no aparecerá si el gamepad se desconecta durante el juego. No aparecerá ningún mensaje para cerrar el cuadro de diálogo o configurar un nuevo controlador. Una vez que se vuelva a conectar el controlador que se había desconectado anteriormente, el juego se reanudará automáticamente.", - "fr_FR": "La boîte de dialogue externe \"Programme Manette\" n'apparaîtra pas si la manette est déconnectée en jeu. Il n'y aura aucune boîte de dialogue ouverte pour configurer une nouvelle manette. Une fois que la manette précédemment déconnectée est reconnectée, le jeu reprendra automatiquement. \n\nLaissez désactivé en cas d'incertitude.", - "he_IL": "תיבת הדו-שיח החיצונית \"Controller Applet\" לא תופיע אם ה-Gamepad מנותק במהלך המשחק. לא תהיה הנחיה לסגור את תיבת הדו-שיח או להגדיר בקר חדש. ברגע שהבקר שנותק בעבר יתחבר מחדש, המשחק יתחדש אוטומטית.", - "it_IT": "La finestra di dialogo esterna \"Controller Applet\" non apparirà se il gamepad viene disconnesso durante il gioco. Non ci sarà alcun prompt per chiudere la finestra di dialogo o impostare un nuovo controller. Una volta che il controller disconnesso in precedenza viene ricollegato, il gioco riprenderà automaticamente.", - "ja_JP": "ゲームプレイ中にゲームパッドが切断された場合、外部ダイアログ「コントローラーアプレット」は表示されません。このダイアログを閉じるか、新しいコントローラーを設定するように求めるプロンプトは表示されません。以前に切断されたコントローラーが再接続されると、ゲームは自動的に再開されます。", - "ko_KR": "게임 플레이 중에 게임패드 연결이 끊어지면 외부 대화 상자 \"컨트롤러 애플릿\"이 나타나지 않습니다. 대화 상자를 닫거나 새 컨트롤러를 설정하라는 메시지가 표시되지 않습니다. 이전에 연결이 끊어진 컨트롤러가 다시 연결되면 게임이 자동으로 다시 시작됩니다.", - "no_NO": "Den eksterne dialogboksen «Controller Applet» vises ikke hvis gamepaden kobles fra under spilling. Du blir ikke bedt om å lukke dialogboksen eller konfigurere en ny kontroller. Når den tidligere frakoblede kontrolleren er koblet til igjen, fortsetter spillet automatisk.", - "pl_PL": "Zewnętrzny dialog \"Controller Applet\" nie pojawi się, jeśli gamepad zostanie odłączony podczas rozgrywki. Nie pojawi się monit o zamknięcie dialogu lub skonfigurowanie nowego kontrolera. Po ponownym podłączeniu poprzednio odłączonego kontrolera gra zostanie automatycznie wznowiona.", - "pt_BR": "O diálogo externo \"Controller Applet\" não aparecerá se o gamepad for desconectado durante o jogo. Não haverá prompt para fechar o diálogo ou configurar um novo controle. Assim que o controle desconectado anteriormente for reconectado, o jogo será retomado automaticamente.", - "ru_RU": "Внешний диалог \"Апплет контроллера\" не появится, если геймпад будет отключен во время игры. Не будет предложено закрыть диалог или настроить новый контроллер. После повторного подключения ранее отключенного контроллера игра автоматически возобновится.", - "sv_SE": "Den externa dialogen \"Handkontroller-applet\" kommer inte att visas om din gamepad är frånkopplad under spel. Det finns ingen fråga att stänga dialogen eller konfigurera en ny handkontroller. När den tidigare frånkopplade handkontrollern återansluts så kommer spelet att automatiskt återupptas.", - "th_TH": "กล่องโต้ตอบภายนอก \"แอปเพล็ตตัวควบคุม\" จะไม่ปรากฏขึ้นหากแป้นเกมถูกตัดการเชื่อมต่อระหว่างการเล่นเกม จะไม่มีข้อความแจ้งให้ปิดกล่องโต้ตอบหรือตั้งค่าตัวควบคุมใหม่ เมื่อเชื่อมต่อคอนโทรลเลอร์ที่ตัดการเชื่อมต่อก่อนหน้านี้อีกครั้ง เกมจะดำเนินการต่อโดยอัตโนมัติ", - "tr_TR": "Oyun sırasında oyun kumandasının bağlantısı kesilirse, harici \"Controller Applet\" iletişim kutusu görünmez. İletişim kutusunu kapatma veya yeni bir kumanda ayarlama isteği olmaz. Daha önce bağlantısı kesilen kumanda tekrar bağlandığında oyun otomatik olarak devam eder.", - "uk_UA": "Зовнішнє діалогове вікно \"Аплет контролера\" не з’являтиметься, якщо геймпад буде від’єднано під час гри. Не буде запиту закрити діалогове вікно чи налаштувати новий контролер. Після повторного підключення раніше від’єднаного контролера гра автоматично відновиться.", - "zh_CN": "如果游戏手柄在游戏过程中断开连接，则不会出现外部对话框“控制器小程序”。不会提示关闭对话框或设置新控制器。一旦先前断开连接的控制器重新连接，游戏将自动恢复。", - "zh_TW": "如果遊戲手把在遊戲過程中斷開連接，則外部對話方塊「控制器小程式」將不會出現。不會提示關閉對話方塊或設定新控制器。一旦先前斷開的控制器重新連接，遊戲將自動恢復。" + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "The Controller Applet dialog will not appear if the gamepad is disconnected while an application is running.\n\nLeave OFF if unsure.", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "A caixa de diálogo do Applet do controlador não aparecerá se o controle for desconectado enquanto um aplicativo estiver em execução.\n\nDeixe a opção DESLIGADO se não tiver certeza.", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" } }, { @@ -16312,7 +16587,7 @@ "ko_KR": "2번째 스레드에서 그래픽 후단부 명령을 실행합니다.\n\n셰이더 컴파일 속도를 높이고, 끊김 현상을 줄이며, 자체 다중 스레딩 지원 없이 GPU 드라이버의 성능을 향상시킵니다. 다중 스레딩이 있는 드라이버에서 성능이 좀 더 좋습니다.\n\n모르면 자동으로 설정합니다.", "no_NO": "Utfører grafikkbackend kommandoer på en annen tråd.\n\nØker hastigheten for shaderkomprimering, reduserer hakking og forbedrer ytelsen til GPU-drivere uten å spre støtten fra sine egne. Litt bedre ytelse på drivere med flertråd.\n\nSett for å AUTO hvis usikker.", "pl_PL": "Wykonuje polecenia backend'u graficznego w drugim wątku.\n\nPrzyspiesza kompilację shaderów, zmniejsza zacinanie się i poprawia wydajność sterowników GPU bez własnej obsługi wielowątkowości. Nieco lepsza wydajność w sterownikach z wielowątkowością.\n\nUstaw na AUTO, jeśli nie masz pewności.", - "pt_BR": "Habilita multithreading do backend gráfico", + "pt_BR": "Executa comandos do renderizador gráfico em um segundo thread.\n\nAcelera a compilação de shader, reduz a gagueira e melhora o desempenho em drivers de GPU sem suporte multithreading próprio. Desempenho ligeiramente melhor em drivers com multithreading.\n\nDefina como AUTO se não tiver certeza.", "ru_RU": "Выполняет команды графического бэкенда на втором потоке.\n\nУскоряет компиляцию шейдеров, уменьшает статтеры и повышает производительность на драйверах видеоадаптера без поддержки многопоточности. Производительность на драйверах с многопоточностью немного выше.\n\nРекомендуется оставить Автоматически.", "sv_SE": "Kör kommandon för grafikbakände i en andra tråd.\n\nSnabbar upp shader compilation, minskar stuttering och förbättrar prestandan på GPU-drivrutiner utan stöd för egen multithreading. Något bättre prestanda på drivrutiner med multithreading.\n\nStäll in till AUTO om du är osäker.", "th_TH": "ดำเนินการคำสั่งแบ็กเอนด์กราฟิกบนเธรดที่สอง\n\nเร่งความเร็วการคอมไพล์ ลดการกระตุก และปรับปรุงประสิทธิภาพการทำงานของไดรเวอร์ GPU โดยไม่ต้องรองรับมัลติเธรดในตัว ประสิทธิภาพที่ดีขึ้นเล็กน้อยสำหรับไดรเวอร์ที่มีมัลติเธรด\n\nตั้งเป็น อัตโนมัติ หากคุณไม่แน่ใจ", @@ -16337,7 +16612,7 @@ "ko_KR": "2번째 스레드에서 그래픽 후단부 명령을 실행합니다.\n\n셰이더 컴파일 속도를 높이고 끊김 현상을 줄이며 자체 다중 스레딩 지원 없이 GPU 드라이버의 성능을 향상시킵니다. 다중 스레딩이 있는 드라이버에서 성능이 좀 더 좋습니다.\n\n모르면 자동으로 설정합니다.", "no_NO": "Utfører grafikkbackend kommandoer på en annen tråd.\n\nØker hastigheten for shaderkomprimering, reduserer hakking og forbedrer ytelsen til GPU-drivere uten flertråd støtte. Litt bedre ytelse på drivere med flertråd.\n\nSett for å AUTO hvis usikker.", "pl_PL": "Wykonuje polecenia backend'u graficznego w drugim wątku.\n\nPrzyspiesza kompilację shaderów, zmniejsza zacinanie się i poprawia wydajność sterowników GPU bez własnej obsługi wielowątkowości. Nieco lepsza wydajność w sterownikach z wielowątkowością.\n\nUstaw na AUTO, jeśli nie masz pewności.", - "pt_BR": "Executa comandos do backend gráfico em uma segunda thread. Permite multithreading em tempo de execução da compilação de shader, diminui os travamentos, e melhora performance em drivers sem suporte embutido a multithreading. Pequena variação na performance máxima em drivers com suporte a multithreading. Ryujinx pode precisar ser reiniciado para desabilitar adequadamente o multithreading embutido do driver, ou você pode precisar fazer isso manualmente para ter a melhor performance.", + "pt_BR": "Executa comandos do renderizador gráfico em um segundo thread.\n\nAcelera a compilação de shader, reduz a gagueira e melhora o desempenho em drivers de GPU sem suporte multithreading próprio. Desempenho ligeiramente melhor em drivers com multithreading.\n\nDefina como AUTO se não tiver certeza.", "ru_RU": "Выполняет команды графического бэкенда на втором потоке.\n\nУскоряет компиляцию шейдеров, уменьшает статтеры и повышает производительность на драйверах видеоадаптера без поддержки многопоточности. Производительность на драйверах с многопоточностью немного выше.\n\nРекомендуется оставить Автоматически.", "sv_SE": "Kör kommandon för grafikbakände i en andra tråd.\n\nSnabbar upp shader compilation, minskar stuttering och förbättrar prestandan på GPU-drivrutiner utan stöd för egen multithreading. Något bättre prestanda på drivrutiner med multithreading.\n\nStäll in till AUTO om du är osäker.", "th_TH": "ดำเนินการคำสั่งแบ็กเอนด์กราฟิกบนเธรดที่สอง\n\nเร่งความเร็วการคอมไพล์เชเดอร์ ลดการกระตุก และปรับปรุงประสิทธิภาพการทำงานของไดรเวอร์ GPU โดยไม่ต้องรองรับมัลติเธรดในตัว ประสิทธิภาพที่ดีขึ้นเล็กน้อยสำหรับไดรเวอร์ที่มีมัลติเธรด\n\nตั้งเป็น อัตโนมัติ หากคุณไม่แน่ใจ", @@ -16362,7 +16637,7 @@ "ko_KR": "후속 실행 시 끊김 현상을 줄이는 디스크 셰이더 캐시를 저장합니다.\n\n모르면 켬으로 두세요.", "no_NO": "Lagrer en disk shader cache som reduserer hakking jo flere ganger du spiller.\n\nLa være PÅ om usikker.", "pl_PL": "Zapisuje pamięć podręczną shaderów na dysku, co zmniejsza zacinanie się w kolejnych uruchomieniach.\n\nPozostaw WŁĄCZONE, jeśli nie masz pewności.", - "pt_BR": "Habilita ou desabilita o cache de shader", + "pt_BR": "Salva um cache de shader no disco que reduz a trepidação em execuções subsequentes.\n\nDeixe LIGADO se não tiver certeza.", "ru_RU": "Сохраняет кэш шейдеров на диске, для уменьшения статтеров при последующих запусках.\n\nРекомендуется оставить включенным.", "sv_SE": "Sparar en disk shader cache som minskar stuttering i efterföljande körningar.\n\nLämna PÅ om du är osäker.", "th_TH": "บันทึกแคชแสงเงาของดิสก์ซึ่งช่วยลดการกระตุกในการรันครั้งต่อๆ ไป\n\nเปิดทิ้งไว้หากคุณไม่แน่ใจ", @@ -16487,7 +16762,7 @@ "ko_KR": "그래픽 셰이더 덤프 경로", "no_NO": "Grafikk Shader Dump bane", "pl_PL": "Ścieżka Zrzutu Shaderów Grafiki", - "pt_BR": "Diretòrio de despejo de shaders", + "pt_BR": "Diretório de Despejo de Shaders", "ru_RU": "Путь с дампами графических шейдеров", "sv_SE": "Sökväg för Graphics Shaders Dump", "th_TH": "ที่เก็บ ดัมพ์ไฟล์เชเดอร์", @@ -16512,7 +16787,7 @@ "ko_KR": "디스크의 로그 파일에 콘솔 기록을 저장합니다. 성능에 영향을 주지 않습니다.", "no_NO": "Lagrer konsoll-logging til en loggfil på harddisken. Påvirker ikke ytelsen.", "pl_PL": "Zapisuje logowanie konsoli w pliku dziennika na dysku. Nie wpływa na wydajność.", - "pt_BR": "Habilita ou desabilita log para um arquivo no disco", + "pt_BR": "Salva o log do console em um arquivo de log no disco. Não afeta o desempenho.", "ru_RU": "Включает ведение журнала в файл на диске. Не влияет на производительность.", "sv_SE": "Sparar konsolloggning till en loggfil på disk. Påverkar inte prestandan.", "th_TH": "บันทึกประวัติคอนโซลลงในไฟล์บันทึก จะไม่ส่งผลกระทบต่อประสิทธิภาพการทำงาน", @@ -16537,7 +16812,7 @@ "ko_KR": "콘솔에 조각 기록 메시지를 출력합니다. 성능에 영향을 주지 않습니다.", "no_NO": "Skriver ut log meldinger i konsollen. Påvirker ikke ytelsen.", "pl_PL": "Wyświetla w konsoli skrótowe komunikaty dziennika. Nie wpływa na wydajność.", - "pt_BR": "Habilita ou desabilita exibição de mensagens de stub", + "pt_BR": "Imprime mensagens de log stub no console. Não afeta o desempenho.", "ru_RU": "Включает ведение журнала-заглушки. Не влияет на производительность.", "sv_SE": "Skriver ut stubbloggmeddelanden i konsollen. Påverkar inte prestandan.", "th_TH": "พิมพ์ข้อความประวัติในคอนโซล จะไม่ส่งผลกระทบต่อประสิทธิภาพการทำงาน", @@ -16562,7 +16837,7 @@ "ko_KR": "콘솔에 정보 기록 메시지를 출력합니다. 성능에 영향을 주지 않습니다.", "no_NO": "Skriver ut info loggmeldinger i konsollen. Påvirker ikke ytelse.", "pl_PL": "Wyświetla komunikaty dziennika informacyjnego w konsoli. Nie wpływa na wydajność.", - "pt_BR": "Habilita ou desabilita exibição de mensagens informativas", + "pt_BR": "Imprime mensagens de log de informações no console. Não afeta o desempenho.", "ru_RU": "Включает вывод сообщений информационного журнала в консоль. Не влияет на производительность.", "sv_SE": "Skriver ut informationsloggmeddelanden i konsollen. Påverkar inte prestandan.", "th_TH": "พิมพ์ข้อความบันทึกข้อมูลในคอนโซล จะไม่ส่งผลกระทบต่อประสิทธิภาพการทำงาน", @@ -16587,7 +16862,7 @@ "ko_KR": "콘솔에 경고 기록 메시지를 출력합니다. 성능에 영향을 주지 않습니다.", "no_NO": "Skriver ut varselloggmeldinger i konsollen. påvirker ikke ytelsen.", "pl_PL": "Wyświetla komunikaty dziennika ostrzeżeń w konsoli. Nie wpływa na wydajność.", - "pt_BR": "Habilita ou desabilita exibição de mensagens de alerta", + "pt_BR": "Imprime mensagens de log de aviso no console. Não afeta o desempenho.", "ru_RU": "Включает вывод сообщений журнала предупреждений в консоль. Не влияет на производительность.", "sv_SE": "Skriver ut varningsloggmeddelanden i konsollen. Påverkar inte prestandan.", "th_TH": "พิมพ์ข้อความประวัติการเตือนในคอนโซล จะไม่ส่งผลกระทบต่อประสิทธิภาพการทำงาน", @@ -16612,7 +16887,7 @@ "ko_KR": "콘솔에 오류 기록 메시지를 출력합니다. 성능에 영향을 주지 않습니다.", "no_NO": "Skriver ut feilloggmeldinger i konsollen. Påvirker ikke ytelse.", "pl_PL": "Wyświetla w konsoli komunikaty dziennika błędów. Nie wpływa na wydajność.", - "pt_BR": "Habilita ou desabilita exibição de mensagens de erro", + "pt_BR": "Imprime mensagens de log de erro no console. Não afeta o desempenho.", "ru_RU": "Включает вывод сообщений журнала ошибок. Не влияет на производительность.", "sv_SE": "Skriver ut felloggmeddelanden i konsollen. Påverkar inte prestandan.", "th_TH": "พิมพ์ข้อความบันทึกข้อผิดพลาดในคอนโซล จะไม่ส่งผลกระทบต่อประสิทธิภาพการทำงาน", @@ -16637,7 +16912,7 @@ "ko_KR": "콘솔에 추적 기록 메시지를 출력합니다. 성능에 영향을 주지 않습니다.", "no_NO": "Skriver ut sporbare loggmeldinger i konsollen. påvirker ikke ytelsen.", "pl_PL": "Wyświetla komunikaty dziennika śledzenia w konsoli. Nie wpływa na wydajność.", - "pt_BR": "Habilita ou desabilita exibição de mensagens de rastreamento", + "pt_BR": "Imprime mensagens de log de rastreamento no console. Não afeta o desempenho.", "ru_RU": "Выводит сообщения журнала трассировки в консоли. Не влияет на производительность.", "sv_SE": "Skriver ut spårloggmeddelanden i konsollen. Påverkar inte prestandan.", "th_TH": "พิมพ์ข้อความประวัติการติดตามในคอนโซล ไม่ส่งผลกระทบต่อประสิทธิภาพการทำงาน", @@ -16662,7 +16937,7 @@ "ko_KR": "콘솔에 게스트 로그 메시지를 출력합니다. 성능에 영향을 주지 않습니다.", "no_NO": "Skriver ut gjesteloggmeldinger i konsollen. påvirker ikke ytelsen.", "pl_PL": "Wyświetla komunikaty dziennika gości w konsoli. Nie wpływa na wydajność.", - "pt_BR": "Habilita ou desabilita exibição de mensagens do programa convidado", + "pt_BR": "Imprime mensagens de log do convidado no console. Não afeta o desempenho.", "ru_RU": "Включает вывод сообщений гостевого журнала. Не влияет на производительность.", "sv_SE": "Skriver ut gästloggmeddelanden i konsollen. Påverkar inte prestandan.", "th_TH": "พิมพ์ข้อความประวัติของผู้เยี่ยมชมในคอนโซล ไม่ส่งผลกระทบต่อประสิทธิภาพการทำงาน", @@ -16687,7 +16962,7 @@ "ko_KR": "콘솔에 파일 접속 기록 메시지를 출력합니다.", "no_NO": "Skriver ut filtilgang til loggmeldinger i konsollen.", "pl_PL": "Wyświetla w konsoli komunikaty dziennika dostępu do plików.", - "pt_BR": "Habilita ou desabilita exibição de mensagens do acesso de arquivos", + "pt_BR": "Imprime mensagens de log de acesso a arquivos no console.", "ru_RU": "Включает вывод сообщений журнала доступа к файлам.", "sv_SE": "Skriver ut loggmeddelanden för filåtkomst i konsollen.", "th_TH": "พิมพ์ข้อความบันทึกการเข้าถึงไฟล์ในคอนโซล", @@ -16712,7 +16987,7 @@ "ko_KR": "콘솔에 파일 시스템 접속 기록 출력을 활성화합니다. 가능한 모드는 0-3", "no_NO": "Aktiverer FS tilgang loggutgang til konsollen. Mulige moduser er 0-3", "pl_PL": "Włącza wyjście dziennika dostępu FS do konsoli. Możliwe tryby to 0-3", - "pt_BR": "Habilita exibição de mensagens de acesso ao sistema de arquivos no console. Modos permitidos são 0-3", + "pt_BR": "Habilita a saída do log de acesso FS para o console. Os modos possíveis são 0-3", "ru_RU": "Включает вывод журнала доступа к файловой системе. Возможные режимы: 0-3", "sv_SE": "Aktiverar loggutdata för filsystemsåtkomst i konsollen. Möjliga lägen är 0-3", "th_TH": "เปิดใช้งาน เอาต์พุตประวัติการเข้าถึง FS ไปยังคอนโซล โหมดที่เป็นไปได้คือ 0-3", @@ -16760,15 +17035,15 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Skriver ut Avalonia (UI)-loggmeldinger i konsollen.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Imprime mensagens de log do Avalonia (UI) no console.", "ru_RU": "", "sv_SE": "", "th_TH": "", "tr_TR": "", "uk_UA": "", - "zh_CN": "", + "zh_CN": "在控制台显示 Avalonia (UI) 的日志信息", "zh_TW": "" } }, @@ -16787,7 +17062,7 @@ "ko_KR": "적절한 기록 수준이 활성화되어 있어야 함", "no_NO": "Krever riktige loggnivåer aktivert", "pl_PL": "Wymaga włączonych odpowiednich poziomów logów", - "pt_BR": "Requer que os níveis de log apropriados estejaam habilitados", + "pt_BR": "Requer níveis de log apropriados habilitados", "ru_RU": "Требует включения соответствующих уровней ведения журнала", "sv_SE": "Kräver att lämpliga loggnivåer aktiveras", "th_TH": "จำเป็นต้องเปิดใช้งานระดับบันทึกที่เหมาะสม", @@ -16812,7 +17087,7 @@ "ko_KR": "콘솔에 디버그 기록 메시지를 출력합니다.\n\n담당자가 특별히 요청한 경우에만 이 기능을 사용하십시오. 로그를 읽기 어렵게 만들고 에뮬레이터 성능을 저하시킬 수 있기 때문입니다.", "no_NO": "Skriver ut loggmeldinger i konsollen.\n\nBruk bare dette hvis et medlem har gitt spesifikke instruksjoner, siden det vil gjøre loggene vanskelig å lese og forverre emulatorytelse.", "pl_PL": "Wyświetla komunikaty dziennika debugowania w konsoli.\n\nUżywaj tego tylko na wyraźne polecenie członka załogi, ponieważ utrudni to odczytanie dzienników i pogorszy wydajność emulatora.", - "pt_BR": "Habilita exibição de mensagens de depuração", + "pt_BR": "Imprime mensagens de log de depuração no console.\n\nUse isso somente se for especificamente instruído por um membro da equipe, pois isso tornará os logs difíceis de ler e piorará o desempenho do emulador.", "ru_RU": "Выводит журнал сообщений отладки в консоли.\n\nИспользуйте только в случае просьбы разработчика, так как включение этой функции затруднит чтение журналов и ухудшит работу эмулятора.", "sv_SE": "Skriver ut felsökningsloggmeddelanden i konsolen.\n\nAnvänd endast detta om det är specifikt instruerat av en medarbetare, eftersom det kommer att göra loggar svåra att läsa och försämra emulatorprestanda.", "th_TH": "พิมพ์ข้อความประวัติการแก้ไขข้อบกพร่องในคอนโซล\n\nใช้สิ่งนี้เฉพาะเมื่อได้รับคำแนะนำจากผู้ดูแลเท่านั้น เนื่องจากจะทำให้บันทึกอ่านยากและทำให้ประสิทธิภาพของโปรแกรมจำลองแย่ลง", @@ -16837,7 +17112,7 @@ "ko_KR": "파일 탐색기를 열어 불러올 Switch 호환 파일을 선택", "no_NO": "Åpne filutforsker for å velge en Switch kompatibel fil å laste", "pl_PL": "Otwórz eksplorator plików, aby wybrać plik kompatybilny z Switch do wczytania", - "pt_BR": "Abre o navegador de arquivos para seleção de um arquivo do Switch compatível a ser carregado", + "pt_BR": "Abre um explorador de arquivos para escolher um arquivo compatível com o Switch para carregar", "ru_RU": "Открывает файловый менеджер для выбора файла, совместимого с Nintendo Switch.", "sv_SE": "Öppna en filutforskare för att välja en Switch-kompatibel fil att läsa in", "th_TH": "เปิดตัวสำรวจไฟล์เพื่อเลือกไฟล์ที่เข้ากันได้กับ Switch ที่จะโหลด", @@ -16862,7 +17137,7 @@ "ko_KR": "Switch와 호환되는 압축 해제된 앱을 선택하여 불러오려면 파일 탐색기를 엽니다.", "no_NO": "Åpne en filutforsker for å velge en Switch kompatibel, upakket applikasjon for å laste", "pl_PL": "Otwórz eksplorator plików, aby wybrać zgodną z Switch, rozpakowaną aplikację do załadowania", - "pt_BR": "Abre o navegador de pastas para seleção de pasta extraída do Switch compatível a ser carregada", + "pt_BR": "Abre um explorador de arquivos para escolher um aplicativo descompactado compatível com o Switch para carregar", "ru_RU": "Открывает файловый менеджер для выбора распакованного приложения, совместимого с Nintendo Switch.", "sv_SE": "Öppna en filutforskare för att välja en Switch-kompatibel, uppackad applikation att läsa in", "th_TH": "เปิดตัวสำรวจไฟล์เพื่อเลือกไฟล์ที่เข้ากันได้กับ Switch ที่จะโหลด", @@ -16887,7 +17162,7 @@ "ko_KR": "파일 탐색기를 열어 DLC를 일괄 불러오기할 폴더를 하나 이상 선택", "no_NO": "Åpne en filutforsker for å velge en eller flere mapper å laste inn DLC fra", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Abre um explorador de arquivos para escolher uma ou mais pastas para carregar DLC em massa", "ru_RU": "Открывает проводник, для выбора одной или нескольких папок для массовой загрузки DLC", "sv_SE": "Öppna en filutforskare för att välja en eller flera mappar att läsa in alla DLC från", "th_TH": "เปิดตัวสำรวจไฟล์เพื่อเลือกหนึ่งโฟลเดอร์ขึ้นไปเพื่อโหลด DLC จำนวนมาก", @@ -16912,7 +17187,7 @@ "ko_KR": "파일 탐색기를 열어 하나 이상의 폴더를 선택하여 대량으로 타이틀 업데이트 불러오기", "no_NO": "Åpne en filutforsker for å velge en eller flere mapper som du vil laste inn titteloppdateringer fra", "pl_PL": "", - "pt_BR": "Abra o explorador de arquivos para selecionar uma ou mais pastas e carregar atualizações de jogo em massa.", + "pt_BR": "Abre um explorador de arquivos para escolher uma ou mais pastas para carregar em massa as atualizações de títulos", "ru_RU": "Открывает проводник, чтобы выбрать одну или несколько папок для массовой загрузки обновлений приложений", "sv_SE": "Öppna en filutforskare för att välja en eller flera mappar att läsa in alla titeluppdateringar från", "th_TH": "เปิดตัวสำรวจไฟล์เพื่อเลือกหนึ่งโฟลเดอร์ขึ้นไปเพื่อโหลดไฟล์อัปเดตจำนวนมาก", @@ -16937,7 +17212,7 @@ "ko_KR": "Ryujinx 파일 시스템 폴더 열기", "no_NO": "Åpne Ryujinx filsystem-mappen", "pl_PL": "Otwórz folder systemu plików Ryujinx", - "pt_BR": "Abre o diretório do sistema de arquivos do Ryujinx", + "pt_BR": "Abre a pasta do sistema de arquivos Ryujinx", "ru_RU": "Открывает папку с файлами Ryujinx", "sv_SE": "Öppna Ryujinx-filsystemsmappen", "th_TH": "เปิดโฟลเดอร์ระบบไฟล์ Ryujinx", @@ -16947,6 +17222,31 @@ "zh_TW": "開啟 Ryujinx 檔案系統資料夾" } }, + { + "ID": "OpenScreenshotFolderTooltip", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Open Ryujinx screenshots folder", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "", + "pl_PL": "", + "pt_BR": "Abre a pasta de capturas de tela do Ryujinx", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "", + "zh_TW": "" + } + }, { "ID": "OpenRyujinxLogsTooltip", "Translations": { @@ -16962,7 +17262,7 @@ "ko_KR": "로그가 기록되는 폴더 열기", "no_NO": "Åpner mappen hvor logger er lagret", "pl_PL": "Otwiera folder, w którym zapisywane są logi", - "pt_BR": "Abre o diretório onde os logs são salvos", + "pt_BR": "Abre a pasta onde os logs são gravados", "ru_RU": "Открывает папку в которую записываются логи", "sv_SE": "Öppnar mappen där loggarna har skrivits till", "th_TH": "เปิดโฟลเดอร์ ที่เก็บไฟล์ประวัติ", @@ -17037,7 +17337,7 @@ "ko_KR": "사용자 프로필 관리자 창 열기", "no_NO": "Åpne vindu for brukerprofiler", "pl_PL": "Otwórz okno Menedżera Profili Użytkownika", - "pt_BR": "Abrir janela de gerenciamento de perfis", + "pt_BR": "Abrir Janela de Gerenciamento de Perfis", "ru_RU": "Открыть менеджер учетных записей", "sv_SE": "Öppna hanterare för användarprofiler", "th_TH": "เปิดหน้าต่างตัวจัดการโปรไฟล์ผู้ใช้", @@ -17112,7 +17412,7 @@ "ko_KR": "정보 창 열기", "no_NO": "Åpne Om Vindu", "pl_PL": "Otwórz Okno Informacje", - "pt_BR": "Abrir janela sobre", + "pt_BR": "Abrir Janela Sobre", "ru_RU": "Открывает окно «О программе»", "sv_SE": "Öppna Om-fönstret", "th_TH": "เปิดหน้าต่าง เกี่ยวกับ", @@ -17137,7 +17437,7 @@ "ko_KR": "그리드 크기", "no_NO": "Rutenett størrelse", "pl_PL": "Wielkość siatki", - "pt_BR": "Tamanho da grade", + "pt_BR": "Tamanho da Grade", "ru_RU": "Размер сетки", "sv_SE": "Rutnätsstorlek", "th_TH": "ขนาดตาราง", @@ -17212,7 +17512,7 @@ "ko_KR": "모든 기여자 보기", "no_NO": "Se alle bidragsytere", "pl_PL": "Zobacz Wszystkich Współtwórców", - "pt_BR": "Ver todos os contribuidores", + "pt_BR": "Ver Todos os Contribuidores", "ru_RU": "Посмотреть всех участников", "sv_SE": "Visa alla som bidragit", "th_TH": "ดูผู้มีส่วนร่วมทั้งหมด", @@ -17262,7 +17562,7 @@ "ko_KR": "음량 변경", "no_NO": "Endre lydenivå", "pl_PL": "Zmień Głośność Dźwięku", - "pt_BR": "Mudar volume do áudio", + "pt_BR": "Mudar Volume do Áudio", "ru_RU": "Изменяет громкость звука", "sv_SE": "Ändra ljudvolym", "th_TH": "ปรับระดับเสียง", @@ -17287,7 +17587,7 @@ "ko_KR": "게스트 인터넷 접속/LAN 모드", "no_NO": "Internett-tilgang for gjeste/LAN-modus", "pl_PL": "Dostęp do Internetu Gościa/Tryb LAN", - "pt_BR": "Habilitar acesso à internet do programa convidado", + "pt_BR": "Acesso à Internet para Convidados/Modo LAN", "ru_RU": "Гостевой доступ в интернет/сетевой режим", "sv_SE": "Gäståtkomst för Internet/LAN-läge", "th_TH": "การเข้าถึงอินเทอร์เน็ตของผู้เยี่ยมชม/โหมด LAN", @@ -17312,7 +17612,7 @@ "ko_KR": "에뮬레이트된 앱을 인터넷에 연결할 수 있습니다.\n\nLAN 모드가 있는 게임은 이 기능이 활성화되고 시스템이 동일한 접속 포인트에 연결되어 있을 때 서로 연결할 수 있습니다. 이는 실제 콘솔도 포함됩니다.\n\nNintendo 서버 연결을 허용하지 않습니다. 인터넷에 연결을 시도하는 특정 게임에서 충돌이 발생할 수 있습니다.\n\n모르면 끔으로 두세요.", "no_NO": "Tillater emulert applikasjon å koble til Internett.\n\nSpill med en LAN-modus kan koble til hverandre når dette er aktivert og systemene er koblet til det samme tilgangspunktet. Dette inkluderer ekte konsoller også.\n\ntillater IKKE tilkobling til Nintendo servere. Kan forårsake krasjing i enkelte spill som prøver å koble til Internett.\n\nLa stå AV hvis du er usikker.", "pl_PL": "Pozwala emulowanej aplikacji na łączenie się z Internetem.\n\nGry w trybie LAN mogą łączyć się ze sobą, gdy ta opcja jest włączona, a systemy są połączone z tym samym punktem dostępu. Dotyczy to również prawdziwych konsol.\n\nNie pozwala na łączenie się z serwerami Nintendo. Może powodować awarie niektórych gier, które próbują połączyć się z Internetem.\n\nPozostaw WYŁĄCZONE, jeśli nie masz pewności.", - "pt_BR": "Habilita acesso à internet do programa convidado. Se habilitado, o aplicativo vai se comportar como se o sistema Switch emulado estivesse conectado a Internet. Note que em alguns casos, aplicativos podem acessar a Internet mesmo com essa opção desabilitada", + "pt_BR": "Permite que o aplicativo emulado se conecte à Internet.\n\nJogos com modo LAN podem se conectar uns aos outros quando isso está habilitado e os sistemas estão conectados ao mesmo ponto de acesso. Isso inclui consoles reais também.\n\nNÃO permite a conexão com servidores Nintendo. Pode causar travamentos em certos jogos que tentam se conectar à Internet.\n\nDeixe DESLIGADO se não tiver certeza.", "ru_RU": "Позволяет эмулированному приложению подключаться к Интернету.\n\nПри включении этой функции игры с возможностью сетевой игры могут подключаться друг к другу, если все эмуляторы (или реальные консоли) подключены к одной и той же точке доступа.\n\nНЕ разрешает подключение к серверам Nintendo. Может вызвать сбой в некоторых играх, которые пытаются подключиться к Интернету.\n\nРекомендутеся оставить выключенным.", "sv_SE": "Tillåter det emulerade programmet att ansluta till internet.\n\nSpel med ett LAN-läge kan ansluta till varandra när detta är aktiverat och systemen är anslutna till samma åtkomstpunkt. Detta inkluderar riktiga konsoler också.\n\nTillåter INTE anslutning till Nintendo-servrar. Kan orsaka kraschar i vissa spel som försöker ansluta till internet.\n\nLämna AV om du är osäker.", "th_TH": "อนุญาตให้แอปพลิเคชันจำลองเชื่อมต่ออินเทอร์เน็ต\n\nเกมที่มีโหมด LAN สามารถเชื่อมต่อระหว่างกันได้เมื่อเปิดใช้งานและระบบเชื่อมต่อกับจุดเชื่อมต่อเดียวกัน รวมถึงคอนโซลจริงด้วย\n\nไม่อนุญาตให้มีการเชื่อมต่อกับเซิร์ฟเวอร์ Nintendo อาจทำให้เกิดการหยุดทำงานในบางเกมที่พยายามเชื่อมต่ออินเทอร์เน็ต\n\nปล่อยให้ปิดหากคุณไม่แน่ใจ", @@ -17337,7 +17637,7 @@ "ko_KR": "치트 관리", "no_NO": "Administrer juksemoduser", "pl_PL": "Zarządzaj Kodami", - "pt_BR": "Gerenciar Cheats", + "pt_BR": "Gerenciar Trapaças", "ru_RU": "Открывает окно управления читами", "sv_SE": "Hantera fusk", "th_TH": "ฟังก์ชั่นจัดการสูตรโกง", @@ -17362,7 +17662,7 @@ "ko_KR": "치트 관리", "no_NO": "Administrer juksemoduser", "pl_PL": "Zarządzaj Kodami", - "pt_BR": "Gerenciar Cheats", + "pt_BR": "Gerenciar Trapaças", "ru_RU": "Управление читами", "sv_SE": "Hantera fusk", "th_TH": "ฟังก์ชั่นจัดการสูตรโกง", @@ -17587,7 +17887,7 @@ "ko_KR": "네트워크 연결", "no_NO": "Nettverk tilkobling", "pl_PL": "Połączenie Sieciowe", - "pt_BR": "Conexão de rede", + "pt_BR": "Conexão de Rede", "ru_RU": "Подключение к сети", "sv_SE": "Nätverksanslutning", "th_TH": "การเชื่อมต่อเครือข่าย", @@ -17637,7 +17937,7 @@ "ko_KR": "CPU 모드", "no_NO": "Prosessor modus", "pl_PL": "Pamięć CPU", - "pt_BR": "Memória da CPU", + "pt_BR": "Modo da CPU", "ru_RU": "Режим работы процессора", "sv_SE": "CPU-läge", "th_TH": "โหมดซีพียู", @@ -17662,7 +17962,7 @@ "ko_KR": "업데이터가 비활성화되었습니다!", "no_NO": "Oppdatering Deaktivert!", "pl_PL": "Aktualizator Wyłączony!", - "pt_BR": "Atualizador desabilitado!", + "pt_BR": "Atualizador Desabilitado!", "ru_RU": "Средство обновления отключено", "sv_SE": "Uppdateringar inaktiverade!", "th_TH": "ปิดใช้งานการอัปเดตแล้ว!", @@ -17672,6 +17972,31 @@ "zh_TW": "更新已停用!" } }, + { + "ID": "UpdaterBackgroundStatusBarButtonText", + "Translations": { + "ar_SA": "", + "de_DE": "", + "el_GR": "", + "en_US": "Update Available!", + "es_ES": "", + "fr_FR": "", + "he_IL": "", + "it_IT": "", + "ja_JP": "", + "ko_KR": "", + "no_NO": "Oppdatering tilgjengelig!", + "pl_PL": "", + "pt_BR": "Atualização Disponível!", + "ru_RU": "", + "sv_SE": "", + "th_TH": "", + "tr_TR": "", + "uk_UA": "", + "zh_CN": "有可用的更新！", + "zh_TW": "" + } + }, { "ID": "ControllerSettingsRotate90", "Translations": { @@ -17687,7 +18012,7 @@ "ko_KR": "시계 방향으로 90° 회전", "no_NO": "Roter 90° med klokken", "pl_PL": "Obróć o 90° w Prawo", - "pt_BR": "Rodar 90° sentido horário", + "pt_BR": "Rodar 90° Sentido Horário", "ru_RU": "Повернуть на 90° по часовой стрелке", "sv_SE": "Rotera 90° medurs", "th_TH": "หมุน 90 องศา ตามเข็มนาฬิกา", @@ -17712,7 +18037,7 @@ "ko_KR": "아이콘 크기", "no_NO": "Ikon størrelse", "pl_PL": "Rozmiar ikon", - "pt_BR": "Tamanho do ícone", + "pt_BR": "Tamanho do Ícone", "ru_RU": "Размер обложек", "sv_SE": "Ikonstorlek", "th_TH": "ขนาดไอคอน", @@ -17762,7 +18087,7 @@ "ko_KR": "콘솔 표시", "no_NO": "Vis konsoll", "pl_PL": "Pokaż Konsolę", - "pt_BR": "Exibir console", + "pt_BR": "Exibir Console", "ru_RU": "Показать консоль", "sv_SE": "Visa konsoll", "th_TH": "แสดง คอนโซล", @@ -17787,7 +18112,7 @@ "ko_KR": "{0}에서 셰이더 캐시를 삭제하는 중 오류 발생 : {1}", "no_NO": "Feil under tømming av shader cache ved {0}: {1}", "pl_PL": "Błąd podczas czyszczenia cache shaderów w {0}: {1}", - "pt_BR": "Erro ao deletar o shader em {0}: {1}", + "pt_BR": "Erro ao limpar o cache do shader em {0}: {1}", "ru_RU": "Ошибка очистки кэша шейдеров в {0}: {1}", "sv_SE": "Fel vid tömning av shader cache i {0}: {1}", "th_TH": "เกิดข้อผิดพลาดในการล้างแคชแสงเงา {0}: {1}", @@ -17862,7 +18187,7 @@ "ko_KR": "펌웨어 구문 분석 오류", "no_NO": "Fastvare analysefeil", "pl_PL": "Błąd parsowania firmware'u", - "pt_BR": "Erro na leitura do Firmware", + "pt_BR": "Erro de análise de firmware", "ru_RU": "Ошибка извлечения прошивки", "sv_SE": "Tolkningsfel i firmware", "th_TH": "เกิดข้อผิดพลาดในการวิเคราะห์เฟิร์มแวร์", @@ -18062,7 +18387,7 @@ "ko_KR": "알 수 없는 오류가 발생했습니다!", "no_NO": "En ukjent feil oppstod!", "pl_PL": "Wystąpił nieznany błąd!", - "pt_BR": "Um erro desconhecido foi encontrado!", + "pt_BR": "Ocorreu um erro desconhecido!", "ru_RU": "Произошла неизвестная ошибка", "sv_SE": "Ett okänt fel inträffade!", "th_TH": "เกิดข้อผิดพลาดที่ไม่รู้จัก!", @@ -18112,7 +18437,7 @@ "ko_KR": "설정 가이드 열기", "no_NO": "Åpne oppsettsveiledningen", "pl_PL": "Otwórz Podręcznik Konfiguracji", - "pt_BR": "Abrir o guia de configuração", + "pt_BR": "Abrir o Guia de Configuração", "ru_RU": "Открыть руководство по установке", "sv_SE": "Öppna konfigurationsguiden", "th_TH": "เปิดคู่มือการตั้งค่า", @@ -18137,7 +18462,7 @@ "ko_KR": "업데이트 없음", "no_NO": "Ingen oppdatering", "pl_PL": "Brak Aktualizacji", - "pt_BR": "Sem atualizações", + "pt_BR": "Sem Atualizações", "ru_RU": "Без обновлений", "sv_SE": "Ingen uppdatering", "th_TH": "ไม่มีการอัปเดต", @@ -18237,7 +18562,7 @@ "ko_KR": "일부", "no_NO": "Delvis", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Parcial", "ru_RU": "Частично", "sv_SE": "Delvis", "th_TH": "", @@ -18262,7 +18587,7 @@ "ko_KR": "트리밍되지 않음", "no_NO": "Ikke trimmet", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Não Reduzido", "ru_RU": "Не обрезан", "sv_SE": "Inte optimerad", "th_TH": "", @@ -18287,7 +18612,7 @@ "ko_KR": "트리밍됨", "no_NO": "Trimmet", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Reduzido", "ru_RU": "Обрезан", "sv_SE": "Optimerad", "th_TH": "", @@ -18312,7 +18637,7 @@ "ko_KR": "(실패)", "no_NO": "(Mislyktes)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Falhou", "ru_RU": "(Ошибка)", "sv_SE": "(misslyckades)", "th_TH": "", @@ -18337,7 +18662,7 @@ "ko_KR": "{0:n0} Mb 저장", "no_NO": "Spare {0:n0} Mb", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Salvar {0:n0} Mb", "ru_RU": "Сохранить {0:n0} Мб", "sv_SE": "Spara {0:n0} Mb", "th_TH": "", @@ -18362,7 +18687,7 @@ "ko_KR": "{0:n0}Mb 저장됨", "no_NO": "Spart {0:n0} Mb", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Salvo {0:n0} Mb", "ru_RU": "Сохранено {0:n0} Мб", "sv_SE": "Sparade {0:n0} Mb", "th_TH": "", @@ -18389,7 +18714,7 @@ "pl_PL": "", "pt_BR": "{0} - Informação", "ru_RU": "{0} - Информация", - "sv_SE": "", + "sv_SE": "{0} - Information", "th_TH": "{0} – ข้อมูล", "tr_TR": "{0} - Bilgi", "uk_UA": "{0} - Інформація", @@ -18537,7 +18862,7 @@ "ko_KR": "캐비닛 대화 상자", "no_NO": "Dialogboks for kabinett", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Diálogo do Gabinete", "ru_RU": "Сообщение кабинета", "sv_SE": "Cabinet-dialog", "th_TH": "", @@ -18562,7 +18887,7 @@ "ko_KR": "Amiibo의 새 이름 입력하기", "no_NO": "Skriv inn Amiiboens nye navn", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Digite o novo nome do seu Amiibo", "ru_RU": "Введите новое имя вашего Amiibo", "sv_SE": "Ange nya namnet för din Amiibo", "th_TH": "", @@ -18587,7 +18912,7 @@ "ko_KR": "지금 Amiibo를 스캔하세요.", "no_NO": "Vennligst skann Amiiboene dine nå.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Por favor, escaneie seu Amiibo agora.", "ru_RU": "Пожалуйста, отсканируйте свой Amiibo.", "sv_SE": "Skanna din Amiibo nu.", "th_TH": "", @@ -18712,7 +19037,7 @@ "ko_KR": "지원되는 컨트롤러 :", "no_NO": "Støttede kontrollere:", "pl_PL": "Obsługiwane Kontrolery:", - "pt_BR": "", + "pt_BR": "Controladores Suportados:", "ru_RU": "Поддерживаемые геймпады:", "sv_SE": "Handkontroller som stöds:", "th_TH": "คอนโทรลเลอร์ที่รองรับ:", @@ -18762,7 +19087,7 @@ "ko_KR": "현재 구성이 유효하지 않습니다. 설정을 열고 입력을 다시 구성하십시오.", "no_NO": "Din nåværende konfigurasjon er ugyldig. Åpne innstillinger og konfigurer inndata.", "pl_PL": "Twoja aktualna konfiguracja jest nieprawidłowa. Otwórz ustawienia i skonfiguruj swoje wejścia.", - "pt_BR": "", + "pt_BR": "Sua configuração atual é inválida. Abra as configurações e reconfigure suas entradas.", "ru_RU": "Текущая конфигурация некорректна. Откройте параметры и перенастройте управление.", "sv_SE": "Din aktuella konfiguration är ogiltig. Öppna inställningarna och konfigurera om din inmatning.", "th_TH": "การกำหนดค่าปัจจุบันของคุณไม่ถูกต้อง กรุณาเปิดการตั้งค่าและกำหนดค่าอินพุตของคุณใหม่", @@ -18787,7 +19112,7 @@ "ko_KR": "도킹 모드가 설정되었습니다. 휴대용 제어 기능을 비활성화해야 합니다.", "no_NO": "Docked modus. Håndholdt kontroll skal være deaktivert.", "pl_PL": "Ustawiony tryb zadokowany. Sterowanie przenośne powinno być wyłączone.", - "pt_BR": "", + "pt_BR": "Modo TV definido. O controle portátil deve ser desabilitado.", "ru_RU": "Используется стационарный режим. Управление в портативном режиме должно быть отключено.", "sv_SE": "Dockat läge angivet. Handhållna kontroller bör inaktiveras.", "th_TH": "ตั้งค่าด็อกโหมด ควรปิดใช้งานการควบคุมแบบแฮนด์เฮลด์", @@ -18862,7 +19187,7 @@ "ko_KR": "새 파일 추가...", "no_NO": "Legger til nye filer...", "pl_PL": "Dodawanie Nowych Plików...", - "pt_BR": "Adicionando novos arquivos...", + "pt_BR": "Adicionando Novos Arquivos...", "ru_RU": "Добавление новых файлов...", "sv_SE": "Lägger till nya filer...", "th_TH": "กำลังเพิ่มไฟล์ใหม่...", @@ -18887,7 +19212,7 @@ "ko_KR": "업데이트 추출...", "no_NO": "Pakker ut oppdatering...", "pl_PL": "Wypakowywanie Aktualizacji...", - "pt_BR": "Extraíndo atualização...", + "pt_BR": "Extraíndo Atualização...", "ru_RU": "Извлечение обновления...", "sv_SE": "Extraherar uppdatering...", "th_TH": "กำลังแยกการอัปเดต...", @@ -18912,7 +19237,7 @@ "ko_KR": "업데이트 내려받기 중...", "no_NO": "Laster ned oppdatering...", "pl_PL": "Pobieranie Aktualizacji...", - "pt_BR": "Baixando atualização...", + "pt_BR": "Baixando Atualização...", "ru_RU": "Загрузка обновления...", "sv_SE": "Hämtar uppdatering...", "th_TH": "กำลังดาวน์โหลดอัปเดต...", @@ -18937,7 +19262,7 @@ "ko_KR": "도킹", "no_NO": "Forankret", "pl_PL": "Zadokowany", - "pt_BR": "TV", + "pt_BR": "Dock/TV", "ru_RU": "Стационарный режим", "sv_SE": "Dockad", "th_TH": "ด็อก", @@ -18987,7 +19312,7 @@ "ko_KR": "연결 오류가 발생했습니다.", "no_NO": "Tilkoblingsfeil", "pl_PL": "Błąd Połączenia.", - "pt_BR": "Erro de conexão.", + "pt_BR": "Erro de Conexão.", "ru_RU": "Ошибка соединения", "sv_SE": "Anslutningsfel.", "th_TH": "การเชื่อมต่อล้มเหลว", @@ -19137,7 +19462,7 @@ "ko_KR": "모든 키보드", "no_NO": "Alle tastaturer", "pl_PL": "Wszystkie klawiatury", - "pt_BR": "Todos os teclados", + "pt_BR": "Todos os Teclados", "ru_RU": "Все клавиатуры", "sv_SE": "Alla tangentbord", "th_TH": "คีย์บอร์ดทั้งหมด", @@ -19187,7 +19512,7 @@ "ko_KR": "압축 해제된 게임이 있는 폴더를 선택", "no_NO": "Velg en mappe med et pakket ut spill", "pl_PL": "Wybierz folder z rozpakowaną grą", - "pt_BR": "Selecione um diretório com um jogo extraído", + "pt_BR": "Selecione uma pasta com um jogo descompactado", "ru_RU": "Выберите папку с распакованной игрой", "sv_SE": "Välj en mapp med ett uppackat spel", "th_TH": "เลือกโฟลเดอร์ที่มีเกมที่แตกไฟล์แล้ว", @@ -19212,7 +19537,7 @@ "ko_KR": "지원되는 모든 형식", "no_NO": "Alle støttede formater", "pl_PL": "Wszystkie Obsługiwane Formaty", - "pt_BR": "Todos os formatos suportados", + "pt_BR": "Todos os Formatos Suportados", "ru_RU": "Все поддерживаемые форматы", "sv_SE": "Alla format som stöds", "th_TH": "รูปแบบที่รองรับทั้งหมด", @@ -19262,7 +19587,7 @@ "ko_KR": "키보드 단축키", "no_NO": "Hurtigtaster for tastatur", "pl_PL": "Skróty Klawiszowe Klawiatury", - "pt_BR": "Atalhos do teclado", + "pt_BR": "Atalhos do Teclado", "ru_RU": "Горячие клавиши", "sv_SE": "Snabbtangenter för tangentbord", "th_TH": "ปุ่มลัดของคีย์บอร์ด", @@ -19287,7 +19612,7 @@ "ko_KR": "키보드 단축키", "no_NO": "Hurtigtaster for tastatur", "pl_PL": "Skróty Klawiszowe Klawiatury", - "pt_BR": "Atalhos do teclado", + "pt_BR": "Atalhos do Teclado", "ru_RU": "Горячие клавиши", "sv_SE": "Snabbtangenter för tangentbord", "th_TH": "ปุ่มลัดของคีย์บอร์ด", @@ -19312,7 +19637,7 @@ "ko_KR": "스크린샷 :", "no_NO": "Skjermbilde", "pl_PL": "Zrzut Ekranu:", - "pt_BR": "Captura de tela:", + "pt_BR": "Captura de Tela:", "ru_RU": "Скриншот:", "sv_SE": "Skärmbild:", "th_TH": "ภาพหน้าจอ:", @@ -19412,7 +19737,7 @@ "ko_KR": "모션 컨트롤 설정", "no_NO": "Innstillinger for bevegelses kontroll", "pl_PL": "Ustawienia Sterowania Ruchowego", - "pt_BR": "Configurações do controle de movimento", + "pt_BR": "Configurações do Controle de Movimento", "ru_RU": "Настройки управления движением", "sv_SE": "Inställningar för rörelsekontroller", "th_TH": "ตั้งค่าควบคุมการเคลื่อนไหว", @@ -19437,7 +19762,7 @@ "ko_KR": "진동 설정", "no_NO": "Innstillinger for Vibrasjon", "pl_PL": "Ustawienia Wibracji", - "pt_BR": "Configurações de vibração", + "pt_BR": "Configurações de Vibração", "ru_RU": "Настройки вибрации", "sv_SE": "Inställningar för vibration", "th_TH": "ตั้งค่าการสั่นไหว", @@ -19460,11 +19785,11 @@ "it_IT": "", "ja_JP": "", "ko_KR": "LED 설정", - "no_NO": "", + "no_NO": "LED-innstillinger", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Configurações de LED", "ru_RU": "", - "sv_SE": "", + "sv_SE": "LED-inställningar", "th_TH": "", "tr_TR": "", "uk_UA": "", @@ -19487,7 +19812,7 @@ "ko_KR": "테마 파일 선택", "no_NO": "Velg tema fil", "pl_PL": "Wybierz Plik Motywu", - "pt_BR": "Selecionar arquivo do tema", + "pt_BR": "Selecionar Arquivo de Tema", "ru_RU": "Выбрать файл темы", "sv_SE": "Välj temafil", "th_TH": "เลือกธีมไฟล์", @@ -19512,7 +19837,7 @@ "ko_KR": "Xaml 테마 파일", "no_NO": "Xaml tema-fil", "pl_PL": "Plik Motywu Xaml", - "pt_BR": "Arquivo de tema Xaml", + "pt_BR": "Arquivo de Tema Xaml", "ru_RU": "Файл темы Xaml", "sv_SE": "Xaml-temafil", "th_TH": "ไฟล์ธีมรูปแบบ XAML", @@ -19537,7 +19862,7 @@ "ko_KR": "계정 관리 - 아바타", "no_NO": "Administrer kontoer - Profilbilde", "pl_PL": "Zarządzaj Kontami — Avatar", - "pt_BR": "Gerenciar contas - Avatar", + "pt_BR": "Gerenciar Contas - Avatar", "ru_RU": "Управление аккаунтами - Аватар", "sv_SE": "Hantera konton - Avatar", "th_TH": "จัดการบัญชี - อวาต้า", @@ -19662,7 +19987,7 @@ "ko_KR": "DLC 파일 선택", "no_NO": "Velg DLC-filer", "pl_PL": "Wybierz pliki DLC", - "pt_BR": "Selecionar arquivos de DLC", + "pt_BR": "Selecionar Arquivos de DLC", "ru_RU": "Выберите файлы DLC", "sv_SE": "Välj DLC-filer", "th_TH": "เลือกไฟล์ DLC", @@ -19712,7 +20037,7 @@ "ko_KR": "모드 디렉터리 선택", "no_NO": "Velg modifikasjons mappe", "pl_PL": "Wybierz katalog modów", - "pt_BR": "", + "pt_BR": "Selecione o diretório do mod", "ru_RU": "Выбрать папку с модами", "sv_SE": "Välj moddkatalog", "th_TH": "เลือกไดเรกทอรี Mods", @@ -19737,7 +20062,7 @@ "ko_KR": "XCI 파일 확인 및 정리", "no_NO": "Kontroller og trim XCI-filen", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Verifique e Reduza o Arquivo XCI", "ru_RU": "Проверить и обрезать XCI файл", "sv_SE": "Kontrollera och optimera XCI-filer", "th_TH": "", @@ -19762,7 +20087,7 @@ "ko_KR": "이 기능은 먼저 충분한 공간을 확보한 다음 XCI 파일을 트리밍하여 디스크 공간을 절약합니다.", "no_NO": "Denne funksjonen kontrollerer først hvor mye plass som er ledig, og trimmer deretter XCI-filen for å spare diskplass.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Esta função primeiro verificará o espaço vazio e depois reduzirá o arquivo XCI para economizar espaço em disco.", "ru_RU": "Эта функция сначала проверит наличие пустого пространства, а затем обрежет файл XCI, чтобы сэкономить место на диске.", "sv_SE": "Denna funktion kommer först att kontrollera ledigt utrymme och sedan optimera XCI-filen för att spara diskutrymme.", "th_TH": "", @@ -19787,7 +20112,7 @@ "ko_KR": "현재 파일 크기 : {0:n}MB\n게임 데이터 크기 : {1:n}MB\n디스크 공간 절약 : {2:n}MB", "no_NO": "Nåværende filstørrelse: 0:n MB\nSpilldatastørrelse: {1:n} MB\nDiskplassbesparelse: {2:n} MB", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Tamanho atual do arquivo: {0:n} MB\nTamanho dos dados do jogo: {1:n} MB\nEconomia de espaço em disco: {2:n} MB", "ru_RU": "Размер текущего файла: {0:n} Мб\nРазмер игровых данных: {1:n} MB\nЭкономия дискового пространства: {2:n} Мб", "sv_SE": "Aktuell filstorlek: {0:n} MB\nStorlek för speldata: {1:n} MB\nSparat diskutrymme: {2:n} MB", "th_TH": "", @@ -19812,7 +20137,7 @@ "ko_KR": "XCI 파일은 트리밍할 필요가 없습니다. 자세한 내용은 로그를 확인", "no_NO": "XCI-filen trenger ikke å trimmes. Sjekk loggene for mer informasjon", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O arquivo XCI não precisa ser reduzido. Verifique os logs para mais detalhes", "ru_RU": "Файл XCI не нуждается в обрезке. Проверьте логи для получения более подробной информации", "sv_SE": "XCI-filen behöver inte optimeras. Kontrollera loggen för mer information", "th_TH": "", @@ -19837,7 +20162,7 @@ "ko_KR": "XCI 파일은 트리밍을 해제할 수 없습니다. 자세한 내용은 로그를 확인", "no_NO": "XCI-filen kan ikke trimmes. Sjekk loggene for mer informasjon", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O arquivo XCI reduzido não pode ser desfeito. Verifique os logs para mais detalhes", "ru_RU": "XCI файл не может быть обрезан. Проверьте логи для получения более подробной информации", "sv_SE": "XCI-filen kan inte avoptimeras. Kontrollera loggen för mer information", "th_TH": "", @@ -19862,7 +20187,7 @@ "ko_KR": "XCI 파일은 읽기 전용이므로 쓰기 가능하게 만들 수 없습니다. 자세한 내용은 로그를 확인", "no_NO": "XCI-filen er skrivebeskyttet og kunne ikke gjøres skrivbar. Sjekk loggene for mer informasjon", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O arquivo XCI é somente leitura e não pôde ser tornado gravável. Verifique os logs para mais detalhes", "ru_RU": "Файл XCI доступен только для чтения и его невозможно сделать доступным для записи. Проверьте логи для получения более подробной информации", "sv_SE": "XCI-filen är skrivskyddad och kunde inte göras skrivbar. Kontrollera loggen för mer information", "th_TH": "", @@ -19887,7 +20212,7 @@ "ko_KR": "XCI 파일이 스캔된 후 크기가 변경되었습니다. 파일이 쓰여지고 있지 않은지 확인하고 다시 시도하세요.", "no_NO": "XCI File har endret størrelse siden den ble skannet. Kontroller at det ikke skrives til filen, og prøv på nytt.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O arquivo XCI mudou de tamanho desde que foi escaneado. Verifique se o arquivo não está sendo gravado e tente novamente.", "ru_RU": "Файл XCI изменился в размере после сканирования. Проверьте, не производится ли запись в этот файл, и повторите попытку.", "sv_SE": "XCI-filen har ändrats i storlek sedan den lästes av. Kontrollera att filen inte skrivs till och försök igen.", "th_TH": "", @@ -19912,7 +20237,7 @@ "ko_KR": "XCI 파일에 여유 공간 영역에 데이터가 있으므로 트리밍하는 것이 안전하지 않음", "no_NO": "XCI-filen har data i ledig plass, og det er ikke trygt å trimme den", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O arquivo XCI tem dados na área de espaço livre, não é seguro reduzi-lo", "ru_RU": "XCI файл содержит данные в пустой зоне, обрезать его небезопасно", "sv_SE": "XCI-filen har data i det lediga utrymmet. Den är inte säker att optimera", "th_TH": "", @@ -19937,7 +20262,7 @@ "ko_KR": "XCI 파일에 유효하지 않은 데이터가 포함되어 있습니다. 자세한 내용은 로그를 확인", "no_NO": "XCI-filen inneholder ugyldige data. Sjekk loggene for ytterligere detaljer", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O arquivo XCI contém dados inválidos. Verifique os logs para obter mais detalhes", "ru_RU": "Файл XCI содержит недопустимые данные. Проверьте логи для получения дополнительной информации", "sv_SE": "XCI-filen innehåller ogiltig data. Kontrollera loggen för mer information", "th_TH": "", @@ -19962,7 +20287,7 @@ "ko_KR": "XCI 파일을 쓰기 위해 열 수 없습니다. 자세한 내용은 로그를 확인", "no_NO": "XCI-filen kunne ikke åpnes for skriving. Sjekk loggene for ytterligere detaljer", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O arquivo XCI não pôde ser aberto para gravação. Verifique os logs para mais detalhes", "ru_RU": "XCI файл не удалось открыть для записи. Проверьте логи для получения дополнительной информации", "sv_SE": "XCI-filen kunde inte öppnas för skrivning. Kontrollera loggen för mer information", "th_TH": "", @@ -19987,7 +20312,7 @@ "ko_KR": "XCI 파일 트리밍에 실패", "no_NO": "Trimming av XCI-filen mislyktes", "pl_PL": "", - "pt_BR": "", + "pt_BR": "A redução do arquivo XCI falhou", "ru_RU": "Обрезка файла XCI не удалась", "sv_SE": "Optimering av XCI-filen misslyckades", "th_TH": "", @@ -20012,7 +20337,7 @@ "ko_KR": "작업이 취소됨", "no_NO": "Operasjonen ble avlyst", "pl_PL": "", - "pt_BR": "", + "pt_BR": "A operação foi cancelada", "ru_RU": "Операция была отменена", "sv_SE": "Åtgärden avbröts", "th_TH": "", @@ -20037,7 +20362,7 @@ "ko_KR": "작업이 수행되지 않음", "no_NO": "Ingen operasjon ble utført", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Nenhuma operação foi realizada", "ru_RU": "Операция не была проведена", "sv_SE": "Ingen åtgärd genomfördes", "th_TH": "", @@ -20062,7 +20387,7 @@ "ko_KR": "사용자 프로필 관리자", "no_NO": "Bruker Profiler Behandler", "pl_PL": "Menedżer Profili Użytkowników", - "pt_BR": "Gerenciador de perfis de usuário", + "pt_BR": "Gerenciador de Perfis de Usuário", "ru_RU": "Менеджер учетных записей", "sv_SE": "Hanterare för användarprofiler", "th_TH": "จัดการโปรไฟล์ผู้ใช้", @@ -20087,7 +20412,7 @@ "ko_KR": "치트 관리자", "no_NO": "Juksing behandler", "pl_PL": "Menedżer Kodów", - "pt_BR": "Gerenciador de Cheats", + "pt_BR": "Gerenciador de Trapaças", "ru_RU": "Менеджер читов", "sv_SE": "Fuskhanterare", "th_TH": "จัดการสูตรโกง", @@ -20112,7 +20437,7 @@ "ko_KR": "{0} ({1})의 내려받기 가능한 콘텐츠 관리", "no_NO": "Behandle nedlastbart innhold for {0} ({1})", "pl_PL": "Menedżer Zawartości do Pobrania", - "pt_BR": "Gerenciador de DLC", + "pt_BR": "Gerenciar conteúdo para download para {0} ({1})", "ru_RU": "Управление DLC для {0} ({1})", "sv_SE": "Hantera hämtningsbart innehåll för {0} ({1})", "th_TH": "จัดการ DLC ที่ดาวน์โหลดได้สำหรับ {0} ({1})", @@ -20162,7 +20487,7 @@ "ko_KR": "타이틀 업데이트 관리자", "no_NO": "Tittel oppdatering behandler", "pl_PL": "Menedżer Aktualizacji Tytułu", - "pt_BR": "Gerenciador de atualizações", + "pt_BR": "Gerenciador de Atualização de Título", "ru_RU": "Менеджер обновлений игр", "sv_SE": "Hanterare för speluppdateringar", "th_TH": "จัดการอัปเดตหัวข้อ", @@ -20187,7 +20512,7 @@ "ko_KR": "XCI 파일 트리머", "no_NO": "", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Redutor de Arquivo XCI", "ru_RU": "Уменьшение размера XCI файлов", "sv_SE": "Optimera XCI-filer", "th_TH": "", @@ -20212,7 +20537,7 @@ "ko_KR": "{1}개 타이틀 중 {0}개 선택됨", "no_NO": "{0} av {1} Valgte tittel(er)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "{0} de {1} Título(s) Selecionado(s)", "ru_RU": "{0} из {1} файла(ов) выбрано", "sv_SE": "{0} av {1} spel markerade", "th_TH": "", @@ -20237,7 +20562,7 @@ "ko_KR": "{1}개 타이틀 중 {0}개 선택됨({2}개 표시됨)", "no_NO": "{0} av {1} Tittel(er) valgt ({2} vises)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "{0} de {1} Título(s) Selecionado(s) ({2} exibidos)", "ru_RU": "{0} из {1} файла(ов) выбрано ({2} показано)", "sv_SE": "{0} av {1} spel markerade ({2} visade)", "th_TH": "", @@ -20262,7 +20587,7 @@ "ko_KR": "{0}개의 타이틀을 트리밍 중...", "no_NO": "Trimming av {0} tittel(er)...", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Reduzindo {0} Título(s)...", "ru_RU": "Обрезка {0} файла(ов)...", "sv_SE": "Optimerar {0} spel...", "th_TH": "", @@ -20287,7 +20612,7 @@ "ko_KR": "{0}개의 타이틀을 트리밍 해제 중...", "no_NO": "Untrimming {0} Tittel(er)...", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Desfazendo redução {0} Título(s)...", "ru_RU": "Отмена обрезки {0} файла(ов)...", "sv_SE": "Avoptimerar {0} spel...", "th_TH": "", @@ -20312,7 +20637,7 @@ "ko_KR": "실패", "no_NO": "Mislyktes", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Falhou", "ru_RU": "Ошибка", "sv_SE": "Misslyckades", "th_TH": "", @@ -20337,7 +20662,7 @@ "ko_KR": "잠재적 비용 절감", "no_NO": "Potensielle besparelser", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Economia Potencial", "ru_RU": "Потенциально освобождено места", "sv_SE": "Möjlig besparning", "th_TH": "", @@ -20362,7 +20687,7 @@ "ko_KR": "실제 비용 절감", "no_NO": "Faktiske besparelser", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Economia Real", "ru_RU": "Реально освобождено места", "sv_SE": "Faktisk besparning", "th_TH": "", @@ -20412,7 +20737,7 @@ "ko_KR": "표시됨 선택", "no_NO": "Velg vist", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Marcar Todos", "ru_RU": "Выбрать то что показано", "sv_SE": "Markera visade", "th_TH": "", @@ -20437,7 +20762,7 @@ "ko_KR": "표시됨 선택 취소", "no_NO": "Opphev valg av Vist", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Desmarcar Todos", "ru_RU": "Отменить выбор показанного", "sv_SE": "Avmarkera visade", "th_TH": "", @@ -20462,7 +20787,7 @@ "ko_KR": "타이틀", "no_NO": "Tittel", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Título", "ru_RU": "Приложение", "sv_SE": "Titel", "th_TH": "", @@ -20487,7 +20812,7 @@ "ko_KR": "공간 절약s", "no_NO": "Plassbesparelser", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Economia de Espaço", "ru_RU": "Сохранение места на диске", "sv_SE": "Utrymmesbesparning", "th_TH": "", @@ -20512,7 +20837,7 @@ "ko_KR": "트림", "no_NO": "", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Reduzir XCI", "ru_RU": "Обрезать", "sv_SE": "Optimera", "th_TH": "", @@ -20537,7 +20862,7 @@ "ko_KR": "언트림", "no_NO": "Utrim", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Desfazer Redução", "ru_RU": "Отмена обрезки", "sv_SE": "Avoptimera", "th_TH": "", @@ -20612,7 +20937,7 @@ "ko_KR": "{0} [{1}]에 사용 가능한 치트", "no_NO": "Juks tilgjengelig for {0} [{1}]", "pl_PL": "Kody Dostępne dla {0} [{1}]", - "pt_BR": "Cheats disponíveis para {0} [{1}]", + "pt_BR": "Trapaças disponíveis para {0} [{1}]", "ru_RU": "Доступные читы для {0} [{1}]", "sv_SE": "Fusk tillgängliga för {0} [{1}]", "th_TH": "สูตรโกงมีให้สำหรับ {0} [{1}]", @@ -20687,7 +21012,7 @@ "ko_KR": "{0} DLC 사용 가능", "no_NO": "{0} Nedlastbare innhold(er)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "{0} DLC(s) disponíveis", "ru_RU": "{0} доступных DLC", "sv_SE": "{0} DLC(er) tillgängliga", "th_TH": "", @@ -20887,7 +21212,7 @@ "ko_KR": "계속", "no_NO": "Fortsett", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Continuar", "ru_RU": "Продолжить", "sv_SE": "Fortsätt", "th_TH": "", @@ -20987,7 +21312,7 @@ "ko_KR": "일시 중지됨", "no_NO": "Satt på pause", "pl_PL": "Wstrzymano", - "pt_BR": "", + "pt_BR": "Pausado", "ru_RU": "Приостановлено", "sv_SE": "Pausad", "th_TH": "หยุดชั่วคราว", @@ -21012,7 +21337,7 @@ "ko_KR": "프로필 이미지 설정", "no_NO": "Angi profilbilde", "pl_PL": "Ustaw Obraz Profilu", - "pt_BR": "Definir imagem de perfil", + "pt_BR": "Definir Imagem de Perfil", "ru_RU": "Установить аватар", "sv_SE": "Välj profilbild", "th_TH": "ตั้งค่ารูปโปรไฟล์", @@ -21037,7 +21362,7 @@ "ko_KR": "이름 필수 입력", "no_NO": "Navn er påkrevd", "pl_PL": "Nazwa jest wymagana", - "pt_BR": "É necessário um nome", + "pt_BR": "Nome é obrigatório", "ru_RU": "Необходимо ввести никнейм", "sv_SE": "Namn krävs", "th_TH": "จำเป็นต้องระบุชื่อ", @@ -21062,7 +21387,7 @@ "ko_KR": "프로필 이미지를 설정해야 함", "no_NO": "Profilbilde må være angitt", "pl_PL": "Należy ustawić obraz profilowy", - "pt_BR": "A imagem de perfil deve ser definida", + "pt_BR": "A Imagem de Perfil Deve ser Definida", "ru_RU": "Необходимо установить аватар", "sv_SE": "Profilbild måste anges", "th_TH": "จำเป็นต้องตั้งค่ารูปโปรไฟล์", @@ -21112,7 +21437,7 @@ "ko_KR": "해상도 증가 :", "no_NO": "Øke oppløsning:", "pl_PL": "Zwiększ Rozdzielczość:", - "pt_BR": "Aumentar a resolução:", + "pt_BR": "Aumentar a Resolução:", "ru_RU": "Увеличить разрешение:", "sv_SE": "Öka upplösning:", "th_TH": "เพิ่มความละเอียด:", @@ -21137,7 +21462,7 @@ "ko_KR": "해상도 감소 :", "no_NO": "Reduser oppløsning:", "pl_PL": "Zmniejsz Rozdzielczość:", - "pt_BR": "Diminuir a resolução:", + "pt_BR": "Reduzir a Resolução:", "ru_RU": "Уменьшить разрешение:", "sv_SE": "Sänk upplösning:", "th_TH": "ลดความละเอียด:", @@ -21187,7 +21512,7 @@ "ko_KR": "사용자 ID :", "no_NO": "Bruker ID:", "pl_PL": "ID Użytkownika:", - "pt_BR": "ID de usuário:", + "pt_BR": "ID de Usuário:", "ru_RU": "ID пользователя:", "sv_SE": "Användar-id:", "th_TH": "รหัสผู้ใช้:", @@ -21212,7 +21537,7 @@ "ko_KR": "그래픽 후단부", "no_NO": "Grafikk Backend", "pl_PL": "Backend Graficzny", - "pt_BR": "Backend gráfico", + "pt_BR": "Renderizador Gráfico", "ru_RU": "Графический бэкенд", "sv_SE": "Grafikbakände", "th_TH": "กราฟิกเบื้องหลัง", @@ -21237,7 +21562,7 @@ "ko_KR": "에뮬레이터에서 사용할 그래픽 후단부를 선택합니다.\n\nVulkan은 드라이버가 최신 상태인 한 모든 최신 그래픽 카드에 전반적으로 더 좋습니다. Vulkan은 또한 모든 GPU 공급업체에서 더 빠른 셰이더 컴파일(덜 끊김)을 제공합니다.\n\nOpenGL은 오래된 Nvidia GPU, Linux의 오래된 AMD GPU 또는 VRAM이 낮은 GPU에서 더 나은 결과를 얻을 수 있지만 셰이더 컴파일 끊김이 더 큽니다.\n\n모르면 Vulkan으로 설정합니다. 최신 그래픽 드라이버를 사용해도 GPU가 Vulkan을 지원하지 않는 경우 OpenGL로 설정하세요..", "no_NO": "Velg grafikkbackend som skal brukes i emulatoren.\n\nVulkan er generelt bedre for alle moderne grafikkort, så lenge driverne er oppdatert. Vulkan har også en raskere sammenstilling av Shader (mindre hakkete) på alle GPU-leverandører.\n\nOpenGL kan oppnå bedre resultater for eldre Nvidia GPU-er, på eldre AMD GPU-er på Linux, eller på GPU-er med lavere VRAM, selv om skyggekompileringsutløser vil være større.\n\nSett til Vulkan hvis du er usikker. Sett til OpenGL hvis ikke GPU-en støtter Vulkan selv med de nyeste grafikkdriverne.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Selecione o renderizador gráfico que será usado no emulador.\n\nO Vulkan é melhor no geral para todas as placas de vídeo modernas, desde que seus drivers estejam atualizados. O Vulkan também apresenta compilação de shader mais rápida (menos travamentos) em todos os fornecedores de GPU.\n\nO OpenGL pode obter melhores resultados em GPUs Nvidia antigas, em GPUs AMD antigas no Linux ou em GPUs com VRAM menor, embora os travamentos de compilação de shader sejam maiores.\n\nDefina como Vulkan se não tiver certeza. Defina como OpenGL se sua GPU não suportar Vulkan, mesmo com os drivers gráficos mais recentes.", "ru_RU": "Выбирает бэкенд, который будет использован в эмуляторе.\n\nVulkan является лучшим выбором для всех современных графических карт с актуальными драйверами. В Vulkan также включена более быстрая компиляция шейдеров (меньше статтеров) для всех видеоадаптеров.\n\nПри использовании OpenGL можно достичь лучших результатов на старых видеоадаптерах Nvidia и AMD в Linux или на видеоадаптерах с небольшим количеством видеопамяти, хотя статтеров при компиляции шейдеров будет больше.\n\nРекомендуется использовать Vulkan. Используйте OpenGL, если ваш видеоадаптер не поддерживает Vulkan даже с актуальными драйверами.", "sv_SE": "Väljer den grafikbakände som ska användas i emulatorn.\n\nVulkan är oftast bättre för alla moderna grafikkort, så länge som deras drivrutiner är uppdaterade. Vulkan har också funktioner för snabbare shader compilation (mindre stuttering) för alla GPU-tillverkare.\n\nOpenGL kan nå bättre resultat på gamla Nvidia GPU:er, på äldre AMD GPU:er på Linux, eller på GPU:er med lägre VRAM, även om shader compilation stuttering kommer att vara större.\n\nStäll in till Vulkan om du är osäker. Ställ in till OpenGL om du GPU inte har stöd för Vulkan även med de senaste grafikdrivrutinerna.", "th_TH": "เลือกกราฟิกเบื้องหลังที่จะใช้ในโปรแกรมจำลอง\n\nโดยรวมแล้ว Vulkan นั้นดีกว่าสำหรับการ์ดจอรุ่นใหม่ทั้งหมด ตราบใดที่ไดรเวอร์ยังอัพเดทอยู่เสมอ Vulkan ยังมีคุณสมบัติการคอมไพล์เชเดอร์ที่เร็วขึ้น(และลดอาการกระตุก) สำหรับ GPU อื่นๆทุกอัน\n\nOpenGL อาจได้รับผลลัพธ์ที่ดีกว่าบน Nvidia GPU รุ่นเก่า, AMD GPU รุ่นเก่าบน Linux หรือบน GPU ที่มี VRAM น้อย แม้ว่าการคอมไพล์เชเดอร์ จะทำให้อาการกระตุกมากขึ้นก็ตาม\n\nตั้งค่าเป็น Vulkan หากไม่แน่ใจ ตั้งค่าเป็น OpenGL หาก GPU ของคุณไม่รองรับ Vulkan แม้จะมีไดรเวอร์กราฟิกล่าสุดก็ตาม", @@ -21262,7 +21587,7 @@ "ko_KR": "자동", "no_NO": "", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Automático", "ru_RU": "Авто", "sv_SE": "Automatiskt", "th_TH": "", @@ -21287,7 +21612,7 @@ "ko_KR": "Vulkan을 사용합니다.\nARM 맥에서 해당 플랫폼에서 잘 실행되는 게임을 플레이하는 경우 Metal 후단부를 사용합니다.", "no_NO": "Bruker Vulkan \nPå en ARM Mac, og når du spiller et spill som kjører bra under den, bruker du Metal-backend.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Usa Vulkan.\nEm um Mac ARM, e ao jogar um jogo que roda bem nele, usa o renderizador Metal.", "ru_RU": "Использует Vulkan.\nНа Mac с ARM процессорами используется Metal, если игра с ним совместима и хорошо работает.", "sv_SE": "Använder Vulkan.\nPå en ARM Mac och vid spel som körs bra på den så används Metal-bakänden.", "th_TH": "", @@ -21312,7 +21637,7 @@ "ko_KR": "텍스처 재압축 활성화", "no_NO": "Aktiver teksturkomprimering", "pl_PL": "Włącz Rekompresję Tekstur", - "pt_BR": "Habilitar recompressão de texturas", + "pt_BR": "Habilitar Recompressão de Texturas", "ru_RU": "Пережимать текстуры", "sv_SE": "Aktivera Texture Recompression", "th_TH": "เปิดใช้งาน การบีบอัดพื้นผิวอีกครั้ง", @@ -21337,7 +21662,7 @@ "ko_KR": "VRAM 사용량을 줄이기 위해 ASTC 텍스처를 압축합니다.\n\n이 텍스처 형식을 사용하는 게임에는 Astral Chain, Bayonetta 3, Fire Emblem Engage, Metroid Prime Remastered, Super Mario Bros. Wonder, The Legend of Zelda: Tears of the Kingdom이 있습니다.\n\n4GiB VRAM 이하의 그래픽 카드는 이러한 게임을 실행하는 동안 어느 시점에서 충돌할 가능성이 있습니다.\n\n위에서 언급한 게임에서 VRAM이 부족한 경우에만 활성화합니다. 모르면 끔으로 두세요.", "no_NO": "Kompresser ASTC-teksturer for å redusere VRAM-bruk.\n\nSpill som bruker dette teksturformatet, inkluderer Astral Chain, Bayonetta 3, Fire Emblem Engage, Metroid Prime Remastered, Super Mario Bros. Wonder and The Legend of Zelda: Tears of the Kingdom.\n\nGrafikkkort med 4GiB VRAM eller mindre, vil sannsynligvis krasje på et tidspunkt når spillene kjører.\n\nAktiver bare hvis du går tom for VRAM på nevnte spill. La AV om du er usikker.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Compacta texturas ASTC para reduzir o uso de VRAM.\n\nJogos que usam esse formato de textura incluem Astral Chain, Bayonetta 3, Fire Emblem Engage, Metroid Prime Remastered, Super Mario Bros. Wonder e The Legend of Zelda: Tears of the Kingdom.\n\nPlacas gráficas com 4GB VRAM ou menos provavelmente travarão em algum momento durante a execução desses jogos.\n\nHabilite somente se estiver ficando sem VRAM nos jogos mencionados acima. Deixe DESLIGADO se não tiver certeza.", "ru_RU": "Сжатие ASTC текстур для уменьшения использования VRAM. \n\nИгры, использующие этот формат текстур: Astral Chain, Bayonetta 3, Fire Emblem Engage, Metroid Prime Remastered, Super Mario Bros. Wonder и The Legend of Zelda: Tears of the Kingdom. \nНа видеоадаптерах с 4GiB видеопамяти или менее возможны вылеты при запуске этих игр. \n\nВключите, только если у вас заканчивается видеопамять в вышеупомянутых играх. \n\nРекомендуется оставить выключенным.", "sv_SE": "Komprimerar ASTC-texturer för att minska VRAM-användning.\n\nSpel som använder detta texturformat inkluderar Astral Chain, Bayonetta 3, Fire Emblem Engage, Metroid Prime Remastered, Super Mario Bros. Wonder och The Legend of Zelda: Tears of the Kingdom.\n\nGrafikkort med 4GiB VRAM eller mindre kommer sannolikt krascha någon gång när du kör dessa spel.\n\nAktivera endast om du har slut på VRAM på ovan nämnda spel. Lämna AV om du är osäker.", "th_TH": "บีบอัดพื้นผิว ASTC เพื่อลดการใช้งาน VRAM\n\nเกมที่ใช้รูปแบบพื้นผิวนี้ ได้แก่ Astral Chain, Bayonetta 3, Fire Emblem Engage, Metroid Prime Remastered, Super Mario Bros. Wonder และ The Legend of Zelda: Tears of the Kingdom\n\nการ์ดจอที่มี 4GiB VRAM หรือน้อยกว่ามีแนวโน้มที่จะพังในบางจุดขณะเล่นเกมเหล่านี้\n\nเปิดใช้งานเฉพาะในกรณีที่ VRAM ของคุณใกล้หมดในเกมที่กล่าวมาข้างต้น ปล่อยให้ปิดหากไม่แน่ใจ", @@ -21362,7 +21687,7 @@ "ko_KR": "기본 GPU", "no_NO": "Foretrukket GPU", "pl_PL": "Preferowane GPU", - "pt_BR": "GPU preferencial", + "pt_BR": "GPU Preferida", "ru_RU": "Предпочтительный видеоадаптер", "sv_SE": "Föredragen GPU", "th_TH": "GPU ที่ต้องการ", @@ -21387,7 +21712,7 @@ "ko_KR": "Vulkan 그래픽 후단부와 함께 사용할 그래픽 카드를 선택하세요.\n\nOpenGL에서 사용할 GPU에는 영향을 미치지 않습니다.\n\n모르면 \"dGPU\"로 플래그가 지정된 GPU로 설정하세요. 없으면 그대로 두세요.", "no_NO": "Velg grafikkkortet som skal brukes sammen med Vulkan grafikkbackenden\n\nPåvirker ikke GPU-er som OpenGL skal bruke.\n\nSett til GPU-merket som \"dGPU\" hvis usikker. Hvis det ikke det er en, la være uberørt.", "pl_PL": "Wybierz kartę graficzną, która będzie używana z backendem graficznym Vulkan.\n\nNie wpływa na GPU używane przez OpenGL.\n\nW razie wątpliwości ustaw flagę GPU jako \"dGPU\". Jeśli żadnej nie ma, pozostaw nietknięte.", - "pt_BR": "Selecione a placa de vídeo que será usada com o backend gráfico Vulkan.\n\nNão afeta a GPU que OpenGL usará.\n\nSelecione \"dGPU\" em caso de dúvida. Se não houver nenhuma, não mexa.", + "pt_BR": "Selecione a placa de vídeo que será usada com o renderizador gráfico Vulkan.\n\nNão afeta a GPU que OpenGL usará.\n\nSelecione \"dGPU\" em caso de dúvida. Se não houver nenhuma, não mexa.", "ru_RU": "Выберает видеоадаптер, который будет использоваться графическим бэкендом Vulkan.\n\nЭта настройка не влияет на видеоадаптер, который будет использоваться с OpenGL.\n\nЕсли вы не уверены что нужно выбрать, используйте графический процессор, помеченный как \"dGPU\". Если его нет, оставьте выбор по умолчанию.", "sv_SE": "Välj grafikkortet som ska användas med Vulkan-grafikbakänden.\n\nPåverkar inte GPU:n som OpenGL använder.\n\nStäll in till den GPU som flaggats som \"dGPU\" om osäker. Om det inte finns någon, lämna orörd.", "th_TH": "เลือกการ์ดจอที่จะใช้กับแบ็กเอนด์กราฟิก Vulkan\n\nไม่ส่งผลต่อ GPU ที่ OpenGL จะใช้\n\nตั้งค่าเป็น GPU ที่ถูกตั้งค่าสถานะเป็น \"dGPU\" ถ้าหากคุณไม่แน่ใจ ,หากไม่มีก็ปล่อยทิ้งไว้โดยไม่ต้องแตะต้องมัน", @@ -21412,7 +21737,7 @@ "ko_KR": "Ryujinx 다시 시작 필요", "no_NO": "Ryujinx Omstart nødvendig", "pl_PL": "Wymagane Zrestartowanie Ryujinx", - "pt_BR": "Reinicialização do Ryujinx necessária", + "pt_BR": "Reinicialização do Ryujinx Necessária", "ru_RU": "Требуется перезапуск Ryujinx", "sv_SE": "Omstart av Ryujinx krävs", "th_TH": "จำเป็นต้องรีสตาร์ท Ryujinx", @@ -21437,7 +21762,7 @@ "ko_KR": "그래픽 후단부 또는 GPU 설정이 수정되었습니다. 이를 적용하려면 다시 시작이 필요", "no_NO": "Grafikk Backend eller GPU-innstillinger er endret. Dette krever en omstart for å aktiveres", "pl_PL": "Zmieniono ustawienia Backendu Graficznego lub GPU. Będzie to wymagało ponownego uruchomienia", - "pt_BR": "Configurações do backend gráfico ou da GPU foram alteradas. Uma reinicialização é necessária para que as mudanças tenham efeito.", + "pt_BR": "Configurações do renderizador gráfico ou da GPU foram alteradas. Uma reinicialização é necessária para que as mudanças tenham efeito.", "ru_RU": "Графический бэкенд или настройки графического процессора были изменены. Требуется перезапуск для вступления в силу изменений.", "sv_SE": "Grafikbakänden eller GPU-inställningar har ändrats. Detta kräver en omstart", "th_TH": "การตั้งค่ากราฟิกเบื้องหลังหรือ GPU ได้รับการแก้ไขแล้ว สิ่งนี้จะต้องมีการรีสตาร์ทจึงจะสามารถใช้งานได้", @@ -21512,7 +21837,7 @@ "ko_KR": "음량 증가 :", "no_NO": "Øk Volum:", "pl_PL": "Zwiększ Głośność:", - "pt_BR": "Aumentar volume:", + "pt_BR": "Aumentar Volume:", "ru_RU": "Увеличить громкость:", "sv_SE": "Öka volym:", "th_TH": "เพิ่มระดับเสียง:", @@ -21537,7 +21862,7 @@ "ko_KR": "음량 감소 :", "no_NO": "Reduser Volum:", "pl_PL": "Zmniejsz Głośność:", - "pt_BR": "Diminuir volume:", + "pt_BR": "Diminuir Volume:", "ru_RU": "Уменьшить громкость:", "sv_SE": "Sänk volym:", "th_TH": "ลดระดับเสียง:", @@ -21562,7 +21887,7 @@ "ko_KR": "매크로 HLE 활성화", "no_NO": "Aktiver Makro HLE", "pl_PL": "Włącz Macro HLE", - "pt_BR": "Habilitar emulação de alto nível para Macros", + "pt_BR": "Habilitar Macro HLE", "ru_RU": "Использовать макрос высокоуровневой эмуляции видеоадаптера", "sv_SE": "Aktivera Macro HLE", "th_TH": "เปิดใช้งาน มาโคร HLE", @@ -21612,7 +21937,7 @@ "ko_KR": "색 공간 통과", "no_NO": "Fargeromsgjennomgang", "pl_PL": "Przekazywanie przestrzeni kolorów", - "pt_BR": "Passagem de Espaço Cor", + "pt_BR": "Passagem do Espaço de Cores", "ru_RU": "Пропускать цветовое пространство", "sv_SE": "Genomströmning av färgrymd", "th_TH": "ทะลุผ่านพื้นที่สี", @@ -21637,7 +21962,7 @@ "ko_KR": "Vulkan 후단부가 색 공간을 지정하지 않고 색상 정보를 전달하도록 지시합니다. 넓은 색역 화면 표시 장치를 사용하는 사용자의 경우 색상 정확성을 희생하고 더 생생한 색상이 나올 수 있습니다.", "no_NO": "Dirigerer Vulkan backenden til å gå gjennom farge informasjonen uten og spesifisere en fargeromsgjennomgang. For brukere med en bred spillvisning kan dette resultere i mer vibrerende farger og få riktig farge.", "pl_PL": "Nakazuje API Vulkan przekazywać informacje o kolorze bez określania przestrzeni kolorów. Dla użytkowników z wyświetlaczami o szerokim zakresie kolorów może to skutkować bardziej żywymi kolorami, kosztem ich poprawności.", - "pt_BR": "Direciona o backend Vulkan para passar informações de cores sem especificar um espaço de cores. Para usuários com telas de ampla gama, isso pode resultar em cores mais vibrantes, ao custo da correção de cores.", + "pt_BR": "Direciona o renderizador Vulkan para passar informações de cores sem especificar um espaço de cores. Para usuários com telas de ampla gama, isso pode resultar em cores mais vibrantes, ao custo da correção de cores.", "ru_RU": "Направляет бэкенд Vulkan на передачу информации о цвете без указания цветового пространства. Для пользователей с экранами с расширенной гаммой данная настройка приводит к получению более ярких цветов за счет снижения корректности цветопередачи.", "sv_SE": "Dirigerar Vulkan-bakänden att skicka genom färginformation utan att ange en färgrymd. För användare med breda gamut-skärmar kan detta resultera i mer levande färger på bekostnad av färgkorrekthet.", "th_TH": "สั่งให้แบ็กเอนด์ Vulkan ส่งผ่านข้อมูลสีโดยไม่ต้องระบุค่าของสี สำหรับผู้ใช้ที่มีการแสดงกระจายตัวของสี อาจส่งผลให้สีสดใสมากขึ้น โดยต้องแลกกับความถูกต้องของสี", @@ -21662,9 +21987,9 @@ "ko_KR": "음량", "no_NO": "", "pl_PL": "Głoś", - "pt_BR": "", + "pt_BR": "Volume", "ru_RU": "Громкость", - "sv_SE": "", + "sv_SE": "Volym", "th_TH": "ระดับเสียง", "tr_TR": "Ses", "uk_UA": "Гуч.", @@ -21687,7 +22012,7 @@ "ko_KR": "저장 관리", "no_NO": "Administrer lagring", "pl_PL": "Zarządzaj Zapisami", - "pt_BR": "Gerenciar jogos salvos", + "pt_BR": "Gerenciar Jogos Salvos", "ru_RU": "Управление сохранениями", "sv_SE": "Hantera sparade spel", "th_TH": "จัดการบันทึก", @@ -21762,7 +22087,7 @@ "ko_KR": "{0} ({1})에 대한 저장 관리", "no_NO": "Administrer lagring for {0} ({1})", "pl_PL": "Zarządzaj Zapisami dla {0}", - "pt_BR": "Gerenciar jogos salvos para {0}", + "pt_BR": "Gerenciar Jogos Salvos para {0}", "ru_RU": "Редактирование сохранений для {0} ({1})", "sv_SE": "Hantera sparade spel för {0} ({1})", "th_TH": "จัดการบันทึกสำหรับ {0} ({1})", @@ -21787,7 +22112,7 @@ "ko_KR": "관리자 저장", "no_NO": "Lagre behandler", "pl_PL": "Menedżer Zapisów", - "pt_BR": "Gerenciador de jogos salvos", + "pt_BR": "Gerenciador de Jogos Salvos", "ru_RU": "Менеджер сохранений", "sv_SE": "Sparhanterare", "th_TH": "จัดการบันทึก", @@ -21887,7 +22212,7 @@ "ko_KR": "잃어버린 계정 복구", "no_NO": "Gjenopprett tapte kontoer", "pl_PL": "Odzyskaj Utracone Konta", - "pt_BR": "Recuperar contas perdidas", + "pt_BR": "Recuperar Contas Perdidas", "ru_RU": "Восстановить учетные записи", "sv_SE": "Återskapa förlorade konton", "th_TH": "กู้คืนบัญชีที่สูญหาย", @@ -22012,7 +22337,7 @@ "ko_KR": "앤티 앨리어싱 :", "no_NO": "Kantutjevning:", "pl_PL": "Antyaliasing:", - "pt_BR": "Anti-serrilhado:", + "pt_BR": "Anti-Serrilhado:", "ru_RU": "Сглаживание:", "sv_SE": "Antialiasing:", "th_TH": "ลดการฉีกขาดของภาพ:", @@ -22037,7 +22362,7 @@ "ko_KR": "크기 조정 필터 :", "no_NO": "Skaleringsfilter:", "pl_PL": "Filtr skalowania:", - "pt_BR": "Filtro de escala:", + "pt_BR": "Filtro de Escala:", "ru_RU": "Интерполяция:", "sv_SE": "Skalningsfilter:", "th_TH": "ปรับขนาดตัวกรอง:", @@ -22162,7 +22487,7 @@ "ko_KR": "영역", "no_NO": "Område", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Área", "ru_RU": "Зональная", "sv_SE": "Yta", "th_TH": "", @@ -22337,7 +22662,7 @@ "ko_KR": "사용자 편집", "no_NO": "Rediger bruker", "pl_PL": "Edytuj użytkownika", - "pt_BR": "Editar usuário", + "pt_BR": "Editar Usuário", "ru_RU": "Редактирование пользователя", "sv_SE": "Redigera användare", "th_TH": "แก้ไขผู้ใช้", @@ -22387,7 +22712,7 @@ "ko_KR": "네트워크 인터페이스 :", "no_NO": "Nettverksgrensesnitt", "pl_PL": "Interfejs sieci:", - "pt_BR": "Interface de rede:", + "pt_BR": "Interface de Rede:", "ru_RU": "Сетевой интерфейс:", "sv_SE": "Nätverksgränssnitt:", "th_TH": "เชื่อมต่อเครือข่าย:", @@ -22487,7 +22812,7 @@ "ko_KR": "GitHub에서 변경 내역 보기", "no_NO": "Vis endringslogg på GitHub", "pl_PL": "Zobacz listę zmian na GitHubie", - "pt_BR": "Ver mudanças no GitHub", + "pt_BR": "Ver Mudanças no GitHub", "ru_RU": "Показать список изменений на GitHub", "sv_SE": "Visa ändringslogg på GitHub", "th_TH": "ดูประวัติการเปลี่ยนแปลงบน GitHub", @@ -22537,7 +22862,7 @@ "ko_KR": "멀티플레이어", "no_NO": "Flerspiller", "pl_PL": "Gra Wieloosobowa", - "pt_BR": "", + "pt_BR": "Multijogador", "ru_RU": "Мультиплеер", "sv_SE": "Flerspelare", "th_TH": "ผู้เล่นหลายคน", @@ -22687,7 +23012,7 @@ "ko_KR": "P2P 네트워크 호스팅 비활성화(대기 시간이 늘어날 수 있음)", "no_NO": "Deaktiver P2P-nettverkshosting (kan øke ventetiden)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Desabilitar hospedagem de rede P2P (pode aumentar a latência)", "ru_RU": "Отключить хостинг P2P-сетей (может увеличить задержку)", "sv_SE": "Inaktivera P2P-nätverkshosting (kan öka latens)", "th_TH": "", @@ -22712,7 +23037,7 @@ "ko_KR": "P2P 네트워크 호스팅을 비활성화하면 피어가 직접 연결하지 않고 마스터 서버를 통해 프록시합니다.", "no_NO": "Deaktiver P2P-nettverkshosting, så vil andre brukere gå via hovedserveren i stedet for å koble seg direkte til deg.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Desabilite a hospedagem de rede P2P, os pares farão proxy através do servidor mestre em vez de se conectarem a você diretamente.", "ru_RU": "Отключая хостинг P2P-сетей, пользователи будут проксироваться через главный сервер, а не подключаться к вам напрямую.", "sv_SE": "Inaktivera P2P-nätverkshosting, motparter kommer skickas genom masterservern isället för att ansluta direkt till dig.", "th_TH": "", @@ -22737,7 +23062,7 @@ "ko_KR": "네트워크 암호 문구 :", "no_NO": "Nettverkspassord:", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Senha de Rede:", "ru_RU": "Cетевой пароль:", "sv_SE": "Lösenfras för nätverk:", "th_TH": "", @@ -22762,7 +23087,7 @@ "ko_KR": "귀하는 귀하와 동일한 암호를 사용하는 호스팅 게임만 볼 수 있습니다.", "no_NO": "Du vil bare kunne se spill som er arrangert med samme passordfrase som deg.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Você só poderá ver jogos hospedados com a mesma senha que você.", "ru_RU": "Вы сможете видеть только те игры, в которых используется тот же пароль, что и у вас.", "sv_SE": "Du kommer endast kunna se hostade spel med samma lösenfras som du.", "th_TH": "", @@ -22787,7 +23112,7 @@ "ko_KR": "Ryujinx-<8 hex chars> 형식으로 암호를 입력하세요. 귀하는 귀하와 동일한 암호를 사용하는 호스팅 게임만 볼 수 있습니다.", "no_NO": "Skriv inn en passordfrase i formatet Ryujinx-<8 heks tegn>. Du vil bare kunne se spill som er arrangert med samme passordfrase som deg.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Insira uma frase-senha no formato Ryujinx-<8 hex chars>. Você só poderá ver jogos hospedados com a mesma frase-senha que você.", "ru_RU": "Введите пароль в формате Ryujinx-<8 шестнадцатеричных символов>. Вы сможете видеть только те игры, в которых используется тот же пароль, что и у вас.", "sv_SE": "Ange en lösenfras i formatet Ryujinx-<8 hextecken>. Du kommer endast kunna se hostade spel med samma lösenfras som du.", "th_TH": "", @@ -22812,7 +23137,7 @@ "ko_KR": "(일반)", "no_NO": "(offentlig)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "(público)", "ru_RU": "(публичный)", "sv_SE": "(publik)", "th_TH": "", @@ -22837,7 +23162,7 @@ "ko_KR": "무작위 생성", "no_NO": "Generer tilfeldig", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Gerar Aleatório", "ru_RU": "Сгенерировать рандомно", "sv_SE": "Generera slumpmässigt", "th_TH": "", @@ -22862,7 +23187,7 @@ "ko_KR": "다른 플레이어와 공유할 수 있는 새로운 암호 문구를 생성합니다.", "no_NO": "Genererer en ny passordfrase, som kan deles med andre spillere.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Gera uma nova senha, que pode ser compartilhada com outros jogadores.", "ru_RU": "Генерирует новый пароль, который можно передать другим игрокам.", "sv_SE": "Genererar en ny lösenfras som kan delas med andra spelare.", "th_TH": "", @@ -22887,7 +23212,7 @@ "ko_KR": "지우기", "no_NO": "Slett", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Limpar", "ru_RU": "Очистить", "sv_SE": "Töm", "th_TH": "", @@ -22912,7 +23237,7 @@ "ko_KR": "현재 암호를 지우고 공용 네트워크로 돌아갑니다.", "no_NO": "Sletter den gjeldende passordfrasen og går tilbake til det offentlige nettverket.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Limpa a senha atual, retornando à rede pública.", "ru_RU": "Очищает текущий пароль, возвращаясь в публичную сеть.", "sv_SE": "Tömmer aktuell lösenfras och återgår till det publika nätverket.", "th_TH": "", @@ -22937,7 +23262,7 @@ "ko_KR": "유효하지 않은 암호입니다! \"Ryujinx-<8 hex chars>\" 형식이어야 합니다.", "no_NO": "Ugyldig passordfrase! Må være i formatet \"Ryujinx-<8 hex tegn>\"", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Frase-senha inválida! Deve estar no formato \"Ryujinx-<8 hex chars>\"", "ru_RU": "Неверный пароль! Пароль должен быть в формате \"Ryujinx-<8 шестнадцатеричных символов>\"", "sv_SE": "Ogiltig lösenfras! Måste vara i formatet \"Ryujinx-<8 hextecken>\"", "th_TH": "", @@ -22987,7 +23312,7 @@ "ko_KR": "사용자 정의 주사율 활성화(실험적)", "no_NO": "Aktiver egendefinert oppdateringsfrekvens (eksperimentell)", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Habilitar taxa de atualização personalizada (Experimental)", "ru_RU": "Включить пользовательскую частоту кадров (Экспериментально)", "sv_SE": "Aktivera anpassad uppdateringsfrekvens (experimentell)", "th_TH": "", @@ -23037,7 +23362,7 @@ "ko_KR": "무제한", "no_NO": "Ubegrenset", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Ilimitado", "ru_RU": "Без ограничений", "sv_SE": "Obunden", "th_TH": "", @@ -23062,7 +23387,7 @@ "ko_KR": "사용자 정의 주사율", "no_NO": "Egendefinert oppdateringsfrekvens", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Taxa de Atualização Personalizada", "ru_RU": "Пользовательская частота кадров", "sv_SE": "Anpassad uppdateringsfrekvens", "th_TH": "", @@ -23076,7 +23401,7 @@ "ID": "SettingsTabSystemVSyncModeTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Emulierte vertikale Synchronisation. \"Switch\" emuliert die 60Hz-Bildwiederholfrequenz der Switch. \"Unbounded\" ist eine unbegrenzte Bildwiederholfrequenz.", "el_GR": "", "en_US": "Emulated Vertical Sync. 'Switch' emulates the Switch's refresh rate of 60Hz. 'Unbounded' is an unbounded refresh rate.", "es_ES": "", @@ -23087,7 +23412,7 @@ "ko_KR": "에뮬레이트된 수직 동기화. '스위치'는 스위치의 60Hz 주사율을 에뮬레이트합니다. '무한'은 무제한 주사율입니다.", "no_NO": "Emulert vertikal synkronisering. «Switch» emulerer Switchs oppdateringsfrekvens på 60 Hz. «Ubegrenset» er en ubegrenset oppdateringsfrekvens.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Sincronização vertical emulada. 'Switch' emula a taxa de atualização de 60 Hz do Switch. 'Ilimitada' é uma taxa de atualização sem limite.", "ru_RU": "Эмулированная вертикальная синхронизация. 'Консоль' эмулирует частоту обновления консоли, равную 60 Гц. 'Без ограничений' - неограниченная частота кадров.", "sv_SE": "Emulerad vertikal synk. 'Switch' emulerar Switchens uppdateringsfrekvens på 60Hz. 'Obunden' är en obegränsad uppdateringsfrekvens.", "th_TH": "", @@ -23101,7 +23426,7 @@ "ID": "SettingsTabSystemVSyncModeTooltipCustom", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Emulierte vertikale Synchronisation. \"Switch\" emuliert die 60Hz-Bildwiederholfrequenz der Switch. „Unbounded“ ist eine unbegrenzte Bildwiederholfrequenz. „Benutzerdefinierte Bildwiederholfrequenz“ emuliert die angegebene benutzerdefinierte Bildwiederholfrequenz.", "el_GR": "", "en_US": "Emulated Vertical Sync. 'Switch' emulates the Switch's refresh rate of 60Hz. 'Unbounded' is an unbounded refresh rate. 'Custom Refresh Rate' emulates the specified custom refresh rate.", "es_ES": "", @@ -23112,7 +23437,7 @@ "ko_KR": "에뮬레이트된 수직 동기화. '스위치'는 스위치의 60Hz 주사율을 에뮬레이트합니다. '무한'은 무제한 주사율입니다. '사용자 지정'은 지정된 사용자 지정 주사율을 에뮬레이트합니다.", "no_NO": "Emulert vertikal synkronisering. «Switch» emulerer Switchs oppdateringsfrekvens på 60 Hz. «Ubegrenset» er en ubegrenset oppdateringsfrekvens. «Egendefinert» emulerer den angitte egendefinerte oppdateringsfrekvensen.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Sincronização Vertical Emulada. 'Switch' emula a taxa de atualização de 60 Hz do Switch. 'Ilimitada' é uma taxa de atualização sem limite. 'Taxa de atualização personalizada' emula a taxa de atualização personalizada especificada.", "ru_RU": "Эмулированная вертикальная синхронизация. 'Консоль' эмулирует частоту обновления консоли, равную 60 Гц. 'Без ограничений' - неограниченная частота кадров. 'Пользовательска частота кадров' эмулирует выбранную пользователем частоту кадров.", "sv_SE": "Emulerad vertikal synk. 'Switch' emulerar Switchens uppdateringsfrekvens på 60Hz. 'Obunden' är en obegränsad uppdateringsfrekvens. 'Anpassad uppdateringsfrekvens' emulerar den angivna anpassade uppdateringsfrekvensen.", "th_TH": "", @@ -23126,7 +23451,7 @@ "ID": "SettingsTabSystemEnableCustomVSyncIntervalTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Ermöglicht es dem Benutzer, eine emulierte Bildwiederholfrequenz festzulegen. In einigen Titeln kann dies die Geschwindigkeit der Spiel-Logik erhöhen oder verringern. In anderen Titeln kann dies dazu führen, dass die FPS auf ein Vielfaches der Bildwiederholfrequenz begrenzt werden oder zu unvorhersehbarem Verhalten führen. Dies ist eine experimentelle Funktion, ohne Garantien dafür, wie sich das Gameplay auswirkt. \n\nLassen Sie diese Option deaktiviert, wenn Sie sich nicht sicher sind.", "el_GR": "", "en_US": "Allows the user to specify an emulated refresh rate. In some titles, this may speed up or slow down the rate of gameplay logic. In other titles, it may allow for capping FPS at some multiple of the refresh rate, or lead to unpredictable behavior. This is an experimental feature, with no guarantees for how gameplay will be affected. \n\nLeave OFF if unsure.", "es_ES": "", @@ -23137,7 +23462,7 @@ "ko_KR": "사용자가 에뮬레이트된 화면 주사율을 지정할 수 있습니다. 일부 타이틀에서는 게임플레이 로직 속도가 빨라지거나 느려질 수 있습니다. 다른 타이틀에서는 주사율의 배수로 FPS를 제한하거나 예측할 수 없는 동작으로 이어질 수 있습니다. 이는 실험적 기능으로 게임 플레이에 어떤 영향을 미칠지 보장할 수 없습니다. \n\n모르면 끔으로 두세요.", "no_NO": "Gjør det mulig for brukeren å angi en emulert oppdateringsfrekvens. I noen titler kan dette øke eller senke hastigheten på spillogikken. I andre titler kan det gjøre det mulig å begrense FPS til et multiplum av oppdateringsfrekvensen, eller føre til uforutsigbar oppførsel. Dette er en eksperimentell funksjon, og det gis ingen garantier for hvordan spillingen påvirkes. \n\nLa AV stå hvis du er usikker.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Permite que o usuário especifique uma taxa de atualização emulada. Em alguns títulos, isso pode acelerar ou desacelerar a taxa de lógica do jogo. Em outros títulos, pode permitir limitar o FPS em algum múltiplo da taxa de atualização ou levar a um comportamento imprevisível. Este é um recurso experimental, sem garantias de como o jogo será afetado. \n\nDeixe OFF se não tiver certeza.", "ru_RU": "Позволяет пользователю указать эмулируемую частоту кадров. В некоторых играх это может ускорить или замедлить скорость логики игрового процесса. В других играх это может позволить ограничить FPS на уровне, кратном частоте обновления, или привести к непредсказуемому поведению. Это экспериментальная функция, и нет никаких гарантий того, как она повлияет на игровой процесс. \n\nОставьте выключенным, если не уверены.", "sv_SE": "Låter användaren ange en emulerad uppdateringsfrekvens. För vissa spel så kan detta snabba upp eller ner frekvensen för spellogiken. I andra spel så kan detta tillåta att bildfrekvensen kapas för delar av uppdateringsfrekvensen eller leda till oväntat beteende. Detta är en experimentell funktion utan några garantier för hur spelet påverkas. \n\nLämna AV om du är osäker.", "th_TH": "", @@ -23151,7 +23476,7 @@ "ID": "SettingsTabSystemCustomVSyncIntervalValueTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Der Zielwert für die benutzerdefinierte Bildwiederholfrequenz.", "el_GR": "", "en_US": "The custom refresh rate target value.", "es_ES": "", @@ -23162,7 +23487,7 @@ "ko_KR": "사용자 정의 주사율 목표 값입니다.", "no_NO": "Den egendefinerte målverdien for oppdateringsfrekvens.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "O valor de meta da taxa de atualização personalizada.", "ru_RU": "Заданное значение частоты кадров", "sv_SE": "Målvärde för anpassad uppdateringsfrekvens.", "th_TH": "", @@ -23176,7 +23501,7 @@ "ID": "SettingsTabSystemCustomVSyncIntervalSliderTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Die benutzerdefinierte Bildwiederholfrequenz als Prozentsatz der normalen Switch-Bildwiederholfrequenz.", "el_GR": "", "en_US": "The custom refresh rate, as a percentage of the normal Switch refresh rate.", "es_ES": "", @@ -23187,7 +23512,7 @@ "ko_KR": "일반 스위치 주사율의 백분율로 나타낸 사용자 지정 주사율입니다.", "no_NO": "Den egendefinerte oppdateringsfrekvensen, i prosent av den normale oppdateringsfrekvensen for Switch-konsollen.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "A taxa de atualização personalizada, como uma porcentagem da taxa de atualização normal do Switch.", "ru_RU": "Пользовательская частота кадров в процентах от обычной частоты обновления на консоли.", "sv_SE": "Anpassad uppdateringsfrekvens, som en procentdel av den normala uppdateringsfrekvensen för Switch.", "th_TH": "", @@ -23201,7 +23526,7 @@ "ID": "SettingsTabSystemCustomVSyncIntervalPercentage", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Benutzerdefinierte Bildwiederholfrequenz %:", "el_GR": "", "en_US": "Custom Refresh Rate %:", "es_ES": "", @@ -23212,7 +23537,7 @@ "ko_KR": "사용자 정의 주사율 % :", "no_NO": "Egendefinert oppdateringsfrekvens %:", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Taxa de Atualização Personalizada %:", "ru_RU": "Пользовательская частота кадров %:", "sv_SE": "Anpassad uppdateringsfrekvens %:", "th_TH": "", @@ -23226,7 +23551,7 @@ "ID": "SettingsTabSystemCustomVSyncIntervalValue", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Wert für benutzerdefinierte Bildwiederholfrequenz:", "el_GR": "", "en_US": "Custom Refresh Rate Value:", "es_ES": "", @@ -23237,7 +23562,7 @@ "ko_KR": "사용자 정의 주사율 값 :", "no_NO": "Egendefinert verdi for oppdateringsfrekvens:", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Valor da Taxa de Atualização Personalizada:", "ru_RU": "Значение пользовательской частоты кадров:", "sv_SE": "Värde för anpassad uppdateringsfrekvens:", "th_TH": "", @@ -23262,7 +23587,7 @@ "ko_KR": "간격", "no_NO": "Intervall", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Intervalo", "ru_RU": "Интервал", "sv_SE": "Intervall", "th_TH": "", @@ -23276,7 +23601,7 @@ "ID": "SettingsTabHotkeysToggleVSyncModeHotkey", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "VSync-Modus umschalten:", "el_GR": "", "en_US": "Toggle VSync mode:", "es_ES": "", @@ -23287,7 +23612,7 @@ "ko_KR": "수직 동기화 모드 전환 :", "no_NO": "Veksle mellom VSync-modus:", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Alternar Modo VSync:", "ru_RU": "Выбрать режим вертикальной синхронизации:", "sv_SE": "Växla VSync-läge:", "th_TH": "", @@ -23301,7 +23626,7 @@ "ID": "SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Benutzerdefinierte Bildwiederholfrequenz erhöhen:", "el_GR": "", "en_US": "Raise custom refresh rate", "es_ES": "", @@ -23312,7 +23637,7 @@ "ko_KR": "사용자 정의 주사율 증가", "no_NO": "Øk den egendefinerte oppdateringsfrekvensen", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Aumentar Taxa de Atualização:", "ru_RU": "Повышение пользовательской частоты кадров", "sv_SE": "Höj anpassad uppdateringsfrekvens", "th_TH": "", @@ -23326,7 +23651,7 @@ "ID": "SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Benutzerdefinierte Bildwiederholfrequenz senken:", "el_GR": "", "en_US": "Lower custom refresh rate:", "es_ES": "", @@ -23337,7 +23662,7 @@ "ko_KR": "사용자 정의 주사율 감소", "no_NO": "Lavere tilpasset oppdateringsfrekvens", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Reduzir Taxa de Atualização:", "ru_RU": "Понижение пользовательской частоты кадров", "sv_SE": "Sänk anpassad uppdateringsfrekvens", "th_TH": "", @@ -23351,7 +23676,7 @@ "ID": "CompatibilityListLastUpdated", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Zuletzt aktualisiert: {0}", "el_GR": "", "en_US": "Last updated: {0}", "es_ES": "", @@ -23362,7 +23687,7 @@ "ko_KR": "최종 업데이트 : {0}", "no_NO": "Sist oppdatert: {0}", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Última atualização: {0}", "ru_RU": "", "sv_SE": "Senast uppdaterad: {0}", "th_TH": "", @@ -23376,7 +23701,7 @@ "ID": "CompatibilityListWarning", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Diese Kompatibilitätsliste könnte veraltete Einträge enthalten. Teste dennoch Spiele im \"Ingame\"-Status.", "el_GR": "", "en_US": "This compatibility list might contain out of date entries.\nDo not be opposed to testing games in the \"Ingame\" status.", "es_ES": "", @@ -23387,7 +23712,7 @@ "ko_KR": "이 호환성 목록에는 오래된 항목이 포함되어 있을 수 있습니다.\n\"게임 내\" 상태에서 게임을 테스트하는 것을 반대하지 마십시오.", "no_NO": "Denne kompatibilitetslisten kan inneholde oppføringer som er tomme for data.\nVær ikke imot å teste spill i statusen «Ingame».", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Esta lista de compatibilidade pode estar desatualizada.\nNão se oponha a testar os jogos", "ru_RU": "", "sv_SE": "Denna kompatibilitetslista kan innehålla utdaterade poster.\nTesta gärna spelen som listas med \"Spelproblem\"-status.", "th_TH": "", @@ -23401,7 +23726,7 @@ "ID": "CompatibilityListSearchBoxWatermark", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Kompatibilitätseinträge durchsuchen...", "el_GR": "", "en_US": "Search compatibility entries...", "es_ES": "", @@ -23412,7 +23737,7 @@ "ko_KR": "호환성 항목 검색...", "no_NO": "Søk i kompatibilitetsoppføringer...", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Pesquisa de compatibilidade", "ru_RU": "", "sv_SE": "Sök i kompatibilitetsposter...", "th_TH": "", @@ -23437,7 +23762,7 @@ "ko_KR": "호환성 목록 열기", "no_NO": "Åpne kompatibilitetslisten", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Lista de Compatibilidade", "ru_RU": "", "sv_SE": "Öppna kompatibilitetslistan", "th_TH": "", @@ -23451,7 +23776,7 @@ "ID": "CompatibilityListOnlyShowOwnedGames", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Nur eigene Spiele anzeigen", "el_GR": "", "en_US": "Only show owned games", "es_ES": "", @@ -23462,7 +23787,7 @@ "ko_KR": "보유 게임만 표시", "no_NO": "Vis bare eide spill", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Mostrar apenas jogos disponíveis", "ru_RU": "", "sv_SE": "Visa endast ägda spel", "th_TH": "", @@ -23476,7 +23801,7 @@ "ID": "CompatibilityListPlayable", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Spielbar", "el_GR": "", "en_US": "Playable", "es_ES": "", @@ -23487,7 +23812,7 @@ "ko_KR": "플레이 가능", "no_NO": "Spillbar", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Jogável", "ru_RU": "", "sv_SE": "Spelbart", "th_TH": "", @@ -23501,7 +23826,7 @@ "ID": "CompatibilityListIngame", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Im Spiel", "el_GR": "", "en_US": "Ingame", "es_ES": "", @@ -23512,7 +23837,7 @@ "ko_KR": "게임 내", "no_NO": "", "pl_PL": "", - "pt_BR": "", + "pt_BR": "No jogo", "ru_RU": "", "sv_SE": "Spelproblem", "th_TH": "", @@ -23537,7 +23862,7 @@ "ko_KR": "메뉴", "no_NO": "Menyer", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Menu", "ru_RU": "", "sv_SE": "Menyer", "th_TH": "", @@ -23562,7 +23887,7 @@ "ko_KR": "부츠", "no_NO": "Starter", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Inicializa", "ru_RU": "", "sv_SE": "Startar", "th_TH": "", @@ -23587,7 +23912,7 @@ "ko_KR": "없음", "no_NO": "Ingenting", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Nada", "ru_RU": "", "sv_SE": "Ingenting", "th_TH": "", @@ -23610,9 +23935,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Starter opp og spiller uten krasj eller GPU-feil av noe slag, og med en hastighet som er rask nok til å ha rimelig glede av på en gjennomsnittlig PC.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Inicializa e roda sem travamentos ou bugs de GPU de qualquer tipo, e em uma velocidade rápida o suficiente para ser aproveitado em um PC comum.", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -23635,9 +23960,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Starter og går i gang i spillet, men lider av ett eller flere av følgende: krasjer, fastlåser, GPU-feil, distraherende dårlig lyd eller er rett og slett for tregt. Spillet kan fortsatt spilles helt til ende, men ikke slik det er ment å spilles.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Inicializa e entra no jogo, mas sofre de um ou mais dos seguintes: travamentos, deadlocks, bugs de GPU, áudio ruim que distrai ou é simplesmente muito lento. O jogo ainda pode ser jogado até o fim, mas não da forma como foi criado para ser jogado.", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -23660,9 +23985,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Starter opp og går forbi tittelskjermen, men kommer ikke inn i hovedspillet.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Inicializa e passa da tela de título, mas não entra no jogo principal.", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -23676,7 +24001,7 @@ "ID": "CompatibilityListBootsTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Startet, kommt aber nicht über den Titelbildschirm hinaus.", "el_GR": "", "en_US": "Boots but does not make it past the title screen.", "es_ES": "", @@ -23685,9 +24010,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Starter, men kommer ikke lenger enn til tittelskjermen.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Inizializa, mas não passa da tela de título.", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -23701,7 +24026,7 @@ "ID": "CompatibilityListNothingTooltip", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Startet nicht oder zeigt keine Anzeichen von Aktivität.", "el_GR": "", "en_US": "Does not boot or shows no signs of activity.", "es_ES": "", @@ -23710,9 +24035,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Starter ikke opp eller viser ingen tegn til aktivitet.", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Não inicializa ou não mostra sinais de atividade.", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -23726,7 +24051,7 @@ "ID": "ExtractAocListHeader", "Translations": { "ar_SA": "", - "de_DE": "", + "de_DE": "Wähle ein DLC zum Extrahieren aus", "el_GR": "", "en_US": "Select a DLC to Extract", "es_ES": "", @@ -23737,9 +24062,9 @@ "ko_KR": "추출할 DLC 선택", "no_NO": "Velg en DLC og hente ut", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Selecione um DLC para Extrair", "ru_RU": "", - "sv_SE": "", + "sv_SE": "Välj en DLC att extrahera", "th_TH": "", "tr_TR": "", "uk_UA": "", @@ -23760,9 +24085,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Rikt nærværsbilde", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Imagem da Presença do Discord", "ru_RU": "", "sv_SE": "", "th_TH": "", @@ -23785,9 +24110,9 @@ "it_IT": "", "ja_JP": "", "ko_KR": "", - "no_NO": "", + "no_NO": "Dynamisk og rik tilstedeværelse", "pl_PL": "", - "pt_BR": "", + "pt_BR": "Presença Dinâmica do Discord", "ru_RU": "", "sv_SE": "", "th_TH": "", diff --git a/src/Ryujinx/Common/ThemeManager.cs b/src/Ryujinx/Common/ThemeManager.cs deleted file mode 100644 index 6da01bfa7..000000000 --- a/src/Ryujinx/Common/ThemeManager.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace Ryujinx.Ava.Common -{ - public static class ThemeManager - { - public static event Action ThemeChanged; - - public static void OnThemeChanged() - { - ThemeChanged?.Invoke(); - } - } -} diff --git a/src/Ryujinx/DiscordIntegrationModule.cs b/src/Ryujinx/DiscordIntegrationModule.cs index 47fc8ad69..8d232b4fb 100644 --- a/src/Ryujinx/DiscordIntegrationModule.cs +++ b/src/Ryujinx/DiscordIntegrationModule.cs @@ -24,7 +24,7 @@ namespace Ryujinx.Ava private static readonly string _description = ReleaseInformation.IsValid - ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}@{ReleaseInformation.BuildGitHash}" + ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}" : "dev build"; private const string ApplicationId = "1293250299716173864"; @@ -56,6 +56,7 @@ namespace Ryujinx.Ava ConfigurationState.Instance.EnableDiscordIntegration.Event += Update; TitleIDs.CurrentApplication.Event += (_, e) => Use(e.NewValue); HorizonStatic.PlayReport += HandlePlayReport; + PlayReports.Initialize(); } private static void Update(object sender, ReactiveEventArgs evnt) diff --git a/src/Ryujinx/Headless/HeadlessRyujinx.cs b/src/Ryujinx/Headless/HeadlessRyujinx.cs index 984cb7f4f..367f6065b 100644 --- a/src/Ryujinx/Headless/HeadlessRyujinx.cs +++ b/src/Ryujinx/Headless/HeadlessRyujinx.cs @@ -5,6 +5,7 @@ using Ryujinx.Ava.Utilities.Configuration; using Ryujinx.Common; using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration.Hid; +using Ryujinx.Common.Configuration.Hid.Controller; using Ryujinx.Common.GraphicsDriver; using Ryujinx.Common.Logging; using Ryujinx.Common.Logging.Targets; diff --git a/src/Ryujinx/Headless/Options.cs b/src/Ryujinx/Headless/Options.cs index a57863d5d..6658ba3ad 100644 --- a/src/Ryujinx/Headless/Options.cs +++ b/src/Ryujinx/Headless/Options.cs @@ -148,7 +148,7 @@ namespace Ryujinx.Headless IgnoreMissingServices = configurationState.System.IgnoreMissingServices; if (NeedsOverride(nameof(IgnoreControllerApplet))) - IgnoreControllerApplet = configurationState.System.IgnoreApplet; + IgnoreControllerApplet = configurationState.System.IgnoreControllerApplet; return; diff --git a/src/Ryujinx/Headless/Windows/WindowBase.cs b/src/Ryujinx/Headless/Windows/WindowBase.cs index 16d6287a7..3c6f5f9e8 100644 --- a/src/Ryujinx/Headless/Windows/WindowBase.cs +++ b/src/Ryujinx/Headless/Windows/WindowBase.cs @@ -1,6 +1,5 @@ using Humanizer; using LibHac.Ns; -using LibHac.Util; using Ryujinx.Ava; using Ryujinx.Common; using Ryujinx.Common.Configuration; diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs index 94492cefc..29226402d 100644 --- a/src/Ryujinx/Program.cs +++ b/src/Ryujinx/Program.cs @@ -47,6 +47,7 @@ namespace Ryujinx.Ava if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 19041)) { _ = MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 20H1 and newer.\n", $"Ryujinx {Version}", MbIconwarning); + return 0; } PreviewerDetached = true; diff --git a/src/Ryujinx/RyujinxApp.axaml.cs b/src/Ryujinx/RyujinxApp.axaml.cs index 32318776a..90552cd16 100644 --- a/src/Ryujinx/RyujinxApp.axaml.cs +++ b/src/Ryujinx/RyujinxApp.axaml.cs @@ -22,6 +22,8 @@ namespace Ryujinx.Ava { public class RyujinxApp : Application { + public static event Action ThemeChanged; + internal static string FormatTitle(LocaleKeys? windowTitleKey = null, bool includeVersion = true) => windowTitleKey is null ? $"{FullAppName}{(includeVersion ? $" {Program.Version}" : string.Empty)}" @@ -112,7 +114,7 @@ namespace Ryujinx.Ava baseStyle = ConfigurationState.Instance.UI.BaseStyle; } - ThemeManager.OnThemeChanged(); + ThemeChanged?.Invoke(); RequestedThemeVariant = baseStyle switch { diff --git a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs index c75e532ec..c9bd08fa3 100644 --- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs +++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs @@ -41,7 +41,7 @@ namespace Ryujinx.Ava.UI.Applet bool okPressed = false; - if (ConfigurationState.Instance.System.IgnoreApplet) + if (ConfigurationState.Instance.System.IgnoreControllerApplet) return false; Dispatcher.UIThread.InvokeAsync(async () => @@ -75,31 +75,32 @@ namespace Ryujinx.Ava.UI.Applet bool opened = false; UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent, - title, - message, - string.Empty, - LocaleManager.Instance[LocaleKeys.DialogOpenSettingsWindowLabel], - string.Empty, - LocaleManager.Instance[LocaleKeys.SettingsButtonClose], - (int)Symbol.Important, - deferEvent, - async window => - { - if (opened) - { - return; - } + title, + message, + string.Empty, + LocaleManager.Instance[LocaleKeys.DialogOpenSettingsWindowLabel], + string.Empty, + LocaleManager.Instance[LocaleKeys.SettingsButtonClose], + (int)Symbol.Important, + deferEvent, + async window => + { + if (opened) + { + return; + } - opened = true; + opened = true; - _parent.SettingsWindow = new SettingsWindow(_parent.VirtualFileSystem, _parent.ContentManager); + _parent.SettingsWindow = + new SettingsWindow(_parent.VirtualFileSystem, _parent.ContentManager); - await _parent.SettingsWindow.ShowDialog(window); + await _parent.SettingsWindow.ShowDialog(window); - _parent.SettingsWindow = null; + _parent.SettingsWindow = null; - opened = false; - }); + opened = false; + }); if (response == UserResult.Ok) { @@ -110,7 +111,9 @@ namespace Ryujinx.Ava.UI.Applet } catch (Exception ex) { - await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogMessageDialogErrorExceptionMessage, ex)); + await ContentDialogHelper.CreateErrorDialog( + LocaleManager.Instance.UpdateAndGetDynamicValue( + LocaleKeys.DialogMessageDialogErrorExceptionMessage, ex)); dialogCloseEvent.Set(); } @@ -134,7 +137,9 @@ namespace Ryujinx.Ava.UI.Applet try { _parent.ViewModel.AppHost.NpadManager.BlockInputUpdates(); - (UserResult result, string userInput) = await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args); + (UserResult result, string userInput) = + await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], + args); if (result == UserResult.Ok) { @@ -146,7 +151,9 @@ namespace Ryujinx.Ava.UI.Applet { error = true; - await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogSoftwareKeyboardErrorExceptionMessage, ex)); + await ContentDialogHelper.CreateErrorDialog( + LocaleManager.Instance.UpdateAndGetDynamicValue( + LocaleKeys.DialogSoftwareKeyboardErrorExceptionMessage, ex)); } finally { @@ -177,7 +184,8 @@ namespace Ryujinx.Ava.UI.Applet args.InitialText = "Ryujinx"; args.StringLengthMin = 1; args.StringLengthMax = 25; - (UserResult result, string userInput) = await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.CabinetDialog], args); + (UserResult result, string userInput) = + await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.CabinetDialog], args); if (result == UserResult.Ok) { inputText = userInput; @@ -201,11 +209,13 @@ namespace Ryujinx.Ava.UI.Applet Dispatcher.UIThread.InvokeAsync(async () => { dialogCloseEvent.Set(); - await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.CabinetScanDialog], - string.Empty, - LocaleManager.Instance[LocaleKeys.InputDialogOk], - string.Empty, - LocaleManager.Instance[LocaleKeys.CabinetTitle]); + await ContentDialogHelper.CreateInfoDialog( + LocaleManager.Instance[LocaleKeys.CabinetScanDialog], + string.Empty, + LocaleManager.Instance[LocaleKeys.InputDialogOk], + string.Empty, + LocaleManager.Instance[LocaleKeys.CabinetTitle] + ); }); dialogCloseEvent.WaitOne(); } @@ -217,7 +227,8 @@ namespace Ryujinx.Ava.UI.Applet _parent.ViewModel.AppHost?.Stop(); } - public bool DisplayErrorAppletDialog(string title, string message, string[] buttons) + public bool DisplayErrorAppletDialog(string title, string message, string[] buttons, + (uint Module, uint Description)? errorCode = null) { ManualResetEvent dialogCloseEvent = new(false); @@ -229,9 +240,7 @@ namespace Ryujinx.Ava.UI.Applet { ErrorAppletWindow msgDialog = new(_parent, buttons, message) { - Title = title, - WindowStartupLocation = WindowStartupLocation.CenterScreen, - Width = 400 + Title = title, WindowStartupLocation = WindowStartupLocation.CenterScreen, Width = 400 }; object response = await msgDialog.Run(); @@ -249,7 +258,9 @@ namespace Ryujinx.Ava.UI.Applet { dialogCloseEvent.Set(); - await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogErrorAppletErrorExceptionMessage, ex)); + await ContentDialogHelper.CreateErrorDialog( + LocaleManager.Instance.UpdateAndGetDynamicValue( + LocaleKeys.DialogErrorAppletErrorExceptionMessage, ex)); } }); @@ -259,38 +270,36 @@ namespace Ryujinx.Ava.UI.Applet } public IDynamicTextInputHandler CreateDynamicTextInputHandler() => new AvaloniaDynamicTextInputHandler(_parent); - + public UserProfile ShowPlayerSelectDialog() { UserId selected = UserId.Null; byte[] defaultGuestImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg"); UserProfile guest = new(new UserId("00000000000000000000000000000080"), "Guest", defaultGuestImage); - + ManualResetEvent dialogCloseEvent = new(false); - + Dispatcher.UIThread.InvokeAsync(async () => { ObservableCollection profiles = []; NavigationDialogHost nav = new(); - + _parent.AccountManager.GetAllUsers() .OrderBy(x => x.Name) .ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav))); - + profiles.Add(new Models.UserProfile(guest, nav)); - UserSelectorDialogViewModel viewModel = new() + ProfileSelectorDialogViewModel viewModel = new() { - Profiles = profiles, - SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId + Profiles = profiles, SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId }; - UserSelectorDialog content = new(viewModel); - (selected, _) = await UserSelectorDialog.ShowInputDialog(content); - + (selected, _) = await ProfileSelectorDialog.ShowInputDialog(viewModel); + dialogCloseEvent.Set(); }); - + dialogCloseEvent.WaitOne(); - + UserProfile profile = _parent.AccountManager.LastOpenedUser; if (selected == guest.UserId) { @@ -311,6 +320,7 @@ namespace Ryujinx.Ava.UI.Applet } } } + return profile; } } diff --git a/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml similarity index 96% rename from src/Ryujinx/UI/Applet/UserSelectorDialog.axaml rename to src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml index 2816afbce..d929cc501 100644 --- a/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml +++ b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml @@ -1,5 +1,5 @@ + x:DataType="viewModels:ProfileSelectorDialogViewModel"> - + diff --git a/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml.cs b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs similarity index 85% rename from src/Ryujinx/UI/Applet/UserSelectorDialog.axaml.cs rename to src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs index 95081913e..b2c396b69 100644 --- a/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml.cs +++ b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs @@ -16,15 +16,15 @@ using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile; namespace Ryujinx.Ava.UI.Applet { - public partial class UserSelectorDialog : UserControl, INotifyPropertyChanged + public partial class ProfileSelectorDialog : UserControl { - public UserSelectorDialogViewModel ViewModel { get; set; } + public ProfileSelectorDialogViewModel ViewModel { get; set; } - public UserSelectorDialog(UserSelectorDialogViewModel viewModel) + public ProfileSelectorDialog(ProfileSelectorDialogViewModel viewModel) { + DataContext = ViewModel = viewModel; + InitializeComponent(); - ViewModel = viewModel; - DataContext = ViewModel; } private void Grid_PointerEntered(object sender, PointerEventArgs e) @@ -54,7 +54,7 @@ namespace Ryujinx.Ava.UI.Applet if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile) { ViewModel.SelectedUserId = userProfile.UserId; - Logger.Info?.Print(LogClass.UI, $"Selected user: {userProfile.UserId}"); + Logger.Info?.Print(LogClass.UI, $"Selected: {userProfile.UserId}", "ProfileSelector"); ObservableCollection newProfiles = []; @@ -79,7 +79,7 @@ namespace Ryujinx.Ava.UI.Applet } } - public static async Task<(UserId Id, bool Result)> ShowInputDialog(UserSelectorDialog content) + public static async Task<(UserId Id, bool Result)> ShowInputDialog(ProfileSelectorDialogViewModel viewModel) { ContentDialog contentDialog = new() { @@ -87,22 +87,25 @@ namespace Ryujinx.Ava.UI.Applet PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue], SecondaryButtonText = string.Empty, CloseButtonText = LocaleManager.Instance[LocaleKeys.Cancel], - Content = content, + Content = new ProfileSelectorDialog(viewModel), Padding = new Thickness(0) }; UserId result = UserId.Null; bool input = false; + + contentDialog.Closed += Handler; + await ContentDialogHelper.ShowAsync(contentDialog); + + return (result, input); + void Handler(ContentDialog sender, ContentDialogClosedEventArgs eventArgs) { if (eventArgs.Result == ContentDialogResult.Primary) { - if (contentDialog.Content is UserSelectorDialog view) - { - result = view.ViewModel.SelectedUserId; - input = true; - } + result = viewModel.SelectedUserId; + input = true; } else { @@ -110,12 +113,6 @@ namespace Ryujinx.Ava.UI.Applet input = false; } } - - contentDialog.Closed += Handler; - - await ContentDialogHelper.ShowAsync(contentDialog); - - return (result, input); } } } diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs index e55e74455..32ed6de39 100644 --- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs +++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs @@ -189,7 +189,7 @@ namespace Ryujinx.Ava.UI.Controls DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0")); DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1")); - List cacheFiles = new(); + List cacheFiles = []; if (mainDir.Exists) { diff --git a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml b/src/Ryujinx/UI/Controls/ApplicationDataView.axaml index aee8f7b36..92e4d1ac3 100644 --- a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml +++ b/src/Ryujinx/UI/Controls/ApplicationDataView.axaml @@ -119,17 +119,23 @@ TextWrapping="Wrap" > - - + + + TextWrapping="Wrap"> - + UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value)); } + private const string LogoPathFormat = "resm:Ryujinx.Assets.UIImages.Logo_{0}_{1}.png?assembly=Ryujinx"; + private void UpdateLogoTheme(string theme) { bool isDarkTheme = theme == "Dark" || (theme == "Auto" && RyujinxApp.DetectSystemTheme() == ThemeVariant.Dark); + + string themeName = isDarkTheme ? "Dark" : "Light"; - string basePath = "resm:Ryujinx.Assets.UIImages."; - string themeSuffix = isDarkTheme ? "Dark.png" : "Light.png"; - - GithubLogo = LoadBitmap($"{basePath}Logo_GitHub_{themeSuffix}?assembly=Ryujinx"); - DiscordLogo = LoadBitmap($"{basePath}Logo_Discord_{themeSuffix}?assembly=Ryujinx"); + GithubLogo = LoadBitmap(LogoPathFormat.Format("GitHub", themeName)); + DiscordLogo = LoadBitmap(LogoPathFormat.Format("Discord", themeName)); } private static Bitmap LoadBitmap(string uri) => new(Avalonia.Platform.AssetLoader.Open(new Uri(uri))); public void Dispose() { - ThemeManager.ThemeChanged -= ThemeManager_ThemeChanged; + RyujinxApp.ThemeChanged -= Ryujinx_ThemeChanged; + + GithubLogo.Dispose(); + DiscordLogo.Dispose(); + GC.SuppressFinalize(this); } } diff --git a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs index e8869c475..e550c4ae0 100644 --- a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs @@ -264,7 +264,7 @@ namespace Ryujinx.Ava.UI.ViewModels Logger.Error?.Print(LogClass.Application, $"Couldn't get valid amiibo data: {exception}"); // Neither local or remote files are valid JSON, close window. - ShowInfoDialog(); + await ShowInfoDialog(); Close(); } else if (!remoteIsValid) @@ -273,7 +273,7 @@ namespace Ryujinx.Ava.UI.ViewModels // Only the local file is valid, the local one should be used // but the user should be warned. - ShowInfoDialog(); + await ShowInfoDialog(); } } @@ -525,7 +525,7 @@ namespace Ryujinx.Ava.UI.ViewModels AmiiboImage = bitmap; } - private static async void ShowInfoDialog() + private static async Task ShowInfoDialog() { await ContentDialogHelper.CreateInfoDialog(LocaleManager.Instance[LocaleKeys.DialogAmiiboApiTitle], LocaleManager.Instance[LocaleKeys.DialogAmiiboApiConnectErrorMessage], diff --git a/src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs b/src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs index 592d5f81a..33c75bc62 100644 --- a/src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs @@ -1,6 +1,7 @@ using Gommon; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Utilities.AppLibrary; +using Ryujinx.Ava.Utilities.PlayReport; namespace Ryujinx.Ava.UI.ViewModels { @@ -10,6 +11,11 @@ namespace Ryujinx.Ava.UI.ViewModels public ApplicationDataViewModel(ApplicationData appData) => AppData = appData; + public string DynamicRichPresenceDescription => + AppData.HasDynamicRichPresenceSupport + ? AppData.RichPresenceSpec.Value.Description + : GameSpec.DefaultDescription; + public string FormattedVersion => LocaleManager.Instance[LocaleKeys.GameListHeaderVersion].Format(AppData.Version); public string FormattedDeveloper => LocaleManager.Instance[LocaleKeys.GameListHeaderDeveloper].Format(AppData.Developer); public string FormattedFileExtension => LocaleManager.Instance[LocaleKeys.GameListHeaderFileExtension].Format(AppData.FileExtension); diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs index 113c00a5a..7d7674c4e 100644 --- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs @@ -7,6 +7,7 @@ using Avalonia.Media.Imaging; using Avalonia.Platform.Storage; using Avalonia.Threading; using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; using DynamicData; using DynamicData.Binding; using FluentAvalonia.UI.Controls; @@ -104,6 +105,13 @@ namespace Ryujinx.Ava.UI.ViewModels [ObservableProperty] private bool _isSubMenuOpen; [ObservableProperty] private ApplicationContextMenu _listAppContextMenu; [ObservableProperty] private ApplicationContextMenu _gridAppContextMenu; + [ObservableProperty] private bool _updateAvailable; + + public static AsyncRelayCommand UpdateCommand { get; } = Commands.Create(async () => + { + if (Updater.CanUpdate(true)) + await Updater.BeginUpdateAsync(true); + }); private bool _showLoadProgress; private bool _isGameRunning; @@ -1339,6 +1347,25 @@ namespace Ryujinx.Ava.UI.ViewModels OpenHelper.OpenFolder(AppDataManager.BaseDirPath); } + public void OpenScreenshotsFolder() + { + string screenshotsDir = Path.Combine(AppDataManager.BaseDirPath, "screenshots"); + + try + { + if (!Directory.Exists(screenshotsDir)) + Directory.CreateDirectory(screenshotsDir); + } + catch (Exception ex) + { + Logger.Error?.Print(LogClass.Application, $"Failed to create directory at path {screenshotsDir}. Error : {ex.GetType().Name}", "Screenshot"); + + return; + } + + OpenHelper.OpenFolder(screenshotsDir); + } + public void OpenLogsFolder() { string logPath = AppDataManager.GetOrCreateLogsDir(); diff --git a/src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs b/src/Ryujinx/UI/ViewModels/ProfileSelectorDialogViewModel.cs similarity index 82% rename from src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs rename to src/Ryujinx/UI/ViewModels/ProfileSelectorDialogViewModel.cs index 094aed5cf..979e1616a 100644 --- a/src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/ProfileSelectorDialogViewModel.cs @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; namespace Ryujinx.Ava.UI.ViewModels { - public partial class UserSelectorDialogViewModel : BaseModel + public partial class ProfileSelectorDialogViewModel : BaseModel { [ObservableProperty] private UserId _selectedUserId; diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index b76498f20..60fe5f08e 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -13,6 +13,7 @@ using Ryujinx.Ava.UI.Models.Input; using Ryujinx.Ava.UI.Windows; using Ryujinx.Ava.Utilities.Configuration; using Ryujinx.Ava.Utilities.Configuration.System; +using Ryujinx.Ava.Utilities.Configuration.UI; using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration.Multiplayer; using Ryujinx.Common.GraphicsDriver; @@ -48,8 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels private int _graphicsBackendMultithreadingIndex; private float _volume; [ObservableProperty] private bool _isVulkanAvailable = true; - [ObservableProperty] private bool _gameDirectoryChanged; - [ObservableProperty] private bool _autoloadDirectoryChanged; + [ObservableProperty] private bool _gameListNeedsRefresh; private readonly List _gpuIds = []; private int _graphicsBackendIndex; private int _scalingFilter; @@ -121,9 +121,14 @@ namespace Ryujinx.Ava.UI.ViewModels public bool RememberWindowState { get; set; } public bool ShowTitleBar { get; set; } public int HideCursor { get; set; } + public int UpdateCheckerType { get; set; } public bool EnableDockedMode { get; set; } public bool EnableKeyboard { get; set; } public bool EnableMouse { get; set; } + public bool DisableInputWhenOutOfFocus { get; set; } + + public int FocusLostActionType { get; set; } + public VSyncMode VSyncMode { get => _vSyncMode; @@ -476,6 +481,8 @@ namespace Ryujinx.Ava.UI.ViewModels RememberWindowState = config.RememberWindowState; ShowTitleBar = config.ShowTitleBar; HideCursor = (int)config.HideCursor.Value; + UpdateCheckerType = (int)config.UpdateCheckerType.Value; + FocusLostActionType = (int)config.FocusLostActionType.Value; GameDirectories.Clear(); GameDirectories.AddRange(config.UI.GameDirs.Value); @@ -495,6 +502,7 @@ namespace Ryujinx.Ava.UI.ViewModels EnableDockedMode = config.System.EnableDockedMode; EnableKeyboard = config.Hid.EnableKeyboard; EnableMouse = config.Hid.EnableMouse; + DisableInputWhenOutOfFocus = config.Hid.DisableInputWhenOutOfFocus; // Keyboard Hotkeys KeyboardHotkey = new HotkeyConfig(config.Hid.Hotkeys.Value); @@ -518,7 +526,7 @@ namespace Ryujinx.Ava.UI.ViewModels EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks; DramSize = config.System.DramSize; IgnoreMissingServices = config.System.IgnoreMissingServices; - IgnoreApplet = config.System.IgnoreApplet; + IgnoreApplet = config.System.IgnoreControllerApplet; // CPU EnablePptc = config.System.EnablePtc; @@ -582,16 +590,10 @@ namespace Ryujinx.Ava.UI.ViewModels config.RememberWindowState.Value = RememberWindowState; config.ShowTitleBar.Value = ShowTitleBar; config.HideCursor.Value = (HideCursorMode)HideCursor; - - if (GameDirectoryChanged) - { - config.UI.GameDirs.Value = [..GameDirectories]; - } - - if (AutoloadDirectoryChanged) - { - config.UI.AutoloadDirs.Value = [..AutoloadDirectories]; - } + config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType; + config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType; + config.UI.GameDirs.Value = [..GameDirectories]; + config.UI.AutoloadDirs.Value = [..AutoloadDirectories]; config.UI.BaseStyle.Value = BaseStyleIndex switch { @@ -605,14 +607,18 @@ namespace Ryujinx.Ava.UI.ViewModels config.System.EnableDockedMode.Value = EnableDockedMode; config.Hid.EnableKeyboard.Value = EnableKeyboard; config.Hid.EnableMouse.Value = EnableMouse; + config.Hid.DisableInputWhenOutOfFocus.Value = DisableInputWhenOutOfFocus; // Keyboard Hotkeys config.Hid.Hotkeys.Value = KeyboardHotkey.GetConfig(); // System config.System.Region.Value = (Region)Region; + + if (config.System.Language.Value != (Language)Language) + GameListNeedsRefresh = true; + config.System.Language.Value = (Language)Language; - if (_validTzRegions.Contains(TimeZone)) { config.System.TimeZone.Value = TimeZone; @@ -623,7 +629,7 @@ namespace Ryujinx.Ava.UI.ViewModels config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks; config.System.DramSize.Value = DramSize; config.System.IgnoreMissingServices.Value = IgnoreMissingServices; - config.System.IgnoreApplet.Value = IgnoreApplet; + config.System.IgnoreControllerApplet.Value = IgnoreApplet; // CPU config.System.EnablePtc.Value = EnablePptc; @@ -703,8 +709,7 @@ namespace Ryujinx.Ava.UI.ViewModels SaveSettingsEvent?.Invoke(); - GameDirectoryChanged = false; - AutoloadDirectoryChanged = false; + GameListNeedsRefresh = false; } private static void RevertIfNotSaved() diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml index cacb4b130..1da91c388 100644 --- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml +++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml @@ -66,6 +66,10 @@ Command="{Binding OpenRyujinxFolder}" Header="{ext:Locale MenuBarFileOpenEmuFolder}" ToolTip.Tip="{ext:Locale OpenRyujinxFolderTooltip}" /> + CompatibilityList.Show()); - - UpdateMenuItem.Command = Commands.Create(async () => - { - if (Updater.CanUpdate(true)) - await Updater.BeginUpdateAsync(true); - }); + + UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand; FaqMenuItem.Command = SetupGuideMenuItem.Command = diff --git a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml index a0259c723..02cc1fc7b 100644 --- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml +++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml @@ -23,7 +23,7 @@ Background="{DynamicResource ThemeContentBackgroundColor}" DockPanel.Dock="Bottom" IsVisible="{Binding ShowMenuAndStatusBar}" - ColumnDefinitions="Auto,Auto,*,Auto,Auto"> + ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto"> - + + + + + + + + + + diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml index aa7144cf1..7a9a55848 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml @@ -316,8 +316,8 @@ - + ToolTip.Tip="{ext:Locale IgnoreControllerAppletTooltip}"> + @@ -30,18 +31,57 @@ ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}" Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" /> - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AddDirButton(GameDirPathBox, ViewModel.GameDirectories, true)); AddAutoloadDirButton.Command = @@ -37,11 +36,8 @@ namespace Ryujinx.Ava.UI.Views.Settings directories.Add(path); addDirBox.Clear(); - - if (isGameList) - ViewModel.GameDirectoryChanged = true; - else - ViewModel.AutoloadDirectoryChanged = true; + + ViewModel.GameListNeedsRefresh = true; } else { @@ -51,10 +47,7 @@ namespace Ryujinx.Ava.UI.Views.Settings { directories.Add(folder.Value.Path.LocalPath); - if (isGameList) - ViewModel.GameDirectoryChanged = true; - else - ViewModel.AutoloadDirectoryChanged = true; + ViewModel.GameListNeedsRefresh = true; } } } @@ -66,7 +59,7 @@ namespace Ryujinx.Ava.UI.Views.Settings foreach (string path in new List(GameDirsList.SelectedItems.Cast())) { ViewModel.GameDirectories.Remove(path); - ViewModel.GameDirectoryChanged = true; + ViewModel.GameListNeedsRefresh = true; } if (GameDirsList.ItemCount > 0) @@ -82,7 +75,7 @@ namespace Ryujinx.Ava.UI.Views.Settings foreach (string path in new List(AutoloadDirsList.SelectedItems.Cast())) { ViewModel.AutoloadDirectories.Remove(path); - ViewModel.AutoloadDirectoryChanged = true; + ViewModel.GameListNeedsRefresh = true; } if (AutoloadDirsList.ItemCount > 0) diff --git a/src/Ryujinx/UI/Windows/AboutWindow.axaml b/src/Ryujinx/UI/Windows/AboutWindow.axaml index df880160f..e215cf27e 100644 --- a/src/Ryujinx/UI/Windows/AboutWindow.axaml +++ b/src/Ryujinx/UI/Windows/AboutWindow.axaml @@ -125,7 +125,7 @@ Background="Transparent" Click="Button_OnClick" CornerRadius="15" - Tag="https://discord.gg/dHPrkBkkyA" + Tag="https://discord.gg/PEuzjrFXUA" ToolTip.Tip="{ext:Locale AboutDiscordUrlTooltipMessage}"> @@ -142,42 +142,40 @@ + VerticalAlignment="Stretch" RowDefinitions="Auto,Auto,Auto"> +