53704ac3f4
The CameraManager class is not supposed to be instantiated multiple times, which led to a singleton implementation. This requires a global instance of the CameraManager, which is destroyed when the global destructors are executed. Relying on global instances causes issues with cleanup, as the order in which the global destructors are run can't be controlled. In particular, the Android camera HAL implementation ends up destroying the CameraHalManager after the CameraManager, which leads to use-after-free problems. To solve this, remove the CameraManager::instance() method and make the CameraManager class instantiable directly. Multiple instances are still not allowed, and this is enforced by storing the instance pointer internally to be checked when an instance is created. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
48 lines
784 B
C++
48 lines
784 B
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* libcamera Camera API tests
|
|
*/
|
|
|
|
#include <iostream>
|
|
|
|
#include "camera_test.h"
|
|
|
|
using namespace libcamera;
|
|
using namespace std;
|
|
|
|
int CameraTest::init()
|
|
{
|
|
cm_ = new CameraManager();
|
|
|
|
if (cm_->start()) {
|
|
cout << "Failed to start camera manager" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
camera_ = cm_->get("VIMC Sensor B");
|
|
if (!camera_) {
|
|
cout << "Can not find VIMC camera" << endl;
|
|
return TestSkip;
|
|
}
|
|
|
|
/* Sanity check that the camera has streams. */
|
|
if (camera_->streams().empty()) {
|
|
cout << "Camera has no stream" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
return TestPass;
|
|
}
|
|
|
|
void CameraTest::cleanup()
|
|
{
|
|
if (camera_) {
|
|
camera_->release();
|
|
camera_.reset();
|
|
}
|
|
|
|
cm_->stop();
|
|
delete cm_;
|
|
};
|