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

Revert of Android GlDrawer: Add frame size as argument to draw functions (patchset #2 id:20001 of https://codereview.webrtc.org/1948473002/ )

Browse Source 
Reason for revert:
Causes errors on Google3 import.

Original issue's description:
> Android GlDrawer: Add frame size as argument to draw functions
>
> BUG=b/28544933
>
> Committed: https://crrev.com/71af75dc3ca8516017dca9de2ebe582145ecad14
> Cr-Commit-Position: refs/heads/master@{#12623}

TBR=glaznev@webrtc.org,magjed@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=b/28544933

Review-Url: https://codereview.webrtc.org/1950953002
Cr-Commit-Position: refs/heads/master@{#12627}
This commit is contained in:
ivoc
2016-05-04 06:50:21 -07:00
committed by Commit bot
parent 274c1dc545
commit 172683173d
7 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/api/java/android/org/webrtc/RendererCommon.java
View File

@ -40,12 +40,9 @@ public class RendererCommon {
* implied by the current EGL context of the calling thread and requires no explicit argument.
* The coordinates specify the viewport location on the surface target.
*/
void drawOes(int oesTextureId, float[] texMatrix, int frameWidth, int frameHeight,
int viewportX, int viewportY, int viewportWidth, int viewportHeight);
void drawRgb(int textureId, float[] texMatrix, int frameWidth, int frameHeight,
int viewportX, int viewportY, int viewportWidth, int viewportHeight);
void drawYuv(int[] yuvTextures, float[] texMatrix, int frameWidth, int frameHeight,
int viewportX, int viewportY, int viewportWidth, int viewportHeight);
void drawOes(int oesTextureId, float[] texMatrix, int x, int y, int width, int height);
void drawRgb(int textureId, float[] texMatrix, int x, int y, int width, int height);
void drawYuv(int[] yuvTextures, float[] texMatrix, int x, int y, int width, int height);
/**
* Release all GL resources. This needs to be done manually, otherwise resources may leak.