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

Add option to reset Android video renderer first frame flag.

Browse Source 
This allows to correctly report first frame event in applications which
use same remote video renderer for multiple calls.

R=wzh@webrtc.org

Review URL: https://codereview.webrtc.org/1384353002 .

Cr-Commit-Position: refs/heads/master@{#10176}
This commit is contained in:
Alex Glaznev 2015-10-05 13:01:34 -07:00
parent 6caafbe5b6
commit 09f1350efa
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
View File

@ -42,7 +42,6 @@ import android.opengl.EGLContext;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.opengl.GLSurfaceView; import android.opengl.GLSurfaceView;
import android.opengl.Matrix; import android.opengl.Matrix;
import android.util.Log;
import org.webrtc.Logging; import org.webrtc.Logging;
import org.webrtc.VideoRenderer.I420Frame; import org.webrtc.VideoRenderer.I420Frame;
@ -172,6 +171,10 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
rotationDegree = 0; rotationDegree = 0;
} }
public synchronized void reset() {
seenFrame = false;
}
private synchronized void release() { private synchronized void release() {
surface = null; surface = null;
synchronized (pendingFrameLock) { synchronized (pendingFrameLock) {
@ -549,7 +552,7 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
Logging.d(TAG, "VideoRendererGui.remove"); Logging.d(TAG, "VideoRendererGui.remove");
if (instance == null) { if (instance == null) {
throw new RuntimeException( throw new RuntimeException(
"Attempt to remove yuv renderer before setting GLSurfaceView"); "Attempt to remove renderer before setting GLSurfaceView");
} }
synchronized (instance.yuvImageRenderers) { synchronized (instance.yuvImageRenderers) {
final int index = instance.yuvImageRenderers.indexOf(renderer); final int index = instance.yuvImageRenderers.indexOf(renderer);
@ -561,6 +564,21 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
} }
} }
public static synchronized void reset(VideoRenderer.Callbacks renderer) {
Logging.d(TAG, "VideoRendererGui.reset");
if (instance == null) {
throw new RuntimeException(
"Attempt to reset renderer before setting GLSurfaceView");
}
synchronized (instance.yuvImageRenderers) {
for (YuvImageRenderer yuvImageRenderer : instance.yuvImageRenderers) {
if (yuvImageRenderer == renderer) {
yuvImageRenderer.reset();
}
}
}
}
@SuppressLint("NewApi") @SuppressLint("NewApi")
@Override @Override
public void onSurfaceCreated(GL10 unused, EGLConfig config) { public void onSurfaceCreated(GL10 unused, EGLConfig config) {