aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libcamera/camera.cpp20
-rw-r--r--test/camera/statemachine.cpp15
2 files changed, 25 insertions, 10 deletions
diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp
index de0123ae..29f2d91d 100644
--- a/src/libcamera/camera.cpp
+++ b/src/libcamera/camera.cpp
@@ -348,6 +348,7 @@ public:
const std::set<Stream *> &streams);
~Private();
+ bool isRunning() const;
int isAccessAllowed(State state, bool allowDisconnected = false,
const char *from = __builtin_FUNCTION()) const;
int isAccessAllowed(State low, State high,
@@ -389,6 +390,11 @@ static const char *const camera_state_names[] = {
"Running",
};
+bool Camera::Private::isRunning() const
+{
+ return state_.load(std::memory_order_acquire) == CameraRunning;
+}
+
int Camera::Private::isAccessAllowed(State state, bool allowDisconnected,
const char *from) const
{
@@ -1062,9 +1068,10 @@ int Camera::start(const ControlList *controls)
* This method stops capturing and processing requests immediately. All pending
* requests are cancelled and complete synchronously in an error state.
*
- * \context This function may only be called when the camera is in the Running
- * state as defined in \ref camera_operation, and shall be synchronized by the
- * caller with other functions that affect the camera state.
+ * \context This function may be called in any camera state as defined in \ref
+ * camera_operation, and shall be synchronized by the caller with other
+ * functions that affect the camera state. If called when the camera isn't
+ * running, it is a no-op.
*
* \return 0 on success or a negative error code otherwise
* \retval -ENODEV The camera has been disconnected from the system
@@ -1074,6 +1081,13 @@ int Camera::stop()
{
Private *const d = LIBCAMERA_D_PTR();
+ /*
+ * \todo Make calling stop() when not in 'Running' part of the state
+ * machine rather than take this shortcut
+ */
+ if (!d->isRunning())
+ return 0;
+
int ret = d->isAccessAllowed(Private::CameraRunning);
if (ret < 0)
return ret;
diff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp
index f0c3d776..26fb5ca1 100644
--- a/test/camera/statemachine.cpp
+++ b/test/camera/statemachine.cpp
@@ -41,13 +41,13 @@ protected:
if (camera_->queueRequest(&request) != -EACCES)
return TestFail;
- if (camera_->stop() != -EACCES)
- return TestFail;
-
/* Test operations which should pass. */
if (camera_->release())
return TestFail;
+ if (camera_->stop())
+ return TestFail;
+
/* Test valid state transitions, end in Acquired state. */
if (camera_->acquire())
return TestFail;
@@ -71,7 +71,8 @@ protected:
if (camera_->queueRequest(&request) != -EACCES)
return TestFail;
- if (camera_->stop() != -EACCES)
+ /* Test operations which should pass. */
+ if (camera_->stop())
return TestFail;
/* Test valid state transitions, end in Configured state. */
@@ -97,14 +98,14 @@ protected:
if (camera_->queueRequest(&request1) != -EACCES)
return TestFail;
- if (camera_->stop() != -EACCES)
- return TestFail;
-
/* Test operations which should pass. */
std::unique_ptr<Request> request2 = camera_->createRequest();
if (!request2)
return TestFail;
+ if (camera_->stop())
+ return TestFail;
+
/* Test valid state transitions, end in Running state. */
if (camera_->release())
return TestFail;

Privacy Policy