Skip to content

Fix init crash #22

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

Open
summeroff wants to merge 3 commits into
base: streamlabs
Choose a base branch
from
+30 −21
Open

Fix init crash #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fe1094
ensure mutex to be created when used
summeroff Dec 9, 2025
d4359e7
restore recursive mutex
summeroff Dec 10, 2025
018b20e
potential fix for plugin init crash
summeroff Dec 17, 2025
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
47 changes: 28 additions & 19 deletions source/dshow-enum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,16 +451,20 @@ static bool EnumDevice(const GUID &type, IMoniker *deviceInfo,
hr = deviceInfo->BindToStorage(0, 0, IID_IPropertyBag,
(void **)&propertyData);
if (FAILED(hr))
return true;
goto cleanup;

VARIANT deviceName, devicePath;
VARIANT deviceName;
VariantInit(&deviceName);
deviceName.vt = VT_BSTR;

VARIANT devicePath;
VariantInit(&devicePath);
devicePath.vt = VT_BSTR;
devicePath.bstrVal = NULL;

hr = propertyData->Read(L"FriendlyName", &deviceName, NULL);
if (FAILED(hr))
return true;
if (FAILED(hr) || deviceName.vt != VT_BSTR || !deviceName.bstrVal) {
goto cleanup;
}

/* workaround to a crash in decklink drivers; if no decklink device
* is plugged in to the system, it will still try to enumerate the
Expand All @@ -469,27 +473,30 @@ static bool EnumDevice(const GUID &type, IMoniker *deviceInfo,
if (deviceName.bstrVal && type == CLSID_AudioInputDeviceCategory &&
wcsstr(deviceName.bstrVal, L"Decklink") != nullptr &&
!decklinkVideoPresent) {
return true;
goto cleanup;
}

hr = propertyData->Read(L"DevicePath", &devicePath, NULL);
HRESULT hrPath;
const wchar_t *devPath;
hrPath = propertyData->Read(L"DevicePath", &devicePath, nullptr);
devPath = SUCCEEDED(hrPath) ? devicePath.bstrVal : nullptr;

if (activate) {
hr = deviceInfo->BindToObject(NULL, 0, IID_IBaseFilter,
(void **)&filter);
if (SUCCEEDED(hr)) {
HRESULT hrObj = deviceInfo->BindToObject(
nullptr, 0, IID_IBaseFilter, (void **)&filter);
if (SUCCEEDED(hrObj)) {
if (!callback(param, filter, deviceName.bstrVal,
devicePath.bstrVal))
return false;
devPath))
goto cleanup;
}
} else {
if (SUCCEEDED(hr)) {
if (!callback(param, NULL, deviceName.bstrVal,
devicePath.bstrVal))
return false;
}
if (!callback(param, nullptr, deviceName.bstrVal, devPath))
goto cleanup;
}

cleanup:
VariantClear(&deviceName);
VariantClear(&devicePath);
return true;
}

Expand All @@ -510,7 +517,9 @@ static bool EnumExceptionVideoDevices(EnumDeviceCallback callback, void *param)
return true;
}

static recursive_mutex enumMutex;
namespace {
static std::recursive_mutex g_enum_mutex;
}

static bool CheckForDLCallback(void *unused, IBaseFilter *filter,
const wchar_t *deviceName,
Expand All @@ -536,7 +545,7 @@ static void CheckForDecklinkVideo(bool activate)

bool EnumDevices(const GUID &type, EnumDeviceCallback callback, void *param, bool activate)
{
lock_guard<recursive_mutex> lock(enumMutex);
std::lock_guard<std::recursive_mutex> lock(g_enum_mutex);
ComPtr<ICreateDevEnum> deviceEnum;
ComPtr<IEnumMoniker> enumMoniker;
ComPtr<IMoniker> deviceInfo;
Expand Down
4 changes: 2 additions & 2 deletions source/dshowencode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static bool EnumVideoEncoder(vector<DeviceId> &encoders, IBaseFilter *encoder,
return true;

id.name = deviceName;
id.path = devicePath;
id.path = devicePath ? devicePath : L"";
encoders.push_back(id);

(void)encoder;
Expand All @@ -104,7 +104,7 @@ bool VideoEncoder::EnumEncoders(vector<DeviceId> &encoders)
{
encoders.clear();
return EnumDevices(KSCATEGORY_ENCODER,
EnumDeviceCallback(EnumVideoEncoder), &encoders, true);
EnumDeviceCallback(EnumVideoEncoder), &encoders, false);
}

};