Revert "Android MediaCodecVideoDecoder: Manage lifetime of texture frames"

talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java

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 1dea3bfdbc5109b2483bda254290a9b233960a63..bf15069f221139ba1c328f5ffe109844080ee56a 100644
--- a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
+++ b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
@@ -29,6 +29,7 @@ package org.webrtc;
 import android.opengl.EGL14;
 import android.os.Build;
 import android.test.ActivityTestCase;
+import android.test.suitebuilder.annotation.Suppress;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
@@ -112,6 +113,7 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
     VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
   }
 
+  /* TODO(perkj): Enable once VideoCapture to texture support has landed in C++.
   @SmallTest
   public void testStartVideoCapturerUsingTextures() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
@@ -121,7 +123,7 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
     VideoCapturerAndroid capturer =
         VideoCapturerAndroid.create("", null, EGL14.EGL_NO_CONTEXT);
     VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
-  }
+  }*/
 
   @SmallTest
   // This test that the camera can be started and that the frames are forwarded
@@ -158,6 +160,7 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
     VideoCapturerAndroidTestFixtures.switchCamera(capturer);
   }
 
+  /* TODO(perkj): Enable once VideoCapture to texture support has landed in C++.
   @SmallTest
   public void testSwitchVideoCapturerUsingTextures() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
@@ -166,7 +169,7 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
     }
     VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null, EGL14.EGL_NO_CONTEXT);
     VideoCapturerAndroidTestFixtures.switchCamera(capturer);
-  }
+  }*/
 
   @MediumTest
   // Test what happens when attempting to call e.g. switchCamera() after camera has been stopped.
@@ -200,6 +203,7 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
     VideoCapturerAndroidTestFixtures.stopRestartVideoSource(capturer);
   }
 
+  /* TODO(perkj): Enable once VideoCapture to texture support has landed in C++.
   @SmallTest
   public void testStopRestartVideoSourceUsingTextures() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
@@ -208,7 +212,7 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
     }
     VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null, EGL14.EGL_NO_CONTEXT);
     VideoCapturerAndroidTestFixtures.stopRestartVideoSource(capturer);
-  }
+  }*/
 
   @SmallTest
   // This test that the camera can be started at different resolutions.
@@ -267,6 +271,7 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
     VideoCapturerAndroidTestFixtures.returnBufferLateEndToEnd(capturer);
   }
 
+  /* TODO(perkj): Enable once VideoCapture to texture support has landed in C++.
   @MediumTest
   public void testReturnBufferLateEndToEndUsingTextures() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
@@ -276,5 +281,5 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
     final VideoCapturerAndroid capturer =
         VideoCapturerAndroid.create("", null, EGL14.EGL_NO_CONTEXT);
     VideoCapturerAndroidTestFixtures.returnBufferLateEndToEnd(capturer);
-  }
+  }*/
 }