Skip to content
Snippets Groups Projects
Unverified Commit 4fa80cb2 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

media: store framerates into a float

Change-Id: Iebaca9e57cb165c11ad44664e3799205e4c9474d
parent b999933c
Branches
Tags
No related merge requests found
...@@ -49,7 +49,7 @@ constexpr static const char PREVIEW_RENDERER_ID[] = "local"; ...@@ -49,7 +49,7 @@ constexpr static const char PREVIEW_RENDERER_ID[] = "local";
using Channel = std::string; using Channel = std::string;
using Resolution = std::string; using Resolution = std::string;
using Framerate = uint64_t; using Framerate = float;
using FrameratesList = std::vector<Framerate>; using FrameratesList = std::vector<Framerate>;
using Capabilities = std::map<Channel, std::map<Resolution, FrameratesList>>; using Capabilities = std::map<Channel, std::map<Resolution, FrameratesList>>;
......
...@@ -221,7 +221,7 @@ AVModel::getDeviceSettings(const std::string& name) const ...@@ -221,7 +221,7 @@ AVModel::getDeviceSettings(const std::string& name) const
result.name = settings["name"].toStdString(); result.name = settings["name"].toStdString();
result.channel = settings["channel"].toStdString(); result.channel = settings["channel"].toStdString();
result.size = settings["size"].toStdString(); result.size = settings["size"].toStdString();
result.rate = settings["rate"].toUInt(); result.rate = settings["rate"].toFloat();
return result; return result;
} }
...@@ -238,7 +238,7 @@ AVModel::getDeviceCapabilities(const std::string& name) const ...@@ -238,7 +238,7 @@ AVModel::getDeviceCapabilities(const std::string& name) const
video::FrameratesList rates; video::FrameratesList rates;
QVectorIterator<QString> itRates(resToRates.second); QVectorIterator<QString> itRates(resToRates.second);
while (itRates.hasNext()) { while (itRates.hasNext()) {
rates.emplace_back(itRates.next().toUInt()); rates.emplace_back(itRates.next().toFloat());
} }
channelCapabilities.insert( channelCapabilities.insert(
std::make_pair(resToRates.first.toStdString(), rates)); std::make_pair(resToRates.first.toStdString(), rates));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment