From 5ecf2d36c1ec86515bd265060f214c6d46520ade Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Sat, 25 Nov 2017 18:00:04 +1100 Subject: [PATCH] [host] Updated to use the new header format --- host/Capture/DXGI.cpp | 8 -------- host/Capture/NvFBC.cpp | 8 -------- host/ICapture.h | 1 - host/Service.cpp | 3 +-- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/host/Capture/DXGI.cpp b/host/Capture/DXGI.cpp index 23cbbb9b..7c97f48f 100644 --- a/host/Capture/DXGI.cpp +++ b/host/Capture/DXGI.cpp @@ -222,14 +222,6 @@ FrameType DXGI::GetFrameType() return FRAME_TYPE_ARGB; } -FrameComp DXGI::GetFrameCompression() -{ - if (!m_initialized) - return FRAME_COMP_NONE; - - return FRAME_COMP_NONE; -} - size_t DXGI::GetMaxFrameSize() { if (!m_initialized) diff --git a/host/Capture/NvFBC.cpp b/host/Capture/NvFBC.cpp index c0f21b4e..37950c65 100644 --- a/host/Capture/NvFBC.cpp +++ b/host/Capture/NvFBC.cpp @@ -202,14 +202,6 @@ FrameType NvFBC::GetFrameType() return FRAME_TYPE_ARGB; } -FrameComp NvFBC::GetFrameCompression() -{ - if (!m_initialized) - return FRAME_COMP_NONE; - - return FRAME_COMP_NONE; -} - size_t NvFBC::GetMaxFrameSize() { if (!m_initialized) diff --git a/host/ICapture.h b/host/ICapture.h index 603a19dc..e8f706f1 100644 --- a/host/ICapture.h +++ b/host/ICapture.h @@ -41,7 +41,6 @@ public: bool Initialize(CaptureOptions * options); void DeInitialize(); enum FrameType GetFrameType(); - enum FrameComp GetFrameCompression(); size_t GetMaxFrameSize(); bool GrabFrame(struct FrameInfo & frame); }; \ No newline at end of file diff --git a/host/Service.cpp b/host/Service.cpp index 25292355..60274c47 100644 --- a/host/Service.cpp +++ b/host/Service.cpp @@ -84,7 +84,7 @@ bool Service::Initialize(ICapture * captureDevice) ZeroMemory(header, sizeof(KVMGFXHeader)); memcpy(header->magic, KVMGFX_HEADER_MAGIC, sizeof(KVMGFX_HEADER_MAGIC)); - header->version = 2; + header->version = KVMGFX_HEADER_VERSION; header->guestID = m_ivshmem->GetPeerID(); header->hostID = hostID; @@ -131,7 +131,6 @@ bool Service::Process() // setup the header header->frameType = m_capture->GetFrameType(); - header->compType = m_capture->GetFrameCompression(); header->dataLen = 0; FrameInfo frame;