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

libcamera: store stream pointers in sets instead of a vectors

Browse Source 
The arrays that store Stream pointers shall always contain unique
values. Storing them in vectors opens up for the same stream pointer
appearing twice. Remove this possibility by storing them in a set which
guarantees each element is unique.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2019-02-26 02:46:33 +01:00
parent dc01a5bc43
commit 132ce9c1cf
7 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/libcamera/camera.h
View File

@@ -9,6 +9,7 @@
#include <map>
#include <memory>
#include <set>
#include <string>
#include <libcamera/request.h>
@@ -27,7 +28,7 @@ class Camera final
public:
static std::shared_ptr<Camera> create(PipelineHandler *pipe,
const std::string &name,
const std::vector<Stream *> &streams);
const std::set<Stream *> &streams);
Camera(const Camera &) = delete;
Camera &operator=(const Camera &) = delete;
@@ -40,9 +41,9 @@ public:
int acquire();
void release();
const std::vector<Stream *> &streams() const;
const std::set<Stream *> &streams() const;
std::map<Stream *, StreamConfiguration>
streamConfiguration(std::vector<Stream *> &streams);
streamConfiguration(std::set<Stream *> &streams);
int configureStreams(std::map<Stream *, StreamConfiguration> &config);
int allocateBuffers();
@@ -64,8 +65,8 @@ private:
std::shared_ptr<PipelineHandler> pipe_;
std::string name_;
std::vector<Stream *> streams_;
std::vector<Stream *> activeStreams_;
std::set<Stream *> streams_;
std::set<Stream *> activeStreams_;
bool acquired_;
bool disconnected_;