diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-05-23 10:20:04 -0700 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-05-23 14:40:59 -0700 |
| commit | 99ad0d7100b7c874cab8c5e42384a819443d1dd9 (patch) | |
| tree | ac7bf9c0a2eb296b5112a6d919cd4e04f5c954f7 /camera/device/3.2/default/CameraDeviceSession.cpp | |
| parent | 1e19a9688906ce5d7451614d418abf9bd2badf96 (diff) | |
| parent | d0ef0df32104ae046996d0ea37bb514b7a878000 (diff) | |
Merge QP1A.190523.001
Change-Id: Ib1b5c796e9ff2926403cf91eee5f2c79983dbd85
Diffstat (limited to 'camera/device/3.2/default/CameraDeviceSession.cpp')
| -rw-r--r-- | camera/device/3.2/default/CameraDeviceSession.cpp | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp index 9e136811e0..8d3bf0285c 100644 --- a/camera/device/3.2/default/CameraDeviceSession.cpp +++ b/camera/device/3.2/default/CameraDeviceSession.cpp @@ -99,11 +99,20 @@ bool CameraDeviceSession::initialize() { 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) { - 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 { - 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>( @@ -114,12 +123,22 @@ bool CameraDeviceSession::initialize() { 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) { - 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 { - 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>( static_cast<size_t>(resFMQSize), false /* non blocking */); |