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 d14b5cd35901d2d0b48bf56cab4468527de12ff2..c875181dcaec16bdb6218dc4b994dfc3200d034d 100644 |
--- a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java |
+++ b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java |
@@ -112,9 +112,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 { |
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) { |
Log.i(TAG, "Capturing to textures is not supported, requires EGL14."); |
return; |
@@ -159,9 +158,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 { |
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) { |
Log.i(TAG, "Capturing to textures is not supported, requires EGL14."); |
return; |
@@ -211,9 +209,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 { |
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) { |
Log.i(TAG, "Capturing to textures is not supported, requires EGL14."); |
return; |
@@ -279,9 +276,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 { |
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) { |
Log.i(TAG, "Capturing to textures is not supported, requires EGL14."); |
return; |