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

Coding Style fixes

Browse Source
This commit is contained in:
sudden6 2016-03-22 13:17:59 +01:00
parent 3f89cd95d5
commit 46adb586c9
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,17 +167,22 @@ void AVForm::updateVideoModes(int curIndex)
idealModes[480] = {854,480,0,0}; idealModes[720] = {1280,720,0,0}; idealModes[480] = {854,480,0,0}; idealModes[720] = {1280,720,0,0};
idealModes[1080] = {1920,1080,0,0}; idealModes[1080] = {1920,1080,0,0};
std::map<int, int> bestModeInds; std::map<int, int> bestModeInds;
qDebug("available Modes:");
for (int i=0; i<videoModes.size(); ++i) for (int i=0; i<videoModes.size(); ++i)
{ {
VideoMode mode = videoModes[i]; VideoMode mode = videoModes[i];
printf("width: %d, height: %d, FPS: %f, pixel format: %s\n", mode.width, mode.height, mode.FPS, CameraDevice::getPixelFormatString(mode.pixel_format).toStdString().c_str()); qDebug("width: %d, height: %d, FPS: %f, pixel format: %s", mode.width, mode.height, mode.FPS, CameraDevice::getPixelFormatString(mode.pixel_format).toStdString().c_str());
for(auto iter = idealModes.begin(); iter != idealModes.end(); ++iter) for(auto iter = idealModes.begin(); iter != idealModes.end(); ++iter)
{ {
int res = iter->first; int res = iter->first;
VideoMode idealMode = iter->second; VideoMode idealMode = iter->second;
// don't take approximately correct resolutions unless they really // don't take approximately correct resolutions unless they really
// are close // are close
if (mode.norm(idealMode) > 300) continue; if (mode.norm(idealMode) > 300)
continue;
if (bestModeInds.find(res) == bestModeInds.end()) if (bestModeInds.find(res) == bestModeInds.end())
{ {
bestModeInds[res] = i; bestModeInds[res] = i;
@ -191,7 +196,8 @@ void AVForm::updateVideoModes(int curIndex)
else if (mode.norm(idealMode) == videoModes[ind].norm(idealMode)) else if (mode.norm(idealMode) == videoModes[ind].norm(idealMode))
{ {
// prefer higher FPS and "better" pixel formats // prefer higher FPS and "better" pixel formats
if (mode.FPS > videoModes[ind].FPS) { if (mode.FPS > videoModes[ind].FPS)
{
bestModeInds[res] = i; bestModeInds[res] = i;
} }
else if (mode.FPS == videoModes[ind].FPS && else if (mode.FPS == videoModes[ind].FPS &&
@ -202,7 +208,7 @@ void AVForm::updateVideoModes(int curIndex)
} }
} }
} }
printf("=====\n"); qDebug("selected Modes:");
int prefResIndex = -1; int prefResIndex = -1;
QSize prefRes = Settings::getInstance().getCamVideoRes(); QSize prefRes = Settings::getInstance().getCamVideoRes();
unsigned short prefFPS = Settings::getInstance().getCamVideoFPS(); unsigned short prefFPS = Settings::getInstance().getCamVideoFPS();
@ -214,7 +220,7 @@ void AVForm::updateVideoModes(int curIndex)
if (mode.width==prefRes.width() && mode.height==prefRes.height() && mode.FPS == prefFPS && prefResIndex==-1) if (mode.width==prefRes.width() && mode.height==prefRes.height() && mode.FPS == prefFPS && prefResIndex==-1)
prefResIndex = i; prefResIndex = i;
QString str; QString str;
printf("width: %d, height: %d, FPS: %f, pixel format: %s\n", mode.width, mode.height, mode.FPS, CameraDevice::getPixelFormatString(mode.pixel_format).toStdString().c_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());
if (mode.height && mode.width) if (mode.height && mode.width)
str += tr("%1p").arg(iter->first); str += tr("%1p").arg(iter->first);
else else