zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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}
This commit is contained in:
Magnus Jedvert
2017-11-17 16:50:17 +01:00
committed by Commit Bot
parent df4883dbf0
commit c040daec11
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/android/api/org/webrtc/SurfaceTextureHelper.java
View File

@ -18,13 +18,9 @@ import android.opengl.GLES20;
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 @@ public class SurfaceTextureHelper {
}
/**
* 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) {

1
sdk/android/api/org/webrtc/YuvConverter.java
View File

@ -216,6 +216,7 @@ public class YuvConverter {
if (textureType != shaderTextureType) {
initShader(textureType);
}
shader.useProgram();
// We draw into a buffer laid out like
//