summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-04-28 16:42:12 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-05-23 00:27:13 +0300
commita40023e6cc005dfc57cc535167ee44761f3ed9f6 (patch)
tree7b666b223754855a7ea8a4e83e3df0bb9752bdfe /test
parent2ca2d658700c57c3d734d72b2148436907152257 (diff)
libcamera: Use stream roles directly instead of StreamUsage
In order to prepare for an API overhall of the camera configuration generation, remove the StreamUsage class and replace its uses by stream roles. The size hints can't be specified anymore, and will be replaced with an API on the StreamConfiguration to negotiate configuration parameters with cameras. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'test')
-rw-r--r--test/camera/capture.cpp2
-rw-r--r--test/camera/configuration_default.cpp6
-rw-r--r--test/camera/configuration_set.cpp2
-rw-r--r--test/camera/statemachine.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index bc3a4d6c..e7e64382 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -43,7 +43,7 @@ protected:
int run()
{
CameraConfiguration config =
- camera_->generateConfiguration({ Stream::VideoRecording() });
+ camera_->generateConfiguration({ StreamRole::VideoRecording });
Stream *stream = config.front();
StreamConfiguration *cfg = &config[stream];
diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp
index 340b5f58..8c4a03db 100644
--- a/test/camera/configuration_default.cpp
+++ b/test/camera/configuration_default.cpp
@@ -21,7 +21,7 @@ protected:
CameraConfiguration config;
/* Test asking for configuration for a video stream. */
- config = camera_->generateConfiguration({ Stream::VideoRecording() });
+ config = camera_->generateConfiguration({ StreamRole::VideoRecording });
if (!config.isValid()) {
cout << "Default configuration invalid" << endl;
return TestFail;
@@ -29,11 +29,11 @@ protected:
/*
* Test that asking for configuration for an empty array of
- * stream usages returns an empty list of configurations.
+ * stream roles returns an empty list of configurations.
*/
config = camera_->generateConfiguration({});
if (config.isValid()) {
- cout << "Failed to retrieve configuration for empty usage list"
+ cout << "Failed to retrieve configuration for empty roles list"
<< endl;
return TestFail;
}
diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp
index 24d5ca66..76d8bc3e 100644
--- a/test/camera/configuration_set.cpp
+++ b/test/camera/configuration_set.cpp
@@ -19,7 +19,7 @@ protected:
int run()
{
CameraConfiguration config =
- camera_->generateConfiguration({ Stream::VideoRecording() });
+ camera_->generateConfiguration({ StreamRole::VideoRecording });
StreamConfiguration *cfg = &config[config.front()];
if (!config.isValid()) {
diff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp
index bd2e61ff..7a74cd85 100644
--- a/test/camera/statemachine.cpp
+++ b/test/camera/statemachine.cpp
@@ -235,7 +235,7 @@ protected:
int run()
{
- defconf_ = camera_->generateConfiguration({ Stream::VideoRecording() });
+ defconf_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
if (testAvailable() != TestPass) {
cout << "State machine in Available state failed" << endl;