libcamera: pipeline_handler: Return unique_ptr from createInstance

Avoid naked pointer with memory allocation by returning a unique_ptr
from PipelineHandlerFactory::createInstance(), in order to increase
memory allocation safety.

This allows iterating over factories in the CameraManager and unit tests
using const pointers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Xavier Roumegue <xavier.roumegue@oss.nxp.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2022-10-03 22:55:11 +03:00
parent 5a867f312c
commit ba3a1adc13
4 changed files with 13 additions and 11 deletions

View file

@ -113,7 +113,8 @@ public:
private: private:
static void registerType(PipelineHandlerFactory *factory); static void registerType(PipelineHandlerFactory *factory);
virtual PipelineHandler *createInstance(CameraManager *manager) const = 0; virtual std::unique_ptr<PipelineHandler>
createInstance(CameraManager *manager) const = 0;
std::string name_; std::string name_;
}; };
@ -125,9 +126,10 @@ public: \
handler##Factory() : PipelineHandlerFactory(#handler) {} \ handler##Factory() : PipelineHandlerFactory(#handler) {} \
\ \
private: \ private: \
PipelineHandler *createInstance(CameraManager *manager) const \ std::unique_ptr<PipelineHandler> \
createInstance(CameraManager *manager) const \
{ \ { \
return new handler(manager); \ return std::make_unique<handler>(manager); \
} \ } \
}; \ }; \
static handler##Factory global_##handler##Factory; static handler##Factory global_##handler##Factory;

View file

@ -142,10 +142,10 @@ void CameraManager::Private::createPipelineHandlers()
* file and only fallback on all handlers if there is no * file and only fallback on all handlers if there is no
* configuration file. * configuration file.
*/ */
std::vector<PipelineHandlerFactory *> &factories = const std::vector<PipelineHandlerFactory *> &factories =
PipelineHandlerFactory::factories(); PipelineHandlerFactory::factories();
for (PipelineHandlerFactory *factory : factories) { for (const PipelineHandlerFactory *factory : factories) {
LOG(Camera, Debug) LOG(Camera, Debug)
<< "Found registered pipeline handler '" << "Found registered pipeline handler '"
<< factory->name() << "'"; << factory->name() << "'";

View file

@ -678,9 +678,9 @@ PipelineHandlerFactory::PipelineHandlerFactory(const char *name)
*/ */
std::shared_ptr<PipelineHandler> PipelineHandlerFactory::create(CameraManager *manager) const std::shared_ptr<PipelineHandler> PipelineHandlerFactory::create(CameraManager *manager) const
{ {
PipelineHandler *handler = createInstance(manager); std::unique_ptr<PipelineHandler> handler = createInstance(manager);
handler->name_ = name_.c_str(); handler->name_ = name_.c_str();
return std::shared_ptr<PipelineHandler>(handler); return std::shared_ptr<PipelineHandler>(std::move(handler));
} }
/** /**
@ -727,8 +727,8 @@ std::vector<PipelineHandlerFactory *> &PipelineHandlerFactory::factories()
* macro. It creates a pipeline handler instance associated with the camera * macro. It creates a pipeline handler instance associated with the camera
* \a manager. * \a manager.
* *
* \return a pointer to a newly constructed instance of the PipelineHandler * \return A unique pointer to a newly constructed instance of the
* subclass corresponding to the factory * PipelineHandler subclass corresponding to the factory
*/ */
/** /**

View file

@ -52,9 +52,9 @@ protected:
ipaManager_ = make_unique<IPAManager>(); ipaManager_ = make_unique<IPAManager>();
/* Create a pipeline handler for vimc. */ /* Create a pipeline handler for vimc. */
std::vector<PipelineHandlerFactory *> &factories = const std::vector<PipelineHandlerFactory *> &factories =
PipelineHandlerFactory::factories(); PipelineHandlerFactory::factories();
for (PipelineHandlerFactory *factory : factories) { for (const PipelineHandlerFactory *factory : factories) {
if (factory->name() == "PipelineHandlerVimc") { if (factory->name() == "PipelineHandlerVimc") {
pipe_ = factory->create(nullptr); pipe_ = factory->create(nullptr);
break; break;