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(avform): Took default resolution from middle of list

Browse Source
This commit is contained in:
Diadlo 2016-06-14 00:04:30 +03:00
parent 33729dcf4a
commit 2d861ee25b
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
1 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/widget/form/settings/avform.cpp
View File

@ -299,44 +299,8 @@ void AVForm::updateVideoModes(int curIndex)
// and the best FPS for that resolution. // and the best FPS for that resolution.
// If we picked the lowest resolution, the quality would be awful // If we picked the lowest resolution, the quality would be awful
// but if we picked the largest, FPS would be bad and thus quality bad too. // but if we picked the largest, FPS would be bad and thus quality bad too.
int numRes=0; int mid = videoModes.size() / 2;
QSize lastSize; bodyUI->videoModescomboBox->setCurrentIndex(mid);
for (int i = 0; i<videoModes.size(); i++)
{
if (lastSize != QSize{videoModes[i].width, videoModes[i].height})
{
numRes++;
lastSize = {videoModes[i].width, videoModes[i].height};
}
}
int target = numRes/2;
numRes=0;
for (int i=0; i<videoModes.size(); i++)
{
if (lastSize != QSize{videoModes[i].width, videoModes[i].height})
{
numRes++;
lastSize = {videoModes[i].width, videoModes[i].height};
}
if (numRes==target)
{
bodyUI->videoModescomboBox->setCurrentIndex(i);
break;
}
}
if (videoModes.size())
{
bodyUI->videoModescomboBox->setUpdatesEnabled(false);
bodyUI->videoModescomboBox->setCurrentIndex(-1);
bodyUI->videoModescomboBox->setUpdatesEnabled(true);
bodyUI->videoModescomboBox->setCurrentIndex(0);
}
else
{
// We don't have any video modes, open it with the default mode
camera.open(devName);
}
} }
void AVForm::onVideoDevChanged(int index) void AVForm::onVideoDevChanged(int index)
@ -352,7 +316,13 @@ void AVForm::onVideoDevChanged(int index)
bool previouslyBlocked = bodyUI->videoModescomboBox->blockSignals(true); bool previouslyBlocked = bodyUI->videoModescomboBox->blockSignals(true);
updateVideoModes(index); updateVideoModes(index);
bodyUI->videoModescomboBox->blockSignals(previouslyBlocked); bodyUI->videoModescomboBox->blockSignals(previouslyBlocked);
camera.open(dev);
int modeIndex = bodyUI->videoModescomboBox->currentIndex();
VideoMode mode = VideoMode();
if (0 < modeIndex || modeIndex < videoModes.size())
mode = videoModes[modeIndex];
camera.open(dev, mode);
if (dev == "none") if (dev == "none")
Core::getInstance()->getAv()->sendNoVideo(); Core::getInstance()->getAv()->sendNoVideo();
} }