Skip to content
This repository has been archived by the owner on Jan 9, 2019. It is now read-only.

Commit

Permalink
Move the settings to the agent interface allowing multiple processes …
Browse files Browse the repository at this point in the history 
…to share the config. Fix a bug in the screen share code for non-gpu that was leaking memory. Improve the non-gpu screen share by actually using the found changes. Fix the possible bug causing laptops with multiple adapters to fail.
  • Loading branch information
Andrew Sampson committed Mar 7, 2017
1 parent 9b2ef12 commit 0e4f211
Show file tree
Hide file tree
Showing 61 changed files with 246 additions and 310 deletions.
5 changes: 5 additions & 0 deletions AgentInterface/AgentInterface.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
<HintPath>..\packages\Cassia.2.0.0.60\lib\2.0\Cassia.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="OpenHardwareMonitorLib, Version=0.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OpenHardwareMonitor.0.7.1\lib\net40\OpenHardwareMonitorLib.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -94,6 +97,8 @@
<Compile Include="FrameContract.cs" />
<Compile Include="InputContract.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Settings\AppEnvironment.cs" />
<Compile Include="Settings\Config.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
Expand Down
97 changes: 67 additions & 30 deletions AgentInterface/Api/ScreenShare/DesktopDuplication/DesktopDuplicator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Drawing.Imaging;
using System.Runtime.InteropServices;
using SharpDX;
using SharpDX.Direct3D;
using SharpDX.Direct3D11;
using SharpDX.DXGI;
using SharpDX.Mathematics.Interop;
Expand Down Expand Up @@ -36,18 +37,7 @@ public class DesktopDuplicator
private bool _isFinalImage1;
private OutputDescription _mOutputDesc;

/// <summary>
/// Duplicates the output of the specified monitor.
/// </summary>
/// <param name="whichMonitor">
/// The output device to duplicate (i.e. monitor). Begins with zero, which seems to correspond
/// to the primary monitor.
/// </param>
public DesktopDuplicator(int whichMonitor)
: this(0, whichMonitor)
{
}


/// <summary>
/// Duplicates the output of the specified monitor on the specified graphics adapter.
/// </summary>
Expand All @@ -56,26 +46,32 @@ public DesktopDuplicator(int whichMonitor)
/// The output device to duplicate (i.e. monitor). Begins with zero, which seems to
/// correspond to the primary monitor.
/// </param>
public DesktopDuplicator(int whichGraphicsCardAdapter, int whichOutputDevice)
public DesktopDuplicator()
{
_mWhichOutputDevice = whichOutputDevice;


Adapter1 adapter;
try
{
adapter = new Factory1().GetAdapter1(whichGraphicsCardAdapter);
adapter = GetBestAdapter(out int bestAdapaterIndex);
if (adapter == null) throw new SharpDXException();
Console.WriteLine($"Using the {adapter.Description.Description} for screen share.");
}
catch (SharpDXException)
{
ScreenData.CanUseGpuAcceleration = false;
throw new DesktopDuplicationException("Could not find the specified graphics card adapter.");
}
_mDevice = new Device(adapter);
DeviceCreationFlags flags = DeviceCreationFlags.BgraSupport;
_mDevice = new Device(adapter, flags, FeatureLevel.Level_11_0);
Output output;
try
{
output = adapter.GetOutput(whichOutputDevice);
output = adapter.GetOutput(0);
}
catch (SharpDXException)
{
ScreenData.CanUseGpuAcceleration = false;
throw new DesktopDuplicationException("Could not find the specified output device.");
}
var output1 = output.QueryInterface<Output1>();
Expand All @@ -101,10 +97,8 @@ public DesktopDuplicator(int whichGraphicsCardAdapter, int whichOutputDevice)
catch (SharpDXException ex)
{
if (ex.ResultCode.Code == ResultCode.NotCurrentlyAvailable.Result.Code)
{
throw new DesktopDuplicationException(
"There is already the maximum number of applications using the Desktop Duplication API running, please close one of the applications and try again.");
}
}
}

Expand All @@ -127,6 +121,48 @@ private Bitmap FinalImage
}
}

/// <summary>
/// Finds the most capable graphics card.
/// </summary>
/// <returns></returns>
private static Adapter1 GetBestAdapter(out int bestAdapterIndex)
{
using (var dxgiFactory = new Factory1())
{
Adapter1 bestAdapter = null;
bestAdapterIndex = -1;
var adapterIndex = -1;
long bestVideoMemory = 0;
long bestSystemMemory = 0;

foreach (var dxgiAdapter in dxgiFactory.Adapters1)
{
adapterIndex++;

// not skip the render only WARP device
if (dxgiAdapter.Description.VendorId != 0x1414 || dxgiAdapter.Description.DeviceId != 0x8c)
if (dxgiAdapter.Outputs == null || dxgiAdapter.Outputs.Length == 0)
continue;

var level = Device.GetSupportedFeatureLevel(dxgiAdapter);

if (level < FeatureLevel.Level_11_0)
continue;
long videoMemory = (uint) dxgiAdapter.Description.DedicatedVideoMemory;
long systemMemory = (uint) dxgiAdapter.Description.DedicatedSystemMemory;

if (bestAdapter != null && videoMemory <= bestVideoMemory &&
(videoMemory != bestVideoMemory || systemMemory <= bestSystemMemory)) continue;
bestAdapter = dxgiAdapter;
bestAdapterIndex = adapterIndex;
bestVideoMemory = videoMemory;
bestSystemMemory = systemMemory;
}

return bestAdapter;
}
}

