DarthAffe/ScreenCapture.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/ScreenCapture.NET.git synced 2025-12-12 13:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed stride-issue introduced with rotation-copy methods

Browse Source
This commit is contained in:
Darth Affe 2023-05-14 15:56:58 +02:00
parent 466f844f20
commit fd5fc11bb1
1 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
ScreenCapture.NET/DirectX/DX11ScreenCapture.cs
View File

@ -186,23 +186,23 @@ public sealed class DX11ScreenCapture : IScreenCapture
MappedSubresource mapSource = _context.Map(stagingTexture, 0, MapMode.Read, MapFlags.None); MappedSubresource mapSource = _context.Map(stagingTexture, 0, MapMode.Read, MapFlags.None);
lock (captureZone.Buffer) lock (captureZone.Buffer)
{ {
Span<byte> source = mapSource.AsSpan(captureZone.Stride * captureZone.Height); Span<byte> source = mapSource.AsSpan(mapSource.RowPitch * captureZone.Height);
switch (Display.Rotation) switch (Display.Rotation)
{ {
case Rotation.Rotation90: case Rotation.Rotation90:
CopyRotate90(source, captureZone); CopyRotate90(source, mapSource.RowPitch, captureZone);
break; break;
case Rotation.Rotation180: case Rotation.Rotation180:
CopyRotate180(source, captureZone); CopyRotate180(source, mapSource.RowPitch, captureZone);
break; break;
case Rotation.Rotation270: case Rotation.Rotation270:
CopyRotate270(source, captureZone); CopyRotate270(source, mapSource.RowPitch, captureZone);
break; break;
default: default:
CopyRotate0(source, captureZone); CopyRotate0(source, mapSource.RowPitch, captureZone);
break; break;
} }
} }
@ -214,62 +214,79 @@ public sealed class DX11ScreenCapture : IScreenCapture
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void CopyRotate0(in Span<byte> source, in CaptureZone captureZone) => source.CopyTo(captureZone.Buffer.AsSpan()); private static void CopyRotate0(in Span<byte> source, int sourceStride, in CaptureZone captureZone)
{
int height = captureZone.Height;
int stride = captureZone.Stride;
Span<byte> target = captureZone.Buffer.AsSpan();
for (int y = 0; y < height; y++)
{
int sourceOffset = y * sourceStride;
int targetOffset = y * stride;
source.Slice(sourceOffset, stride).CopyTo(target.Slice(targetOffset, stride));
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void CopyRotate90(in Span<byte> source, in CaptureZone captureZone) private static void CopyRotate90(in Span<byte> source, int sourceStride, in CaptureZone captureZone)
{ {
int width = captureZone.Width; int width = captureZone.Width;
int height = captureZone.Height; int height = captureZone.Height;
Span<byte> destination = captureZone.Buffer.AsSpan(); Span<byte> target = captureZone.Buffer.AsSpan();
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
int offset = ((y * width) + x) * BPP; int sourceOffset = ((y * sourceStride) + (x * BPP));
int destinationOffset = ((x * height) + ((height - 1) - y)) * BPP; int targetOffset = ((x * height) + ((height - 1) - y)) * BPP;
destination[destinationOffset] = source[offset];
destination[destinationOffset + 1] = source[offset + 1]; target[targetOffset] = source[sourceOffset];
destination[destinationOffset + 2] = source[offset + 2]; target[targetOffset + 1] = source[sourceOffset + 1];
destination[destinationOffset + 3] = source[offset + 3]; target[targetOffset + 2] = source[sourceOffset + 2];
target[targetOffset + 3] = source[sourceOffset + 3];
} }
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void CopyRotate180(in Span<byte> source, in CaptureZone captureZone) private static void CopyRotate180(in Span<byte> source, int sourceStride, in CaptureZone captureZone)
{ {
int width = captureZone.Width; int width = captureZone.Width;
int height = captureZone.Height; int height = captureZone.Height;
Span<byte> destination = captureZone.Buffer.AsSpan(); int stride = captureZone.Stride;
Span<byte> target = captureZone.Buffer.AsSpan();
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
int offset = ((y * width) + x) * BPP; int sourceOffset = ((y * sourceStride) + (x * BPP));
int destinationOffset = destination.Length - offset; int targetOffset = target.Length - ((y * stride) + (x * BPP)) - 1;
destination[destinationOffset - 4] = source[offset];
destination[destinationOffset - 3] = source[offset + 1]; target[targetOffset - 3] = source[sourceOffset];
destination[destinationOffset - 2] = source[offset + 2]; target[targetOffset - 2] = source[sourceOffset + 1];
destination[destinationOffset - 1] = source[offset + 3]; target[targetOffset - 1] = source[sourceOffset + 2];
target[targetOffset] = source[sourceOffset + 3];
} }
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void CopyRotate270(in Span<byte> source, in CaptureZone captureZone) private static void CopyRotate270(in Span<byte> source, int sourceStride, in CaptureZone captureZone)
{ {
int width = captureZone.Width; int width = captureZone.Width;
int height = captureZone.Height; int height = captureZone.Height;
Span<byte> destination = captureZone.Buffer.AsSpan(); Span<byte> target = captureZone.Buffer.AsSpan();
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
int offset = ((y * width) + x) * BPP; int sourceOffset = ((y * sourceStride) + (x * BPP));
int destinationOffset = ((((width - 1) - x) * height) + y) * BPP; int targetOffset = ((((width - 1) - x) * height) + y) * BPP;
destination[destinationOffset] = source[offset];
destination[destinationOffset + 1] = source[offset + 1]; target[targetOffset] = source[sourceOffset];
destination[destinationOffset + 2] = source[offset + 2]; target[targetOffset + 1] = source[sourceOffset + 1];
destination[destinationOffset + 3] = source[offset + 3]; target[targetOffset + 2] = source[sourceOffset + 2];
target[targetOffset + 3] = source[sourceOffset + 3];
} }
} }