From 8ce0bd54e9b603750cdc2246add1388b046f2182 Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Wed, 9 Sep 2015 18:51:06 +0200 Subject: [PATCH] Android video rendering: Fix texture matrix multiplication order BUG=webrtc:4968, webrtc:4742 R=hbos@webrtc.org, pbos@webrtc.org Review URL: https://codereview.webrtc.org/1314163008 . Cr-Commit-Position: refs/heads/master@{#9909} --- talk/app/webrtc/java/android/org/webrtc/RendererCommon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/talk/app/webrtc/java/android/org/webrtc/RendererCommon.java b/talk/app/webrtc/java/android/org/webrtc/RendererCommon.java index 44b64151f5..5195044a82 100644 --- a/talk/app/webrtc/java/android/org/webrtc/RendererCommon.java +++ b/talk/app/webrtc/java/android/org/webrtc/RendererCommon.java @@ -86,11 +86,11 @@ public class RendererCommon { } // Clockwise rotation matrix in the XY-plane (around the Z-axis). final float[] rotationMatrix = new float[16]; - Matrix.setRotateM(rotationMatrix, 0, -rotationDegree, 0, 0, 1); + Matrix.setRotateM(rotationMatrix, 0, rotationDegree, 0, 0, 1); adjustOrigin(rotationMatrix); // Multiply matrices together. final float[] tmpMatrix = new float[16]; - Matrix.multiplyMM(tmpMatrix, 0, rotationMatrix, 0, samplingMatrix, 0); + Matrix.multiplyMM(tmpMatrix, 0, samplingMatrix, 0, rotationMatrix, 0); return tmpMatrix; }