generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AppRTCDemo: don't render frames that are already outdated.

Browse Source 
BUG=2121
R=henrike@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1850004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4392 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2013-07-24 20:40:03 +00:00
parent 87f8a7eb67
commit 880c842627
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
talk/examples/android/src/org/appspot/apprtc/VideoStreamsView.java
View File

@ -68,6 +68,9 @@ public class VideoStreamsView
private long lastFPSLogTime = System.nanoTime(); private long lastFPSLogTime = System.nanoTime();
private long numFramesSinceLastLog = 0; private long numFramesSinceLastLog = 0;
private FramePool framePool = new FramePool(); private FramePool framePool = new FramePool();
// Accessed on multiple threads! Must be synchronized.
private EnumMap<Endpoint, I420Frame> framesToRender =
new EnumMap<Endpoint, I420Frame>(Endpoint.class);
public VideoStreamsView(Context c, Point screenDimensions) { public VideoStreamsView(Context c, Point screenDimensions) {
super(c); super(c);
@ -83,18 +86,43 @@ public class VideoStreamsView
// to get spent on the render thread instead of the UI thread. // to get spent on the render thread instead of the UI thread.
abortUnless(framePool.validateDimensions(frame), "Frame too large!"); abortUnless(framePool.validateDimensions(frame), "Frame too large!");
final I420Frame frameCopy = framePool.takeFrame(frame).copyFrom(frame); final I420Frame frameCopy = framePool.takeFrame(frame).copyFrom(frame);
queueEvent(new Runnable() { boolean needToScheduleRender;
public void run() { synchronized (framesToRender) {
updateFrame(stream, frameCopy); // A new render needs to be scheduled (via updateFrames()) iff there isn't
} // already a render scheduled, which is true iff framesToRender is empty.
}); needToScheduleRender = framesToRender.isEmpty();
I420Frame frameToDrop = framesToRender.put(stream, frameCopy);
if (frameToDrop != null) {
framePool.returnFrame(frameToDrop);
}
}
if (needToScheduleRender) {
queueEvent(new Runnable() {
public void run() {
updateFrames();
}
});
}
} }
// Upload the planes from |frame| to the textures owned by this View. // Upload the planes from |framesToRender| to the textures owned by this View.
private void updateFrame(Endpoint stream, I420Frame frame) { private void updateFrames() {
int[] textures = yuvTextures[stream == Endpoint.LOCAL ? 0 : 1]; I420Frame localFrame = null;
texImage2D(frame, textures); I420Frame remoteFrame = null;
framePool.returnFrame(frame); synchronized (framesToRender) {
localFrame = framesToRender.remove(Endpoint.LOCAL);
remoteFrame = framesToRender.remove(Endpoint.REMOTE);
}
if (localFrame != null) {
texImage2D(localFrame, yuvTextures[0]);
framePool.returnFrame(localFrame);
}
if (remoteFrame != null) {
texImage2D(remoteFrame, yuvTextures[1]);
framePool.returnFrame(remoteFrame);
}
abortUnless(localFrame != null || remoteFrame != null,
"Nothing to render!");
requestRender(); requestRender();
} }