diff options
| author | nadlabak <pavel@doshaska.net> | 2015-12-31 01:18:01 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-03-23 10:17:27 -0700 |
| commit | b47a1c5b2acec0fc12fcab98369faf340436467b (patch) | |
| tree | 52a09fa5fc83c676bc9016985d2f5e1b324ca517 /core/java/android/hardware | |
| parent | 9df009b1d04b1c860d172db873c84a136b8cbe43 (diff) | |
| download | frameworks_base-b47a1c5b2acec0fc12fcab98369faf340436467b.zip frameworks_base-b47a1c5b2acec0fc12fcab98369faf340436467b.tar.gz frameworks_base-b47a1c5b2acec0fc12fcab98369faf340436467b.tar.bz2 | |
camera2 legacy: Allow HDR processing to take a while
Change-Id: Ifc471d5a79299c40b40c2ea6cb457f6e3fd31338
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/RequestThreadManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java index a0a03b1..c26d07d 100644 --- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java +++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java @@ -81,6 +81,7 @@ public class RequestThreadManager { private static final int PREVIEW_FRAME_TIMEOUT = 1000; // ms private static final int JPEG_FRAME_TIMEOUT = 4000; // ms (same as CTS for API2) + private static final int HDR_TIMEOUT = 20000; //ms private static final int REQUEST_COMPLETE_TIMEOUT = JPEG_FRAME_TIMEOUT; private static final float ASPECT_RATIO_TOLERANCE = 0.01f; @@ -825,7 +826,9 @@ public class RequestThreadManager { if (holder.hasJpegTargets()) { doJpegCapture(holder); - if (!mReceivedJpeg.block(JPEG_FRAME_TIMEOUT)) { + if (!mReceivedJpeg.block( + mParams.getSceneMode().equals(mParams.SCENE_MODE_HDR) + ? HDR_TIMEOUT : JPEG_FRAME_TIMEOUT)) { Log.e(TAG, "Hit timeout for jpeg callback!"); mCaptureCollector.failNextJpeg(); } |