diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-10-20 08:41:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-20 08:41:24 -0700 |
| commit | 7b9a10fef160cd452f7905ee52f7b9ac2262faf5 (patch) | |
| tree | 5c7284fc4ca44451b6ae32e8848dff716ab09929 /src/com/android/camera/VideoCamera.java | |
| parent | 71d40934176ee23be9a91ca0aa33656e1cce8ce6 (diff) | |
| parent | 51b06d6696a4743339d026b3b3bd282645725b27 (diff) | |
| download | packages_apps_LegacyCamera-7b9a10fef160cd452f7905ee52f7b9ac2262faf5.tar.gz packages_apps_LegacyCamera-7b9a10fef160cd452f7905ee52f7b9ac2262faf5.tar.bz2 packages_apps_LegacyCamera-7b9a10fef160cd452f7905ee52f7b9ac2262faf5.zip | |
Merge "Fix effects orientation handling." into ics-mr0
Diffstat (limited to 'src/com/android/camera/VideoCamera.java')
| -rwxr-xr-x | src/com/android/camera/VideoCamera.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index e3de79d9..4694c90d 100755 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -530,9 +530,8 @@ public class VideoCamera extends ActivityBase if (mOrientationCompensation != orientationCompensation) { mOrientationCompensation = orientationCompensation; if (effectsActive()) { - CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId]; - int rotation = (info.orientation + mOrientation) % 360; - mEffectsRecorder.setOrientationHint(rotation); + mEffectsRecorder.setOrientationHint( + mOrientationCompensation % 360); } // Do not rotate the icons during recording because the video // orientation is fixed after recording. @@ -1252,9 +1251,10 @@ public class VideoCamera extends ActivityBase // documentation. int rotation = 0; if (mOrientation != OrientationEventListener.ORIENTATION_UNKNOWN) { - rotation = (info.orientation + mOrientation) % 360; + rotation = mOrientationCompensation % 360; } mEffectsRecorder.setOrientationHint(rotation); + mOrientationCompensationAtRecordStart = mOrientationCompensation; mEffectsRecorder.setPreviewDisplay( |