NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: Use stream roles directly instead of StreamUsage

Browse source 
In order to prepare for an API overhall of the camera configuration
generation, remove the StreamUsage class and replace its uses by stream
roles. The size hints can't be specified anymore, and will be replaced
with an API on the StreamConfiguration to negotiate configuration
parameters with cameras.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2019-04-28 16:42:12 +03:00
parent 2ca2d65870
commit a40023e6cc
16 changed files with 69 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/cam/main.cpp
View file

@ -87,13 +87,13 @@ static int parseOptions(int argc, char *argv[])
static int prepareCameraConfig(CameraConfiguration *config)
{
std::vector<StreamUsage> roles;
StreamRoles roles;
streamInfo.clear();
/* If no configuration is provided assume a single video stream. */
if (!options.isSet(OptStream)) {
*config = camera->generateConfiguration({ Stream::VideoRecording() });
*config = camera->generateConfiguration({ StreamRole::VideoRecording });
streamInfo[config->front()] = "stream0";
return 0;
}
@ -106,14 +106,13 @@ static int prepareCameraConfig(CameraConfiguration *config)
KeyValueParser::Options conf = value.toKeyValues();
if (!conf.isSet("role")) {
roles.push_back(Stream::VideoRecording());
roles.push_back(StreamRole::VideoRecording);
} else if (conf["role"].toString() == "viewfinder") {
roles.push_back(Stream::Viewfinder(conf["width"],
conf["height"]));
roles.push_back(StreamRole::Viewfinder);
} else if (conf["role"].toString() == "video") {
roles.push_back(Stream::VideoRecording());
roles.push_back(StreamRole::VideoRecording);
} else if (conf["role"].toString() == "still") {
roles.push_back(Stream::StillCapture());
roles.push_back(StreamRole::StillCapture);
} else {
std::cerr << "Unknown stream role "
<< conf["role"].toString() << std::endl;