scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 22:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

DShow: fix init race condition + debug

Browse Source
This commit is contained in:
Martin Pulec
2021-02-15 14:02:39 +01:00
parent 6d79723b17
commit d8be7fc5a5
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/video_capture/DirectShowGrabber.cpp
View File

@@ -80,7 +80,6 @@ struct vidcap_dshow_state {
bool convert_YUYV_RGB; ///< @todo check - currently newer set
struct video_frame *frame;
long frameLength;
long grabBufferLen;
long returnBufferLen;
bool haveNewReturnBuffer;
@@ -183,7 +182,10 @@ public:
s->haveNewReturnBuffer = true;
}
LeaveCriticalSection(&s->returnBufferCS);
if (grabMightWait) WakeConditionVariable(&s->grabWaitCV);
if (grabMightWait) {
LOG(LOG_LEVEL_DEBUG) << MOD_NAME << "WakeConditionVariable s->grabWaitCV\n";
WakeConditionVariable(&s->grabWaitCV);
}
return S_OK;
}
@@ -268,6 +270,13 @@ static bool common_init(struct vidcap_dshow_state *s) {
return false;
}
// Create non-inheritable mutex without a name, owned by this thread
InitializeCriticalSectionAndSpinCount(&s->returnBufferCS, 0x40);
s->haveNewReturnBuffer = false;
s->frames = 0;
gettimeofday(&s->t0, NULL);
// create device enumerator
res = CoCreateInstance(CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&s->devEnumerator));
if (res != S_OK) {
@@ -1234,15 +1243,7 @@ static int vidcap_dshow_init(struct vidcap_params *params, void **state) {
goto error;
}
// Create non-inheritable mutex without a name, owned by this thread
InitializeCriticalSectionAndSpinCount(&s->returnBufferCS, 0x40);
s->haveNewReturnBuffer = false;
s->frame = vf_alloc_desc(s->desc);
s->frameLength = 0;
s->frames = 0;
gettimeofday(&s->t0, NULL);
*state = s;
return VIDCAP_INIT_OK;
@@ -1289,15 +1290,16 @@ static struct video_frame * vidcap_dshow_grab(void *state, struct audio_frame **
struct vidcap_dshow_state *s = (struct vidcap_dshow_state *) state;
*audio = NULL;
//fprintf(stderr, "[dshow] GRAB: enter: %d\n", s->deviceNumber);
LOG(LOG_LEVEL_DEBUG) << MOD_NAME << "GRAB: enter: " << s->deviceNumber << "\n";
EnterCriticalSection(&s->returnBufferCS);
//fprintf(stderr, "[dshow] s: %p\n", s);
while (!s->haveNewReturnBuffer) {
//fprintf(stderr, "[dshow] s: %p\n", s);
LOG(LOG_LEVEL_DEBUG) << MOD_NAME << "Wait CV\n";
SleepConditionVariableCS(&s->grabWaitCV, &s->returnBufferCS, INFINITE);
//fprintf(stderr, "[dshow] s: %p\n", s);
}
LOG(LOG_LEVEL_DEBUG) << MOD_NAME << "Swap buffers\n";
//fprintf(stderr, "[dshow] s: %p\n", s);
// switch the buffers
BYTE *tmp = s->returnBuffer;