/// <summary>
/// Retrieves the latest desktop image and associated metadata.
/// </summary>
Expand Down Expand Up @@ -173,9 +209,7 @@ private bool RetrieveFrame()
catch (SharpDXException ex)
{
if (ex.ResultCode.Code == ResultCode.WaitTimeout.Result.Code)
{
return true;
}
if (ex.ResultCode.Failure)
{
//return true;
Expand All @@ -184,7 +218,9 @@ private bool RetrieveFrame()
}
}
using (var tempTexture = desktopResource?.QueryInterface<Texture2D>())
{
_mDevice.ImmediateContext.CopyResource(tempTexture, _desktopImageTexture);
}
desktopResource?.Dispose();
return false;
}
Expand All @@ -198,7 +234,7 @@ private void RetrieveFrameMetadata(DesktopFrame frame)
var movedRectangles = new OutputDuplicateMoveRectangle[_frameInfo.TotalMetadataBufferSize];
_mDeskDupl.GetFrameMoveRects(movedRectangles.Length, movedRectangles, out movedRegionsLength);
frame.MovedRegions =
new MovedRegion[movedRegionsLength/Marshal.SizeOf(typeof(OutputDuplicateMoveRectangle))];
new MovedRegion[movedRegionsLength / Marshal.SizeOf(typeof(OutputDuplicateMoveRectangle))];
for (var i = 0; i < frame.MovedRegions.Length; i++)
{
var destRect = (Rectangle) movedRectangles[i].DestinationRect;
Expand All @@ -214,12 +250,16 @@ private void RetrieveFrameMetadata(DesktopFrame frame)
var dirtyRegionsLength = 0;
var dirtyRectangles = new RawRectangle[_frameInfo.TotalMetadataBufferSize];
_mDeskDupl.GetFrameDirtyRects(dirtyRectangles.Length, dirtyRectangles, out dirtyRegionsLength);
frame.UpdatedRegions = new global::System.Drawing.Rectangle[dirtyRegionsLength/Marshal.SizeOf(typeof(Rectangle))];
frame.UpdatedRegions =
new global::System.Drawing.Rectangle[dirtyRegionsLength / Marshal.SizeOf(typeof(Rectangle))];
frame.FinishedRegions = new FinishedRegions[frame.UpdatedRegions.Length];
for (var i = 0; i < frame.UpdatedRegions.Length; i++)
{
var dirtyRect = (Rectangle) dirtyRectangles[i];
var rect = new global::System.Drawing.Rectangle(dirtyRect.X, dirtyRect.Y, dirtyRect.Width, dirtyRect.Height);
var rect = new global::System.Drawing.Rectangle(dirtyRect.X, dirtyRect.Y, dirtyRect.Width,
dirtyRect.Height);


frame.FinishedRegions[i] = new FinishedRegions
{
Destination = rect,
Expand All @@ -237,7 +277,6 @@ private void RetrieveFrameMetadata(DesktopFrame frame)

private Bitmap ExtractRect(int originX, int originY, int width, int height)
{

// Get the desktop capture screenTexture
var mapSource = _mDevice.ImmediateContext.MapSubresource(_desktopImageTexture, 0, MapMode.Read,
MapFlags.None);
Expand All @@ -252,12 +291,12 @@ private Bitmap ExtractRect(int originX, int originY, int width, int height)
var sourcePtr = mapSource.DataPointer;
var destPtr = mapDest.Scan0;

sourcePtr = IntPtr.Add(sourcePtr, originY*mapSource.RowPitch + originX*4);
sourcePtr = IntPtr.Add(sourcePtr, originY * mapSource.RowPitch + originX * 4);
for (var y = 0; y < height; y++)
{
// Copy a single line

Utilities.CopyMemory(destPtr, sourcePtr, width*4);
Utilities.CopyMemory(destPtr, sourcePtr, width * 4);

// Advance pointers
if (y != height - 1)
Expand Down Expand Up @@ -286,7 +325,7 @@ private void ProcessFrame(DesktopFrame frame)
for (var y = 0; y < bounds.Height; y++)
{
// Copy a single line
Utilities.CopyMemory(destPtr, sourcePtr, bounds.Width*4);
Utilities.CopyMemory(destPtr, sourcePtr, bounds.Width * 4);

// Advance pointers
sourcePtr = IntPtr.Add(sourcePtr, mapSource.RowPitch);
Expand All @@ -308,9 +347,7 @@ private void ReleaseFrame()
catch (SharpDXException ex)
{
if (ex.ResultCode.Failure)
{
throw new DesktopDuplicationException("Failed to release frame.");
}
}
}
}
Expand Down
Loading

0 comments on commit 0e4f211

Please sign in to comment.