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

Correctly pass drawn frame size when layout aspect ratio is used in EglRenderer.

Browse Source 
Previously, layout matrix was not correctly taken into account when calculating
the drawn size of the frame.

BUG=webrtc:6470

Review-Url: https://codereview.webrtc.org/2514793002
Cr-Commit-Position: refs/heads/master@{#15163}
This commit is contained in:
sakal 2016-11-21 02:24:46 -08:00 committed by Commit bot
parent 96c1587551
commit 6280960998
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
webrtc/api/android/java/src/org/webrtc/EglRenderer.java
View File

@ -533,6 +533,8 @@ public class EglRenderer implements VideoRenderer.Callbacks {
// After a surface size change, the EGLSurface might still have a buffer of the old size in the
// pipeline. Querying the EGLSurface will show if the underlying buffer dimensions haven't yet
// changed. Such a buffer will be rendered incorrectly, so flush it with a black frame.
final int drawnFrameWidth;
final int drawnFrameHeight;
synchronized (layoutLock) {
int surfaceClearCount = 0;
while (eglBase.surfaceWidth() != surfaceWidth || eglBase.surfaceHeight() != surfaceHeight) {
@ -548,11 +550,20 @@ public class EglRenderer implements VideoRenderer.Callbacks {
}
final float[] layoutMatrix;
if (layoutAspectRatio > 0) {
layoutMatrix = RendererCommon.getLayoutMatrix(
mirror, frame.rotatedWidth() / (float) frame.rotatedHeight(), layoutAspectRatio);
final float frameAspectRatio = frame.rotatedWidth() / (float) frame.rotatedHeight();
layoutMatrix = RendererCommon.getLayoutMatrix(mirror, frameAspectRatio, layoutAspectRatio);
if (frameAspectRatio > layoutAspectRatio) {
drawnFrameWidth = (int) (frame.rotatedHeight() * layoutAspectRatio);
drawnFrameHeight = frame.rotatedHeight();
} else {
drawnFrameWidth = frame.rotatedWidth();
drawnFrameHeight = (int) (frame.rotatedWidth() / layoutAspectRatio);
}
} else {
layoutMatrix =
mirror ? RendererCommon.horizontalFlipMatrix() : RendererCommon.identityMatrix();
drawnFrameWidth = frame.rotatedWidth();
drawnFrameHeight = frame.rotatedHeight();
}
drawMatrix = RendererCommon.multiplyMatrices(texMatrix, layoutMatrix);
}
@ -567,12 +578,13 @@ public class EglRenderer implements VideoRenderer.Callbacks {
yuvTextures[i] = GlUtil.generateTexture(GLES20.GL_TEXTURE_2D);
}
}
yuvUploader.uploadYuvData(
yuvTextures, frame.width, frame.height, frame.yuvStrides, frame.yuvPlanes);
drawer.drawYuv(yuvTextures, drawMatrix, frame.rotatedWidth(), frame.rotatedHeight(), 0, 0,
surfaceWidth, surfaceHeight);
drawer.drawYuv(yuvTextures, drawMatrix, drawnFrameWidth, drawnFrameHeight, 0, 0, surfaceWidth,
surfaceHeight);
} else {
drawer.drawOes(frame.textureId, drawMatrix, frame.rotatedWidth(), frame.rotatedHeight(), 0, 0,
drawer.drawOes(frame.textureId, drawMatrix, drawnFrameWidth, drawnFrameHeight, 0, 0,
surfaceWidth, surfaceHeight);
}