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

Log supported camera preview resolutions.

Browse Source 
BUG=b/29935437
R=sakal@webrtc.org

Review URL: https://codereview.webrtc.org/2356563002 .

Cr-Commit-Position: refs/heads/master@{#14336}
This commit is contained in:
Alex Glaznev
2016-09-21 12:17:05 -07:00
parent c4ccd4d61c
commit 772bd0d40b
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,6 +333,7 @@ public class Camera2Session implements CameraSession {
List<CaptureFormat.FramerateRange> framerateRanges = List<CaptureFormat.FramerateRange> framerateRanges =
Camera2Enumerator.convertFramerates(fpsRanges, fpsUnitFactor); Camera2Enumerator.convertFramerates(fpsRanges, fpsUnitFactor);
List<Size> sizes = Camera2Enumerator.getSupportedSizes(cameraCharacteristics); List<Size> sizes = Camera2Enumerator.getSupportedSizes(cameraCharacteristics);
Logging.d(TAG, "Available preview sizes: " + sizes);
Logging.d(TAG, "Available fps ranges: " + framerateRanges); Logging.d(TAG, "Available fps ranges: " + framerateRanges);
if (framerateRanges.isEmpty() || sizes.isEmpty()) { if (framerateRanges.isEmpty() || sizes.isEmpty()) {

18
webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java
View File

@ -391,8 +391,11 @@ public class VideoCapturerAndroid implements
final CaptureFormat.FramerateRange fpsRange = final CaptureFormat.FramerateRange fpsRange =
CameraEnumerationAndroid.getClosestSupportedFramerateRange(supportedFramerates, framerate); CameraEnumerationAndroid.getClosestSupportedFramerateRange(supportedFramerates, framerate);
final Size previewSize = CameraEnumerationAndroid.getClosestSupportedSize( final List<Size> supportedPreviewSizes =
Camera1Enumerator.convertSizes(parameters.getSupportedPreviewSizes()), width, height); Camera1Enumerator.convertSizes(parameters.getSupportedPreviewSizes());
final Size previewSize =
CameraEnumerationAndroid.getClosestSupportedSize(supportedPreviewSizes, width, height);
Logging.d(TAG, "Available preview sizes: " + supportedPreviewSizes);
final CaptureFormat captureFormat = final CaptureFormat captureFormat =
new CaptureFormat(previewSize.width, previewSize.height, fpsRange); new CaptureFormat(previewSize.width, previewSize.height, fpsRange);
@ -432,15 +435,16 @@ public class VideoCapturerAndroid implements
camera.setPreviewCallbackWithBuffer(null); camera.setPreviewCallbackWithBuffer(null);
} }
List<String> focusModes = parameters.getSupportedFocusModes();
if (focusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
Logging.d(TAG, "Enable continuous auto focus mode.");
parameters.setFocusMode(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
}
// (Re)start preview. // (Re)start preview.
Logging.d(TAG, "Start capturing: " + captureFormat); Logging.d(TAG, "Start capturing: " + captureFormat);
this.captureFormat = captureFormat; this.captureFormat = captureFormat;
List<String> focusModes = parameters.getSupportedFocusModes();
if (focusModes.contains(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
parameters.setFocusMode(android.hardware.Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
}
camera.setParameters(parameters); camera.setParameters(parameters);
// Calculate orientation manually and send it as CVO instead. // Calculate orientation manually and send it as CVO instead.
camera.setDisplayOrientation(0 /* degrees */); camera.setDisplayOrientation(0 /* degrees */);