From 160bb0998bc47abefeb876be1ecbff9534960dbc Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Fri, 2 Oct 2020 20:48:35 +0200 Subject: android: camera_stream: Construct with Android stream Pass the android camera3_stream_t, and a libcamera::StreamConfiguration to identify the source and destination parameters of this stream. Pass a CameraDevice pointer to the CameraStream constructor to allow retrieval of the StreamConfiguration associated with the CameraStream. Also change the format on which the CameraDevice performs checks to decide if post-processing is required, as the libcamera facing format is not meaningful anymore, but the Android requested format should be used instead. Reviewed-by: Kieran Bingham Signed-off-by: Jacopo Mondi --- src/android/camera_stream.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/android/camera_stream.cpp') diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 2d0c6ff9..b3d345af 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -7,14 +7,24 @@ #include "camera_stream.h" +#include "camera_device.h" #include "jpeg/encoder.h" #include "jpeg/encoder_libjpeg.h" using namespace libcamera; -CameraStream::CameraStream(PixelFormat format, Size size, Type type, unsigned int index) - : format_(format), size_(size), type_(type), index_(index) +CameraStream::CameraStream(CameraDevice *cameraDevice, + camera3_stream_t *camera3Stream, + const libcamera::StreamConfiguration &cfg, + Type type, unsigned int index) + : cameraDevice_(cameraDevice), camera3Stream_(camera3Stream), + type_(type), index_(index) { + config_ = cameraDevice_->cameraConfiguration(); + + format_ = cfg.pixelFormat; + size_ = cfg.size; + if (type_ == Type::Internal || type_ == Type::Mapped) encoder_ = std::make_unique(); } -- cgit v1.2.1