diff options
| author | Igor Murashkin <iam@google.com> | 2014-06-24 10:49:11 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2014-06-24 18:29:18 +0000 |
| commit | 5096defdaa4716ce81047a855d6e5ce3f8263600 (patch) | |
| tree | 6fe4d2b0a19d1e5e54d3efb0a73af9b8805fe0cf /core/java/android/hardware | |
| parent | a296fece2b974a11bc624fd67b275863f17df867 (diff) | |
| download | frameworks_base-5096defdaa4716ce81047a855d6e5ce3f8263600.zip frameworks_base-5096defdaa4716ce81047a855d6e5ce3f8263600.tar.gz frameworks_base-5096defdaa4716ce81047a855d6e5ce3f8263600.tar.bz2 | |
camera2: (legacy) Write the JPEG size as part of the blob transport
This fixes StillCaptureTest#testStillPreviewCombination
Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
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 b4da796..efc2b0e 100644 --- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java +++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java @@ -64,7 +64,7 @@ public class RequestThreadManager { private static final int MSG_CLEANUP = 3; private static final int PREVIEW_FRAME_TIMEOUT = 300; // ms - private static final int JPEG_FRAME_TIMEOUT = 1000; // ms + private static final int JPEG_FRAME_TIMEOUT = 3000; // ms (same as CTS for API2) private static final float ASPECT_RATIO_TOLERANCE = 0.01f; private boolean mPreviewRunning = false; @@ -401,6 +401,9 @@ public class RequestThreadManager { if (mPreviewTexture != null) { mPreviewTexture.setOnFrameAvailableListener(mPreviewCallback); } + + // TODO: configure the JPEG surface with some arbitrary size + // using LegacyCameraDevice.nativeConfigureSurface } /** |