diff options
| author | Abhijit Trivedi <abhijitt@codeaurora.org> | 2018-06-20 15:54:48 -0700 |
|---|---|---|
| committer | Susmitha Gummalla <vgummall@codeaurora.org> | 2018-06-20 18:31:09 -0700 |
| commit | 4702bae07131d96a6cf49a6be3bf50d873721d7f (patch) | |
| tree | 6126446bea71895c3f4dcde3f25dfa179686282a /camera/device/3.2/default/CameraDeviceSession.cpp | |
| parent | ce4c0adbec7b05f9347b0099f58cfeb19ae496be (diff) | |
frameworks: Update HIDL overrideFormat from HAL
--HAL requires 64 bit usage flags to support more feature
--Re-used one of the reserved locations to read 64bit usage flags
and override format
CRs-fixed: 2264577
Change-Id: I9a4cbb80b1c2d82ec4af3941f0d98b67ecfd59ef
Diffstat (limited to 'camera/device/3.2/default/CameraDeviceSession.cpp')
| -rw-r--r-- | camera/device/3.2/default/CameraDeviceSession.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp index 69f853562c..64d6d81a28 100644 --- a/camera/device/3.2/default/CameraDeviceSession.cpp +++ b/camera/device/3.2/default/CameraDeviceSession.cpp @@ -869,12 +869,12 @@ bool CameraDeviceSession::preProcessConfigurationLocked( mStreamMap[id].data_space); mCirculatingBuffers.emplace(stream.mId, CirculatingBuffers{}); } else { - // width/height/format must not change, but usage/rotation might need to change + // width/height must not change, but usage/rotation might need to change + // format might change and get updated with overrideFormat if (mStreamMap[id].stream_type != (int) requestedConfiguration.streams[i].streamType || mStreamMap[id].width != requestedConfiguration.streams[i].width || mStreamMap[id].height != requestedConfiguration.streams[i].height || - mStreamMap[id].format != (int) requestedConfiguration.streams[i].format || mStreamMap[id].data_space != mapToLegacyDataspace( static_cast<android_dataspace_t> ( requestedConfiguration.streams[i].dataSpace))) { |