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

refactor(avform): Extracted functions with best mode search and combo box filling

Browse Source
This commit is contained in:
Diadlo 2016-06-13 19:15:35 +03:00
parent 684835de1b
commit 6f3ef0cf59
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
2 changed files with 118 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,23 +154,8 @@ void AVForm::onVideoModesIndexChanged(int index)
camera.open(devName, mode);
}
void AVForm::updateVideoModes(int curIndex)
std::map<int, int> AVForm::getBestModeInds(QVector<VideoMode> &allVideoModes)
{
if (curIndex<0 || curIndex>=videoDeviceList.size())
{
qWarning() << "Invalid index";
return;
}
QString devName = videoDeviceList[curIndex].first;
QVector<VideoMode> allVideoModes = CameraDevice::getVideoModes(devName);
std::sort(allVideoModes.begin(), allVideoModes.end(),
[](const VideoMode& a, const VideoMode& b)
{return a.width!=b.width ? a.width>b.width :
a.height!=b.height ? a.height>b.height :
a.FPS>b.FPS;});
bool previouslyBlocked = bodyUI->videoModescomboBox->blockSignals(true);
bodyUI->videoModescomboBox->clear();
// Identify the best resolutions available for the supposed XXXXp resolutions.
std::map<int, VideoMode> idealModes;
idealModes[120] = {160,120,0,0};
@ -179,10 +164,9 @@ void AVForm::updateVideoModes(int curIndex)
idealModes[480] = {854,480,0,0};
idealModes[720] = {1280,720,0,0};
idealModes[1080] = {1920,1080,0,0};
std::map<int, int> bestModeInds;
qDebug("available Modes:");
for (int i=0; i<allVideoModes.size(); ++i)
std::map<int, int> bestModeInds;
for (int i = 0; i < allVideoModes.size(); ++i)
{
VideoMode mode = allVideoModes[i];
qDebug("width: %d, height: %d, FPS: %f, pixel format: %s", mode.width, mode.height, mode.FPS, CameraDevice::getPixelFormatString(mode.pixel_format).toStdString().c_str());
@ -225,41 +209,101 @@ void AVForm::updateVideoModes(int curIndex)
}
}
}
qDebug("selected Modes:");
QVector<VideoMode> newVideoModes;
int index = 0;
for (auto it = bestModeInds.rbegin(); it != bestModeInds.rend(); ++it)
{
int i = it->second;
VideoMode mode = videoModes[i];
auto result = std::find(newVideoModes.begin(), newVideoModes.end(), mode);
if (result == newVideoModes.end())
newVideoModes.push_back(mode);
it->second = index++;
}
videoModes = newVideoModes;
return bestModeInds;
}
int AVForm::fillModesComboBox(std::map<int, int> bestModeInds)
{
bool previouslyBlocked = bodyUI->videoModescomboBox->blockSignals(true);
bodyUI->videoModescomboBox->clear();
int prefResIndex = -1;
QSize prefRes = Settings::getInstance().getCamVideoRes();
unsigned short prefFPS = Settings::getInstance().getCamVideoFPS();
// Iterate backwards to show higest resolution first.
videoModes.clear();
for(auto iter = bestModeInds.rbegin(); iter != bestModeInds.rend(); ++iter)
{
int i = iter->second;
VideoMode mode = allVideoModes[i];
int index = iter->second;
VideoMode mode = videoModes[index];
if (videoModes.contains(mode))
continue;
if (mode.width == prefRes.width()
&& mode.height == prefRes.height()
&& mode.FPS == prefFPS
&& prefResIndex == -1)
prefResIndex = index;
videoModes.append(mode);
if (mode.width==prefRes.width() && mode.height==prefRes.height() && mode.FPS == prefFPS && prefResIndex==-1)
prefResIndex = videoModes.size() - 1;
QString str;
qDebug("width: %d, height: %d, FPS: %f, pixel format: %s\n", mode.width, mode.height, mode.FPS, CameraDevice::getPixelFormatString(mode.pixel_format).toStdString().c_str());
QString pixelFormat = CameraDevice::getPixelFormatString(mode.pixel_format);
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)
str += tr("%1p").arg(iter->first);
str += QString("%1p").arg(iter->first);
else
str += tr("Default resolution");
bodyUI->videoModescomboBox->addItem(str);
}
if (videoModes.isEmpty())
bodyUI->videoModescomboBox->addItem(tr("Default resolution"));
bodyUI->videoModescomboBox->blockSignals(previouslyBlocked);
return prefResIndex;
}
void AVForm::updateVideoModes(int curIndex)
{
if (curIndex<0 || curIndex>=videoDeviceList.size())
{
qWarning() << "Invalid index";
return;
}
QString devName = videoDeviceList[curIndex].first;
QVector<VideoMode> allVideoModes = CameraDevice::getVideoModes(devName);
std::sort(allVideoModes.begin(), allVideoModes.end(),
[](const VideoMode& a, const VideoMode& b)
{return a.width!=b.width ? a.width>b.width :
a.height!=b.height ? a.height>b.height :
a.FPS>b.FPS;});
qDebug("available Modes:");
std::map<int, int> bestModeInds = getBestModeInds(allVideoModes);
videoModes = allVideoModes;
qDebug("selected Modes:");
int prefResIndex = fillModesComboBox(bestModeInds);
if (prefResIndex != -1)
{
bodyUI->videoModescomboBox->setCurrentIndex(prefResIndex);
return;
}
else
if (videoModes.size() == 0)
{
// If the user hasn't set a preffered resolution yet,
// We don't have any video modes, open it with the default mode
camera.open(devName);
return;
}
// If the user hasn't set a preferred resolution yet,
// we'll pick the resolution in the middle of the list,
// and the best FPS for that resolution.
// If we picked the lowest resolution, the quality would be awful
@ -302,7 +346,6 @@ void AVForm::updateVideoModes(int curIndex)
// We don't have any video modes, open it with the default mode
camera.open(devName);
}
}
}
void AVForm::onVideoDevChanged(int index)

4
src/widget/form/settings/avform.h
View File

@ -46,6 +46,9 @@ private:
void getAudioOutDevices();
void getVideoDevices();
std::map<int, int> getBestModeInds(QVector<VideoMode> &allVideoModes);
int fillModesComboBox(std::map<int, int> bestModeInds);
void createVideoSurface();
void killVideoSurface();
@ -70,7 +73,6 @@ protected:
private:
bool eventFilter(QObject *o, QEvent *e) final override;
void hideEvent(QHideEvent* event) final override;
void showEvent(QShowEvent*event) final override;