diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-10 00:49:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 00:49:37 +0000 |
| commit | 9d283076744f1d8f5166476b747f23c3bc443aba (patch) | |
| tree | d670720c6d19d044152c8e905921db9b14ad07d4 | |
| parent | 2ad38174f2adfd09bc9b28087820079575877645 (diff) | |
| parent | 06b23bb5cbddfed587a6f0d75636734862b49a1e (diff) | |
| download | android_frameworks_ex-9d283076744f1d8f5166476b747f23c3bc443aba.tar.gz android_frameworks_ex-9d283076744f1d8f5166476b747f23c3bc443aba.tar.bz2 android_frameworks_ex-9d283076744f1d8f5166476b747f23c3bc443aba.zip | |
am 06b23bb5: Merge "Camera2: Update for camera2 API changes" into lmp-dev
* commit '06b23bb5cbddfed587a6f0d75636734862b49a1e':
Camera2: Update for camera2 API changes
5 files changed, 9 insertions, 9 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java index ce9a8b8..a746634 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java @@ -1099,7 +1099,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { new CaptureAvailableListener() { @Override public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, - long timestamp) { + long timestamp, long frameNumber) { if (shutter != null) { handler.post(new Runnable() { @Override diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java index 4fb2c43..f55437f 100644 --- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java +++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java @@ -123,8 +123,8 @@ public class BlockingCaptureCallback extends CameraCaptureSession.CaptureCallbac @Override public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, - long timestamp) { - if (mProxy != null) mProxy.onCaptureStarted(session, request, timestamp); + long timestamp, long frameNumber) { + if (mProxy != null) mProxy.onCaptureStarted(session, request, timestamp, frameNumber); mStateChangeListener.onStateChanged(CAPTURE_STARTED); } diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java index 97b5b6e..e6988b5 100644 --- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java +++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java @@ -89,11 +89,11 @@ public class Camera2CaptureCallbackForwarder extends CaptureCallback { @Override public void onCaptureStarted(final CameraCaptureSession session, final CaptureRequest request, - final long timestamp) { + final long timestamp, final long frameNumber) { mHandler.post(new Runnable() { @Override public void run() { - mListener.onCaptureStarted(session, request, timestamp); + mListener.onCaptureStarted(session, request, timestamp, frameNumber); }}); } } diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java index f813076..86c6070 100644 --- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java +++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java @@ -87,9 +87,9 @@ public class Camera2CaptureCallbackSplitter extends CaptureCallback { @Override public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, - long timestamp) { + long timestamp, long frameNumber) { for (CaptureCallback target : mRecipients) { - target.onCaptureStarted(session, request, timestamp); + target.onCaptureStarted(session, request, timestamp, frameNumber); } } } diff --git a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java index 3156cf7..ea320a7 100644 --- a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java +++ b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java @@ -55,9 +55,9 @@ public class Camera2UtilsTest extends Camera2DeviceTester { for (CaptureCallback each : terminals) { verify(each).onCaptureSequenceCompleted(null, 0, 0L); } - splitter.onCaptureStarted(null, null, 0L); + splitter.onCaptureStarted(null, null, 0L, 1L); for (CaptureCallback each : terminals) { - verify(each).onCaptureStarted(null, null, 0L); + verify(each).onCaptureStarted(null, null, 0L, 1L); } } |