zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup code in Camera2.

Browse Source 
BUG=b/30423446
NOTRY=True

Review-Url: https://codereview.webrtc.org/2189473003
Cr-Commit-Position: refs/heads/master@{#13540}
This commit is contained in:
sakal
2016-07-27 05:25:45 -07:00
committed by Commit bot
parent 85228d6af6
commit 81031d6dca
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
View File

@ -24,8 +24,6 @@ import android.hardware.camera2.CameraMetadata;
import android.hardware.camera2.CaptureFailure; import android.hardware.camera2.CaptureFailure;
import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.TotalCaptureResult; import android.hardware.camera2.TotalCaptureResult;
import android.hardware.camera2.params.StreamConfigurationMap;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Range; import android.util.Range;
@ -523,6 +521,7 @@ public class Camera2Capturer implements
Logging.w(TAG, "Opening camera failed, trying again: " + getErrorDescription(errorCode)); Logging.w(TAG, "Opening camera failed, trying again: " + getErrorDescription(errorCode));
postDelayedOnCameraThread(OPEN_CAMERA_DELAY_MS, new Runnable() { postDelayedOnCameraThread(OPEN_CAMERA_DELAY_MS, new Runnable() {
@Override
public void run() { public void run() {
openCamera(); openCamera();
} }

1
webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java
View File

@ -14,7 +14,6 @@ import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.graphics.ImageFormat;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraAccessException;