diff --git a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll index ccd306d..179a145 100644 Binary files a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll and b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll differ diff --git a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll index db8b992..f144eea 100644 Binary files a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll and b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll differ diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp index 7138f50..065d7dc 100644 --- a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp +++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp @@ -203,7 +203,7 @@ ComPtr Duplicator::GetDuplication() } -const Duplicator::Frame& Duplicator::GetFrame() const +const Duplicator::Frame& Duplicator::GetLastFrame() const { std::lock_guard lock(mutex_); return lastFrame_; diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h index c682a41..1d24c1a 100644 --- a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h +++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h @@ -59,7 +59,7 @@ public: Monitor* GetMonitor() const; Microsoft::WRL::ComPtr GetDevice(); Microsoft::WRL::ComPtr GetDuplication(); - const Frame& GetFrame() const; + const Frame& GetLastFrame() const; private: void InitializeDevice(); diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp index cc96916..b0cf818 100644 --- a/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp +++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp @@ -70,9 +70,9 @@ void Monitor::Finalize() void Monitor::Render() { - const auto& frame = duplicator_->GetFrame(); + const auto& frame = duplicator_->GetLastFrame(); const auto texture = frame.texture; - const auto& frameInfo = frame.info; + const auto frameInfo = frame.info; // clone if (!texture) return; @@ -243,28 +243,28 @@ int Monitor::GetHeight() const int Monitor::GetMoveRectCount() const { - const auto& metaData = duplicator_->GetFrame().metaData; + const auto& metaData = duplicator_->GetLastFrame().metaData; return metaData.moveRectSize / sizeof(DXGI_OUTDUPL_MOVE_RECT); } DXGI_OUTDUPL_MOVE_RECT* Monitor::GetMoveRects() const { - const auto& metaData = duplicator_->GetFrame().metaData; + const auto& metaData = duplicator_->GetLastFrame().metaData; return metaData.buffer.As(); } int Monitor::GetDirtyRectCount() const { - const auto& metaData = duplicator_->GetFrame().metaData; + const auto& metaData = duplicator_->GetLastFrame().metaData; return metaData.dirtyRectSize / sizeof(RECT); } RECT* Monitor::GetDirtyRects() const { - const auto& metaData = duplicator_->GetFrame().metaData; + const auto& metaData = duplicator_->GetLastFrame().metaData; return metaData.buffer.As(metaData.moveRectSize); }