Skip to content

Add streaming recording heartbeat #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
irvingouj@Devolutions (irvingoujAtDevolution) wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add streaming recording heartbeat #185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 67 additions & 3 deletions dll/OutputMirror.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <MsRdpEx/RecordingManifest.h>
#include <MsRdpEx/OutputMirror.h>

#define MSRDPEX_STREAMING_MIN_FRAME_RATE 30

struct _MsRdpEx_OutputMirror
{
uint8_t* bitmapData;
Expand Down Expand Up @@ -35,10 +37,53 @@ struct _MsRdpEx_OutputMirror
FILE* frameMetadataFile;

uint32_t videoFrameRate;
HANDLE heartbeatStopEvent;
HANDLE heartbeatThread;

CRITICAL_SECTION lock;
};

static DWORD WINAPI MsRdpEx_OutputMirror_HeartbeatThread(LPVOID parameter)
{
MsRdpEx_OutputMirror* ctx = (MsRdpEx_OutputMirror*) parameter;
uint32_t interval = 1000 / ctx->videoFrameRate;

while (WaitForSingleObject(ctx->heartbeatStopEvent, interval) == WAIT_TIMEOUT)
{
if (!TryEnterCriticalSection(&ctx->lock))
continue;

if (ctx->videoRecordingEnabled && ctx->videoRecorder && ctx->bitmapData)
{
MsRdpEx_VideoRecorder_UpdateFrame(ctx->videoRecorder, ctx->bitmapData,
0, 0, ctx->bitmapWidth, ctx->bitmapHeight, ctx->bitmapStep);
Comment on lines +58 to +59
}

LeaveCriticalSection(&ctx->lock);
}

return 0;
}

static void MsRdpEx_OutputMirror_StopHeartbeat(MsRdpEx_OutputMirror* ctx)
{
if (ctx->heartbeatStopEvent)
SetEvent(ctx->heartbeatStopEvent);

if (ctx->heartbeatThread)
{
WaitForSingleObject(ctx->heartbeatThread, INFINITE);
Comment on lines +73 to +75
CloseHandle(ctx->heartbeatThread);
ctx->heartbeatThread = NULL;
}

if (ctx->heartbeatStopEvent)
{
CloseHandle(ctx->heartbeatStopEvent);
ctx->heartbeatStopEvent = NULL;
}
}

void MsRdpEx_OutputMirror_Lock(MsRdpEx_OutputMirror* ctx)
{
MsRdpEx_Stopwatch stopwatch;
Expand Down Expand Up @@ -237,6 +282,10 @@ bool MsRdpEx_OutputMirror_Init(MsRdpEx_OutputMirror* ctx)
ctx->videoRecorder = MsRdpEx_VideoRecorder_New();

if (ctx->videoRecorder) {
bool streaming = !MsRdpEx_StringIsNullOrEmpty(ctx->recordingPipeName);
uint32_t frameRate = streaming
? max(ctx->videoFrameRate, MSRDPEX_STREAMING_MIN_FRAME_RATE)
: ctx->videoFrameRate;
int64_t startTime = (ctx->videoRecordingCount < 1) ? ctx->startTime : MsRdpEx_GetUnixTime();
sprintf_s(filename, MSRDPEX_MAX_PATH, "%s\\recording-%d.webm", ctx->outputPath, ctx->videoRecordingCount);
MsRdpEx_RecordingManifest_FinalizeFile(ctx->manifest, 0);
Expand All @@ -246,15 +295,28 @@ bool MsRdpEx_OutputMirror_Init(MsRdpEx_OutputMirror* ctx)
MsRdpEx_VideoRecorder_SetFileName(ctx->videoRecorder, filename);
MsRdpEx_VideoRecorder_SetVideoQuality(ctx->videoRecorder, ctx->videoQualityLevel);

if (ctx->videoFrameRate > 0) {
MsRdpEx_VideoRecorder_SetFrameRate(ctx->videoRecorder, ctx->videoFrameRate);
if (frameRate > 0) {
MsRdpEx_VideoRecorder_SetFrameRate(ctx->videoRecorder, frameRate);
}

if (!MsRdpEx_StringIsNullOrEmpty(ctx->recordingPipeName)) {
MsRdpEx_VideoRecorder_SetPipeName(ctx->videoRecorder, ctx->recordingPipeName);
}

MsRdpEx_VideoRecorder_Init(ctx->videoRecorder);
bool initialized = MsRdpEx_VideoRecorder_Init(ctx->videoRecorder);
if (streaming && initialized) {
ctx->videoFrameRate = frameRate;
ctx->heartbeatStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (ctx->heartbeatStopEvent) {
ctx->heartbeatThread = CreateThread(NULL, 0,
MsRdpEx_OutputMirror_HeartbeatThread, ctx, 0, NULL);
}

if (!ctx->heartbeatStopEvent || !ctx->heartbeatThread) {
MsRdpEx_LogPrint(WARN, "failed to start video recording heartbeat");
MsRdpEx_OutputMirror_StopHeartbeat(ctx);
}
}
}

if (ctx->dumpBitmapUpdates) {
Expand All @@ -271,6 +333,8 @@ bool MsRdpEx_OutputMirror_Init(MsRdpEx_OutputMirror* ctx)

bool MsRdpEx_OutputMirror_Uninit(MsRdpEx_OutputMirror* ctx)
{
MsRdpEx_OutputMirror_StopHeartbeat(ctx);

if (ctx->hShadowDC)
{
SelectObject(ctx->hShadowDC, ctx->hShadowObject);
Expand Down