change member name.

This commit is contained in:
hecomi
2017-01-07 13:18:11 +09:00
parent 68d9e30816
commit f5a8a83c7e
4 changed files with 10 additions and 7 deletions
@@ -308,7 +308,7 @@ bool Duplicator::Duplicate(UINT timeout)
return false; return false;
} }
auto sharedTexture = device_->GetCompatibleSharedTexture(texture, frame % 2); auto sharedTexture = device_->GetCompatibleSharedTexture(texture, lastFrameId_ % 2);
if (!sharedTexture) if (!sharedTexture)
{ {
return false; return false;
@@ -323,10 +323,13 @@ bool Duplicator::Duplicate(UINT timeout)
{ {
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
lastFrame_.frame = frame++; lastFrame_ = Frame
lastFrame_.texture = sharedTexture; {
lastFrame_.info = frameInfo; lastFrameId_++,
lastFrame_.metaData = metaData_; sharedTexture,
frameInfo,
metaData_
};
} }
return true; return true;
@@ -44,7 +44,7 @@ public:
struct Frame struct Frame
{ {
UINT frame = 0; UINT id;
Microsoft::WRL::ComPtr<ID3D11Texture2D> texture; Microsoft::WRL::ComPtr<ID3D11Texture2D> texture;
DXGI_OUTDUPL_FRAME_INFO info; DXGI_OUTDUPL_FRAME_INFO info;
Metadata metaData; Metadata metaData;
@@ -82,7 +82,7 @@ private:
std::shared_ptr<class IsolatedD3D11Device> device_; std::shared_ptr<class IsolatedD3D11Device> device_;
Microsoft::WRL::ComPtr<IDXGIOutputDuplication> dupl_; Microsoft::WRL::ComPtr<IDXGIOutputDuplication> dupl_;
Frame lastFrame_; Frame lastFrame_;
UINT frame = 0; UINT lastFrameId_ = 0;
volatile bool shouldRun_ = false; volatile bool shouldRun_ = false;
std::thread thread_; std::thread thread_;