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

libcamera: pipeline: simple: Manage converter with std::unique_ptr<>

Browse Source 
Replace manual destruction of the converter with std::unique_ptr<>. This
removes the need for the SimplePipelineHandler destructor.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Phi-Bang Nguyen <pnguyen@baylibre.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2020-12-24 18:01:43 +02:00
parent 817a4b4472
commit 96bcf66ac7
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcamera/pipeline/simple/simple.cpp
View File

@@ -116,7 +116,6 @@ class SimplePipelineHandler : public PipelineHandler
{
public:
SimplePipelineHandler(CameraManager *manager);
~SimplePipelineHandler();
CameraConfiguration *generateConfiguration(Camera *camera,
const StreamRoles &roles) override;
@@ -132,7 +131,7 @@ public:
V4L2VideoDevice *video(const MediaEntity *entity);
V4L2Subdevice *subdev(const MediaEntity *entity);
SimpleConverter *converter() { return converter_; }
SimpleConverter *converter() { return converter_.get(); }
protected:
int queueRequestDevice(Camera *camera, Request *request) override;
@@ -151,7 +150,7 @@ private:
std::map<const MediaEntity *, std::unique_ptr<V4L2VideoDevice>> videos_;
std::map<const MediaEntity *, V4L2Subdevice> subdevs_;
SimpleConverter *converter_;
std::unique_ptr<SimpleConverter> converter_;
bool useConverter_;
std::vector<std::unique_ptr<FrameBuffer>> converterBuffers_;
std::queue<FrameBuffer *> converterQueue_;
@@ -507,15 +506,10 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()
*/
SimplePipelineHandler::SimplePipelineHandler(CameraManager *manager)
: PipelineHandler(manager), converter_(nullptr)
: PipelineHandler(manager)
{
}
SimplePipelineHandler::~SimplePipelineHandler()
{
delete converter_;
}
CameraConfiguration *SimplePipelineHandler::generateConfiguration(Camera *camera,
const StreamRoles &roles)
{
@@ -763,12 +757,11 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)
/* Open the converter, if any. */
if (converter) {
converter_ = new SimpleConverter(converter);
converter_ = std::make_unique<SimpleConverter>(converter);
if (converter_->open() < 0) {
LOG(SimplePipeline, Warning)
<< "Failed to open converter, disabling format conversion";
delete converter_;
converter_ = nullptr;
converter_.reset();
} else {
converter_->bufferReady.connect(this, &SimplePipelineHandler::converterDone);
}