diff options
| author | zhuw <zhuw@codeaurora.org> | 2018-11-27 14:01:03 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-05 17:59:16 -0800 |
| commit | c4eb91e5643abedca73acbf3099a5f7fad46bcbe (patch) | |
| tree | b0dc2b46a3f1802ecd347cbf530b54d0d66e900d /src/com/android/camera/util | |
| parent | 57c04a3c6c2ded19c25b83363967c4d26300437b (diff) | |
| download | android_packages_apps_Snap-c4eb91e5643abedca73acbf3099a5f7fad46bcbe.tar.gz android_packages_apps_Snap-c4eb91e5643abedca73acbf3099a5f7fad46bcbe.tar.bz2 android_packages_apps_Snap-c4eb91e5643abedca73acbf3099a5f7fad46bcbe.zip | |
fix unknow camera id error when getcamerainfo in APP
use camera2 API instead of camera1 API
Change-Id: Ie1d6311b8e8ee3c76cbb322c8809690fdf80dd79
CRs-Fixed:2356334
Diffstat (limited to 'src/com/android/camera/util')
| -rwxr-xr-x | src/com/android/camera/util/CameraUtil.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 6b5f941e0..85f38257c 100755 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -501,6 +501,19 @@ public class CameraUtil { return result; } + public static int getDisplayOrientationForCamera2(int degrees, int cameraId) { + CameraCharacteristics info = CameraHolder.instance().getCameraCharacteristics(cameraId); + int result; + if (info.get(CameraCharacteristics.LENS_FACING) == + CameraCharacteristics.LENS_FACING_FRONT) { + result = (info.get(CameraCharacteristics.SENSOR_ORIENTATION) + degrees) % 360; + result = (360 - result) % 360; // compensate the mirror + } else { + result = (info.get(CameraCharacteristics.SENSOR_ORIENTATION) - degrees + 360) % 360; + } + return result; + } + public static int getCameraOrientation(int cameraId) { Camera.CameraInfo info = new Camera.CameraInfo(); Camera.getCameraInfo(cameraId, info); |