[host] added option parsing to application

host/Capture/DXGI.cpp

@@ -22,6 +22,7 @@ using namespace Capture;
 #include "common\debug.h"
 
 DXGI::DXGI() :
+  m_options(NULL),
   m_initialized(false),
   m_dxgiFactory(NULL),
   m_device(NULL),
@@ -37,11 +38,12 @@ DXGI::~DXGI()
 
 }
 
-bool DXGI::Initialize()
+bool DXGI::Initialize(CaptureOptions * options)
 {
   if (m_initialized)
     DeInitialize();
 
+  m_options = options;
   HRESULT status;
 
   status = CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void **)(&m_dxgiFactory));
@@ -208,7 +210,7 @@ bool DXGI::ReInitialize()
   */
   Sleep(200);
 
-  return Initialize();
+  return Initialize(m_options);
 }
 
 FrameType DXGI::GetFrameType()

host/Capture/DXGI.h

@@ -33,7 +33,10 @@ namespace Capture
   public:
     DXGI();
     ~DXGI();
-    bool Initialize();
+
+    const char * GetName() { return "DXGI"; }
+
+    bool Initialize(CaptureOptions * options);
     void DeInitialize();
     enum FrameType GetFrameType();
     enum FrameComp GetFrameCompression();
@@ -41,6 +44,8 @@ namespace Capture
     bool GrabFrame(struct FrameInfo & frame);
 
   private:
+    CaptureOptions * m_options;
+
     bool ReInitialize();
 
     bool          m_initialized;

host/Capture/NvFBC.cpp

@@ -31,6 +31,8 @@ using namespace Capture;
 #endif
 
 NvFBC::NvFBC() :
+  m_options(NULL),
+  m_optNoCrop(false),
   m_initialized(false),
   m_hDLL(NULL),
   m_nvFBC(NULL)
@@ -41,11 +43,18 @@ NvFBC::~NvFBC()
 {
 }
 
-bool NvFBC::Initialize()
+bool NvFBC::Initialize(CaptureOptions * options)
 {
   if (m_initialized)
     DeInitialize();
 
+  m_options   = options;
+  m_optNoCrop = false;
+  for (CaptureOptions::const_iterator it = options->begin(); it != options->end(); ++it)
+  {
+    if (_strcmpi(*it, "nocrop") == 0) { m_optNoCrop = true; continue; }
+  }
+
   std::string nvfbc = Util::GetSystemRoot() + "\\" + NVFBC_LIBRARY_NAME;
   m_hDLL = LoadLibraryA(nvfbc.c_str());
   if (!m_hDLL)
@@ -221,15 +230,30 @@ bool NvFBC::GrabFrame(struct FrameInfo & frame)
     NVFBCRESULT status = m_nvFBC->NvFBCToSysGrabFrame(&m_grabFrameParams);
     if (status == NVFBC_SUCCESS)
     {
-      const unsigned int realHeight = min(m_grabInfo.dwHeight, desktop.bottom - desktop.top );
-      const unsigned int realWidth  = min(m_grabInfo.dwWidth , desktop.right  - desktop.left);
-      const unsigned int dataWidth  = realWidth * 3;
-      const unsigned int dataOffset =
-        (((m_grabInfo.dwHeight - realHeight) >> 1)  * m_grabInfo.dwBufferWidth +
-        ((m_grabInfo.dwWidth  - realWidth ) >> 1)) * 3;
+      unsigned int dataWidth;
+      unsigned int dataOffset;
+
+      if (m_optNoCrop)
+      {
+        dataWidth  = m_grabInfo.dwWidth * 3;
+        dataOffset = 0;
+
+        frame.width   = m_grabInfo.dwWidth;
+        frame.height  = m_grabInfo.dwHeight;
+      }
+      else
+      {
+        const unsigned int realHeight = min(m_grabInfo.dwHeight, (unsigned int)(desktop.bottom - desktop.top));
+        const unsigned int realWidth  = min(m_grabInfo.dwWidth , (unsigned int)(desktop.right  - desktop.left));
+        dataWidth  = realWidth * 3;
+        dataOffset =
+          (((m_grabInfo.dwHeight - realHeight) >> 1)  * m_grabInfo.dwBufferWidth +
+          ((m_grabInfo.dwWidth  - realWidth ) >> 1)) * 3;
+
+        frame.width  = realWidth;
+        frame.height = realHeight;
+      }
 
-      frame.width   = realWidth;
-      frame.height  = realHeight;
       frame.stride  = frame.width;
       frame.outSize = frame.width * frame.height * 3;
 
@@ -251,7 +275,7 @@ bool NvFBC::GrabFrame(struct FrameInfo & frame)
     {
       DEBUG_WARN("Session was invalidated, attempting to restart");
       DeInitialize();
-      if (!Initialize())
+      if (!Initialize(m_options))
       {
         DEBUG_ERROR("Failed to re-iniaialize");
         return false;

host/Capture/NvFBC.h

@@ -33,7 +33,9 @@ namespace Capture
     NvFBC();
     ~NvFBC();
 
-    bool Initialize();
+    const char * GetName() { return "NvFBC"; }
+
+    bool Initialize(CaptureOptions * options);
     void DeInitialize();
     enum FrameType GetFrameType();
     enum FrameComp GetFrameCompression();
@@ -41,6 +43,9 @@ namespace Capture
     bool GrabFrame(struct FrameInfo & frame);
 
   private:
+    CaptureOptions * m_options;
+    bool m_optNoCrop;
+
     bool m_initialized;
     HMODULE  m_hDLL;