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 and simplified textures; Updated Vortice

Browse Source
This commit is contained in:
Darth Affe 2021-07-05 00:38:22 +02:00
parent 6237578059
commit 6a9ddf6462
4 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ using Vortice.DXGI;
using Vortice.Mathematics;
using MapFlags = Vortice.Direct3D11.MapFlags;
using ResultCode = Vortice.DXGI.ResultCode;
using Usage = Vortice.Direct3D11.Usage;
namespace ScreenCapture.NET
{
@ -31,6 +30,8 @@ namespace ScreenCapture.NET
FeatureLevel.Level_10_0
};
private const int BPP = 4;
#endregion
#region Properties & Fields
@ -179,7 +180,13 @@ namespace ScreenCapture.NET
MappedSubresource mapSource = _context.Map(stagingTexture, 0, MapMode.Read, MapFlags.None);
IntPtr sourcePtr = mapSource.DataPointer;
lock (captureZone.Buffer)
Marshal.Copy(sourcePtr, captureZone.Buffer, 0, captureZone.Buffer.Length);
{
for (int y = 0; y < captureZone.Height; y++)
{
Marshal.Copy(sourcePtr, captureZone.Buffer, y * captureZone.Stride, captureZone.Stride);
sourcePtr += mapSource.RowPitch;
}
}
_context.Unmap(stagingTexture, 0);
captureZone.SetUpdated();
@ -199,9 +206,6 @@ namespace ScreenCapture.NET
if ((x + width) > Display.Width) throw new ArgumentException("x + width > Display width");
if ((y + height) > Display.Height) throw new ArgumentException("y + height > Display height");
int textureWidth = (int)Math.Ceiling(width / 32.0) * 32;
int textureHeight = (int)Math.Ceiling(height / 32.0) * 32;
int unscaledWidth = width;
int unscaledHeight = height;
if (downscaleLevel > 0)
@ -214,12 +218,9 @@ namespace ScreenCapture.NET
if (width < 1) width = 1;
if (height < 1) height = 1;
int bufferWidth = (int)Math.Ceiling(width / 32.0) * 32;
int bufferHeight = (int)Math.Ceiling(height / 32.0) * 32;
byte[] buffer = new byte[width * height * 4];
byte[] buffer = new byte[bufferWidth * bufferHeight * 4];
CaptureZone captureZone = new(_indexCounter++, x, y, width, height, downscaleLevel, unscaledWidth, unscaledHeight, textureWidth, textureHeight, bufferWidth, bufferHeight, buffer);
CaptureZone captureZone = new(_indexCounter++, x, y, width, height, BPP, downscaleLevel, unscaledWidth, unscaledHeight, buffer);
lock (_captureZones)
InitializeCaptureZone(captureZone);
@ -252,13 +253,13 @@ namespace ScreenCapture.NET
CpuAccessFlags = CpuAccessFlags.Read,
BindFlags = BindFlags.None,
Format = Format.B8G8R8A8_UNorm,
Width = captureZone.BufferWidth,
Height = captureZone.BufferHeight,
Width = captureZone.Width,
Height = captureZone.Height,
OptionFlags = ResourceOptionFlags.None,
MipLevels = 1,
ArraySize = 1,
SampleDescription = { Count = 1, Quality = 0 },
Usage = Usage.Staging
Usage = ResourceUsage.Staging
};
ID3D11Texture2D stagingTexture = _device!.CreateTexture2D(stagingTextureDesc);
@ -271,13 +272,13 @@ namespace ScreenCapture.NET
CpuAccessFlags = CpuAccessFlags.None,
BindFlags = BindFlags.RenderTarget | BindFlags.ShaderResource,
Format = Format.B8G8R8A8_UNorm,
Width = captureZone.CaptureWidth,
Height = captureZone.CaptureHeight,
Width = captureZone.UnscaledWidth,
Height = captureZone.UnscaledHeight,
OptionFlags = ResourceOptionFlags.GenerateMips,
MipLevels = captureZone.DownscaleLevel + 1,
ArraySize = 1,
SampleDescription = { Count = 1, Quality = 0 },
Usage = Usage.Default
Usage = ResourceUsage.Default
};
scalingTexture = _device!.CreateTexture2D(scalingTextureDesc);
scalingTextureView = _device.CreateShaderResourceView(scalingTexture);
@ -302,7 +303,7 @@ namespace ScreenCapture.NET
_context = _device.ImmediateContext;
_output = adapter.GetOutput(Display.Index);
using IDXGIOutput5 output1 = _output.QueryInterface<IDXGIOutput5>();
using IDXGIOutput5 output = _output.QueryInterface<IDXGIOutput5>();
Texture2DDescription captureTextureDesc = new()
{
@ -315,7 +316,7 @@ namespace ScreenCapture.NET
MipLevels = 1,
ArraySize = 1,
SampleDescription = { Count = 1, Quality = 0 },
Usage = Usage.Default
Usage = ResourceUsage.Default
};
_captureTexture = _device.CreateTexture2D(captureTextureDesc);
@ -324,8 +325,8 @@ namespace ScreenCapture.NET
foreach (CaptureZone captureZone in captureZones)
InitializeCaptureZone(captureZone);
}
_duplicatedOutput = output1.DuplicateOutput1(_device, Format.B8G8R8A8_UNorm); // DarthAffe 27.02.2021: This prepares for the use of 10bit color depth
_duplicatedOutput = output.DuplicateOutput1(_device, Format.B8G8R8A8_UNorm); // DarthAffe 27.02.2021: This prepares for the use of 10bit color depth
}
catch { Dispose(false); }
}

