[host] NvFBC now takes full screen capture and crops off letterboxing

For this to function correctly the display scaling in the nvidia control
panel must be set to "No scaling", failure to do so will cause incorrect
window cropping. This is due to the inability to capture a non-scaled
image using NvFBC.
This commit is contained in:
Geoffrey McRae 2017-11-16 14:00:40 +11:00
parent 6f5eba3c01
commit 71c6e5d317

View File

@ -145,11 +145,14 @@ bool NvFBC::Initialize()
ZeroMemory(&m_grabInfo, sizeof(NvFBCFrameGrabInfo)); ZeroMemory(&m_grabInfo, sizeof(NvFBCFrameGrabInfo));
m_grabFrameParams.dwVersion = NVFBC_TOSYS_GRAB_FRAME_PARAMS_VER; m_grabFrameParams.dwVersion = NVFBC_TOSYS_GRAB_FRAME_PARAMS_VER;
m_grabFrameParams.dwFlags = NVFBC_TOSYS_NOFLAGS; m_grabFrameParams.dwFlags = NVFBC_TOSYS_NOFLAGS;
m_grabFrameParams.eGMode = NVFBC_TOSYS_SOURCEMODE_FULL;
m_grabFrameParams.dwStartX = 0; m_grabFrameParams.dwStartX = 0;
m_grabFrameParams.dwStartY = 0; m_grabFrameParams.dwStartY = 0;
m_grabFrameParams.eGMode = NVFBC_TOSYS_SOURCEMODE_SCALE; m_grabFrameParams.dwTargetWidth = 0;
m_grabFrameParams.dwTargetHeight = 0;
m_grabFrameParams.pNvFBCFrameGrabInfo = &m_grabInfo; m_grabFrameParams.pNvFBCFrameGrabInfo = &m_grabInfo;
m_initialized = true; m_initialized = true;
return true; return true;
} }
@ -213,18 +216,28 @@ bool NvFBC::GrabFrame(struct FrameInfo & frame)
RECT desktop; RECT desktop;
GetWindowRect(hDesktop, &desktop); GetWindowRect(hDesktop, &desktop);
m_grabFrameParams.dwTargetWidth = desktop.right;
m_grabFrameParams.dwTargetHeight = desktop.bottom;
for(int i = 0; i < 2; ++i) for(int i = 0; i < 2; ++i)
{ {
NVFBCRESULT status = m_nvFBC->NvFBCToSysGrabFrame(&m_grabFrameParams); NVFBCRESULT status = m_nvFBC->NvFBCToSysGrabFrame(&m_grabFrameParams);
if (status == NVFBC_SUCCESS) if (status == NVFBC_SUCCESS)
{ {
frame.width = m_grabInfo.dwWidth; const unsigned int realHeight = min(m_grabInfo.dwHeight, desktop.bottom - desktop.top );
frame.height = m_grabInfo.dwHeight; const unsigned int realWidth = min(m_grabInfo.dwWidth , desktop.right - desktop.left);
frame.stride = m_grabInfo.dwBufferWidth; const unsigned int dataWidth = realWidth * 3;
frame.outSize = m_grabInfo.dwBufferWidth * m_grabInfo.dwHeight * 3; const unsigned int dataOffset =
memcpy_s(frame.buffer, frame.bufferSize, m_frameBuffer, frame.outSize); (((m_grabInfo.dwHeight - realHeight) >> 1) * m_grabInfo.dwBufferWidth +
((m_grabInfo.dwWidth - realWidth ) >> 1)) * 3;
frame.width = realWidth;
frame.height = realHeight;
frame.stride = frame.width;
frame.outSize = frame.width * frame.height * 3;
uint8_t *src = (uint8_t *)m_frameBuffer + dataOffset;
uint8_t *dst = (uint8_t *)frame.buffer;
for(unsigned int y = 0; y < frame.height; ++y, dst += dataWidth, src += m_grabInfo.dwBufferWidth * 3)
memcpy_s(dst, dataWidth, src, dataWidth);
return true; return true;
} }