crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-07-25 08:27:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

misc: Replace references to IntPtr/UIntPtr with nint/nuint + code cleanups.

Browse source
This commit is contained in:
Evan Husted 2024-10-26 08:46:41 -05:00
parent a09d314817
commit dfb4854d19
172 changed files with 902 additions and 914 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx.Graphics.Nvdec.FFmpeg/FFmpegContext.cs
View file

@ -91,7 +91,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg
FFmpegApi.av_log_format_line(ptr, level, format, vl, lineBuffer, lineSize, &printPrefix);
string line = Marshal.PtrToStringAnsi((IntPtr)lineBuffer).Trim();
string line = Marshal.PtrToStringAnsi((nint)lineBuffer).Trim();
switch (level)
{

12
src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVCodec.cs
View file

@ -12,15 +12,15 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public int Capabilities;
public byte MaxLowRes;
public unsafe AVRational* SupportedFramerates;
public IntPtr PixFmts;
public IntPtr SupportedSamplerates;
public IntPtr SampleFmts;
public nint PixFmts;
public nint SupportedSamplerates;
public nint SampleFmts;
// Deprecated
public unsafe ulong* ChannelLayouts;
public unsafe IntPtr PrivClass;
public IntPtr Profiles;
public unsafe nint PrivClass;
public nint Profiles;
public unsafe byte* WrapperName;
public IntPtr ChLayouts;
public nint ChLayouts;
#pragma warning restore CS0649
}
}

10
src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVCodec501.cs
View file

@ -12,13 +12,13 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public int Capabilities;
public byte MaxLowRes;
public unsafe AVRational* SupportedFramerates;
public IntPtr PixFmts;
public IntPtr SupportedSamplerates;
public IntPtr SampleFmts;
public nint PixFmts;
public nint SupportedSamplerates;
public nint SampleFmts;
// Deprecated
public unsafe ulong* ChannelLayouts;
public unsafe IntPtr PrivClass;
public IntPtr Profiles;
public unsafe nint PrivClass;
public nint Profiles;
public unsafe byte* WrapperName;
#pragma warning restore CS0649
}

56
src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVCodecContext.cs
View file

@ -6,22 +6,22 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
struct AVCodecContext
{
#pragma warning disable CS0649 // Field is never assigned to
public unsafe IntPtr AvClass;
public unsafe nint AvClass;
public int LogLevelOffset;
public int CodecType;
public unsafe AVCodec* Codec;
public AVCodecID CodecId;
public uint CodecTag;
public IntPtr PrivData;
public IntPtr Internal;
public IntPtr Opaque;
public nint PrivData;
public nint Internal;
public nint Opaque;
public long BitRate;
public int BitRateTolerance;
public int GlobalQuality;
public int CompressionLevel;
public int Flags;
public int Flags2;
public IntPtr ExtraData;
public nint ExtraData;
public int ExtraDataSize;
public AVRational TimeBase;
public int TicksPerFrame;
@ -32,8 +32,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public int CodedHeight;
public int GopSize;
public int PixFmt;
public IntPtr DrawHorizBand;
public IntPtr GetFormat;
public nint DrawHorizBand;
public nint GetFormat;
public int MaxBFrames;
public float BQuantFactor;
public float BQuantOffset;
@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public float PMasking;
public float DarkMasking;
public int SliceCount;
public IntPtr SliceOffset;
public nint SliceOffset;
public AVRational SampleAspectRatio;
public int MeCmp;
public int MeSubCmp;
@ -60,8 +60,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public int MeRange;
public int SliceFlags;
public int MbDecision;
public IntPtr IntraMatrix;
public IntPtr InterMatrix;
public nint IntraMatrix;
public nint InterMatrix;
public int IntraDcPrecision;
public int SkipTop;
public int SkipBottom;
@ -89,7 +89,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public ulong RequestChannelLayout;
public int AudioServiceType;
public int RequestSampleFmt;
public IntPtr GetBuffer2;
public nint GetBuffer2;
public float QCompress;
public float QBlur;
public int QMin;
@ -97,23 +97,23 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public int MaxQdiff;
public int RcBufferSize;
public int RcOverrideCount;
public IntPtr RcOverride;
public nint RcOverride;
public long RcMaxRate;
public long RcMinRate;
public float RcMax_available_vbv_use;
public float RcMin_vbv_overflow_use;
public int RcInitialBufferOccupancy;
public int Trellis;
public IntPtr StatsOut;
public IntPtr StatsIn;
public nint StatsOut;
public nint StatsIn;
public int WorkaroundBugs;
public int StrictStdCompliance;
public int ErrorConcealment;
public int Debug;
public int ErrRecognition;
public long ReorderedOpaque;
public IntPtr HwAccel;
public IntPtr HwAccelContext;
public nint HwAccel;
public nint HwAccelContext;
public Array8<ulong> Error;
public int DctAlgo;
public int IdctAlgo;
@ -124,48 +124,48 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public int ThreadType;
public int ActiveThreadType;
public int ThreadSafeCallbacks;
public IntPtr Execute;
public IntPtr Execute2;
public nint Execute;
public nint Execute2;
public int NsseWeight;
public int Profile;
public int Level;
public int SkipLoopFilter;
public int SkipIdct;
public int SkipFrame;
public IntPtr SubtitleHeader;
public nint SubtitleHeader;
public int SubtitleHeaderSize;
public int InitialPadding;
public AVRational Framerate;
public int SwPixFmt;
public AVRational PktTimebase;
public IntPtr CodecDescriptor;
public nint CodecDescriptor;
public long PtsCorrectionNumFaultyPts;
public long PtsCorrectionNumFaultyDts;
public long PtsCorrectionLastPts;
public long PtsCorrectionLastDts;
public IntPtr SubCharenc;
public nint SubCharenc;
public int SubCharencMode;
public int SkipAlpha;
public int SeekPreroll;
public int DebugMv;
public IntPtr ChromaIntraMatrix;
public IntPtr DumpSeparator;
public IntPtr CodecWhitelist;
public nint ChromaIntraMatrix;
public nint DumpSeparator;
public nint CodecWhitelist;
public uint Properties;
public IntPtr CodedSideData;
public nint CodedSideData;
public int NbCodedSideData;
public IntPtr HwFramesCtx;
public nint HwFramesCtx;
public int SubTextFormat;
public int TrailingPadding;
public long MaxPixels;
public IntPtr HwDeviceCtx;
public nint HwDeviceCtx;
public int HwAccelFlags;
public int applyCropping;
public int ExtraHwFrames;
public int DiscardDamagedPercentage;
public long MaxSamples;
public int ExportSideData;
public IntPtr GetEncodeBuffer;
public nint GetEncodeBuffer;
#pragma warning restore CS0649
}
}

