Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-25 09:35:06 +03:00
Code Issues Projects Releases Packages 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

8
include/libcamera/camera.h
View file

@ -14,16 +14,13 @@
#include <libcamera/request.h>
#include <libcamera/signal.h>
#include <libcamera/stream.h>
namespace libcamera {
class Buffer;
class PipelineHandler;
class Request;
class Stream;
class StreamUsage;
struct StreamConfiguration;
class CameraConfiguration
{
@ -74,8 +71,7 @@ public:
int release();
const std::set<Stream *> &streams() const;
CameraConfiguration
generateConfiguration(const std::vector<StreamUsage> &usage);
CameraConfiguration generateConfiguration(const StreamRoles &roles);
int configure(const CameraConfiguration &config);
int allocateBuffers();

44
include/libcamera/stream.h
View file

@ -8,6 +8,7 @@
#define __LIBCAMERA_STREAM_H__
#include <string>
#include <vector>
#include <libcamera/buffer.h>
#include <libcamera/geometry.h>
@ -25,48 +26,17 @@ struct StreamConfiguration {
std::string toString() const;
};
class StreamUsage
{
public:
enum Role {
StillCapture,
VideoRecording,
Viewfinder,
};
Role role() const { return role_; }
const Size &size() const { return size_; }
protected:
explicit StreamUsage(Role role);
StreamUsage(Role role, const Size &size);
private:
Role role_;
Size size_;
enum StreamRole {
StillCapture,
VideoRecording,
Viewfinder,
};
using StreamRoles = std::vector<StreamRole>;
class Stream
{
public:
class StillCapture : public StreamUsage
{
public:
StillCapture();
};
class VideoRecording : public StreamUsage
{
public:
VideoRecording();
};
class Viewfinder : public StreamUsage
{
public:
Viewfinder(int width, int height);
};
Stream();
BufferPool &bufferPool() { return bufferPool_; }
const StreamConfiguration &configuration() const { return configuration_; }