NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: camera_device: Make CameraStream configuration nicer

Browse source 
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>
This commit is contained in:
Jacopo Mondi 2020-10-03 13:45:29 +02:00
parent fc1fcb5bc9
commit 6c8837da5e
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/android/camera_device.cpp
View file

@ -1287,17 +1287,12 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
* StreamConfiguration and set the number of required buffers in * StreamConfiguration and set the number of required buffers in
* the Android camera3_stream_t. * the Android camera3_stream_t.
*/ */
for (unsigned int i = 0; i < stream_list->num_streams; ++i) { for (CameraStream &cameraStream : streams_) {
camera3_stream_t *stream = stream_list->streams[i]; int ret = cameraStream.configure();
CameraStream *cameraStream = static_cast<CameraStream *>(stream->priv); if (ret) {
const StreamConfiguration &cfg = cameraStream->configuration(); LOG(HAL, Error) << "Failed to configure camera stream";
int ret = cameraStream->configure(cfg);
if (ret)
return ret; return ret;
}
/* Use the bufferCount confirmed by the validation process. */
stream->max_buffers = cfg.bufferCount;
} }
/* /*

11
src/android/camera_stream.cpp
View file

@ -38,10 +38,15 @@ Stream *CameraStream::stream() const
return configuration().stream(); return configuration().stream();
} }
int CameraStream::configure(const libcamera::StreamConfiguration &cfg) int CameraStream::configure()
{ {
if (encoder_) if (encoder_) {
return encoder_->configure(cfg); int ret = encoder_->configure(configuration());
if (ret)
return ret;
}
camera3Stream_->max_buffers = configuration().bufferCount;
return 0; return 0;
} }

2
src/android/camera_stream.h
View file

@ -114,7 +114,7 @@ public:
const libcamera::StreamConfiguration &configuration() const; const libcamera::StreamConfiguration &configuration() const;
libcamera::Stream *stream() const; libcamera::Stream *stream() const;
int configure(const libcamera::StreamConfiguration &cfg); int configure();
int process(const libcamera::FrameBuffer &source, int process(const libcamera::FrameBuffer &source,
MappedCamera3Buffer *dest, CameraMetadata *metadata); MappedCamera3Buffer *dest, CameraMetadata *metadata);