6
src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVFrame.cs
View file

@ -6,9 +6,9 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
struct AVFrame
{
#pragma warning disable CS0649 // Field is never assigned to
public Array8<IntPtr> Data;
public Array8<nint> Data;
public Array8<int> LineSize;
public IntPtr ExtendedData;
public nint ExtendedData;
public int Width;
public int Height;
public int NumSamples;
@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public int CodedPictureNumber;
public int DisplayPictureNumber;
public int Quality;
public IntPtr Opaque;
public nint Opaque;
public int RepeatPicture;
public int InterlacedFrame;
public int TopFieldFirst;

12
src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFCodec.cs
View file

@ -8,12 +8,12 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public T Base;
public int CapsInternalOrCbType;
public int PrivDataSize;
public IntPtr UpdateThreadContext;
public IntPtr UpdateThreadContextForUser;
public IntPtr Defaults;
public IntPtr InitStaticData;
public IntPtr Init;
public IntPtr CodecCallback;
public nint UpdateThreadContext;
public nint UpdateThreadContextForUser;
public nint Defaults;
public nint InitStaticData;
public nint Init;
public nint CodecCallback;
#pragma warning restore CS0649
// NOTE: There is more after, but the layout kind of changed a bit and we don't need more than this. This is safe as we only manipulate this behind a reference.

16
src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFCodecLegacy.cs
View file

@ -8,14 +8,14 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
public T Base;
public uint CapsInternalOrCbType;
public int PrivDataSize;
public IntPtr UpdateThreadContext;
public IntPtr UpdateThreadContextForUser;
public IntPtr Defaults;
public IntPtr InitStaticData;
public IntPtr Init;
public IntPtr EncodeSub;
public IntPtr Encode2;
public IntPtr Decode;
public nint UpdateThreadContext;
public nint UpdateThreadContextForUser;
public nint Defaults;
public nint InitStaticData;
public nint Init;
public nint EncodeSub;
public nint Encode2;
public nint Decode;
#pragma warning restore CS0649
// NOTE: There is more after, but the layout kind of changed a bit and we don't need more than this. This is safe as we only manipulate this behind a reference.

6
src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
View file

@ -37,9 +37,9 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
}
private static bool TryLoadWhitelistedLibrary(string libraryName, Assembly assembly, DllImportSearchPath? searchPath, out IntPtr handle)
private static bool TryLoadWhitelistedLibrary(string libraryName, Assembly assembly, DllImportSearchPath? searchPath, out nint handle)
{
handle = IntPtr.Zero;
handle = nint.Zero;
if (_librariesWhitelist.TryGetValue(libraryName, out var value))
{
@ -71,7 +71,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
return handle;
}
return IntPtr.Zero;
return nint.Zero;
});
}

6
src/Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs
View file

@ -11,9 +11,9 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg
public int RequestedWidth { get; }
public int RequestedHeight { get; }
public Plane YPlane => new((IntPtr)Frame->Data[0], Stride * Height);
public Plane UPlane => new((IntPtr)Frame->Data[1], UvStride * UvHeight);
public Plane VPlane => new((IntPtr)Frame->Data[2], UvStride * UvHeight);
public Plane YPlane => new((nint)Frame->Data[0], Stride * Height);
public Plane UPlane => new((nint)Frame->Data[1], UvStride * UvHeight);
public Plane VPlane => new((nint)Frame->Data[2], UvStride * UvHeight);
public FrameField Field => Frame->InterlacedFrame != 0 ? FrameField.Interlaced : FrameField.Progressive;