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

Android: Add option to set presentation timestamp in EglRenderer

Browse Source 
Bug: b/119004693
Change-Id: I78b676a4417ac313e7fbbea009c8dd586707b1af
Reviewed-on: https://webrtc-review.googlesource.com/c/109503
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25517}
This commit is contained in:
Magnus Jedvert
2018-11-06 11:32:46 +01:00
committed by Commit Bot
parent 967f7d5497
commit 361dbc1973
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sdk/android/api/org/webrtc/EglRenderer.java
View File

@ -125,6 +125,7 @@ public class EglRenderer implements VideoSink {
@Nullable private EglBase eglBase; @Nullable private EglBase eglBase;
private final VideoFrameDrawer frameDrawer = new VideoFrameDrawer(); private final VideoFrameDrawer frameDrawer = new VideoFrameDrawer();
@Nullable private RendererCommon.GlDrawer drawer; @Nullable private RendererCommon.GlDrawer drawer;
private boolean usePresentationTimeStamp;
private final Matrix drawMatrix = new Matrix(); private final Matrix drawMatrix = new Matrix();
// Pending frame to render. Serves as a queue with size 1. Synchronized on |frameLock|. // Pending frame to render. Serves as a queue with size 1. Synchronized on |frameLock|.
@ -185,16 +186,19 @@ public class EglRenderer implements VideoSink {
* Initialize this class, sharing resources with |sharedContext|. The custom |drawer| will be used * Initialize this class, sharing resources with |sharedContext|. The custom |drawer| will be used
* for drawing frames on the EGLSurface. This class is responsible for calling release() on * for drawing frames on the EGLSurface. This class is responsible for calling release() on
* |drawer|. It is allowed to call init() to reinitialize the renderer after a previous * |drawer|. It is allowed to call init() to reinitialize the renderer after a previous
* init()/release() cycle. * init()/release() cycle. If usePresentationTimeStamp is true, eglPresentationTimeANDROID will be
* set with the frame timestamps, which specifies desired presentation time and might be useful
* for e.g. syncing audio and video.
*/ */
public void init(@Nullable final EglBase.Context sharedContext, final int[] configAttributes, public void init(@Nullable final EglBase.Context sharedContext, final int[] configAttributes,
RendererCommon.GlDrawer drawer) { RendererCommon.GlDrawer drawer, boolean usePresentationTimeStamp) {
synchronized (handlerLock) { synchronized (handlerLock) {
if (renderThreadHandler != null) { if (renderThreadHandler != null) {
throw new IllegalStateException(name + "Already initialized"); throw new IllegalStateException(name + "Already initialized");
} }
logD("Initializing EglRenderer"); logD("Initializing EglRenderer");
this.drawer = drawer; this.drawer = drawer;
this.usePresentationTimeStamp = usePresentationTimeStamp;
final HandlerThread renderThread = new HandlerThread(name + "EglRenderer"); final HandlerThread renderThread = new HandlerThread(name + "EglRenderer");
renderThread.start(); renderThread.start();
@ -230,6 +234,16 @@ public class EglRenderer implements VideoSink {
} }
} }
/**
* Same as above with usePresentationTimeStamp set to false.
*
* @see #init(EglBase.Context, int[], RendererCommon.GlDrawer, boolean)
*/
public void init(@Nullable final EglBase.Context sharedContext, final int[] configAttributes,
RendererCommon.GlDrawer drawer) {
init(sharedContext, configAttributes, drawer, /* usePresentationTimeStamp= */ false);
}
public void createEglSurface(Surface surface) { public void createEglSurface(Surface surface) {
createEglSurfaceInternal(surface); createEglSurfaceInternal(surface);
} }
@ -617,7 +631,11 @@ public class EglRenderer implements VideoSink {
eglBase.surfaceWidth(), eglBase.surfaceHeight()); eglBase.surfaceWidth(), eglBase.surfaceHeight());
final long swapBuffersStartTimeNs = System.nanoTime(); final long swapBuffersStartTimeNs = System.nanoTime();
eglBase.swapBuffers(); if (usePresentationTimeStamp) {
eglBase.swapBuffers(frame.getTimestampNs());
} else {
eglBase.swapBuffers();
}
final long currentTimeNs = System.nanoTime(); final long currentTimeNs = System.nanoTime();
synchronized (statisticsLock) { synchronized (statisticsLock) {