StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(directshow): Fixed problem with crosses initialization

Browse Source
This commit is contained in:
Diadlo 2016-06-25 11:46:59 +03:00
parent c3de6238ca
commit 504ad534e0
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/camera/directshow.cpp
View File

@ -187,6 +187,7 @@ QVector<VideoMode> DirectShow::getDeviceModes(QString devName)
IPin *pin; IPin *pin;
if (devFilter->EnumPins(&pins) != S_OK) if (devFilter->EnumPins(&pins) != S_OK)
return modes; return modes;
while (pins->Next(1, &pin, nullptr) == S_OK) while (pins->Next(1, &pin, nullptr) == S_OK)
{ {
IKsPropertySet *p = nullptr; IKsPropertySet *p = nullptr;
@ -214,12 +215,14 @@ QVector<VideoMode> DirectShow::getDeviceModes(QString devName)
goto next; goto next;
if (config->GetNumberOfCapabilities(&n, &size) != S_OK) if (config->GetNumberOfCapabilities(&n, &size) != S_OK)
goto pinend; goto pinend;
assert(size == sizeof(VIDEO_STREAM_CONFIG_CAPS)); assert(size == sizeof(VIDEO_STREAM_CONFIG_CAPS));
vcaps = new VIDEO_STREAM_CONFIG_CAPS; vcaps = new VIDEO_STREAM_CONFIG_CAPS;
for (int i=0; i<n; ++i) for (int i = 0; i < n; ++i)
{ {
AM_MEDIA_TYPE* type = nullptr; AM_MEDIA_TYPE* type = nullptr;
VideoMode mode;
if (config->GetStreamCaps(i, &type, (BYTE*)vcaps) != S_OK) if (config->GetStreamCaps(i, &type, (BYTE*)vcaps) != S_OK)
goto nextformat; goto nextformat;
@ -227,7 +230,6 @@ QVector<VideoMode> DirectShow::getDeviceModes(QString devName)
&& !IsEqualGUID(type->formattype, FORMAT_VideoInfo2)) && !IsEqualGUID(type->formattype, FORMAT_VideoInfo2))
goto nextformat; goto nextformat;
VideoMode mode;
mode.width = vcaps->MaxOutputSize.cx; mode.width = vcaps->MaxOutputSize.cx;
mode.height = vcaps->MaxOutputSize.cy; mode.height = vcaps->MaxOutputSize.cy;
mode.FPS = 1e7 / vcaps->MinFrameInterval; mode.FPS = 1e7 / vcaps->MinFrameInterval;