diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2017-03-23 15:39:12 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2017-03-30 16:11:26 -0700 |
| commit | 2d80c0d66f9ca869d6102f07bd236b7c4c94c205 (patch) | |
| tree | 46763eb68304189bc7b37618969ab2ce02545b54 /camera/device/3.2/default/CameraDeviceSession.cpp | |
| parent | 2f44ec6c868b220be1b566e7ccfbb251beec70ec (diff) | |
camera: Map between legacy gralloc0 usage, and HIDL gralloc1 usages
Otherwise some bits will be set incorrectly.
Also move device@1.0 to use ProducerUsageFlags instead of ProducerUsage,
and add a compatibility workaround to set the gralloc0 HW_CAMERA_ZSL flags
when ConsumerUsage::CAMERA is passed in.
Test: Camera CTS passes, updated VTS tests pass
Bug: 35215313
Change-Id: I981dc1a650f838f94d932944fe835fd267f2004d
Diffstat (limited to 'camera/device/3.2/default/CameraDeviceSession.cpp')
| -rw-r--r-- | camera/device/3.2/default/CameraDeviceSession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp index fb1d1ff7c1..2887a757a3 100644 --- a/camera/device/3.2/default/CameraDeviceSession.cpp +++ b/camera/device/3.2/default/CameraDeviceSession.cpp @@ -611,7 +611,7 @@ Return<void> CameraDeviceSession::configureStreams( return Void(); } mStreamMap[id].rotation = (int) requestedConfiguration.streams[i].rotation; - mStreamMap[id].usage = (uint32_t) requestedConfiguration.streams[i].usage; + mStreamMap[id].usage = convertFromHidlUsage(requestedConfiguration.streams[i].usage); } streams[i] = &mStreamMap[id]; } |