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

android: camera_device: Support multiple stream configurations

Browse source 
Create an initial Camera Configuration using an empty role set, and
populate the StreamConfigurations manually from each of the streams
given by the Android camera3_stream_configuration_t stream_list.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Kieran Bingham 2020-06-26 20:19:10 +01:00
parent 43e3b8002b
commit 0a9244ed37
1 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/android/camera_device.cpp
View file

@ -942,6 +942,16 @@ PixelFormat CameraDevice::toPixelFormat(int format)
*/ */
int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
{ {
/*
* Generate an empty configuration, and construct a StreamConfiguration
* for each camera3_stream to add to it.
*/
config_ = camera_->generateConfiguration();
if (!config_) {
LOG(HAL, Error) << "Failed to generate camera configuration";
return -EINVAL;
}
for (unsigned int i = 0; i < stream_list->num_streams; ++i) { for (unsigned int i = 0; i < stream_list->num_streams; ++i) {
camera3_stream_t *stream = stream_list->streams[i]; camera3_stream_t *stream = stream_list->streams[i];
@ -953,36 +963,19 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
<< ", height: " << stream->height << ", height: " << stream->height
<< ", format: " << utils::hex(stream->format) << ", format: " << utils::hex(stream->format)
<< " (" << format.toString() << ")"; << " (" << format.toString() << ")";
if (!format.isValid())
return -EINVAL;
StreamConfiguration streamConfiguration;
streamConfiguration.size.width = stream->width;
streamConfiguration.size.height = stream->height;
streamConfiguration.pixelFormat = format;
config_->addConfiguration(streamConfiguration);
} }
/* Only one stream is supported. */
if (stream_list->num_streams != 1) {
LOG(HAL, Error) << "Only one stream supported";
return -EINVAL;
}
camera3_stream_t *camera3Stream = stream_list->streams[0];
/* Translate Android format code to libcamera pixel format. */
PixelFormat format = toPixelFormat(camera3Stream->format);
if (!format.isValid())
return -EINVAL;
/*
* Hardcode viewfinder role, replacing the generated configuration
* parameters with the ones requested by the Android framework.
*/
StreamRoles roles = { StreamRole::Viewfinder };
config_ = camera_->generateConfiguration(roles);
if (!config_ || config_->empty()) {
LOG(HAL, Error) << "Failed to generate camera configuration";
return -EINVAL;
}
StreamConfiguration *streamConfiguration = &config_->at(0);
streamConfiguration->size.width = camera3Stream->width;
streamConfiguration->size.height = camera3Stream->height;
streamConfiguration->pixelFormat = format;
switch (config_->validate()) { switch (config_->validate()) {
case CameraConfiguration::Valid: case CameraConfiguration::Valid:
break; break;
@ -996,7 +989,13 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
return -EINVAL; return -EINVAL;
} }
camera3Stream->max_buffers = streamConfiguration->bufferCount; for (unsigned int i = 0; i < stream_list->num_streams; ++i) {
camera3_stream_t *stream = stream_list->streams[i];
StreamConfiguration &streamConfiguration = config_->at(i);
/* Use the bufferCount confirmed by the validation process. */
stream->max_buffers = streamConfiguration.bufferCount;
}
/* /*
* Once the CameraConfiguration has been adjusted/validated * Once the CameraConfiguration has been adjusted/validated