commit c040daec1176915de6ad8a8df0116eb825ffa0f6
author Magnus Jedvert <magjed@webrtc.org> Fri Nov 17 16:50:17 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Sat Nov 18 11:07:28 2017 +0000
tree be1ca178fc4aa5348f1eee35cd7f3acce0d50fd4
parent df4883dbf02d02085af9f0f9952fe376a1bdb7d3

Android: Allow SurfaceTextureHelper.textureToYuv to be used for RGB frames

TBR=sakal@webrtc.org

Bug: b/69162554
Change-Id: I342777a1cc961346a3e61408d02fbc6a16b7b633
Reviewed-on: https://webrtc-review.googlesource.com/24101
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20748}

sdk/android/api/org/webrtc/SurfaceTextureHelper.java

diff --git a/sdk/android/api/org/webrtc/SurfaceTextureHelper.java b/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
index dbdf268..fc5eb37 100644
--- a/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
+++ b/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
@@ -18,13 +18,9 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.os.SystemClock;
 import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
 import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 import org.webrtc.EglBase;
-import org.webrtc.VideoFrame.I420Buffer;
 import org.webrtc.VideoFrame.TextureBuffer;
 
 /**
@@ -256,14 +252,9 @@
   }
 
   /**
-   * Posts to the correct thread to convert |textureBuffer| to I420. Must only be called with
-   * textures generated by this SurfaceTextureHelper.
+   * Posts to the correct thread to convert |textureBuffer| to I420.
    */
   public VideoFrame.I420Buffer textureToYuv(final TextureBuffer textureBuffer) {
-    if (textureBuffer.getTextureId() != oesTextureId) {
-      throw new IllegalStateException("textureToByteBuffer called with unexpected textureId");
-    }
-
     final VideoFrame.I420Buffer[] result = new VideoFrame.I420Buffer[1];
     ThreadUtils.invokeAtFrontUninterruptibly(handler, () -> {
       if (yuvConverter == null) {

sdk/android/api/org/webrtc/YuvConverter.java

diff --git a/sdk/android/api/org/webrtc/YuvConverter.java b/sdk/android/api/org/webrtc/YuvConverter.java
index 268e4d2..844ab58 100644
--- a/sdk/android/api/org/webrtc/YuvConverter.java
+++ b/sdk/android/api/org/webrtc/YuvConverter.java
@@ -216,6 +216,7 @@
     if (textureType != shaderTextureType) {
       initShader(textureType);
     }
+    shader.useProgram();
 
     // We draw into a buffer laid out like
     //