| 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 dbbe5963cd6ba5e67aa0c871179154c6e83be7cb..35c3235d712e14cb6734de8347abd933fb0ddcbd 100644
|
| --- a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| +++ b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| @@ -108,9 +108,8 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
|
| VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
|
| }
|
|
|
| - // TODO(perkj): Enable once VideoCapture to texture support has landed in C++.
|
| @SmallTest
|
| - public void DISABLED_testStartVideoCapturerUsingTextures() throws InterruptedException {
|
| + public void testStartVideoCapturerUsingTextures() throws InterruptedException {
|
| VideoCapturerAndroid capturer =
|
| VideoCapturerAndroid.create("", null, EGL10.EGL_NO_CONTEXT);
|
| VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
|
| @@ -151,9 +150,8 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
|
| VideoCapturerAndroidTestFixtures.switchCamera(capturer);
|
| }
|
|
|
| - // TODO(perkj): Enable once VideoCapture to texture support has landed in C++.
|
| @SmallTest
|
| - public void DISABLED_testSwitchVideoCapturerUsingTextures() throws InterruptedException {
|
| + public void testSwitchVideoCapturerUsingTextures() throws InterruptedException {
|
| VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null, EGL10.EGL_NO_CONTEXT);
|
| VideoCapturerAndroidTestFixtures.switchCamera(capturer);
|
| }
|
| @@ -195,9 +193,8 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
|
| VideoCapturerAndroidTestFixtures.stopRestartVideoSource(capturer);
|
| }
|
|
|
| - // TODO(perkj): Enable once VideoCapture to texture support has landed in C++.
|
| @SmallTest
|
| - public void DISABLED_testStopRestartVideoSourceUsingTextures() throws InterruptedException {
|
| + public void testStopRestartVideoSourceUsingTextures() throws InterruptedException {
|
| VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null, EGL10.EGL_NO_CONTEXT);
|
| VideoCapturerAndroidTestFixtures.stopRestartVideoSource(capturer);
|
| }
|
| @@ -251,9 +248,8 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
|
| VideoCapturerAndroidTestFixtures.returnBufferLateEndToEnd(capturer);
|
| }
|
|
|
| - // TODO(perkj): Enable once VideoCapture to texture support has landed in C++.
|
| @MediumTest
|
| - public void DISABLED_testReturnBufferLateEndToEndUsingTextures() throws InterruptedException {
|
| + public void testReturnBufferLateEndToEndUsingTextures() throws InterruptedException {
|
| final VideoCapturerAndroid capturer =
|
| VideoCapturerAndroid.create("", null, EGL10.EGL_NO_CONTEXT);
|
| VideoCapturerAndroidTestFixtures.returnBufferLateEndToEnd(capturer);
|
|
|