diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2019-08-22 12:41:12 -0700 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2020-06-06 18:17:47 +0200 |
| commit | 50f84dda7fdfc36032e66cb51d27afc5e5823d6c (patch) | |
| tree | 4e1e2dfb29e94c74d1c02abc8c0f1293129fbabc | |
| parent | b0bd1c67b2517e74f84644fbe7b3f966ab2db461 (diff) | |
| download | frameworks_av-50f84dda7fdfc36032e66cb51d27afc5e5823d6c.tar.gz frameworks_av-50f84dda7fdfc36032e66cb51d27afc5e5823d6c.tar.bz2 frameworks_av-50f84dda7fdfc36032e66cb51d27afc5e5823d6c.zip | |
Camera: Make originalDataSpace be const upon stream creationHEADlineage-17.1
The previous logic was wrong(!) where DATASPACE_UNKNOWN shouldn't be
used as an initializtion condition.
Test: CTS and vendor testing
Bug: 139820060
Bug: 151405656
Change-Id: I6b59d40ff796d48fe1804b45c189004f1ecc8c18
Merged-In: I6b59d40ff796d48fe1804b45c189004f1ecc8c18
(cherry picked from 2f5010dfa412c4998ab4047bfd3e20b595def61b)
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Stream.cpp | 5 | ||||
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Stream.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp index fd9b4b0409..f707ef835a 100644 --- a/services/camera/libcameraservice/device3/Camera3Stream.cpp +++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp @@ -70,7 +70,7 @@ Camera3Stream::Camera3Stream(int id, mFormatOverridden(false), mOriginalFormat(format), mDataSpaceOverridden(false), - mOriginalDataSpace(HAL_DATASPACE_UNKNOWN), + mOriginalDataSpace(dataSpace), mPhysicalCameraId(physicalCameraId), mLastTimestamp(0) { @@ -137,9 +137,6 @@ int Camera3Stream::getOriginalFormat() const { void Camera3Stream::setDataSpaceOverride(bool dataSpaceOverridden) { mDataSpaceOverridden = dataSpaceOverridden; - if (dataSpaceOverridden && mOriginalDataSpace == HAL_DATASPACE_UNKNOWN) { - mOriginalDataSpace = camera3_stream::data_space; - } } bool Camera3Stream::isDataSpaceOverridden() const { diff --git a/services/camera/libcameraservice/device3/Camera3Stream.h b/services/camera/libcameraservice/device3/Camera3Stream.h index 67afd0fd85..805df82599 100644 --- a/services/camera/libcameraservice/device3/Camera3Stream.h +++ b/services/camera/libcameraservice/device3/Camera3Stream.h @@ -588,7 +588,7 @@ class Camera3Stream : //Keep track of original dataSpace in case it gets overridden bool mDataSpaceOverridden; - android_dataspace mOriginalDataSpace; + const android_dataspace mOriginalDataSpace; String8 mPhysicalCameraId; nsecs_t mLastTimestamp; |