14
ScreenCapture.NET/Model/BlackBarDetection.cs
View File

@ -78,11 +78,10 @@ namespace ScreenCapture.NET
private int CalculateTop()
{
int threshold = Threshold;
int stride = _captureZone.BufferWidth * 4;
int bytesPerRow = _captureZone.Width * 4;
int stride = _captureZone.Stride;
for (int row = 0; row < _captureZone.Height; row++)
{
Span<byte> data = new(_captureZone.Buffer, row * stride, bytesPerRow);
Span<byte> data = new(_captureZone.Buffer, row * stride, stride);
for (int i = 0; i < data.Length; i += 4)
if ((data[i] > threshold) || (data[i + 1] > threshold) || (data[i + 2] > threshold))
return row;
@ -94,11 +93,10 @@ namespace ScreenCapture.NET
private int CalculateBottom()
{
int threshold = Threshold;
int stride = _captureZone.BufferWidth * 4;
int bytesPerRow = _captureZone.Width * 4;
int stride = _captureZone.Stride;
for (int row = _captureZone.Height; row >= 0; row--)
{
Span<byte> data = new(_captureZone.Buffer, row * stride, bytesPerRow);
Span<byte> data = new(_captureZone.Buffer, row * stride, stride);
for (int i = 0; i < data.Length; i += 4)
if ((data[i] > threshold) || (data[i + 1] > threshold) || (data[i + 2] > threshold))
return _captureZone.Height - row;
@ -110,7 +108,7 @@ namespace ScreenCapture.NET
private int CalculateLeft()
{
int threshold = Threshold;
int stride = _captureZone.BufferWidth * 4;
int stride = _captureZone.Stride;
byte[] buffer = _captureZone.Buffer;
for (int column = 0; column < _captureZone.Width; column++)
for (int row = 0; row < _captureZone.Height; row++)
@ -125,7 +123,7 @@ namespace ScreenCapture.NET
private int CalculateRight()
{
int threshold = Threshold;
int stride = _captureZone.BufferWidth * 4;
int stride = _captureZone.Stride;
byte[] buffer = _captureZone.Buffer;
for (int column = _captureZone.Width; column >= 0; column--)
for (int row = 0; row < _captureZone.Height; row++)

31
ScreenCapture.NET/Model/CaptureZone.cs
View File

@ -52,26 +52,14 @@ namespace ScreenCapture.NET
public int UnscaledHeight { get; }
/// <summary>
/// Gets the actually captured width of the region (this can be greated than <see cref="Width"/> due to size-constraints on the GPU).
/// Gets the amount of bytes per pixel in the image (most likely 3 [RGB] or 4 [ARGB]).
/// </summary>
public int CaptureWidth { get; }
public int BytesPerPixel { get; }
/// <summary>
/// Gets the actually captured height of the region (this can be greated than <see cref="Height"/> due to size-constraints on the GPU).
/// Gets the size in bytes of a row in the region (<see cref="Width"/> * <see cref="BytesPerPixel"/>).
/// </summary>
public int CaptureHeight { get; }
/// <summary>
/// Gets the width of the buffer the capture is saved to.
/// Equals <see cref="CaptureWidth"/> most of the time but can be bigger.
/// </summary>
public int BufferWidth { get; }
/// <summary>
/// Gets the height of the buffer the capture is saved to.
/// Equals <see cref="CaptureHeight"/> most of the time but can be bigger.
/// </summary>
public int BufferHeight { get; }
public int Stride => Width * BytesPerPixel;
/// <summary>
/// Gets the buffer containing the image data. Format depends on the specific capture but is most likely BGRA32.
@ -117,25 +105,18 @@ namespace ScreenCapture.NET
/// <param name="downscaleLevel">The level of downscaling applied to the image of this region before copying to local memory.</param>
/// <param name="unscaledWidth">The original width of the region.</param>
/// <param name="unscaledHeight">The original height of the region</param>
/// <param name="captureWidth">The actually captured width of the region.</param>
/// <param name="captureHeight">The actually captured height of the region.</param>
/// <param name="bufferWidth">The width of the buffer the capture is saved to.</param>
/// <param name="bufferHeight">The height of the buffer the capture is saved to.</param>
/// <param name="buffer">The buffer containing the image data.</param>
public CaptureZone(int id, int x, int y, int width, int height, int downscaleLevel, int unscaledWidth, int unscaledHeight, int captureWidth, int captureHeight, int bufferWidth, int bufferHeight, byte[] buffer)
internal CaptureZone(int id, int x, int y, int width, int height, int bytesPerPixel, int downscaleLevel, int unscaledWidth, int unscaledHeight, byte[] buffer)
{
this.Id = id;
this.X = x;
this.Y = y;
this.Width = width;
this.Height = height;
this.BytesPerPixel = bytesPerPixel;
this.UnscaledWidth = unscaledWidth;
this.UnscaledHeight = unscaledHeight;
this.DownscaleLevel = downscaleLevel;
this.CaptureWidth = captureWidth;
this.CaptureHeight = captureHeight;
this.BufferWidth = bufferWidth;
this.BufferHeight = bufferHeight;
this.Buffer = buffer;
BlackBars = new BlackBarDetection(this);

2
ScreenCapture.NET/ScreenCapture.NET.csproj
View File

@ -60,7 +60,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Vortice.Direct3D11" Version="1.9.65" />
<PackageReference Include="Vortice.Direct3D11" Version="1.9.87" />
</ItemGroup>
</Project>