mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Additional update
This commit is contained in:
parent
3f4b5b0bc4
commit
0c2363934a
@ -1290,11 +1290,11 @@ QJsonArray V4L2Grabber::discover(const QJsonObject& params)
|
|||||||
format["format"] = pixelFormatToString(encodingFormat);
|
format["format"] = pixelFormatToString(encodingFormat);
|
||||||
|
|
||||||
QMap<std::pair<int, int>, QSet<int>> combined = QMap<std::pair<int, int>, QSet<int>>();
|
QMap<std::pair<int, int>, QSet<int>> combined = QMap<std::pair<int, int>, QSet<int>>();
|
||||||
for (auto enc : input.value().encodingFormats.values(encodingFormat))
|
for (const auto &enc : input.value().encodingFormats.values(encodingFormat))
|
||||||
{
|
{
|
||||||
std::pair<int, int> width_height{enc.width, enc.height};
|
std::pair<int, int> width_height{enc.width, enc.height};
|
||||||
auto &com = combined[width_height];
|
auto &com = combined[width_height];
|
||||||
for (auto framerate : qAsConst(enc.framerates))
|
for (auto framerate : enc.framerates)
|
||||||
{
|
{
|
||||||
com.insert(framerate);
|
com.insert(framerate);
|
||||||
}
|
}
|
||||||
@ -1326,7 +1326,7 @@ QJsonArray V4L2Grabber::discover(const QJsonObject& params)
|
|||||||
device["video_inputs"] = video_inputs;
|
device["video_inputs"] = video_inputs;
|
||||||
|
|
||||||
QJsonObject controls, controls_default;
|
QJsonObject controls, controls_default;
|
||||||
for (const auto &control : qAsConst(_deviceControls[device_property.key()]))
|
for (const auto &control : std::as_const(_deviceControls[device_property.key()]))
|
||||||
{
|
{
|
||||||
QJsonObject property;
|
QJsonObject property;
|
||||||
property["minValue"] = control.minValue;
|
property["minValue"] = control.minValue;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user