LiRuochen_WorkFlow/uDesktopDuplication
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

modify codes.

Browse Source
This commit is contained in:
hecomi
2016-11-15 02:29:38 +09:00
parent 0a39e37659
commit f8d8e64e46
4 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll
BIN
View File
Binary file not shown.
Assets/uDesktopDuplication/Scripts/Manager.cs
+2 -1
View File
@@ -193,8 +193,9 @@ public class Manager : MonoBehaviour
for (int i = 0; i < monitorCount; ++i) {
if (i == monitors.Count) {
monitors.Add(new Monitor(i));
} else {
monitors[i].Reinitialize();
}
monitors[i].Reinitialize();
}
}
Assets/uDesktopDuplication/Scripts/Monitor.cs
+5 -8
View File
@@ -203,7 +203,7 @@ public class Monitor
set;
}
private Texture2D errorTexture_;
private static Texture2D errorTexture;
private static readonly string errorTexturePath = "uDesktopDuplication/Textures/NotAvailable";
private Texture2D texture_;
@@ -212,8 +212,8 @@ public class Monitor
get
{
if (!available) {
return errorTexture_ ??
(errorTexture_ = Resources.Load<Texture2D>(errorTexturePath));
return errorTexture ??
(errorTexture = Resources.Load<Texture2D>(errorTexturePath));
}
if (texture_ == null) {
CreateTexture();
@@ -245,11 +245,8 @@ public class Monitor
if (texture_) {
if (texture_.width != w || texture_.height != h) {
if (texture_) {
Object.Destroy(texture_);
texture_ = null;
}
shouldCreate = true;
Object.DestroyImmediate(texture_);
texture_ = null;
} else {
shouldCreate = false;
}
Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp
+30 -19
View File
@@ -18,6 +18,7 @@ Monitor::Monitor(int id)
Monitor::~Monitor()
{
deskDupl_->Release();
}
@@ -118,25 +119,35 @@ void Monitor::Render(UINT timeout)
switch (hr)
{
case DXGI_ERROR_ACCESS_LOST:
// If any monitor setting has changed (e.g. monitor size has changed),
// it is necessary to re-initialize monitors.
Debug::Log("Monitor::Render() => DXGI_ERROR_ACCESS_LOST.");
state_ = State::AccessLost;
break;
{
// If any monitor setting has changed (e.g. monitor size has changed),
// it is necessary to re-initialize monitors.
Debug::Log("Monitor::Render() => DXGI_ERROR_ACCESS_LOST.");
state_ = State::AccessLost;
break;
}
case DXGI_ERROR_WAIT_TIMEOUT:
// This often occurs when timeout value is small and it is not problem.
// Debug::Log("Monitor::Render() => DXGI_ERROR_WAIT_TIMEOUT.");
break;
{
// This often occurs when timeout value is small and it is not problem.
// Debug::Log("Monitor::Render() => DXGI_ERROR_WAIT_TIMEOUT.");
break;
}
case DXGI_ERROR_INVALID_CALL:
Debug::Error("Monitor::Render() => DXGI_ERROR_INVALID_CALL.");
break;
{
Debug::Error("Monitor::Render() => DXGI_ERROR_INVALID_CALL.");
break;
}
case E_INVALIDARG:
Debug::Error("Monitor::Render() => E_INVALIDARG.");
break;
{
Debug::Error("Monitor::Render() => E_INVALIDARG.");
break;
}
default:
state_ = State::Unknown;
Debug::Error("Monitor::Render() => Unknown Error.");
break;
{
state_ = State::Unknown;
Debug::Error("Monitor::Render() => Unknown Error.");
break;
}
}
return;
}
@@ -159,11 +170,11 @@ void Monitor::Render(UINT timeout)
Debug::Error("Monitor::Render() => Texture sizes are defferent.");
Debug::Error(" Source : (", srcDesc.Width, ", ", srcDesc.Height, ")");
Debug::Error(" Dest : (", dstDesc.Width, ", ", dstDesc.Height, ")");
Debug::Log(" => Try modifying width/height using reported value from DDA.");
width_ = srcDesc.Width;
height_ = srcDesc.Height;
//Debug::Log(" => Try modifying width/height using reported value from DDA.");
//width_ = srcDesc.Width;
//height_ = srcDesc.Height;
state_ = MonitorState::TextureSizeInconsistent;
SendMessageToUnity(Message::TextureSizeChanged);
//SendMessageToUnity(Message::TextureSizeChanged);
}
else
{