Skip to content

SDK / exoplayer

Go to a project
Commit 8f3a363d by sofijajvc Committed by Oliver Woodman
Options

Add OpenGL support to av1 extension: Libgav1VideoRenderer 

Move reusable code from LibvpxVideoRenderer to SimpleDecoderVideoRenderer.
Pass outputBuffer to renderOutputBuffer method instead of keeping the reference in the renderer.

PiperOrigin-RevId: 272899549
parent 27b90fba
Inline Side-by-side
Showing with 162 additions and 156 deletions
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
...@@ -28,7 +28,6 @@ import com.google.android.exoplayer2.PlayerMessage.Target; ...@@ -28,7 +28,6 @@ import com.google.android.exoplayer2.PlayerMessage.Target;
import com.google.android.exoplayer2.decoder.SimpleDecoder; import com.google.android.exoplayer2.decoder.SimpleDecoder;
import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.ExoMediaCrypto; import com.google.android.exoplayer2.drm.ExoMediaCrypto;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.TraceUtil;
import com.google.android.exoplayer2.video.SimpleDecoderVideoRenderer; import com.google.android.exoplayer2.video.SimpleDecoderVideoRenderer;
...@@ -72,13 +71,7 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -72,13 +71,7 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
private final boolean disableLoopFilter; private final boolean disableLoopFilter;
private final int threads; private final int threads;
private Surface surface;
private VideoDecoderOutputBufferRenderer outputBufferRenderer;
@C.VideoOutputMode private int outputMode;
private VpxDecoder decoder; private VpxDecoder decoder;
private VideoDecoderOutputBuffer outputBuffer;
private VideoFrameMetadataListener frameMetadataListener; private VideoFrameMetadataListener frameMetadataListener;
/** /**
...@@ -197,7 +190,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -197,7 +190,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
this.threads = threads; this.threads = threads;
this.numInputBuffers = numInputBuffers; this.numInputBuffers = numInputBuffers;
this.numOutputBuffers = numOutputBuffers; this.numOutputBuffers = numOutputBuffers;
outputMode = C.VIDEO_OUTPUT_MODE_NONE;
} }
@Override @Override
...@@ -236,53 +228,37 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -236,53 +228,37 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
disableLoopFilter, disableLoopFilter,
enableRowMultiThreadMode, enableRowMultiThreadMode,
threads); threads);
decoder.setOutputMode(outputMode);
TraceUtil.endSection(); TraceUtil.endSection();
return decoder; return decoder;
} }
@Override @Override
@Nullable protected void renderOutputBuffer(
protected VideoDecoderOutputBuffer dequeueOutputBuffer() throws VpxDecoderException { VideoDecoderOutputBuffer outputBuffer, long presentationTimeUs, Format outputFormat)
outputBuffer = decoder.dequeueOutputBuffer(); throws VideoDecoderException {
return outputBuffer;
}
@Override
protected void renderOutputBuffer(long presentationTimeUs, Format outputFormat)
throws VpxDecoderException {
if (frameMetadataListener != null) { if (frameMetadataListener != null) {
frameMetadataListener.onVideoFrameAboutToBeRendered( frameMetadataListener.onVideoFrameAboutToBeRendered(
presentationTimeUs, System.nanoTime(), outputFormat); presentationTimeUs, System.nanoTime(), outputFormat);
} }
super.renderOutputBuffer(outputBuffer, presentationTimeUs, outputFormat);
int bufferMode = outputBuffer.mode;
boolean renderSurface = bufferMode == C.VIDEO_OUTPUT_MODE_SURFACE_YUV && surface != null;
boolean renderYuv = bufferMode == C.VIDEO_OUTPUT_MODE_YUV && outputBufferRenderer != null;
if (!renderYuv && !renderSurface) {
dropOutputBuffer(outputBuffer);
} else {
maybeNotifyVideoSizeChanged(outputBuffer.width, outputBuffer.height);
if (renderYuv) {
outputBufferRenderer.setOutputBuffer(outputBuffer);
// The renderer will release the buffer.
} else { // renderSurface
decoder.renderToSurface(outputBuffer, surface);
outputBuffer.release();
}
onFrameRendered(surface);
}
} }
@Override @Override
protected void clearOutputBuffer() { protected void renderOutputBufferToSurface(VideoDecoderOutputBuffer outputBuffer, Surface surface)
super.clearOutputBuffer(); throws VpxDecoderException {
outputBuffer = null; if (decoder == null) {
throw new VpxDecoderException(
"Failed to render output buffer to surface: decoder is not initialized.");
}
decoder.renderToSurface(outputBuffer, surface);
outputBuffer.release();
} }
@Override @Override
protected boolean hasOutputSurface() { protected void setDecoderOutputMode(@C.VideoOutputMode int outputMode) {
return outputMode != C.VIDEO_OUTPUT_MODE_NONE; if (decoder != null) {
decoder.setOutputMode(outputMode);
}
} }
// PlayerMessage.Target implementation. // PlayerMessage.Target implementation.
...@@ -290,44 +266,13 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -290,44 +266,13 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
@Override @Override
public void handleMessage(int messageType, @Nullable Object message) throws ExoPlaybackException { public void handleMessage(int messageType, @Nullable Object message) throws ExoPlaybackException {
if (messageType == C.MSG_SET_SURFACE) { if (messageType == C.MSG_SET_SURFACE) {
setOutput((Surface) message, null); setOutputSurface((Surface) message);
} else if (messageType == C.MSG_SET_OUTPUT_BUFFER_RENDERER) { } else if (messageType == C.MSG_SET_OUTPUT_BUFFER_RENDERER) {
setOutput(null, (VideoDecoderOutputBufferRenderer) message); setOutputBufferRenderer((VideoDecoderOutputBufferRenderer) message);
} else if (messageType == C.MSG_SET_VIDEO_FRAME_METADATA_LISTENER) { } else if (messageType == C.MSG_SET_VIDEO_FRAME_METADATA_LISTENER) {
frameMetadataListener = (VideoFrameMetadataListener) message; frameMetadataListener = (VideoFrameMetadataListener) message;
} else { } else {
super.handleMessage(messageType, message); super.handleMessage(messageType, message);
} }
} }
// Internal methods.
private void setOutput(
@Nullable Surface surface, @Nullable VideoDecoderOutputBufferRenderer outputBufferRenderer) {
// At most one output may be non-null. Both may be null if the output is being cleared.
Assertions.checkState(surface == null || outputBufferRenderer == null);
if (this.surface != surface || this.outputBufferRenderer != outputBufferRenderer) {
// The output has changed.
this.surface = surface;
this.outputBufferRenderer = outputBufferRenderer;
if (surface != null) {
outputMode = C.VIDEO_OUTPUT_MODE_SURFACE_YUV;
} else {
outputMode =
outputBufferRenderer != null ? C.VIDEO_OUTPUT_MODE_YUV : C.VIDEO_OUTPUT_MODE_NONE;
}
if (hasOutputSurface()) {
if (decoder != null) {
decoder.setOutputMode(outputMode);
}
onOutputSurfaceChanged();
} else {
// The output has been removed. We leave the outputMode of the underlying decoder unchanged
// in anticipation that a subsequent output will likely be of the same type.
onOutputSurfaceRemoved();
}
} else if (hasOutputSurface()) {
onOutputSurfaceReset(surface);
}
}
} }
library/core/src/main/java/com/google/android/exoplayer2/video/SimpleDecoderVideoRenderer.java
...@@ -86,6 +86,10 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -86,6 +86,10 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
decoder; decoder;
private VideoDecoderInputBuffer inputBuffer; private VideoDecoderInputBuffer inputBuffer;
private VideoDecoderOutputBuffer outputBuffer; private VideoDecoderOutputBuffer outputBuffer;
@Nullable private Surface surface;
@Nullable private VideoDecoderOutputBufferRenderer outputBufferRenderer;
@C.VideoOutputMode private int outputMode;
@Nullable private DrmSession<ExoMediaCrypto> decoderDrmSession; @Nullable private DrmSession<ExoMediaCrypto> decoderDrmSession;
@Nullable private DrmSession<ExoMediaCrypto> sourceDrmSession; @Nullable private DrmSession<ExoMediaCrypto> sourceDrmSession;
...@@ -147,6 +151,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -147,6 +151,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
flagsOnlyBuffer = DecoderInputBuffer.newFlagsOnlyInstance(); flagsOnlyBuffer = DecoderInputBuffer.newFlagsOnlyInstance();
eventDispatcher = new EventDispatcher(eventHandler, eventListener); eventDispatcher = new EventDispatcher(eventHandler, eventListener);
decoderReinitializationState = REINITIALIZATION_STATE_NONE; decoderReinitializationState = REINITIALIZATION_STATE_NONE;
outputMode = C.VIDEO_OUTPUT_MODE_NONE;
} }
// BaseRenderer implementation. // BaseRenderer implementation.
...@@ -210,7 +215,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -210,7 +215,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
} }
if (inputFormat != null if (inputFormat != null
&& (isSourceReady() || outputBuffer != null) && (isSourceReady() || outputBuffer != null)
&& (renderedFirstFrame || !hasOutputSurface())) { && (renderedFirstFrame || !hasOutput())) {
// Ready. If we were joining then we've now joined, so clear the joining deadline. // Ready. If we were joining then we've now joined, so clear the joining deadline.
joiningDeadlineMs = C.TIME_UNSET; joiningDeadlineMs = C.TIME_UNSET;
return true; return true;
...@@ -227,6 +232,8 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -227,6 +232,8 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
} }
} }
// Protected methods.
@Override @Override
protected void onEnabled(boolean joining) throws ExoPlaybackException { protected void onEnabled(boolean joining) throws ExoPlaybackException {
decoderCounters = new DecoderCounters(); decoderCounters = new DecoderCounters();
...@@ -316,7 +323,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -316,7 +323,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
inputBuffer = null; inputBuffer = null;
if (outputBuffer != null) { if (outputBuffer != null) {
outputBuffer.release(); outputBuffer.release();
clearOutputBuffer(); outputBuffer = null;
} }
decoder.flush(); decoder.flush();
decoderReceivedBuffers = false; decoderReceivedBuffers = false;
...@@ -327,7 +334,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -327,7 +334,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
@CallSuper @CallSuper
protected void releaseDecoder() { protected void releaseDecoder() {
inputBuffer = null; inputBuffer = null;
clearOutputBuffer(); outputBuffer = null;
decoderReinitializationState = REINITIALIZATION_STATE_NONE; decoderReinitializationState = REINITIALIZATION_STATE_NONE;
decoderReceivedBuffers = false; decoderReceivedBuffers = false;
buffersInCodecCount = 0; buffersInCodecCount = 0;
...@@ -339,16 +346,6 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -339,16 +346,6 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
setDecoderDrmSession(null); setDecoderDrmSession(null);
} }
private void setSourceDrmSession(@Nullable DrmSession<ExoMediaCrypto> session) {
DrmSession.replaceSessionReferences(sourceDrmSession, session);
sourceDrmSession = session;
}
private void setDecoderDrmSession(@Nullable DrmSession<ExoMediaCrypto> session) {
DrmSession.replaceSessionReferences(decoderDrmSession, session);
decoderDrmSession = session;
}
/** /**
* Called when a new format is read from the upstream source. * Called when a new format is read from the upstream source.
* *
...@@ -528,94 +525,124 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -528,94 +525,124 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
throws VideoDecoderException; throws VideoDecoderException;
/** /**
* Dequeues output buffer. * Renders the specified output buffer.
*
* <p>The implementation of this method takes ownership of the output buffer and is responsible
* for calling {@link VideoDecoderOutputBuffer#release()} either immediately or in the future.
* *
* @return Dequeued video decoder output buffer, or null if an output buffer isn't available. * @param outputBuffer {@link VideoDecoderOutputBuffer} to render.
* @throws VideoDecoderException If an error occurs while dequeuing the output buffer. * @param presentationTimeUs Presentation time in microseconds.
* @param outputFormat Output {@link Format}.
* @throws VideoDecoderException If an error occurs when rendering the output buffer.
*/ */
@Nullable protected void renderOutputBuffer(
protected abstract VideoDecoderOutputBuffer dequeueOutputBuffer() throws VideoDecoderException; VideoDecoderOutputBuffer outputBuffer, long presentationTimeUs, Format outputFormat)
throws VideoDecoderException {
/** Clears output buffer. */ lastRenderTimeUs = C.msToUs(SystemClock.elapsedRealtime() * 1000);
protected void clearOutputBuffer() { int bufferMode = outputBuffer.mode;
outputBuffer = null; boolean renderSurface = bufferMode == C.VIDEO_OUTPUT_MODE_SURFACE_YUV && surface != null;
boolean renderYuv = bufferMode == C.VIDEO_OUTPUT_MODE_YUV && outputBufferRenderer != null;
if (!renderYuv && !renderSurface) {
dropOutputBuffer(outputBuffer);
} else {
maybeNotifyVideoSizeChanged(outputBuffer.width, outputBuffer.height);
if (renderYuv) {
outputBufferRenderer.setOutputBuffer(outputBuffer);
} else {
renderOutputBufferToSurface(outputBuffer, surface);
}
consecutiveDroppedFrameCount = 0;
decoderCounters.renderedOutputBufferCount++;
maybeNotifyRenderedFirstFrame();
}
} }
/** /**
* Renders the specified output buffer. * Renders the specified output buffer to the passed surface.
* *
* <p>The implementation of this method takes ownership of the output buffer and is responsible * <p>The implementation of this method takes ownership of the output buffer and is responsible
* for calling {@link VideoDecoderOutputBuffer#release()} either immediately or in the future. * for calling {@link VideoDecoderOutputBuffer#release()} either immediately or in the future.
* *
* @param presentationTimeUs Presentation time in microseconds. * @param outputBuffer {@link VideoDecoderOutputBuffer} to render.
* @param outputFormat Output format. * @param surface Output {@link Surface}.
* @throws VideoDecoderException If an error occurs when rendering the output buffer.
*/ */
// TODO: The output buffer is not being passed to this method currently. Due to the need of protected abstract void renderOutputBufferToSurface(
// decoder-specific output buffer type, the reference to the output buffer is being kept in the VideoDecoderOutputBuffer outputBuffer, Surface surface) throws VideoDecoderException;
// subclass. Once the common output buffer is established, this method can be updated to receive
// the output buffer as an argument. See [Internal: b/139174707].
protected abstract void renderOutputBuffer(long presentationTimeUs, Format outputFormat)
throws VideoDecoderException;
/** /**
* Returns whether the renderer has output surface. * Sets output surface.
* *
* @return Whether the renderer has output surface. * @param surface Surface.
*/ */
protected abstract boolean hasOutputSurface(); protected final void setOutputSurface(@Nullable Surface surface) {
if (this.surface != surface) {
/** Called when the output surface is changed. */ // The output has changed.
protected final void onOutputSurfaceChanged() { this.surface = surface;
// If we know the video size, report it again immediately. if (surface != null) {
maybeRenotifyVideoSizeChanged(); outputMode = C.VIDEO_OUTPUT_MODE_SURFACE_YUV;
// We haven't rendered to the new output yet. if (decoder != null) {
clearRenderedFirstFrame(); setDecoderOutputMode(outputMode);
if (getState() == STATE_STARTED) { }
setJoiningDeadlineMs(); onOutputChanged();
} else {
// The output has been removed. We leave the outputMode of the underlying decoder unchanged
// in anticipation that a subsequent output will likely be of the same type.
outputMode = C.VIDEO_OUTPUT_MODE_NONE;
onOutputRemoved();
}
} else if (surface != null) {
// The output is unchanged and non-null.
onOutputReset();
} }
} }
/** Called when the output surface is removed. */
protected final void onOutputSurfaceRemoved() {
clearReportedVideoSize();
clearRenderedFirstFrame();
}
/** /**
* Called when the output surface is set again to the same non-null value. * Sets output buffer renderer.
* *
* @param surface Output surface. * @param outputBufferRenderer Output buffer renderer.
*/ */
protected final void onOutputSurfaceReset(Surface surface) { protected final void setOutputBufferRenderer(
// The output is unchanged and non-null. If we know the video size and/or have already @Nullable VideoDecoderOutputBufferRenderer outputBufferRenderer) {
// rendered to the output, report these again immediately. if (this.outputBufferRenderer != outputBufferRenderer) {
maybeRenotifyVideoSizeChanged(); // The output has changed.
maybeRenotifyRenderedFirstFrame(surface); this.outputBufferRenderer = outputBufferRenderer;
if (outputBufferRenderer != null) {
outputMode = C.VIDEO_OUTPUT_MODE_YUV;
if (decoder != null) {
setDecoderOutputMode(outputMode);
}
onOutputChanged();
} else {
// The output has been removed. We leave the outputMode of the underlying decoder unchanged
// in anticipation that a subsequent output will likely be of the same type.
outputMode = C.VIDEO_OUTPUT_MODE_NONE;
onOutputRemoved();
}
} else if (outputBufferRenderer != null) {
// The output is unchanged and non-null.
onOutputReset();
}
} }
/** /**
* Notifies event dispatcher if video size changed. * Sets output mode of the decoder.
* *
* @param width New video width. * @param outputMode Output mode.
* @param height New video height.
*/ */
protected final void maybeNotifyVideoSizeChanged(int width, int height) { protected abstract void setDecoderOutputMode(@C.VideoOutputMode int outputMode);
if (reportedWidth != width || reportedHeight != height) {
reportedWidth = width;
reportedHeight = height;
eventDispatcher.videoSizeChanged(
width, height, /* unappliedRotationDegrees= */ 0, /* pixelWidthHeightRatio= */ 1);
}
}
/** Called after rendering a frame. */ // Internal methods.
protected final void onFrameRendered(Surface surface) {
consecutiveDroppedFrameCount = 0; private void setSourceDrmSession(@Nullable DrmSession<ExoMediaCrypto> session) {
decoderCounters.renderedOutputBufferCount++; DrmSession.replaceSessionReferences(sourceDrmSession, session);
maybeNotifyRenderedFirstFrame(surface); sourceDrmSession = session;
} }
// Internal methods. private void setDecoderDrmSession(@Nullable DrmSession<ExoMediaCrypto> session) {
DrmSession.replaceSessionReferences(decoderDrmSession, session);
decoderDrmSession = session;
}
private void maybeInitDecoder() throws ExoPlaybackException { private void maybeInitDecoder() throws ExoPlaybackException {
if (decoder != null) { if (decoder != null) {
...@@ -642,6 +669,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -642,6 +669,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
try { try {
long decoderInitializingTimestamp = SystemClock.elapsedRealtime(); long decoderInitializingTimestamp = SystemClock.elapsedRealtime();
decoder = createDecoder(inputFormat, mediaCrypto); decoder = createDecoder(inputFormat, mediaCrypto);
setDecoderOutputMode(outputMode);
long decoderInitializedTimestamp = SystemClock.elapsedRealtime(); long decoderInitializedTimestamp = SystemClock.elapsedRealtime();
onDecoderInitialized( onDecoderInitialized(
decoder.getName(), decoder.getName(),
...@@ -731,7 +759,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -731,7 +759,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
private boolean drainOutputBuffer(long positionUs, long elapsedRealtimeUs) private boolean drainOutputBuffer(long positionUs, long elapsedRealtimeUs)
throws ExoPlaybackException, VideoDecoderException { throws ExoPlaybackException, VideoDecoderException {
if (outputBuffer == null) { if (outputBuffer == null) {
outputBuffer = dequeueOutputBuffer(); outputBuffer = decoder.dequeueOutputBuffer();
if (outputBuffer == null) { if (outputBuffer == null) {
return false; return false;
} }
...@@ -746,7 +774,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -746,7 +774,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
maybeInitDecoder(); maybeInitDecoder();
} else { } else {
outputBuffer.release(); outputBuffer.release();
clearOutputBuffer(); outputBuffer = null;
outputStreamEnded = true; outputStreamEnded = true;
} }
return false; return false;
...@@ -755,7 +783,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -755,7 +783,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
boolean processedOutputBuffer = processOutputBuffer(positionUs, elapsedRealtimeUs); boolean processedOutputBuffer = processOutputBuffer(positionUs, elapsedRealtimeUs);
if (processedOutputBuffer) { if (processedOutputBuffer) {
onProcessedOutputBuffer(outputBuffer.timeUs); onProcessedOutputBuffer(outputBuffer.timeUs);
clearOutputBuffer(); outputBuffer = null;
} }
return processedOutputBuffer; return processedOutputBuffer;
} }
...@@ -777,7 +805,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -777,7 +805,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
} }
long earlyUs = outputBuffer.timeUs - positionUs; long earlyUs = outputBuffer.timeUs - positionUs;
if (!hasOutputSurface()) { if (!hasOutput()) {
// Skip frames in sync with playback, so we'll be at the right frame if the mode changes. // Skip frames in sync with playback, so we'll be at the right frame if the mode changes.
if (isBufferLate(earlyUs)) { if (isBufferLate(earlyUs)) {
skipOutputBuffer(outputBuffer); skipOutputBuffer(outputBuffer);
...@@ -797,8 +825,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -797,8 +825,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
if (!renderedFirstFrame if (!renderedFirstFrame
|| (isStarted || (isStarted
&& shouldForceRenderOutputBuffer(earlyUs, elapsedRealtimeNowUs - lastRenderTimeUs))) { && shouldForceRenderOutputBuffer(earlyUs, elapsedRealtimeNowUs - lastRenderTimeUs))) {
lastRenderTimeUs = SystemClock.elapsedRealtime() * 1000; renderOutputBuffer(outputBuffer, presentationTimeUs, outputFormat);
renderOutputBuffer(presentationTimeUs, outputFormat);
return true; return true;
} }
...@@ -815,14 +842,39 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -815,14 +842,39 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
} }
if (earlyUs < 30000) { if (earlyUs < 30000) {
lastRenderTimeUs = SystemClock.elapsedRealtime() * 1000; renderOutputBuffer(outputBuffer, presentationTimeUs, outputFormat);
renderOutputBuffer(presentationTimeUs, outputFormat);
return true; return true;
} }
return false; return false;
} }
private boolean hasOutput() {
return outputMode != C.VIDEO_OUTPUT_MODE_NONE;
}
private void onOutputChanged() {
// If we know the video size, report it again immediately.
maybeRenotifyVideoSizeChanged();
// We haven't rendered to the new output yet.
clearRenderedFirstFrame();
if (getState() == STATE_STARTED) {
setJoiningDeadlineMs();
}
}
private void onOutputRemoved() {
clearReportedVideoSize();
clearRenderedFirstFrame();
}
private void onOutputReset() {
// The output is unchanged and non-null. If we know the video size and/or have already
// rendered to the output, report these again immediately.
maybeRenotifyVideoSizeChanged();
maybeRenotifyRenderedFirstFrame();
}
private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException { private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackException {
if (decoderDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) { if (decoderDrmSession == null || (!bufferEncrypted && playClearSamplesWithoutKeys)) {
return false; return false;
...@@ -845,14 +897,14 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -845,14 +897,14 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
renderedFirstFrame = false; renderedFirstFrame = false;
} }
private void maybeNotifyRenderedFirstFrame(Surface surface) { private void maybeNotifyRenderedFirstFrame() {
if (!renderedFirstFrame) { if (!renderedFirstFrame) {
renderedFirstFrame = true; renderedFirstFrame = true;
eventDispatcher.renderedFirstFrame(surface); eventDispatcher.renderedFirstFrame(surface);
} }
} }
private void maybeRenotifyRenderedFirstFrame(Surface surface) { private void maybeRenotifyRenderedFirstFrame() {
if (renderedFirstFrame) { if (renderedFirstFrame) {
eventDispatcher.renderedFirstFrame(surface); eventDispatcher.renderedFirstFrame(surface);
} }
...@@ -863,6 +915,15 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer { ...@@ -863,6 +915,15 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
reportedHeight = Format.NO_VALUE; reportedHeight = Format.NO_VALUE;
} }
private void maybeNotifyVideoSizeChanged(int width, int height) {
if (reportedWidth != width || reportedHeight != height) {
reportedWidth = width;
reportedHeight = height;
eventDispatcher.videoSizeChanged(
width, height, /* unappliedRotationDegrees= */ 0, /* pixelWidthHeightRatio= */ 1);
}
}
private void maybeRenotifyVideoSizeChanged() { private void maybeRenotifyVideoSizeChanged() {
if (reportedWidth != Format.NO_VALUE || reportedHeight != Format.NO_VALUE) { if (reportedWidth != Format.NO_VALUE || reportedHeight != Format.NO_VALUE) {
eventDispatcher.videoSizeChanged( eventDispatcher.videoSizeChanged(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment