admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android video rendering: Fix texture matrix multiplication order

Browse Source 
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}
This commit is contained in:
Magnus Jedvert 2015-09-09 18:51:06 +02:00
parent 942a699f14
commit 8ce0bd54e9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/app/webrtc/java/android/org/webrtc/RendererCommon.java
View File

@ -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;
}