diff --git a/host/Capture/DXGI.cpp b/host/Capture/DXGI.cpp index 6282f99e..864c812e 100644 --- a/host/Capture/DXGI.cpp +++ b/host/Capture/DXGI.cpp @@ -163,12 +163,6 @@ bool DXGI::Initialize() DeInitialize(); return false; } - - if (!m_memcpy.Initialize()) - { - DEBUG_ERROR("Failed to initialize memcpy"); - return false; - } m_initialized = true; return true; @@ -176,8 +170,6 @@ bool DXGI::Initialize() void DXGI::DeInitialize() { - m_memcpy.DeInitialize(); - if (m_pointer) { delete[] m_pointer; @@ -358,7 +350,7 @@ bool DXGI::GrabFrame(FrameInfo & frame) frame.stride = rect.Pitch / 4; frame.outSize = min(frame.bufferSize, m_height * rect.Pitch); - m_memcpy.Copy(frame.buffer, rect.pBits, frame.outSize); + memcpy_s(frame.buffer, frame.bufferSize, rect.pBits, frame.outSize); status = surface->Unmap(); // if we have a mouse update diff --git a/host/Capture/DXGI.h b/host/Capture/DXGI.h index f490d0a8..b6549491 100644 --- a/host/Capture/DXGI.h +++ b/host/Capture/DXGI.h @@ -19,7 +19,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA #pragma once #include "ICapture.h" -#include "MTMemcpy.h" #define W32_LEAN_AND_MEAN #include @@ -45,7 +44,6 @@ namespace Capture bool ReInitialize(); bool m_initialized; - MTMemcpy m_memcpy; unsigned int m_width; unsigned int m_height; diff --git a/host/Capture/NvFBC.cpp b/host/Capture/NvFBC.cpp index 0e0c7e16..f513cbc0 100644 --- a/host/Capture/NvFBC.cpp +++ b/host/Capture/NvFBC.cpp @@ -150,21 +150,12 @@ bool NvFBC::Initialize() m_grabFrameParams.eGMode = NVFBC_TOSYS_SOURCEMODE_SCALE; m_grabFrameParams.pNvFBCFrameGrabInfo = &m_grabInfo; - if (!m_memcpy.Initialize()) - { - DEBUG_ERROR("Failed to initialize MTMemcpy"); - DeInitialize(); - return false; - } - m_initialized = true; return true; } void NvFBC::DeInitialize() { - m_memcpy.DeInitialize(); - m_frameBuffer = NULL; if (m_nvFBC) @@ -233,11 +224,7 @@ bool NvFBC::GrabFrame(struct FrameInfo & frame) frame.height = m_grabInfo.dwHeight; frame.stride = m_grabInfo.dwBufferWidth; frame.outSize = m_grabInfo.dwBufferWidth * m_grabInfo.dwHeight * 3; - if (!m_memcpy.Copy(frame.buffer, m_frameBuffer, frame.outSize)) - { - DEBUG_ERROR("Memory copy failed"); - return false; - } + memcpy_s(frame.buffer, frame.bufferSize, m_frameBuffer, frame.outSize); return true; } diff --git a/host/Capture/NvFBC.h b/host/Capture/NvFBC.h index d79ba19c..6b554e92 100644 --- a/host/Capture/NvFBC.h +++ b/host/Capture/NvFBC.h @@ -18,7 +18,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA #pragma once #include "ICapture.h" -#include "MTMemcpy.h" #define W32_LEAN_AND_MEAN #include @@ -44,7 +43,6 @@ namespace Capture private: bool m_initialized; HMODULE m_hDLL; - MTMemcpy m_memcpy; NvFBC_CreateFunctionExType m_fnCreateEx; NvFBC_SetGlobalFlagsType m_fnSetGlobalFlags;