Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-08 03:34:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] added option parsing to application

Browse Source
This commit is contained in:
Geoffrey McRae
2017-11-16 20:53:22 +11:00
parent 71c6e5d317
commit 6eb40a1897
15 changed files with 462 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
host/Capture/DXGI.cpp
View File

@@ -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()

7
host/Capture/DXGI.h
View File

@@ -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;

44
host/Capture/NvFBC.cpp
View File

@@ -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;

7
host/Capture/NvFBC.h
View File

@@ -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;

73
host/CaptureFactory.h
View File

@@ -20,6 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#define W32_LEAN_AND_MEAN
#include <Windows.h>
#include <vector>
#include "common\debug.h"
#include "ICapture.h"
@@ -29,29 +30,61 @@ Place, Suite 330, Boston, MA 02111-1307 USA
class CaptureFactory
{
public:
static ICapture * GetCaptureDevice()
typedef std::vector<ICapture *> DeviceList;
static DeviceList & GetDevices()
{
ICapture *dev;
static DeviceList devices;
if (!devices.empty())
return devices;
dev = new Capture::NvFBC();
if (dev->Initialize())
{
DEBUG_INFO("Using NvFBC");
return dev;
}
dev->DeInitialize();
delete dev;
dev = new Capture::DXGI();
if (dev->Initialize())
{
DEBUG_INFO("Using DXGI");
return dev;
}
dev->DeInitialize();
delete dev;
devices.push_back(new Capture::NvFBC());
devices.push_back(new Capture::DXGI ());
DEBUG_ERROR("Failed to initialize a compatible capture device");
return devices;
}
static ICapture * GetDevice(const char * name, CaptureOptions * options)
{
DeviceList devices = GetDevices();
for (DeviceList::const_iterator it = devices.begin(); it != devices.end(); ++it)
{
ICapture * device = *it;
if (_strcmpi(name, device->GetName()) != 0)
continue;
if (device->Initialize(options))
{
DEBUG_INFO("Using %s", device->GetName());
return device;
}
device->DeInitialize();
DEBUG_ERROR("Failed to initialize %s", device->GetName());
return NULL;
}
DEBUG_ERROR("No such device: %s", name);
return NULL;
}
static ICapture * DetectDevice(CaptureOptions * options)
{
DeviceList devices = GetDevices();
for (DeviceList::const_iterator it = devices.begin(); it != devices.end(); ++it)
{
ICapture * device = *it;
DEBUG_INFO("Trying %s", device->GetName());
if (device->Initialize(options))
{
DEBUG_INFO("Using %s", device->GetName());
return device;
}
device->DeInitialize();
}
DEBUG_ERROR("Failed to initialize a capture device");
return NULL;
}
};

7
host/ICapture.h
View File

