eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve icons

Browse Source
This commit is contained in:
brunoherbelin
2020-09-30 23:21:43 +02:00
parent d4b014188e
commit e8a88fcbb9
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DeviceSource.cpp
View File

@@ -328,7 +328,8 @@ void DeviceSource::setDevice(const std::string &devicename)
Log::Info("Device %s selected its optimal config: %s %s %dx%d@%.1ffps", device_.c_str(), best.stream.c_str(), best.format.c_str(), best.width, best.height, fps);
pipeline << " ! " << best.stream;
pipeline << ",format=" << best.format;
if (!best.format.empty())
pipeline << ",format=" << best.format;
pipeline << ",framerate=" << best.fps_numerator << "/" << best.fps_denominator;
pipeline << ",width=" << best.width;
pipeline << ",height=" << best.height;
@@ -433,9 +434,6 @@ DeviceConfigSet Device::getDeviceConfigs(const std::string &src_description)
config.format = f;
break;
}
// else keep f if it contains J (for JPEG) and not already JPG in config
else if ( (f.find("J") != std::string::npos) && (config.format.find("J") == std::string::npos ) )
config.format = f;
// default, take at least one if nothing yet in config
else if ( config.format.empty() )
config.format = f;