commit bdf366cc70639b0e16b8f84eebe612a48a8b8b06
author Igor Murashkin <iam@google.com> Fri Jul 25 16:54:20 2014 -0700
committer Igor Murashkin <iam@google.com> Tue Jul 29 15:09:45 2014 -0700
tree 16462c554cb11a21016fbcf032f2519a8cbdead8
parent 3a3eb157417fb5618518b29d889c23e8831b081c

camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)

Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
index ed4e457..18b1202 100644
--- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
@@ -313,6 +313,7 @@
         return mCameraId;
     }
 
+    @Override
     public void configureOutputs(List<Surface> outputs) throws CameraAccessException {
         // Treat a null input the same an empty list
         if (outputs == null) {
@@ -448,6 +449,7 @@
         }
     }
 
+    @Override
     public int capture(CaptureRequest request, CaptureListener listener, Handler handler)
             throws CameraAccessException {
         if (DEBUG) {
@@ -458,6 +460,7 @@
         return submitCaptureRequest(requestList, listener, handler, /*streaming*/false);
     }
 
+    @Override
     public int captureBurst(List<CaptureRequest> requests, CaptureListener listener,
             Handler handler) throws CameraAccessException {
         if (requests == null || requests.isEmpty()) {
@@ -610,6 +613,7 @@
         }
     }
 
+    @Override
     public int setRepeatingRequest(CaptureRequest request, CaptureListener listener,
             Handler handler) throws CameraAccessException {
         List<CaptureRequest> requestList = new ArrayList<CaptureRequest>();
@@ -617,6 +621,7 @@
         return submitCaptureRequest(requestList, listener, handler, /*streaming*/true);
     }
 
+    @Override
     public int setRepeatingBurst(List<CaptureRequest> requests, CaptureListener listener,
             Handler handler) throws CameraAccessException {
         if (requests == null || requests.isEmpty()) {
@@ -625,6 +630,7 @@
         return submitCaptureRequest(requests, listener, handler, /*streaming*/true);
     }
 
+    @Override
     public void stopRepeating() throws CameraAccessException {
 
         synchronized(mInterfaceLock) {
@@ -675,6 +681,7 @@
         }
     }
 
+    @Override
     public void flush() throws CameraAccessException {
         synchronized(mInterfaceLock) {
             checkIfCameraClosedOrInError();
@@ -1031,8 +1038,10 @@
                 CaptureResultExtras resultExtras) throws RemoteException {
 
             int requestId = resultExtras.getRequestId();
+            long frameNumber = resultExtras.getFrameNumber();
+
             if (DEBUG) {
-                Log.v(TAG, "Received result frame " + resultExtras.getFrameNumber() + " for id "
+                Log.v(TAG, "Received result frame " + frameNumber + " for id "
                         + requestId);
             }
 
@@ -1051,7 +1060,7 @@
 
                 // Update tracker (increment counter) when it's not a partial result.
                 if (!isPartialResult) {
-                    mFrameNumberTracker.updateTracker(resultExtras.getFrameNumber(),
+                    mFrameNumberTracker.updateTracker(frameNumber,
                             /*error*/false);
                 }
 
@@ -1060,7 +1069,7 @@
                     if (DEBUG) {
                         Log.d(TAG,
                                 "holder is null, early return at frame "
-                                        + resultExtras.getFrameNumber());
+                                        + frameNumber);
                     }
                     return;
                 }
@@ -1069,7 +1078,7 @@
                     if (DEBUG) {
                         Log.d(TAG,
                                 "camera is closed, early return at frame "
-                                        + resultExtras.getFrameNumber());
+                                        + frameNumber);
                     }
                     return;
                 }
@@ -1082,7 +1091,7 @@
                 // Either send a partial result or the final capture completed result
                 if (isPartialResult) {
                     final CaptureResult resultAsCapture =
-                            new CaptureResult(result, request, requestId);
+                            new CaptureResult(result, request, resultExtras);
 
                     // Partial result
                     resultDispatch = new Runnable() {
@@ -1098,7 +1107,7 @@
                     };
                 } else {
                     final TotalCaptureResult resultAsCapture =
-                            new TotalCaptureResult(result, request, requestId);
+                            new TotalCaptureResult(result, request, resultExtras);
 
                     // Final capture result
                     resultDispatch = new Runnable() {