| Index: talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| diff --git a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| index 1a6c1bc6337aa0e8ded2026a4b15442cc15f0d87..d21e42fed193dfae1bb3fcd5b50d228f8a1b8e44 100644
|
| --- a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| +++ b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| @@ -299,4 +299,20 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
|
| VideoCapturerAndroidTestFixtures.cameraErrorEventOnBufferStarvation(capturer,
|
| cameraEvents, getInstrumentation().getContext());
|
| }
|
| +
|
| + @MediumTest
|
| + // This test that frames forwarded to a renderer is scaled if onOutputFormatRequest is
|
| + // called. This test both Java and C++ parts of of the stack.
|
| + public void testScaleCameraOutput() throws InterruptedException {
|
| + VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null);
|
| + VideoCapturerAndroidTestFixtures.scaleCameraOutput(capturer);
|
| + }
|
| +
|
| + @MediumTest
|
| + // This test that frames forwarded to a renderer is scaled if onOutputFormatRequest is
|
| + // called. This test both Java and C++ parts of of the stack.
|
| + public void testScaleCameraOutputUsingTextures() throws InterruptedException {
|
| + VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null, EGL10.EGL_NO_CONTEXT);
|
| + VideoCapturerAndroidTestFixtures.scaleCameraOutput(capturer);
|
| + }
|
| }
|
|
|