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

android: camera_device: Add debug to stream initialization

Browse source 
Add debug printouts to the CameraDevice::initializeStreamConfigurations()
function that help to follow the process of building the stream
configurations map.

Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
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-09-01 15:40:49 +02:00
parent 843565c6ec
commit af264ec750
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/android/camera_device.cpp
View file

@ -369,12 +369,19 @@ int CameraDevice::initializeStreamConfigurations()
const std::vector<PixelFormat> &libcameraFormats = const std::vector<PixelFormat> &libcameraFormats =
camera3Format.libcameraFormats; camera3Format.libcameraFormats;
LOG(HAL, Debug) << "Trying to map Android format "
<< camera3Format.name;
/* /*
* JPEG is always supported, either produced directly by the * JPEG is always supported, either produced directly by the
* camera, or encoded in the HAL. * camera, or encoded in the HAL.
*/ */
if (androidFormat == HAL_PIXEL_FORMAT_BLOB) { if (androidFormat == HAL_PIXEL_FORMAT_BLOB) {
formatsMap_[androidFormat] = formats::MJPEG; formatsMap_[androidFormat] = formats::MJPEG;
LOG(HAL, Debug) << "Mapped Android format "
<< camera3Format.name << " to "
<< formats::MJPEG.toString()
<< " (fixed mapping)";
continue; continue;
} }
@ -385,6 +392,8 @@ int CameraDevice::initializeStreamConfigurations()
PixelFormat mappedFormat; PixelFormat mappedFormat;
for (const PixelFormat &pixelFormat : libcameraFormats) { for (const PixelFormat &pixelFormat : libcameraFormats) {
LOG(HAL, Debug) << "Testing " << pixelFormat.toString();
/* /*
* The stream configuration size can be adjusted, * The stream configuration size can be adjusted,
* not the pixel format. * not the pixel format.
@ -420,14 +429,22 @@ int CameraDevice::initializeStreamConfigurations()
* stream configurations map, by testing the image resolutions. * stream configurations map, by testing the image resolutions.
*/ */
formatsMap_[androidFormat] = mappedFormat; formatsMap_[androidFormat] = mappedFormat;
LOG(HAL, Debug) << "Mapped Android format "
<< camera3Format.name << " to "
<< mappedFormat.toString();
for (const Size &res : cameraResolutions) { for (const Size &res : cameraResolutions) {
cfg.pixelFormat = mappedFormat; cfg.pixelFormat = mappedFormat;
cfg.size = res; cfg.size = res;
CameraConfiguration::Status status = cameraConfig->validate(); CameraConfiguration::Status status = cameraConfig->validate();
if (status != CameraConfiguration::Valid) if (status != CameraConfiguration::Valid) {
LOG(HAL, Debug) << cfg.toString()
<< " not supported";
continue; continue;
}
LOG(HAL, Debug) << cfg.toString() << " supported";
streamConfigurations_.push_back({ res, androidFormat }); streamConfigurations_.push_back({ res, androidFormat });