diff options
author | Alok Kediya <kediya@codeaurora.org> | 2013-09-28 17:39:13 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:44 -0600 |
commit | 4b6f3f924aa4fc207be69b285db7133995efd706 (patch) | |
tree | 509a11ae7cc800e5b72d27c93c58d7fa9413b9c2 /src/com/android/camera/util | |
parent | 6f9440bb6489cf96e5510e0a396aa25c356c92ad (diff) | |
download | android_packages_apps_Snap-4b6f3f924aa4fc207be69b285db7133995efd706.tar.gz android_packages_apps_Snap-4b6f3f924aa4fc207be69b285db7133995efd706.tar.bz2 android_packages_apps_Snap-4b6f3f924aa4fc207be69b285db7133995efd706.zip |
Camera: Support stream based flip
Flip operation needs to be done per stream. App will read from system
property about stream based flipping setting and set corresponding
parameters to let camera hardware to apply flipping setting per stream.
To keep app behavior persistent when flip and rotation are enabled,
need to take case H/V flip when 90 or 270 rotation happens. Need
to reverse H/V flip to acheive same output no matter device is in
portait or landscape mode.
(cherrypicked from commit b38b8246204871082dc7ac6f5e626d6162d2be70)
Change-Id: Ia06060709162237dece1a05a3ae58429a0c99b06
Conflicts:
src/com/android/camera/util/CameraUtil.java
(cherry picked from commit b6aff328cdd99fb0db11c989a72f5eafd7d82324)
(cherry picked from commit 29888be992b8955f88a2f89ffd407733d771c1e6)
Diffstat (limited to 'src/com/android/camera/util')
-rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index eff0c4078..04d56ec54 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -56,7 +56,7 @@ import com.android.camera.CameraActivity; import com.android.camera.CameraDisabledException; import com.android.camera.CameraHolder; import com.android.camera.CameraManager; -import com.android.camera.util.IntentHelper; +import com.android.camera.CameraSettings; import com.android.camera2.R; import java.io.Closeable; @@ -795,7 +795,20 @@ public class CameraUtil { } } } - + public static String getFilpModeString(int value){ + switch(value){ + case 0: + return CameraSettings.FLIP_MODE_OFF; + case 1: + return CameraSettings.FLIP_MODE_H; + case 2: + return CameraSettings.FLIP_MODE_V; + case 3: + return CameraSettings.FLIP_MODE_VH; + default: + return null; + } + } /** * For still image capture, we need to get the right fps range such that the * camera can slow down the framerate to allow for less-noisy/dark |