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

libcamera: camera: Rename configureStreams() and streamConfiguration()

Browse Source 
Rename the configureStreams() and streamConfiguration() methods to
configure() and generateConfiguration() respectively in order to clarify
the API. Both methods deal with CameraConfiguration objects, and are
thus not limited to streams, even if a CameraConfiguration currently
contains streams only.

While at it, remove the qcam MainWindow::configureStreams() method that
is declared but never defined or used.

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>
This commit is contained in:
Laurent Pinchart
2019-04-28 15:41:20 +03:00
parent d8de003a04
commit 2ca2d65870
16 changed files with 87 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/camera/capture.cpp
+2 -2
View File
@@ -43,7 +43,7 @@ protected:
int run()
{
CameraConfiguration config =
camera_->streamConfiguration({ Stream::VideoRecording() });
camera_->generateConfiguration({ Stream::VideoRecording() });
Stream *stream = config.front();
StreamConfiguration *cfg = &config[stream];
@@ -57,7 +57,7 @@ protected:
return TestFail;
}
if (camera_->configureStreams(config)) {
if (camera_->configure(config)) {
cout << "Failed to set default configuration" << endl;
return TestFail;
}
test/camera/configuration_default.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ protected:
CameraConfiguration config;
/* Test asking for configuration for a video stream. */
config = camera_->streamConfiguration({ Stream::VideoRecording() });
config = camera_->generateConfiguration({ Stream::VideoRecording() });
if (!config.isValid()) {
cout << "Default configuration invalid" << endl;
return TestFail;
@@ -31,7 +31,7 @@ protected:
* Test that asking for configuration for an empty array of
* stream usages returns an empty list of configurations.
*/
config = camera_->streamConfiguration({});
config = camera_->generateConfiguration({});
if (config.isValid()) {
cout << "Failed to retrieve configuration for empty usage list"
<< endl;
test/camera/configuration_set.cpp
+5 -5
View File
@@ -19,7 +19,7 @@ protected:
int run()
{
CameraConfiguration config =
camera_->streamConfiguration({ Stream::VideoRecording() });
camera_->generateConfiguration({ Stream::VideoRecording() });
StreamConfiguration *cfg = &config[config.front()];
if (!config.isValid()) {
@@ -33,7 +33,7 @@ protected:
}
/* Test that setting the default configuration works. */
if (camera_->configureStreams(config)) {
if (camera_->configure(config)) {
cout << "Failed to set default configuration" << endl;
return TestFail;
}
@@ -48,7 +48,7 @@ protected:
return TestFail;
}
if (!camera_->configureStreams(config)) {
if (!camera_->configure(config)) {
cout << "Setting configuration on a camera not acquired succeeded when it should have failed"
<< endl;
return TestFail;
@@ -66,7 +66,7 @@ protected:
*/
cfg->size.width *= 2;
cfg->size.height *= 2;
if (camera_->configureStreams(config)) {
if (camera_->configure(config)) {
cout << "Failed to set modified configuration" << endl;
return TestFail;
}
@@ -75,7 +75,7 @@ protected:
* Test that setting an invalid configuration fails.
*/
cfg->size = { 0, 0 };
if (!camera_->configureStreams(config)) {
if (!camera_->configure(config)) {
cout << "Invalid configuration incorrectly accepted" << endl;
return TestFail;
}
test/camera/statemachine.cpp
+8 -8
View File
@@ -19,7 +19,7 @@ protected:
int testAvailable()
{
/* Test operations which should fail. */
if (camera_->configureStreams(defconf_) != -EACCES)
if (camera_->configure(defconf_) != -EACCES)
return TestFail;
if (camera_->allocateBuffers() != -EACCES)
@@ -84,7 +84,7 @@ protected:
if (camera_->acquire())
return TestFail;
if (camera_->configureStreams(defconf_))
if (camera_->configure(defconf_))
return TestFail;
return TestPass;
@@ -113,7 +113,7 @@ protected:
return TestFail;
/* Test operations which should pass. */
if (camera_->configureStreams(defconf_))
if (camera_->configure(defconf_))
return TestFail;
/* Test valid state transitions, end in Prepared state. */
@@ -123,7 +123,7 @@ protected:
if (camera_->acquire())
return TestFail;
if (camera_->configureStreams(defconf_))
if (camera_->configure(defconf_))
return TestFail;
if (camera_->allocateBuffers())
@@ -141,7 +141,7 @@ protected:
if (camera_->release() != -EBUSY)
return TestFail;
if (camera_->configureStreams(defconf_) != -EACCES)
if (camera_->configure(defconf_) != -EACCES)
return TestFail;
if (camera_->allocateBuffers() != -EACCES)
@@ -172,7 +172,7 @@ protected:
if (camera_->acquire())
return TestFail;
if (camera_->configureStreams(defconf_))
if (camera_->configure(defconf_))
return TestFail;
if (camera_->allocateBuffers())
@@ -193,7 +193,7 @@ protected:
if (camera_->release() != -EBUSY)
return TestFail;
if (camera_->configureStreams(defconf_) != -EACCES)
if (camera_->configure(defconf_) != -EACCES)
return TestFail;
if (camera_->allocateBuffers() != -EACCES)
@@ -235,7 +235,7 @@ protected:
int run()
{
defconf_ = camera_->streamConfiguration({ Stream::VideoRecording() });
defconf_ = camera_->generateConfiguration({ Stream::VideoRecording() });
if (testAvailable() != TestPass) {
cout << "State machine in Available state failed" << endl;