Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera2 API: fix bug in Camera2 CTS test failure."

Browse Source
This commit is contained in:
Jianing Wei
2014-04-19 01:21:56 +00:00
committed by Android (Google) Code Review
parent 239751237c baf0c650b3
commit 2bcd40235e
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/hardware/camera2/impl/CameraDevice.java
View File

@@ -315,6 +315,12 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
holder = (index >= 0) ? mCaptureListenerMap.valueAt(index) : null; holder = (index >= 0) ? mCaptureListenerMap.valueAt(index) : null;
if (holder != null) { if (holder != null) {
mCaptureListenerMap.removeAt(index); mCaptureListenerMap.removeAt(index);
if (DEBUG) {
Log.v(TAG, String.format(
"remove holder for requestId %d, "
+ "because lastFrame is %d.",
requestId, lastFrameNumber));
}
} }
if (holder != null) { if (holder != null) {
@@ -390,6 +396,10 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
if (listener != null) { if (listener != null) {
mCaptureListenerMap.put(requestId, new CaptureListenerHolder(listener, mCaptureListenerMap.put(requestId, new CaptureListenerHolder(listener,
requestList, handler, repeating)); requestList, handler, repeating));
} else {
if (DEBUG) {
Log.d(TAG, "Listen for request " + requestId + " is null");
}
} }
long lastFrameNumber = lastFrameNumberRef.getNumber(); long lastFrameNumber = lastFrameNumberRef.getNumber();
@@ -828,7 +838,8 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
CaptureResultExtras resultExtras) throws RemoteException { CaptureResultExtras resultExtras) throws RemoteException {
int requestId = resultExtras.getRequestId(); int requestId = resultExtras.getRequestId();
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Received result for id " + requestId); Log.v(TAG, "Received result frame " + resultExtras.getFrameNumber() + " for id "
+ requestId);
} }
final CaptureListenerHolder holder; final CaptureListenerHolder holder;
synchronized (mLock) { synchronized (mLock) {
@@ -838,17 +849,26 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
Boolean quirkPartial = result.get(CaptureResult.QUIRKS_PARTIAL_RESULT); Boolean quirkPartial = result.get(CaptureResult.QUIRKS_PARTIAL_RESULT);
boolean quirkIsPartialResult = (quirkPartial != null && quirkPartial); boolean quirkIsPartialResult = (quirkPartial != null && quirkPartial);
// Update tracker (increment counter) when it's not a partial result.
if (!quirkIsPartialResult) {
mFrameNumberTracker.updateTracker(resultExtras.getFrameNumber(), /*error*/false);
}
// Check if we have a listener for this // Check if we have a listener for this
if (holder == null) { if (holder == null) {
if (DEBUG) { if (DEBUG) {
Log.v(TAG, "holder is null, early return"); Log.d(TAG,
"holder is null, early return at frame "
+ resultExtras.getFrameNumber());
} }
return; return;
} }
if (isClosed()) { if (isClosed()) {
if (DEBUG) { if (DEBUG) {
Log.v(TAG, "camera is closed, early return"); Log.d(TAG,
"camera is closed, early return at frame "
+ resultExtras.getFrameNumber());
} }
return; return;
} }
@@ -891,7 +911,6 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice {
// Fire onCaptureSequenceCompleted // Fire onCaptureSequenceCompleted
if (!quirkIsPartialResult) { if (!quirkIsPartialResult) {
mFrameNumberTracker.updateTracker(resultExtras.getFrameNumber(), /*error*/false);
checkAndFireSequenceComplete(); checkAndFireSequenceComplete();
} }
} }