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

android: camera_device: Simplify leftover CameraMetadata calls

Browse source 
There were some CameraMetadata calls that were left in the old version.
Update them.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Paul Elder 2021-05-26 18:22:04 +09:00
parent 5db033f0e7
commit b4c3db4c01
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/android/camera_device.cpp
View file

@ -931,7 +931,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
{ 0, 1 } { 0, 1 }
}; };
staticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_STEP, staticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_STEP,
aeCompensationStep, 1); aeCompensationStep);
std::vector<uint8_t> availableAfModes = { std::vector<uint8_t> availableAfModes = {
ANDROID_CONTROL_AF_MODE_OFF, ANDROID_CONTROL_AF_MODE_OFF,
@ -1153,7 +1153,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
/* Statistics static metadata. */ /* Statistics static metadata. */
uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF; uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;
staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES, staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,
&faceDetectMode, 1); faceDetectMode);
int32_t maxFaceCount = 0; int32_t maxFaceCount = 0;
staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT, staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,
@ -1273,8 +1273,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT); ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);
} }
staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,
availableStreamConfigurations.data(), availableStreamConfigurations);
availableStreamConfigurations.size());
std::vector<int64_t> availableStallDurations = { std::vector<int64_t> availableStallDurations = {
ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333, ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,