Index: webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java |
diff --git a/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java b/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java |
index 2bd1e62324cc4716c5994615d660878c110ba131..4e8761f6f82d5b1298e34230a97a4ee699cc9fac 100644 |
--- a/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java |
+++ b/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java |
@@ -289,7 +289,7 @@ public class VideoCapturerAndroidTestFixtures { |
final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create( |
"SurfaceTextureHelper test" /* threadName */, null /* sharedContext */); |
final FakeCapturerObserver observer = new FakeCapturerObserver(); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
// Make sure camera is started and first frame is received and then stop it. |
assertTrue(observer.WaitForCapturerToStart()); |
@@ -313,7 +313,7 @@ public class VideoCapturerAndroidTestFixtures { |
final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create( |
"SurfaceTextureHelper test" /* threadName */, null /* sharedContext */); |
final FakeCapturerObserver observer = new FakeCapturerObserver(); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
// Make sure camera is started and then stop it. |
assertTrue(observer.WaitForCapturerToStart()); |
@@ -363,7 +363,7 @@ public class VideoCapturerAndroidTestFixtures { |
for(int i = 0; i < 3 ; ++i) { |
CameraEnumerationAndroid.CaptureFormat format = formats.get(i); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
assertTrue(observer.WaitForCapturerToStart()); |
observer.WaitForNextCapturedFrame(); |
@@ -412,7 +412,7 @@ public class VideoCapturerAndroidTestFixtures { |
final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create( |
"SurfaceTextureHelper test" /* threadName */, null /* sharedContext */); |
final FakeCapturerObserver observer = new FakeCapturerObserver(); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP_MR1) { |
@@ -437,7 +437,7 @@ public class VideoCapturerAndroidTestFixtures { |
final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create( |
"SurfaceTextureHelper test" /* threadName */, null /* sharedContext */); |
final FakeCapturerObserver observer = new FakeCapturerObserver(); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
waitUntilIdle(capturer); |
@@ -463,7 +463,7 @@ public class VideoCapturerAndroidTestFixtures { |
final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create( |
"SurfaceTextureHelper test" /* threadName */, null /* sharedContext */); |
final FakeCapturerObserver observer = new FakeCapturerObserver(); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
capturer.stopCapture(); |
release(capturer); |
@@ -479,7 +479,7 @@ public class VideoCapturerAndroidTestFixtures { |
List<CaptureFormat> formats = capturer.getSupportedFormats(); |
CameraEnumerationAndroid.CaptureFormat format = formats.get(0); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
assertTrue(observer.WaitForCapturerToStart()); |
@@ -489,7 +489,7 @@ public class VideoCapturerAndroidTestFixtures { |
assertTrue(listOftimestamps.size() >= 1); |
format = formats.get(1); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
observer.WaitForCapturerToStart(); |
if (capturer.isCapturingToTexture()) { |
@@ -553,7 +553,7 @@ public class VideoCapturerAndroidTestFixtures { |
final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create( |
"SurfaceTextureHelper test" /* threadName */, null /* sharedContext */); |
final FakeCapturerObserver observer = new FakeCapturerObserver(); |
- capturer.startCapture(format.width, format.height, format.maxFramerate, |
+ capturer.startCapture(format.width, format.height, format.framerate.max, |
surfaceTextureHelper, appContext, observer); |
// Make sure camera is started. |
assertTrue(observer.WaitForCapturerToStart()); |