|
|
@ -248,7 +248,7 @@ void AVForm::selectBestModes(QVector<VideoMode> &allVideoModes) |
|
|
|
{ |
|
|
|
{ |
|
|
|
VideoMode mode = allVideoModes[it->second]; |
|
|
|
VideoMode mode = allVideoModes[it->second]; |
|
|
|
|
|
|
|
|
|
|
|
if(newVideoModes.empty()) |
|
|
|
if (newVideoModes.empty()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
newVideoModes.push_back(mode); |
|
|
|
newVideoModes.push_back(mode); |
|
|
|
} |
|
|
|
} |
|
|
@ -258,10 +258,8 @@ void AVForm::selectBestModes(QVector<VideoMode> &allVideoModes) |
|
|
|
auto result = std::find_if(newVideoModes.cbegin(), newVideoModes.cend(), |
|
|
|
auto result = std::find_if(newVideoModes.cbegin(), newVideoModes.cend(), |
|
|
|
[size](VideoMode mode) { return getModeSize(mode) == size; }); |
|
|
|
[size](VideoMode mode) { return getModeSize(mode) == size; }); |
|
|
|
|
|
|
|
|
|
|
|
if(result == newVideoModes.end()) |
|
|
|
if (result == newVideoModes.end()) |
|
|
|
{ |
|
|
|
|
|
|
|
newVideoModes.push_back(mode); |
|
|
|
newVideoModes.push_back(mode); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
allVideoModes = newVideoModes; |
|
|
|
allVideoModes = newVideoModes; |
|
|
@ -281,7 +279,7 @@ void AVForm::fillCameraModesComboBox() |
|
|
|
qDebug("width: %d, height: %d, FPS: %f, pixel format: %s\n", mode.width, mode.height, mode.FPS, pixelFormat.toStdString().c_str()); |
|
|
|
qDebug("width: %d, height: %d, FPS: %f, pixel format: %s\n", mode.width, mode.height, mode.FPS, pixelFormat.toStdString().c_str()); |
|
|
|
|
|
|
|
|
|
|
|
if (mode.height && mode.width) |
|
|
|
if (mode.height && mode.width) |
|
|
|
str += QString("%1p").arg(getModeSize(mode)); |
|
|
|
str += QString("%1p").arg(mode.height); |
|
|
|
else |
|
|
|
else |
|
|
|
str += tr("Default resolution"); |
|
|
|
str += tr("Default resolution"); |
|
|
|
|
|
|
|
|
|
|
|