summaryrefslogtreecommitdiff
path: root/src/android/camera_stream.cpp
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2020-10-03 13:45:29 +0200
committerJacopo Mondi <jacopo@jmondi.org>2020-10-07 16:07:45 +0200
commit6c8837da5e8f9ba31aed338f8f6bbe578ddd638a (patch)
tree8d880c1a76cf140e5ddb64ecf8ba47c37e152e28 /src/android/camera_stream.cpp
parentfc1fcb5bc9c21cc497bb978b866885787587aa9f (diff)
android: camera_device: Make CameraStream configuration nicer
Loop over the CameraStream instances and use their interface to perform CameraStream configuration. Modify CameraStream::configure() to configure the android stream buffer count and to retrieve the StreamConfiguration by index instead of receiving it as a parameter. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/android/camera_stream.cpp')
-rw-r--r--src/android/camera_stream.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp
index 3946a2cd..f899be4f 100644
--- a/src/android/camera_stream.cpp
+++ b/src/android/camera_stream.cpp
@@ -38,10 +38,15 @@ Stream *CameraStream::stream() const
return configuration().stream();
}
-int CameraStream::configure(const libcamera::StreamConfiguration &cfg)
+int CameraStream::configure()
{
- if (encoder_)
- return encoder_->configure(cfg);
+ if (encoder_) {
+ int ret = encoder_->configure(configuration());
+ if (ret)
+ return ret;
+ }
+
+ camera3Stream_->max_buffers = configuration().bufferCount;
return 0;
}