Index: talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
diff --git a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
index 7e56e700c2e6f62acbb4bb4bc7f12d7b09d67ea1..1720d7fcb765e6eeb958ba99851871b0a0e21438 100644 |
--- a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
+++ b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
@@ -404,16 +404,10 @@ public class SurfaceViewRenderer extends SurfaceView |
} |
final long startTimeNs = System.nanoTime(); |
- if (!frame.yuvFrame) { |
- // TODO(magjed): Move updateTexImage() to the video source instead. |
- SurfaceTexture surfaceTexture = (SurfaceTexture) frame.textureObject; |
- surfaceTexture.updateTexImage(); |
- } |
- |
final float[] texMatrix = new float[16]; |
synchronized (layoutLock) { |
- final float[] samplingMatrix = RendererCommon.getSamplingMatrix( |
- (SurfaceTexture) frame.textureObject, frame.rotationDegree); |
+ final float[] samplingMatrix = |
+ RendererCommon.rotateTextureMatrix(frame.samplingMatrix, frame.rotationDegree); |
final float[] layoutMatrix = RendererCommon.getLayoutMatrix( |
mirror, frameAspectRatio(), (float) layoutWidth / layoutHeight); |
Matrix.multiplyMM(texMatrix, 0, samplingMatrix, 0, layoutMatrix, 0); |