diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-19 16:00:52 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-08-19 16:01:50 -0700 |
| commit | 4a91c438b37988bf2faaaa1fd8d827d2b3a894dd (patch) | |
| tree | 06f1de293d9d237f234e6c7708f401fe416657c6 | |
| parent | c52b876faea09e94b69fee865e249cb3a2b0bfb1 (diff) | |
| download | android_device_generic_goldfish-4a91c438b37988bf2faaaa1fd8d827d2b3a894dd.tar.gz android_device_generic_goldfish-4a91c438b37988bf2faaaa1fd8d827d2b3a894dd.tar.bz2 android_device_generic_goldfish-4a91c438b37988bf2faaaa1fd8d827d2b3a894dd.zip | |
Camera: Fix poseRotation quaternion
Order is x,y,z,w; not w,x,y,z.
Also, the conditional should not be double-flipped.
Bug: 20537722
Change-Id: I25a671c7b7b94160321a654e08bf918628e9edd2
| -rw-r--r-- | camera/EmulatedFakeCamera3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp index f59c774..50d6096 100644 --- a/camera/EmulatedFakeCamera3.cpp +++ b/camera/EmulatedFakeCamera3.cpp @@ -1185,7 +1185,7 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { static const float qO[] = { 0.707107f, 0.f, 0.f, 0.707107f}; // Either a 180-degree rotation for back-facing, or no rotation for front-facing - const float qF[] = {(mFacingBack ? 0.f : 1.f), 0, (!mFacingBack ? 1.f : 0.f), 0}; + const float qF[] = {0, (mFacingBack ? 1.f : 0.f), 0, (mFacingBack ? 0.f : 1.f)}; // Quarternion product, orientation change then facing const float lensPoseRotation[] = {qO[0]*qF[0] - qO[1]*qF[1] - qO[2]*qF[2] - qO[3]*qF[3], |