Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Camera: Add fall back properties for FMQ size override" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-16 20:05:23 +00:00
committed by Android (Google) Code Review
parent 82dc3faca0 5ec377b430
commit a07b613b59
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
camera/device/3.2/default/CameraDeviceSession.cpp
View File

@@ -99,11 +99,20 @@ bool CameraDeviceSession::initialize() {
return true; return true;
} }
int32_t reqFMQSize = property_get_int32("ro.camera.req.fmq.size", /*default*/-1); // "ro.camera" properties are no longer supported on vendor side.
// Support a fall back for the fmq size override that uses "ro.vendor.camera"
// properties.
int32_t reqFMQSize = property_get_int32("ro.vendor.camera.req.fmq.size", /*default*/-1);
if (reqFMQSize < 0) { if (reqFMQSize < 0) {
reqFMQSize = CAMERA_REQUEST_METADATA_QUEUE_SIZE; reqFMQSize = property_get_int32("ro.camera.req.fmq.size", /*default*/-1);
if (reqFMQSize < 0) {
reqFMQSize = CAMERA_REQUEST_METADATA_QUEUE_SIZE;
} else {
ALOGV("%s: request FMQ size overridden to %d", __FUNCTION__, reqFMQSize);
}
} else { } else {
ALOGV("%s: request FMQ size overridden to %d", __FUNCTION__, reqFMQSize); ALOGV("%s: request FMQ size overridden to %d via fallback property", __FUNCTION__,
reqFMQSize);
} }
mRequestMetadataQueue = std::make_unique<RequestMetadataQueue>( mRequestMetadataQueue = std::make_unique<RequestMetadataQueue>(
@@ -114,12 +123,22 @@ bool CameraDeviceSession::initialize() {
return true; return true;
} }
int32_t resFMQSize = property_get_int32("ro.camera.res.fmq.size", /*default*/-1); // "ro.camera" properties are no longer supported on vendor side.
// Support a fall back for the fmq size override that uses "ro.vendor.camera"
// properties.
int32_t resFMQSize = property_get_int32("ro.vendor.camera.res.fmq.size", /*default*/-1);
if (resFMQSize < 0) { if (resFMQSize < 0) {
resFMQSize = CAMERA_RESULT_METADATA_QUEUE_SIZE; resFMQSize = property_get_int32("ro.camera.res.fmq.size", /*default*/-1);
if (resFMQSize < 0) {
resFMQSize = CAMERA_RESULT_METADATA_QUEUE_SIZE;
} else {
ALOGV("%s: result FMQ size overridden to %d", __FUNCTION__, resFMQSize);
}
} else { } else {
ALOGV("%s: result FMQ size overridden to %d", __FUNCTION__, resFMQSize); ALOGV("%s: result FMQ size overridden to %d via fallback property", __FUNCTION__,
resFMQSize);
} }
mResultMetadataQueue = std::make_shared<RequestMetadataQueue>( mResultMetadataQueue = std::make_shared<RequestMetadataQueue>(
static_cast<size_t>(resFMQSize), static_cast<size_t>(resFMQSize),
false /* non blocking */); false /* non blocking */);