Added support for rotated screens

This commit is contained in:
Darth Affe 2023-05-07 23:19:46 +02:00
parent 3e7550ae1d
commit 5b2c83a3e1
4 changed files with 114 additions and 10 deletions

View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Threading;
using SharpGen.Runtime;
using Vortice.Direct3D;
@ -184,13 +184,26 @@ public sealed class DX11ScreenCapture : IScreenCapture
captureZone.Y + captureZone.UnscaledHeight, 1));
MappedSubresource mapSource = _context.Map(stagingTexture, 0, MapMode.Read, MapFlags.None);
IntPtr sourcePtr = mapSource.DataPointer;
lock (captureZone.Buffer)
{
for (int y = 0; y < captureZone.Height; y++)
Span<byte> source = mapSource.AsSpan(captureZone.Stride * captureZone.Height);
switch (Display.Rotation)
{
Marshal.Copy(sourcePtr, captureZone.Buffer, y * captureZone.Stride, captureZone.Stride);
sourcePtr += mapSource.RowPitch;
case Rotation.Rotation90:
CopyRotate90(source, captureZone);
break;
case Rotation.Rotation180:
CopyRotate180(source, captureZone);
break;
case Rotation.Rotation270:
CopyRotate270(source, captureZone);
break;
default:
CopyRotate0(source, captureZone);
break;
}
}
@ -200,11 +213,74 @@ public sealed class DX11ScreenCapture : IScreenCapture
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void CopyRotate0(in Span<byte> source, in CaptureZone captureZone) => source.CopyTo(captureZone.Buffer.AsSpan());
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void CopyRotate90(in Span<byte> source, in CaptureZone captureZone)
{
int width = captureZone.Width;
int height = captureZone.Height;
Span<byte> destination = captureZone.Buffer.AsSpan();
for (int y = 0; y < height; y++)
for (int x = 0; x < width; x++)
{
int offset = ((y * width) + x) * BPP;
int destinationOffset = ((x * height) + ((height - 1) - y)) * BPP;
destination[destinationOffset] = source[offset];
destination[destinationOffset + 1] = source[offset + 1];
destination[destinationOffset + 2] = source[offset + 2];
destination[destinationOffset + 3] = source[offset + 3];
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void CopyRotate180(in Span<byte> source, in CaptureZone captureZone)
{
int width = captureZone.Width;
int height = captureZone.Height;
Span<byte> destination = captureZone.Buffer.AsSpan();
for (int y = 0; y < height; y++)
for (int x = 0; x < width; x++)
{
int offset = ((y * width) + x) * BPP;
int destinationOffset = destination.Length - offset;
destination[destinationOffset - 4] = source[offset];
destination[destinationOffset - 3] = source[offset + 1];
destination[destinationOffset - 2] = source[offset + 2];
destination[destinationOffset - 1] = source[offset + 3];
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void CopyRotate270(in Span<byte> source, in CaptureZone captureZone)
{
int width = captureZone.Width;
int height = captureZone.Height;
Span<byte> destination = captureZone.Buffer.AsSpan();
for (int y = 0; y < height; y++)
for (int x = 0; x < width; x++)
{
int offset = ((y * width) + x) * BPP;
int destinationOffset = ((((width - 1) - x) * height) + y) * BPP;
destination[destinationOffset] = source[offset];
destination[destinationOffset + 1] = source[offset + 1];
destination[destinationOffset + 2] = source[offset + 2];
destination[destinationOffset + 3] = source[offset + 3];
}
}
/// <inheritdoc />
public CaptureZone RegisterCaptureZone(int x, int y, int width, int height, int downscaleLevel = 0)
{
ValidateCaptureZoneAndThrow(x, y, width, height);
if (Display.Rotation is Rotation.Rotation90 or Rotation.Rotation270)
(x, y, width, height) = (y, x, height, width);
int unscaledWidth = width;
int unscaledHeight = height;
(width, height) = CalculateScaledSize(unscaledWidth, unscaledHeight, downscaleLevel);
@ -252,6 +328,9 @@ public sealed class DX11ScreenCapture : IScreenCapture
ValidateCaptureZoneAndThrow(newX, newY, newUnscaledWidth, newUnscaledHeight);
if (Display.Rotation is Rotation.Rotation90 or Rotation.Rotation270)
(newX, newY, newUnscaledWidth, newUnscaledHeight) = (newY, newX, newUnscaledHeight, newUnscaledWidth);
captureZone.X = newX;
captureZone.Y = newY;
@ -361,13 +440,18 @@ public sealed class DX11ScreenCapture : IScreenCapture
_output = adapter.GetOutput(Display.Index) ?? throw new ApplicationException("Couldn't get DirectX-Output.");
using IDXGIOutput5 output = _output.QueryInterface<IDXGIOutput5>();
int width = Display.Width;
int height = Display.Height;
if (Display.Rotation is Rotation.Rotation90 or Rotation.Rotation270)
(width, height) = (height, width);
Texture2DDescription captureTextureDesc = new()
{
CPUAccessFlags = CpuAccessFlags.None,
BindFlags = BindFlags.RenderTarget | BindFlags.ShaderResource,
Format = Format.B8G8R8A8_UNorm,
Width = Display.Width,
Height = Display.Height,
Width = width,
Height = height,
MiscFlags = ResourceOptionFlags.None,
MipLevels = 1,
ArraySize = 1,

View File

@ -53,12 +53,20 @@ public class DX11ScreenCaptureService : IScreenCaptureService
{
int width = output.Description.DesktopCoordinates.Right - output.Description.DesktopCoordinates.Left;
int height = output.Description.DesktopCoordinates.Bottom - output.Description.DesktopCoordinates.Top;
yield return new Display(i, output.Description.DeviceName, width, height, graphicsCard);
yield return new Display(i, output.Description.DeviceName, width, height, GetRotation(output.Description.Rotation), graphicsCard);
output.Dispose();
i++;
}
}
private Rotation GetRotation(ModeRotation rotation) => rotation switch
{
ModeRotation.Rotate90 => Rotation.Rotation90,
ModeRotation.Rotate180 => Rotation.Rotation180,
ModeRotation.Rotate270 => Rotation.Rotation270,
_ => Rotation.None
};
/// <inheritdoc />
public IScreenCapture GetScreenCapture(Display display)
{

View File

@ -31,6 +31,8 @@ public readonly struct Display
/// </summary>
public int Height { get; }
public Rotation Rotation { get; }
/// <summary>
/// Gets the <see cref="GraphicsCard"/> this <see cref="Display"/> is connected to.
/// </summary>
@ -48,12 +50,13 @@ public readonly struct Display
/// <param name="width">The with of the <see cref="Display"/>.</param>
/// <param name="height">The height of the <see cref="Display"/>.</param>
/// <param name="graphicsCard">The <see cref="GraphicsCard"/> this <see cref="Display"/> is connected to.</param>
public Display(int index, string deviceName, int width, int height, GraphicsCard graphicsCard)
public Display(int index, string deviceName, int width, int height, Rotation rotation, GraphicsCard graphicsCard)
{
this.Index = index;
this.DeviceName = deviceName;
this.Width = width;
this.Height = height;
this.Rotation = rotation;
this.GraphicsCard = graphicsCard;
}
@ -73,7 +76,7 @@ public readonly struct Display
/// <inheritdoc />
public override int GetHashCode() => HashCode.Combine(Index, GraphicsCard);
/// <summary>
/// Determines whether two <see cref="Display"/> are equal.
/// </summary>

View File

@ -0,0 +1,9 @@
namespace ScreenCapture.NET;
public enum Rotation
{
None = 0,
Rotation90 = 90,
Rotation180 = 180,
Rotation270 = 270
}