PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

16
src/libcamera/camera.cpp
View File

@@ -542,23 +542,23 @@ const std::set<Stream *> &Camera::streams() const
}
/**
* \brief Generate a default camera configuration according to stream usages
* \param[in] usages A list of stream usages
* \brief Generate a default camera configuration according to stream roles
* \param[in] roles A list of stream roles
*
* Generate a camera configuration for a set of desired usages. The caller
* specifies a list of stream usages and the camera returns a configuration
* Generate a camera configuration for a set of desired stream roles. The caller
* specifies a list of stream roles and the camera returns a configuration
* containing suitable streams and their suggested default configurations.
*
* \return A valid CameraConfiguration if the requested usages can be satisfied,
* \return A valid CameraConfiguration if the requested roles can be satisfied,
* or a invalid one otherwise
*/
CameraConfiguration
Camera::generateConfiguration(const std::vector<StreamUsage> &usages)
Camera::generateConfiguration(const StreamRoles &roles)
{
if (disconnected_ || !usages.size() || usages.size() > streams_.size())
if (disconnected_ || !roles.size() || roles.size() > streams_.size())
return CameraConfiguration();
CameraConfiguration config = pipe_->generateConfiguration(this, usages);
CameraConfiguration config = pipe_->generateConfiguration(this, roles);
std::ostringstream msg("streams configuration:", std::ios_base::ate);
unsigned int index = 0;