Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-10 08:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] update to use the new header format

Browse Source
This commit is contained in:
Geoffrey McRae 2017-12-17 05:03:47 +11:00
parent 6595374a2c
commit 1815387bbb
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
host/Service.cpp
View File

@ -95,13 +95,11 @@ bool Service::Initialize(ICapture * captureDevice)
// update everything except for the hostID // update everything except for the hostID
memcpy(m_shmHeader->magic, KVMFR_HEADER_MAGIC, sizeof(KVMFR_HEADER_MAGIC)); memcpy(m_shmHeader->magic, KVMFR_HEADER_MAGIC, sizeof(KVMFR_HEADER_MAGIC));
m_shmHeader->version = KVMFR_HEADER_VERSION; m_shmHeader->version = KVMFR_HEADER_VERSION;
m_shmHeader->guestID = m_ivshmem->GetPeerID();
m_shmHeader->updateCount = 0; m_shmHeader->updateCount = 0;
// clear but retain the restart flag if it was set by the client // clear but retain the restart flag if it was set by the client
INTERLOCKED_AND8((char *)&m_shmHeader->flags, KVMFR_HEADER_FLAG_RESTART); INTERLOCKED_AND8((char *)&m_shmHeader->flags, KVMFR_HEADER_FLAG_RESTART);
ZeroMemory(&m_shmHeader->frame , sizeof(KVMFRFrame )); ZeroMemory(&m_shmHeader->detail, sizeof(KVMFRDetail));
ZeroMemory(&m_shmHeader->cursor, sizeof(KVMFRCursor));
m_initialized = true; m_initialized = true;
return true; return true;
@ -260,17 +258,17 @@ bool Service::Process()
} }
uint8_t updateFlags = 0; uint8_t updateFlags = 0;
m_header.cursor.flags = 0; m_detail.cursor.flags = 0;
if (!cursorOnly) if (!cursorOnly)
{ {
// signal a frame update // signal a frame update
updateFlags |= KVMFR_HEADER_FLAG_FRAME; updateFlags |= KVMFR_HEADER_FLAG_FRAME;
m_header.frame.type = m_capture->GetFrameType(); m_detail.frame.type = m_capture->GetFrameType();
m_header.frame.width = frame.width; m_detail.frame.width = frame.width;
m_header.frame.height = frame.height; m_detail.frame.height = frame.height;
m_header.frame.stride = frame.stride; m_detail.frame.stride = frame.stride;
m_header.frame.dataPos = m_dataOffset[m_frameIndex]; m_detail.frame.dataPos = m_dataOffset[m_frameIndex];
if (++m_frameIndex == 2) if (++m_frameIndex == 2)
m_frameIndex = 0; m_frameIndex = 0;
} }
@ -288,11 +286,11 @@ bool Service::Process()
// tell the host where the cursor is // tell the host where the cursor is
updateFlags |= KVMFR_HEADER_FLAG_CURSOR; updateFlags |= KVMFR_HEADER_FLAG_CURSOR;
m_header.cursor.flags |= KVMFR_CURSOR_FLAG_POS; m_detail.cursor.flags |= KVMFR_CURSOR_FLAG_POS;
if (m_cursor.visible) if (m_cursor.visible)
m_header.cursor.flags |= KVMFR_CURSOR_FLAG_VISIBLE; m_detail.cursor.flags |= KVMFR_CURSOR_FLAG_VISIBLE;
m_header.cursor.x = m_cursor.x; m_detail.cursor.x = m_cursor.x;
m_header.cursor.y = m_cursor.y; m_detail.cursor.y = m_cursor.y;
} }
if (frame.cursor.hasShape || m_shapePending || (m_cursor.hasShape && restart)) if (frame.cursor.hasShape || m_shapePending || (m_cursor.hasShape && restart))
@ -331,15 +329,17 @@ bool Service::Process()
{ {
// give the host the new cursor shape // give the host the new cursor shape
updateFlags |= KVMFR_HEADER_FLAG_CURSOR; updateFlags |= KVMFR_HEADER_FLAG_CURSOR;
m_header.cursor.flags |= KVMFR_CURSOR_FLAG_SHAPE; m_detail.cursor.flags |= KVMFR_CURSOR_FLAG_SHAPE;
if (m_cursor.visible) if (m_cursor.visible)
m_header.cursor.flags |= KVMFR_CURSOR_FLAG_VISIBLE; m_detail.cursor.flags |= KVMFR_CURSOR_FLAG_VISIBLE;
m_header.cursor.type = m_cursor.type; // shapes are sent as frame data
m_header.cursor.w = m_cursor.w; m_detail.cursor.type = m_cursor.type;
m_header.cursor.h = m_cursor.h; m_detail.frame.width = m_cursor.w;
m_header.cursor.pitch = m_cursor.pitch; m_detail.frame.height = m_cursor.h;
m_header.cursor.dataPos = m_dataOffset[m_frameIndex]; m_detail.frame.stride = 0;
m_detail.frame.pitch = m_cursor.pitch;
m_detail.frame.dataPos = m_dataOffset[m_frameIndex];
memcpy(m_frame[m_frameIndex], m_cursorData, m_cursor.dataSize); memcpy(m_frame[m_frameIndex], m_cursorData, m_cursor.dataSize);
m_shapePending = false; m_shapePending = false;
@ -352,13 +352,8 @@ bool Service::Process()
INTERLOCKED_AND8((volatile char *)flags, KVMFR_HEADER_FLAG_RESTART); INTERLOCKED_AND8((volatile char *)flags, KVMFR_HEADER_FLAG_RESTART);
INTERLOCKED_OR8 ((volatile char *)flags, updateFlags); INTERLOCKED_OR8 ((volatile char *)flags, updateFlags);
// update the shared header but don't touch the setup fields // update the shared details only
const size_t offset = (uintptr_t)&m_header.frame - (uintptr_t)&m_header; memcpy(&m_shmHeader->detail, &m_detail, sizeof(KVMFRDetail));
memcpy(
(uint8_t *)m_shmHeader + offset,
(uint8_t *)&m_header + offset,
sizeof(KVMFRHeader) - offset
);
// increment the update count so the guest stops waiting // increment the update count so the guest stops waiting
++m_shmHeader->updateCount; ++m_shmHeader->updateCount;

2
host/Service.h
View File

@ -55,7 +55,7 @@ private:
HANDLE m_timer; HANDLE m_timer;
ICapture * m_capture; ICapture * m_capture;
KVMFRHeader m_header; KVMFRDetail m_detail;
KVMFRHeader * m_shmHeader; KVMFRHeader * m_shmHeader;
uint8_t * m_frame[2]; uint8_t * m_frame[2];
size_t m_frameSize; size_t m_frameSize;