Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java

Issue 2186253002: Session based capturing for Camera2Capturer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 4 years, 4 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
Index: webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
index 2b68702febe53c6ffe03ec28536ce5282e600c26..fa827f720849c77ed3e06e57e944bdb5abf72d2c 100644
--- a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
+++ b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
@@ -22,20 +22,13 @@ public class Camera1CapturerUsingByteBufferTest extends InstrumentationTestCase
private class TestObjectFactory
extends CameraVideoCapturerTestFixtures.TestObjectFactory {
@Override
- public CameraVideoCapturer createCapturer(
- String name,
- CameraVideoCapturer.CameraEventsHandler eventsHandler) {
- return new VideoCapturerAndroid(name, eventsHandler, isCapturingToTexture());
- }
-
- @Override
public boolean isCapturingToTexture() {
return false;
}
@Override
public CameraEnumerator getCameraEnumerator() {
- return new Camera1Enumerator();
+ return new Camera1Enumerator(false);
}
@Override
@@ -69,12 +62,12 @@ public class Camera1CapturerUsingByteBufferTest extends InstrumentationTestCase
}
@SmallTest
- public void testCreateAndDispose() {
+ public void testCreateAndDispose() throws InterruptedException {
fixtures.createCapturerAndDispose();
}
@SmallTest
- public void testCreateNonExistingCamera() {
+ public void testCreateNonExistingCamera() throws InterruptedException {
fixtures.createNonExistingCamera();
}

Powered by Google App Engine
This is Rietveld 408576698