webrtc/api/java/android/org/webrtc/Camera1Enumerator.java - Issue 2078473002: Android: Camera2 implementation and tests for it.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/java/android/org/webrtc/Camera1Enumerator.java

Issue 2078473002: Android: Camera2 implementation and tests for it. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@enumerator_change

Patch Set: Make stopCapture non-blocking. Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java ('k') | webrtc/api/java/android/org/webrtc/Camera2Capturer.java » ('j') | webrtc/api/java/android/org/webrtc/Camera2Capturer.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/api/java/android/org/webrtc/Camera1Enumerator.java

diff --git a/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java b/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java

index 13a5237074f4f8c72b85f58e3d9e71ab46ab8258..1f1f158e7c3832e94f056d8ee59d22121464808a 100644

--- a/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java

+++ b/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java

@@ -106,7 +106,7 @@ public class Camera1Enumerator implements CameraEnumerator {

}

// Convert from android.hardware.Camera.Size to Size.

- public static List<Size> convertSizes(List<android.hardware.Camera.Size> cameraSizes) {

+ static List<Size> convertSizes(List<android.hardware.Camera.Size> cameraSizes) {

final List<Size> sizes = new ArrayList<Size>();

for (android.hardware.Camera.Size size : cameraSizes) {

sizes.add(new Size(size.width, size.height));

@@ -115,7 +115,7 @@ public class Camera1Enumerator implements CameraEnumerator {

}

// Convert from int[2] to CaptureFormat.FramerateRange.

- public static List<CaptureFormat.FramerateRange> convertFramerates(List<int[]> arrayRanges) {

+ static List<CaptureFormat.FramerateRange> convertFramerates(List<int[]> arrayRanges) {

final List<CaptureFormat.FramerateRange> ranges = new ArrayList<CaptureFormat.FramerateRange>();

for (int[] range : arrayRanges) {

ranges.add(new CaptureFormat.FramerateRange(