New NVDEC and VIC implementation (#1384)
* Initial NVDEC and VIC implementation * Update FFmpeg.AutoGen to 4.3.0 * Add nvdec dependencies for Windows * Unify some VP9 structures * Rename VP9 structure fields * Improvements to Video API * XML docs for Common.Memory * Remove now unused or redundant overloads from MemoryAccessor * NVDEC UV surface read/write scalar paths * Add FIXME comments about hacky things/stuff that will need to be fixed in the future * Cleaned up VP9 memory allocation * Remove some debug logs * Rename some VP9 structs * Remove unused struct * No need to compile Ryujinx.Graphics.Host1x with unsafe anymore * Name AsyncWorkQueue threads to make debugging easier * Make Vp9PictureInfo a ref struct * LayoutConverter no longer needs the depth argument (broken by rebase) * Pooling of VP9 buffers, plus fix a memory leak on VP9 * Really wish VS could rename projects properly... * Address feedback * Remove using * Catch OperationCanceledException * Add licensing informations * Add THIRDPARTY.md to release too Co-authored-by: Thog <me@thog.eu>
This commit is contained in:
gdkchan
GitHub
parent
38b26cf424
commit
4d02a2d2c0
202 changed files with 20563 additions and 2567 deletions
253
Ryujinx.Graphics.Vic/Image/SurfaceReader.cs
Normal file
253
Ryujinx.Graphics.Vic/Image/SurfaceReader.cs
Normal file
|
|
@ -0,0 +1,253 @@
|
|||
using Ryujinx.Common.Logging;
|
||||
using Ryujinx.Graphics.Gpu.Memory;
|
||||
using Ryujinx.Graphics.Texture;
|
||||
using Ryujinx.Graphics.Vic.Types;
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.Intrinsics;
|
||||
using System.Runtime.Intrinsics.X86;
|
||||
using static Ryujinx.Graphics.Vic.Image.SurfaceCommon;
|
||||
|
||||
namespace Ryujinx.Graphics.Vic.Image
|
||||
{
|
||||
static class SurfaceReader
|
||||
{
|
||||
public static Surface Read(ResourceManager rm, ref SlotSurfaceConfig config, ref PlaneOffsets offsets)
|
||||
{
|
||||
switch (config.SlotPixelFormat)
|
||||
{
|
||||
case PixelFormat.Y8___V8U8_N420: return ReadNv12(rm, ref config, ref offsets);
|
||||
}
|
||||
|
||||
Logger.PrintError(LogClass.Vic, $"Unsupported pixel format \"{config.SlotPixelFormat}\".");
|
||||
|
||||
int lw = config.SlotLumaWidth + 1;
|
||||
int lh = config.SlotLumaHeight + 1;
|
||||
|
||||
return new Surface(rm.SurfacePool, lw, lh);
|
||||
}
|
||||
|
||||
private unsafe static Surface ReadNv12(ResourceManager rm, ref SlotSurfaceConfig config, ref PlaneOffsets offsets)
|
||||
{
|
||||
InputSurface input = ReadSurface(rm.Gmm, ref config, ref offsets, 1, 2);
|
||||
|
||||
int width = input.Width;
|
||||
int height = input.Height;
|
||||
|
||||
int yStride = GetPitch(width, 1);
|
||||
int uvStride = GetPitch(input.UvWidth, 2);
|
||||
|
||||
Surface output = new Surface(rm.SurfacePool, width, height);
|
||||
|
||||
if (Sse41.IsSupported)
|
||||
{
|
||||
Vector128<byte> shufMask = Vector128.Create(
|
||||
(byte)0, (byte)2, (byte)3, (byte)1,
|
||||
(byte)4, (byte)6, (byte)7, (byte)5,
|
||||
(byte)8, (byte)10, (byte)11, (byte)9,
|
||||
(byte)12, (byte)14, (byte)15, (byte)13);
|
||||
Vector128<short> alphaMask = Vector128.Create(0xffUL << 48).AsInt16();
|
||||
|
||||
int yStrideGap = yStride - width;
|
||||
int uvStrideGap = uvStride - input.UvWidth;
|
||||
|
||||
int widthTrunc = width & ~0xf;
|
||||
|
||||
fixed (Pixel* dstPtr = output.Data)
|
||||
{
|
||||
Pixel* op = dstPtr;
|
||||
|
||||
fixed (byte* src0Ptr = input.Buffer0, src1Ptr = input.Buffer1)
|
||||
{
|
||||
byte* i0p = src0Ptr;
|
||||
|
||||
for (int y = 0; y < height; y++)
|
||||
{
|
||||
byte* i1p = src1Ptr + (y >> 1) * uvStride;
|
||||
|
||||
int x = 0;
|
||||
|
||||
for (; x < widthTrunc; x += 16, i0p += 16, i1p += 16)
|
||||
{
|
||||
Vector128<short> ya0 = Sse41.ConvertToVector128Int16(i0p);
|
||||
Vector128<short> ya1 = Sse41.ConvertToVector128Int16(i0p + 8);
|
||||
|
||||
Vector128<byte> uv = Sse2.LoadVector128(i1p);
|
||||
|
||||
Vector128<short> uv0 = Sse2.UnpackLow(uv.AsInt16(), uv.AsInt16());
|
||||
Vector128<short> uv1 = Sse2.UnpackHigh(uv.AsInt16(), uv.AsInt16());
|
||||
|
||||
Vector128<short> rgba0 = Sse2.UnpackLow(ya0, uv0);
|
||||
Vector128<short> rgba1 = Sse2.UnpackHigh(ya0, uv0);
|
||||
Vector128<short> rgba2 = Sse2.UnpackLow(ya1, uv1);
|
||||
Vector128<short> rgba3 = Sse2.UnpackHigh(ya1, uv1);
|
||||
|
||||
rgba0 = Ssse3.Shuffle(rgba0.AsByte(), shufMask).AsInt16();
|
||||
rgba1 = Ssse3.Shuffle(rgba1.AsByte(), shufMask).AsInt16();
|
||||
rgba2 = Ssse3.Shuffle(rgba2.AsByte(), shufMask).AsInt16();
|
||||
rgba3 = Ssse3.Shuffle(rgba3.AsByte(), shufMask).AsInt16();
|
||||
|
||||
Vector128<short> rgba16_0 = Sse41.ConvertToVector128Int16(rgba0.AsByte());
|
||||
Vector128<short> rgba16_1 = Sse41.ConvertToVector128Int16(HighToLow(rgba0.AsByte()));
|
||||
Vector128<short> rgba16_2 = Sse41.ConvertToVector128Int16(rgba1.AsByte());
|
||||
Vector128<short> rgba16_3 = Sse41.ConvertToVector128Int16(HighToLow(rgba1.AsByte()));
|
||||
Vector128<short> rgba16_4 = Sse41.ConvertToVector128Int16(rgba2.AsByte());
|
||||
Vector128<short> rgba16_5 = Sse41.ConvertToVector128Int16(HighToLow(rgba2.AsByte()));
|
||||
Vector128<short> rgba16_6 = Sse41.ConvertToVector128Int16(rgba3.AsByte());
|
||||
Vector128<short> rgba16_7 = Sse41.ConvertToVector128Int16(HighToLow(rgba3.AsByte()));
|
||||
|
||||
rgba16_0 = Sse2.Or(rgba16_0, alphaMask);
|
||||
rgba16_1 = Sse2.Or(rgba16_1, alphaMask);
|
||||
rgba16_2 = Sse2.Or(rgba16_2, alphaMask);
|
||||
rgba16_3 = Sse2.Or(rgba16_3, alphaMask);
|
||||
rgba16_4 = Sse2.Or(rgba16_4, alphaMask);
|
||||
rgba16_5 = Sse2.Or(rgba16_5, alphaMask);
|
||||
rgba16_6 = Sse2.Or(rgba16_6, alphaMask);
|
||||
rgba16_7 = Sse2.Or(rgba16_7, alphaMask);
|
||||
|
||||
rgba16_0 = Sse2.ShiftLeftLogical(rgba16_0, 2);
|
||||
rgba16_1 = Sse2.ShiftLeftLogical(rgba16_1, 2);
|
||||
rgba16_2 = Sse2.ShiftLeftLogical(rgba16_2, 2);
|
||||
rgba16_3 = Sse2.ShiftLeftLogical(rgba16_3, 2);
|
||||
rgba16_4 = Sse2.ShiftLeftLogical(rgba16_4, 2);
|
||||
rgba16_5 = Sse2.ShiftLeftLogical(rgba16_5, 2);
|
||||
rgba16_6 = Sse2.ShiftLeftLogical(rgba16_6, 2);
|
||||
rgba16_7 = Sse2.ShiftLeftLogical(rgba16_7, 2);
|
||||
|
||||
Sse2.Store((short*)(op + (uint)x + 0), rgba16_0);
|
||||
Sse2.Store((short*)(op + (uint)x + 2), rgba16_1);
|
||||
Sse2.Store((short*)(op + (uint)x + 4), rgba16_2);
|
||||
Sse2.Store((short*)(op + (uint)x + 6), rgba16_3);
|
||||
Sse2.Store((short*)(op + (uint)x + 8), rgba16_4);
|
||||
Sse2.Store((short*)(op + (uint)x + 10), rgba16_5);
|
||||
Sse2.Store((short*)(op + (uint)x + 12), rgba16_6);
|
||||
Sse2.Store((short*)(op + (uint)x + 14), rgba16_7);
|
||||
}
|
||||
|
||||
for (; x < width; x++, i1p += (x & 1) * 2)
|
||||
{
|
||||
Pixel* px = op + (uint)x;
|
||||
|
||||
px->R = Upsample(*i0p++);
|
||||
px->G = Upsample(*i1p);
|
||||
px->B = Upsample(*(i1p + 1));
|
||||
px->A = 0x3ff;
|
||||
}
|
||||
|
||||
op += width;
|
||||
i0p += yStrideGap;
|
||||
i1p += uvStrideGap;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int y = 0; y < height; y++)
|
||||
{
|
||||
int uvBase = (y >> 1) * uvStride;
|
||||
|
||||
for (int x = 0; x < width; x++)
|
||||
{
|
||||
output.SetR(x, y, Upsample(input.Buffer0[y * yStride + x]));
|
||||
|
||||
int uvOffs = uvBase + (x & ~1);
|
||||
|
||||
output.SetG(x, y, Upsample(input.Buffer1[uvOffs]));
|
||||
output.SetB(x, y, Upsample(input.Buffer1[uvOffs + 1]));
|
||||
output.SetA(x, y, 0x3ff);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
private static Vector128<byte> HighToLow(Vector128<byte> value)
|
||||
{
|
||||
return Sse.MoveHighToLow(value.AsSingle(), value.AsSingle()).AsByte();
|
||||
}
|
||||
|
||||
private static InputSurface ReadSurface(
|
||||
MemoryManager gmm,
|
||||
ref SlotSurfaceConfig config,
|
||||
ref PlaneOffsets offsets,
|
||||
int bytesPerPixel,
|
||||
int planes)
|
||||
{
|
||||
InputSurface surface = new InputSurface();
|
||||
|
||||
int gobBlocksInY = 1 << config.SlotBlkHeight;
|
||||
|
||||
bool linear = config.SlotBlkKind == 0;
|
||||
|
||||
int lw = config.SlotLumaWidth + 1;
|
||||
int lh = config.SlotLumaHeight + 1;
|
||||
|
||||
int cw = config.SlotChromaWidth + 1;
|
||||
int ch = config.SlotChromaHeight + 1;
|
||||
|
||||
surface.Width = lw;
|
||||
surface.Height = lh;
|
||||
surface.UvWidth = cw;
|
||||
surface.UvHeight = ch;
|
||||
|
||||
if (planes > 0)
|
||||
{
|
||||
surface.Buffer0 = ReadBuffer(gmm, offsets.LumaOffset, linear, lw, lh, bytesPerPixel, gobBlocksInY);
|
||||
}
|
||||
|
||||
if (planes > 1)
|
||||
{
|
||||
surface.Buffer1 = ReadBuffer(gmm, offsets.ChromaUOffset, linear, cw, ch, planes == 2 ? 2 : 1, gobBlocksInY);
|
||||
}
|
||||
|
||||
if (planes > 2)
|
||||
{
|
||||
surface.Buffer2 = ReadBuffer(gmm, offsets.ChromaVOffset, linear, cw, ch, 1, gobBlocksInY);
|
||||
}
|
||||
|
||||
return surface;
|
||||
}
|
||||
|
||||
private static ReadOnlySpan<byte> ReadBuffer(
|
||||
MemoryManager gmm,
|
||||
uint offset,
|
||||
bool linear,
|
||||
int width,
|
||||
int height,
|
||||
int bytesPerPixel,
|
||||
int gobBlocksInY)
|
||||
{
|
||||
int stride = GetPitch(width, bytesPerPixel);
|
||||
|
||||
if (linear)
|
||||
{
|
||||
return gmm.GetSpan(ExtendOffset(offset), stride * height);
|
||||
}
|
||||
|
||||
return ReadBuffer(gmm, offset, width, height, stride, bytesPerPixel, gobBlocksInY);
|
||||
}
|
||||
|
||||
private static ReadOnlySpan<byte> ReadBuffer(
|
||||
MemoryManager gmm,
|
||||
uint offset,
|
||||
int width,
|
||||
int height,
|
||||
int dstStride,
|
||||
int bytesPerPixel,
|
||||
int gobBlocksInY)
|
||||
{
|
||||
int inSize = GetBlockLinearSize(width, height, bytesPerPixel, gobBlocksInY);
|
||||
|
||||
ReadOnlySpan<byte> src = gmm.GetSpan(ExtendOffset(offset), inSize);
|
||||
|
||||
Span<byte> dst = new byte[dstStride * height];
|
||||
|
||||
LayoutConverter.ConvertBlockLinearToLinear(dst, width, height, dstStride, bytesPerPixel, gobBlocksInY, src);
|
||||
|
||||
return dst;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue