diff options
| author | Mary <mary@mary.zone> | 2022-07-14 15:13:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-14 15:13:23 +0200 |
| commit | c5bddfeab8a905ce6c306ffafb079d8550f0b027 (patch) | |
| tree | 01b2bcb1d248e7b79c48842294c8ebe1486a4f14 /Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs | |
| parent | 70ec5def9cc7f02580f33dbef65815f0d7ac2229 (diff) | |
Remove dependency for FFmpeg.AutoGen and Update FFmpeg to 5.0.1 for Windows (#3466)
* Remove dependency for FFMpeg.AutoGen
Also prepare for FFMpeg 5.0 and 5.1
* Update Ryujinx.Graphics.Nvdec.Dependencies to 5.0.1-build10
* Address gdkchan's comments
* Address Ack's comment
* Address gdkchan's comment
Diffstat (limited to 'Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs')
| -rw-r--r-- | Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs b/Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs index 13d0df49..1ca9d1d5 100644 --- a/Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs +++ b/Ryujinx.Graphics.Nvdec.FFmpeg/Surface.cs @@ -1,4 +1,4 @@ -using FFmpeg.AutoGen; +using Ryujinx.Graphics.Nvdec.FFmpeg.Native; using Ryujinx.Graphics.Video; using System; @@ -11,31 +11,31 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg public int RequestedWidth { get; } public int RequestedHeight { get; } - public Plane YPlane => new Plane((IntPtr)Frame->data[0], Stride * Height); - public Plane UPlane => new Plane((IntPtr)Frame->data[1], UvStride * UvHeight); - public Plane VPlane => new Plane((IntPtr)Frame->data[2], UvStride * UvHeight); + public Plane YPlane => new Plane((IntPtr)Frame->Data[0], Stride * Height); + public Plane UPlane => new Plane((IntPtr)Frame->Data[1], UvStride * UvHeight); + public Plane VPlane => new Plane((IntPtr)Frame->Data[2], UvStride * UvHeight); - public FrameField Field => Frame->interlaced_frame != 0 ? FrameField.Interlaced : FrameField.Progressive; + public FrameField Field => Frame->InterlacedFrame != 0 ? FrameField.Interlaced : FrameField.Progressive; - public int Width => Frame->width; - public int Height => Frame->height; - public int Stride => Frame->linesize[0]; + public int Width => Frame->Width; + public int Height => Frame->Height; + public int Stride => Frame->LineSize[0]; public int UvWidth => (Width + 1) >> 1; public int UvHeight => (Height + 1) >> 1; - public int UvStride => Frame->linesize[1]; + public int UvStride => Frame->LineSize[1]; public Surface(int width, int height) { RequestedWidth = width; RequestedHeight = height; - Frame = ffmpeg.av_frame_alloc(); + Frame = FFmpegApi.av_frame_alloc(); } public void Dispose() { - ffmpeg.av_frame_unref(Frame); - ffmpeg.av_free(Frame); + FFmpegApi.av_frame_unref(Frame); + FFmpegApi.av_free(Frame); } } } |