@@ -19,6 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#pragma once
#include "common/KVMGFXHeader.h"
#include <vector>
struct FrameInfo
{
@@ -30,10 +31,14 @@ struct FrameInfo
size_t outSize;
};
typedef std::vector<const char *> CaptureOptions;
__interface ICapture
{
public:
bool Initialize();
const char * GetName();
bool Initialize(CaptureOptions * options);
void DeInitialize();
enum FrameType GetFrameType();
enum FrameComp GetFrameCompression();

11
host/Service.cpp
View File

@@ -40,19 +40,12 @@ Service::~Service()
{
}
bool Service::Initialize()
bool Service::Initialize(ICapture * captureDevice)
{
if (m_initialized)
DeInitialize();
m_capture = CaptureFactory::GetCaptureDevice();
if (!m_capture)
{
DEBUG_ERROR("Failed to initialize capture interface");
DeInitialize();
return false;
}
m_capture = captureDevice;
if (!m_ivshmem->Initialize())
{
DEBUG_ERROR("IVSHMEM failed to initalize");

2
host/Service.h
View File

@@ -35,7 +35,7 @@ public:
return m_instance;
}
bool Initialize();
bool Initialize(ICapture * captureDevice);
void DeInitialize();
bool Process();

1
host/kvm-ivshmem-host.vcxproj
View File

@@ -160,6 +160,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\vendor\getopt\getopt.c" />
<ClCompile Include="Capture\DXGI.cpp" />
<ClCompile Include="Capture\NvFBC.cpp" />
<ClCompile Include="ivshmem.cpp" />

3
host/kvm-ivshmem-host.vcxproj.filters
View File

@@ -39,6 +39,9 @@
<ClCompile Include="Capture\DXGI.cpp">
<Filter>Source Files\Capture</Filter>
</ClCompile>
<ClCompile Include="..\vendor\getopt\getopt.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ivshmem.h">

262
host/main.cpp
View File

@@ -17,70 +17,244 @@ Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <Windows.h>
#include "common\debug.h"
#include <Shlwapi.h>
#include "common\debug.h"
#include "vendor\getopt\getopt.h"
#include "CaptureFactory.h"
#include "Service.h"
#ifdef DEBUG
#include <io.h>
#include <fcntl.h>
#include <iostream>
#endif
int parseArgs(struct StartupArgs & args);
int run(struct StartupArgs & args);
void doHelp();
void doLicense();
bool consoleActive = false;
void setupConsole();
struct StartupArgs
{
bool foreground;
const char * captureDevice;
CaptureOptions captureOptions;
};
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdParam, int iCmdShow)
{
#ifdef DEBUG
struct StartupArgs args;
ZeroMemory(&args, sizeof(struct StartupArgs));
int ret = parseArgs(args);
if (ret == 0)
{
HANDLE _handle;
int _conout;
FILE * fp;
AllocConsole();
CONSOLE_SCREEN_BUFFER_INFO conInfo;
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &conInfo);
conInfo.dwSize.Y = 500;
SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), conInfo.dwSize);
_handle = GetStdHandle(STD_INPUT_HANDLE);
_conout = _open_osfhandle((intptr_t)_handle, _O_TEXT);
fp = _fdopen(_conout, "r");
freopen_s(&fp, "CONIN$", "r", stdin);
_handle = GetStdHandle(STD_OUTPUT_HANDLE);
_conout = _open_osfhandle((intptr_t)_handle, _O_TEXT);
fp = _fdopen(_conout, "w");
freopen_s(&fp, "CONOUT$", "w", stdout);
_handle = GetStdHandle(STD_ERROR_HANDLE);
_conout = _open_osfhandle((intptr_t)_handle, _O_TEXT);
fp = _fdopen(_conout, "w");
freopen_s(&fp, "CONOUT$", "w", stderr);
std::ios::sync_with_stdio();
std::wcout.clear();
std::cout.clear();
std::wcerr.clear();
std::cerr.clear();
std::wcin.clear();
std::cin.clear();
ret = run(args);
if (ret != 0)
{
if (!args.foreground)
{
setupConsole();
fprintf(stderr, "An error occurred, re-run in forground mode (-f) for more information\n");
}
}
}
#endif
Service *svc = svc->Get();
if (!svc->Initialize())
if (consoleActive)
{
DEBUG_ERROR("Failed to initialize service");
fprintf(stderr, "\nPress enter to terminate...");
fflush(stderr);
getc(stdin);
}
return ret;
}
int run(struct StartupArgs & args)
{
if (args.foreground)
setupConsole();
ICapture * captureDevice;
if (args.captureDevice == NULL)
captureDevice = CaptureFactory::DetectDevice(&args.captureOptions);
else
{
captureDevice = CaptureFactory::GetDevice(args.captureDevice, &args.captureOptions);
if (!captureDevice)
{
setupConsole();
fprintf(stderr, "Failed to configure requested capture device\n");
return -1;
}
}
if (!captureDevice)
{
setupConsole();
fprintf(stderr, "Unable to configure a capture device\n");
return -1;
}
Service *svc = svc->Get();
if (!svc->Initialize(captureDevice))
return -1;
while (true)
if (!svc->Process())
break;
svc->DeInitialize();
#ifdef DEBUG
getc(stdin);
#endif
return 0;
}
int parseArgs(struct StartupArgs & args)
{
int c;
while((c = getopt(__argc, __argv, "hc:o:fl")) != -1)
{
switch (c)
{
case '?':
case 'h':
doHelp();
return -1;
case 'c':
{
const CaptureFactory::DeviceList deviceList = CaptureFactory::GetDevices();
bool found = false;
if (strcmp(optarg, "?") != 0)
{
for (CaptureFactory::DeviceList::const_iterator it = deviceList.begin(); it != deviceList.end(); ++it)
{
if (_strcmpi(optarg, (*it)->GetName()) == 0)
{
args.captureDevice = (*it)->GetName();
found = true;
break;
}
}
if (!found)
{
setupConsole();
fprintf(stderr, "Invalid capture device: %s\n\n", optarg);
}
}
if (!found)
{
setupConsole();
fprintf(stderr, "Available Capture Devices:\n\n");
for (CaptureFactory::DeviceList::const_iterator it = deviceList.begin(); it != deviceList.end(); ++it)
fprintf(stderr, " %s\n", (*it)->GetName());
return -1;
}
break;
}
case 'o':
{
args.captureOptions.push_back(optarg);
break;
}
case 'f':
args.foreground = true;
break;
case 'l':
doLicense();
return -1;
}
}
return 0;
}
void doHelp()
{
setupConsole();
const char *app = PathFindFileNameA(__argv[0]);
fprintf(stderr,
"Usage: %s [OPTION]...\n"
"Example: %s -c ?\n"
"\n"
" -h Print out this help\n"
" -c Specify the capture device to use or ? to list availble (device is probed if not specified)\n"
" -o Option to pass to the capture device, may be specified multiple times for extra options\n"
" -f Foreground mode\n"
" -l License information\n",
app,
app
);
}
void doLicense()
{
setupConsole();
fprintf(stderr,
"KVMGFX Client - A KVM Client for VGA Passthrough\n"
"Copyright(C) 2017 Geoffrey McRae <geoff@hostfission.com>\n"
"\n"
"This program is free software; you can redistribute it and / or modify it under\n"
"the terms of the GNU General Public License as published by the Free Software\n"
"Foundation; either version 2 of the License, or (at your option) any later\n"
"version.\n"
"\n"
"This program is distributed in the hope that it will be useful, but WITHOUT ANY\n"
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A\n"
"PARTICULAR PURPOSE.See the GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along with\n"
"this program; if not, write to the Free Software Foundation, Inc., 59 Temple\n"
"Place, Suite 330, Boston, MA 02111 - 1307 USA\n"
);
}
void setupConsole()
{
if (consoleActive)
return;
HANDLE _handle;
int _conout;
FILE * fp;
AllocConsole();
CONSOLE_SCREEN_BUFFER_INFO conInfo;
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &conInfo);
conInfo.dwSize.Y = 500;
SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), conInfo.dwSize);
_handle = GetStdHandle(STD_INPUT_HANDLE);
_conout = _open_osfhandle((intptr_t)_handle, _O_TEXT);
fp = _fdopen(_conout, "r");
freopen_s(&fp, "CONIN$", "r", stdin);
_handle = GetStdHandle(STD_OUTPUT_HANDLE);
_conout = _open_osfhandle((intptr_t)_handle, _O_TEXT);
fp = _fdopen(_conout, "w");
freopen_s(&fp, "CONOUT$", "w", stdout);
_handle = GetStdHandle(STD_ERROR_HANDLE);
_conout = _open_osfhandle((intptr_t)_handle, _O_TEXT);
fp = _fdopen(_conout, "w");
freopen_s(&fp, "CONOUT$", "w", stderr);
std::ios::sync_with_stdio();
std::wcout.clear();
std::cout.clear();
std::wcerr.clear();
std::cerr.clear();
std::wcin.clear();
std::cin.clear();
consoleActive = true;
}