Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-15 08:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: camera_device: Translate Android format

Browse source 
Translate the Android format code to the libcamera format code
at stream configuration time, using the translation map built at
camera device initialization time.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi 2020-05-26 15:16:55 +02:00
parent bde7b98cac
commit 82d9331efd
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/android/camera_device.cpp
View file

@ -938,12 +938,26 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
<< ", format: " << utils::hex(stream->format); << ", format: " << utils::hex(stream->format);
} }
/* Hardcode viewfinder role, collecting sizes from the stream config. */ /* Only one stream is supported. */
if (stream_list->num_streams != 1) { if (stream_list->num_streams != 1) {
LOG(HAL, Error) << "Only one stream supported"; LOG(HAL, Error) << "Only one stream supported";
return -EINVAL; return -EINVAL;
} }
camera3_stream_t *camera3Stream = stream_list->streams[0];
/* Translate Android format code to libcamera pixel format. */
auto it = formatsMap_.find(camera3Stream->format);
if (it == formatsMap_.end()) {
LOG(HAL, Error) << "Requested format "
<< utils::hex(camera3Stream->format)
<< " not supported";
return -EINVAL;
}
/*
* Hardcode viewfinder role, replacing the generated configuration
* parameters with the ones requested by the Android framework.
*/
StreamRoles roles = { StreamRole::Viewfinder }; StreamRoles roles = { StreamRole::Viewfinder };
config_ = camera_->generateConfiguration(roles); config_ = camera_->generateConfiguration(roles);
if (!config_ || config_->empty()) { if (!config_ || config_->empty()) {
@ -951,17 +965,10 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
return -EINVAL; return -EINVAL;
} }
/* Only one stream is supported. */
camera3_stream_t *camera3Stream = stream_list->streams[0];
StreamConfiguration *streamConfiguration = &config_->at(0); StreamConfiguration *streamConfiguration = &config_->at(0);
streamConfiguration->size.width = camera3Stream->width; streamConfiguration->size.width = camera3Stream->width;
streamConfiguration->size.height = camera3Stream->height; streamConfiguration->size.height = camera3Stream->height;
streamConfiguration->pixelFormat = it->second;
/*
* \todo We'll need to translate from Android defined pixel format codes
* to the libcamera image format codes. For now, do not change the
* format returned from Camera::generateConfiguration().
*/
switch (config_->validate()) { switch (config_->validate()) {
case CameraConfiguration::Valid: case CameraConfiguration::Valid: