diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-08-21 22:46:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 22:46:04 +0000 |
| commit | c9ad42d5232e7b6d4c9b5221643ffcb956ea6fe5 (patch) | |
| tree | 0faf78a6a2c25391fac62e389eb8917ee19f3632 | |
| parent | 1da8c89a9d4a2319bb939771e43960c118445329 (diff) | |
| parent | b3afa1e3c2af242e0d31a7619713b170d43c7e88 (diff) | |
| download | frameworks_av-c9ad42d5232e7b6d4c9b5221643ffcb956ea6fe5.zip frameworks_av-c9ad42d5232e7b6d4c9b5221643ffcb956ea6fe5.tar.gz frameworks_av-c9ad42d5232e7b6d4c9b5221643ffcb956ea6fe5.tar.bz2 | |
Merge "camera2: Fix CameraUtils orientation for front camera." into lmp-dev
| -rw-r--r-- | camera/CameraUtils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/camera/CameraUtils.cpp b/camera/CameraUtils.cpp index 1ff63ab..04244ac 100644 --- a/camera/CameraUtils.cpp +++ b/camera/CameraUtils.cpp @@ -73,23 +73,23 @@ status_t CameraUtils::getRotationTransform(const CameraMetadata& staticInfo, return INVALID_OPERATION; } } else { - // Front camera needs to be horizontally flipped for - // mirror-like behavior. - // Note: Flips are applied before rotates. + // Front camera needs to be horizontally flipped for mirror-like behavior. + // Note: Flips are applied before rotates; using XOR here as some of these flags are + // composed in terms of other flip/rotation flags, and are not bitwise-ORable. switch (orientation) { case 0: flags = NATIVE_WINDOW_TRANSFORM_FLIP_H; break; case 90: - flags = NATIVE_WINDOW_TRANSFORM_FLIP_H | + flags = NATIVE_WINDOW_TRANSFORM_FLIP_H ^ NATIVE_WINDOW_TRANSFORM_ROT_270; break; case 180: - flags = NATIVE_WINDOW_TRANSFORM_FLIP_H | + flags = NATIVE_WINDOW_TRANSFORM_FLIP_H ^ NATIVE_WINDOW_TRANSFORM_ROT_180; break; case 270: - flags = NATIVE_WINDOW_TRANSFORM_FLIP_H | + flags = NATIVE_WINDOW_TRANSFORM_FLIP_H ^ NATIVE_WINDOW_TRANSFORM_ROT_90; break; |