diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2016-10-12 09:50:47 -0700 |
---|---|---|
committer | Jack Yoo <jyoo@codeaurora.org> | 2016-10-20 11:24:37 -0700 |
commit | e5638a1b4697191588438be133102f61b67a3985 (patch) | |
tree | b127b3484af48db5d576d320b3807250fc190166 /src/com/android/camera/imageprocessor/filter/UbifocusFilter.java | |
parent | c250484c375484e70a1c8e64eb8bd956b3f1c15d (diff) | |
download | android_packages_apps_Snap-e5638a1b4697191588438be133102f61b67a3985.tar.gz android_packages_apps_Snap-e5638a1b4697191588438be133102f61b67a3985.tar.bz2 android_packages_apps_Snap-e5638a1b4697191588438be133102f61b67a3985.zip |
SnapdragonCamera: PanoramaUI and filter change
1. Adjusting Panorama UI
2. Adjusting Chormaflash filter
3. Changing Ubifocus focus timeout value
4. ZSL Flash mode change
Change-Id: Ia46fdc827cd5529a8b7c6f5cfafc44bb3cf00d06
CRs-Fixed: 1080317
Diffstat (limited to 'src/com/android/camera/imageprocessor/filter/UbifocusFilter.java')
-rw-r--r-- | src/com/android/camera/imageprocessor/filter/UbifocusFilter.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/camera/imageprocessor/filter/UbifocusFilter.java b/src/com/android/camera/imageprocessor/filter/UbifocusFilter.java index 57da5c441..f32832dd8 100644 --- a/src/com/android/camera/imageprocessor/filter/UbifocusFilter.java +++ b/src/com/android/camera/imageprocessor/filter/UbifocusFilter.java @@ -64,7 +64,7 @@ public class UbifocusFilter implements ImageFilter { private int mStrideVU; private static String TAG = "UbifocusFilter"; private static final boolean DEBUG = false; - private static final int FOCUS_ADJUST_TIME_OUT = 200; + private static final int FOCUS_ADJUST_TIME_OUT = 400; private static final int META_BYTES_SIZE = 25; private int temp; private static boolean mIsSupported = true; @@ -206,6 +206,8 @@ public class UbifocusFilter implements ImageFilter { float value = (i * step); mModule.setAFModeToPreview(mModule.getMainCameraId(), CaptureRequest.CONTROL_AF_MODE_OFF); mModule.setFocusDistanceToPreview(mModule.getMainCameraId(), value); + Log("Request: " + value); + float focusDistance; try { int count = FOCUS_ADJUST_TIME_OUT; do { @@ -214,15 +216,15 @@ public class UbifocusFilter implements ImageFilter { if(count <= 0) { break; } - } while(Math.abs(mModule.getPreviewCaptureResult().get(CaptureResult.LENS_FOCUS_DISTANCE) - - value) >= 0.5f); + focusDistance = mModule.getPreviewCaptureResult().get(CaptureResult.LENS_FOCUS_DISTANCE); + Log("Taken focus value :"+focusDistance); + } while(Math.abs(focusDistance - value) >= 1f); } catch (InterruptedException e) { } catch (NullPointerException e) { } builder.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_OFF); builder.set(CaptureRequest.LENS_FOCUS_DISTANCE, value); captureSession.capture(builder.build(), callback, handler); - Log.d(TAG, "Request: " + value); } } |