Skip to content

SDK / exoplayer

Go to a project
Commit b58f6940 by eguven Committed by Oliver Woodman
Options

Add VideoFrameMetadataListener 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209193233
parent bd8a956d
Expand all
Inline Side-by-side
Showing with 529 additions and 57 deletions
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
...@@ -39,8 +39,10 @@ import com.google.android.exoplayer2.drm.DrmSessionManager; ...@@ -39,8 +39,10 @@ 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.Assertions;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.TimedValueQueue;
import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.TraceUtil;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.VideoRendererEventListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher; import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -109,11 +111,14 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -109,11 +111,14 @@ public class LibvpxVideoRenderer extends BaseRenderer {
private final boolean playClearSamplesWithoutKeys; private final boolean playClearSamplesWithoutKeys;
private final EventDispatcher eventDispatcher; private final EventDispatcher eventDispatcher;
private final FormatHolder formatHolder; private final FormatHolder formatHolder;
private final TimedValueQueue<Format> formatQueue;
private final DecoderInputBuffer flagsOnlyBuffer; private final DecoderInputBuffer flagsOnlyBuffer;
private final DrmSessionManager<ExoMediaCrypto> drmSessionManager; private final DrmSessionManager<ExoMediaCrypto> drmSessionManager;
private final boolean useSurfaceYuvOutput; private final boolean useSurfaceYuvOutput;
private Format format; private Format format;
private Format pendingFormat;
private Format outputFormat;
private VpxDecoder decoder; private VpxDecoder decoder;
private VpxInputBuffer inputBuffer; private VpxInputBuffer inputBuffer;
private VpxOutputBuffer outputBuffer; private VpxOutputBuffer outputBuffer;
...@@ -142,6 +147,8 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -142,6 +147,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
private int consecutiveDroppedFrameCount; private int consecutiveDroppedFrameCount;
private int buffersInCodecCount; private int buffersInCodecCount;
private long lastRenderTimeUs; private long lastRenderTimeUs;
private long outputStreamOffsetUs;
private VideoFrameMetadataListener frameMetadataListener;
protected DecoderCounters decoderCounters; protected DecoderCounters decoderCounters;
...@@ -219,6 +226,7 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -219,6 +226,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
joiningDeadlineMs = C.TIME_UNSET; joiningDeadlineMs = C.TIME_UNSET;
clearReportedVideoSize(); clearReportedVideoSize();
formatHolder = new FormatHolder(); formatHolder = new FormatHolder();
formatQueue = new TimedValueQueue<>();
flagsOnlyBuffer = DecoderInputBuffer.newFlagsOnlyInstance(); flagsOnlyBuffer = DecoderInputBuffer.newFlagsOnlyInstance();
eventDispatcher = new EventDispatcher(eventHandler, eventListener); eventDispatcher = new EventDispatcher(eventHandler, eventListener);
outputMode = VpxDecoder.OUTPUT_MODE_NONE; outputMode = VpxDecoder.OUTPUT_MODE_NONE;
...@@ -328,6 +336,7 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -328,6 +336,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
} else { } else {
joiningDeadlineMs = C.TIME_UNSET; joiningDeadlineMs = C.TIME_UNSET;
} }
formatQueue.clear();
} }
@Override @Override
...@@ -371,6 +380,12 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -371,6 +380,12 @@ public class LibvpxVideoRenderer extends BaseRenderer {
} }
} }
@Override
protected void onStreamChanged(Format[] formats, long offsetUs) throws ExoPlaybackException {
outputStreamOffsetUs = offsetUs;
super.onStreamChanged(formats, offsetUs);
}
/** /**
* Called when a decoder has been created and configured. * Called when a decoder has been created and configured.
* *
...@@ -437,6 +452,7 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -437,6 +452,7 @@ public class LibvpxVideoRenderer extends BaseRenderer {
protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackException { protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackException {
Format oldFormat = format; Format oldFormat = format;
format = newFormat; format = newFormat;
pendingFormat = newFormat;
boolean drmInitDataChanged = !Util.areEqual(format.drmInitData, oldFormat == null ? null boolean drmInitDataChanged = !Util.areEqual(format.drmInitData, oldFormat == null ? null
: oldFormat.drmInitData); : oldFormat.drmInitData);
...@@ -629,6 +645,8 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -629,6 +645,8 @@ public class LibvpxVideoRenderer extends BaseRenderer {
setOutput((Surface) message, null); setOutput((Surface) message, null);
} else if (messageType == MSG_SET_OUTPUT_BUFFER_RENDERER) { } else if (messageType == MSG_SET_OUTPUT_BUFFER_RENDERER) {
setOutput(null, (VpxOutputBufferRenderer) message); setOutput(null, (VpxOutputBufferRenderer) message);
} else if (messageType == C.MSG_SET_VIDEO_FRAME_METADATA_LISTENER) {
frameMetadataListener = (VideoFrameMetadataListener) message;
} else { } else {
super.handleMessage(messageType, message); super.handleMessage(messageType, message);
} }
...@@ -772,6 +790,10 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -772,6 +790,10 @@ public class LibvpxVideoRenderer extends BaseRenderer {
if (waitingForKeys) { if (waitingForKeys) {
return false; return false;
} }
if (pendingFormat != null) {
formatQueue.add(inputBuffer.timeUs, pendingFormat);
pendingFormat = null;
}
inputBuffer.flip(); inputBuffer.flip();
inputBuffer.colorInfo = formatHolder.format.colorInfo; inputBuffer.colorInfo = formatHolder.format.colorInfo;
onQueueInputBuffer(inputBuffer); onQueueInputBuffer(inputBuffer);
...@@ -851,11 +873,21 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -851,11 +873,21 @@ public class LibvpxVideoRenderer extends BaseRenderer {
return false; return false;
} }
long presentationTimeUs = outputBuffer.timeUs - outputStreamOffsetUs;
Format format = formatQueue.pollFloor(presentationTimeUs);
if (format != null) {
outputFormat = format;
}
long elapsedRealtimeNowUs = SystemClock.elapsedRealtime() * 1000; long elapsedRealtimeNowUs = SystemClock.elapsedRealtime() * 1000;
boolean isStarted = getState() == STATE_STARTED; boolean isStarted = getState() == STATE_STARTED;
if (!renderedFirstFrame if (!renderedFirstFrame
|| (isStarted || (isStarted
&& shouldForceRenderOutputBuffer(earlyUs, elapsedRealtimeNowUs - lastRenderTimeUs))) { && shouldForceRenderOutputBuffer(earlyUs, elapsedRealtimeNowUs - lastRenderTimeUs))) {
if (frameMetadataListener != null) {
frameMetadataListener.onVideoFrameAboutToBeRendered(
presentationTimeUs, System.nanoTime(), outputFormat);
}
renderOutputBuffer(outputBuffer); renderOutputBuffer(outputBuffer);
return true; return true;
} }
...@@ -873,6 +905,10 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -873,6 +905,10 @@ public class LibvpxVideoRenderer extends BaseRenderer {
} }
if (earlyUs < 30000) { if (earlyUs < 30000) {
if (frameMetadataListener != null) {
frameMetadataListener.onVideoFrameAboutToBeRendered(
presentationTimeUs, System.nanoTime(), outputFormat);
}
renderOutputBuffer(outputBuffer); renderOutputBuffer(outputBuffer);
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/C.java
...@@ -26,6 +26,7 @@ import android.view.Surface; ...@@ -26,6 +26,7 @@ import android.view.Surface;
import com.google.android.exoplayer2.PlayerMessage.Target; import com.google.android.exoplayer2.PlayerMessage.Target;
import com.google.android.exoplayer2.audio.AuxEffectInfo; import com.google.android.exoplayer2.audio.AuxEffectInfo;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.UUID; import java.util.UUID;
...@@ -734,6 +735,13 @@ public final class C { ...@@ -734,6 +735,13 @@ public final class C {
public static final int MSG_SET_AUX_EFFECT_INFO = 5; public static final int MSG_SET_AUX_EFFECT_INFO = 5;
/** /**
* The type of a message that can be passed to a video {@link Renderer} via {@link
* ExoPlayer#createMessage(Target)}. The message payload should be a {@link
* VideoFrameMetadataListener} instance, or null.
*/
public static final int MSG_SET_VIDEO_FRAME_METADATA_LISTENER = 6;
/**
* Applications or extensions may define custom {@code MSG_*} constants that can be passed to * Applications or extensions may define custom {@code MSG_*} constants that can be passed to
* {@link Renderer}s. These custom constants must be greater than or equal to this value. * {@link Renderer}s. These custom constants must be greater than or equal to this value.
*/ */
......
library/core/src/main/java/com/google/android/exoplayer2/Player.java
...@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.source.TrackGroupArray; ...@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.text.TextOutput; import com.google.android.exoplayer2.text.TextOutput;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoListener; import com.google.android.exoplayer2.video.VideoListener;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -166,6 +167,25 @@ public interface Player { ...@@ -166,6 +167,25 @@ public interface Player {
void removeVideoListener(VideoListener listener); void removeVideoListener(VideoListener listener);
/** /**
* Sets a listener to receive video frame metadata events.
*
* <p>This method is intended to be called by the same component that sets the {@link Surface}
* onto which video will be rendered. If using ExoPlayer's standard UI components, this method
* should not be called directly from application code.
*
* @param listener The listener.
*/
void setVideoFrameMetadataListener(VideoFrameMetadataListener listener);
/**
* Clears the listener which receives video frame metadata events if it matches the one passed.
* Else does nothing.
*
* @param listener The listener to clear.
*/
void clearVideoFrameMetadataListener(VideoFrameMetadataListener listener);
/**
* Clears any {@link Surface}, {@link SurfaceHolder}, {@link SurfaceView} or {@link TextureView} * Clears any {@link Surface}, {@link SurfaceHolder}, {@link SurfaceView} or {@link TextureView}
* currently set on the player. * currently set on the player.
*/ */
......
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
...@@ -51,6 +51,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelector; ...@@ -51,6 +51,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.BandwidthMeter;
import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.Clock;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.VideoRendererEventListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
...@@ -105,6 +106,7 @@ public class SimpleExoPlayer ...@@ -105,6 +106,7 @@ public class SimpleExoPlayer
private float audioVolume; private float audioVolume;
private MediaSource mediaSource; private MediaSource mediaSource;
private List<Cue> currentCues; private List<Cue> currentCues;
private VideoFrameMetadataListener videoFrameMetadataListener;
/** /**
* @param renderersFactory A factory for creating {@link Renderer}s to be used by the instance. * @param renderersFactory A factory for creating {@link Renderer}s to be used by the instance.
...@@ -598,6 +600,36 @@ public class SimpleExoPlayer ...@@ -598,6 +600,36 @@ public class SimpleExoPlayer
videoListeners.remove(listener); videoListeners.remove(listener);
} }
@Override
public void setVideoFrameMetadataListener(VideoFrameMetadataListener listener) {
videoFrameMetadataListener = listener;
for (Renderer renderer : renderers) {
if (renderer.getTrackType() == C.TRACK_TYPE_VIDEO) {
player
.createMessage(renderer)
.setType(C.MSG_SET_VIDEO_FRAME_METADATA_LISTENER)
.setPayload(listener)
.send();
}
}
}
@Override
public void clearVideoFrameMetadataListener(VideoFrameMetadataListener listener) {
if (videoFrameMetadataListener != listener) {
return;
}
for (Renderer renderer : renderers) {
if (renderer.getTrackType() == C.TRACK_TYPE_VIDEO) {
player
.createMessage(renderer)
.setType(C.MSG_SET_VIDEO_FRAME_METADATA_LISTENER)
.setPayload(null)
.send();
}
}
}
/** /**
* Sets a listener to receive video events, removing all existing listeners. * Sets a listener to receive video events, removing all existing listeners.
* *
......
library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
...@@ -547,9 +547,17 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -547,9 +547,17 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
} }
@Override @Override
protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, MediaCodec codec, protected boolean processOutputBuffer(
ByteBuffer buffer, int bufferIndex, int bufferFlags, long bufferPresentationTimeUs, long positionUs,
boolean shouldSkip) throws ExoPlaybackException { long elapsedRealtimeUs,
MediaCodec codec,
ByteBuffer buffer,
int bufferIndex,
int bufferFlags,
long bufferPresentationTimeUs,
boolean shouldSkip,
Format format)
throws ExoPlaybackException {
if (passthroughEnabled && (bufferFlags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) { if (passthroughEnabled && (bufferFlags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
// Discard output buffers from the passthrough (raw) decoder containing codec specific data. // Discard output buffers from the passthrough (raw) decoder containing codec specific data.
codec.releaseOutputBuffer(bufferIndex, false); codec.releaseOutputBuffer(bufferIndex, false);
......
library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java 0 → 100644
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.exoplayer2.util;
import android.support.annotation.Nullable;
import java.util.Arrays;
import org.checkerframework.checker.nullness.compatqual.NullableType;
/** A utility class to keep a queue of values with timestamps. This class is thread safe. */
public final class TimedValueQueue<V> {
private static final int INITIAL_BUFFER_SIZE = 10;
// Looping buffer for timestamps and values
private long[] timestamps;
private @NullableType V[] values;
private int first;
private int size;
public TimedValueQueue() {
this(INITIAL_BUFFER_SIZE);
}
/** Creates a TimedValueBuffer with the given initial buffer size. */
public TimedValueQueue(int initialBufferSize) {
timestamps = new long[initialBufferSize];
values = newArray(initialBufferSize);
}
/**
* Associates the specified value with the specified timestamp. All new values should have a
* greater timestamp than the previously added values. Otherwise all values are removed before
* adding the new one.
*/
public synchronized void add(long timestamp, V value) {
clearBufferOnTimeDiscontinuity(timestamp);
doubleCapacityIfFull();
addUnchecked(timestamp, value);
}
/** Removes all of the values. */
public synchronized void clear() {
first = 0;
size = 0;
Arrays.fill(values, null);
}
/** Returns number of the values buffered. */
public synchronized int size() {
return size;
}
/**
* Returns the value with the greatest timestamp which is less than or equal to the given
* timestamp. Removes all older values including the returned one from the buffer.
*
* @param timestamp The timestamp value.
* @return The value with the greatest timestamp which is less than or equal to the given
* timestamp or null if there is no such value.
* @see #poll(long)
*/
public synchronized @Nullable V pollFloor(long timestamp) {
return poll(timestamp, /* onlyOlder= */ true);
}
/**
* Returns the value with the closest timestamp to the given timestamp. Removes all older values
* including the returned one from the buffer.
*
* @param timestamp The timestamp value.
* @return The value with the closest timestamp or null if the buffer is empty.
* @see #pollFloor(long)
*/
public synchronized @Nullable V poll(long timestamp) {
return poll(timestamp, /* onlyOlder= */ false);
}
/**
* Returns the value with the closest timestamp to the given timestamp. Removes all older values
* including the returned one from the buffer.
*
* @param timestamp The timestamp value.
* @param onlyOlder Whether this method can return a new value in case its timestamp value is
* closest to {@code timestamp}.
* @return The value with the closest timestamp or null if the buffer is empty or there is no
* older value and {@code onlyOlder} is true.
*/
private @Nullable V poll(long timestamp, boolean onlyOlder) {
V value = null;
long previousTimeDiff = Long.MAX_VALUE;
while (size > 0) {
long timeDiff = timestamp - timestamps[first];
if (timeDiff < 0 && (onlyOlder || -timeDiff >= previousTimeDiff)) {
break;
}
previousTimeDiff = timeDiff;
value = values[first];
values[first] = null;
first = (first + 1) % values.length;
size--;
}
return value;
}
private void clearBufferOnTimeDiscontinuity(long timestamp) {
if (size > 0) {
int last = (first + size - 1) % values.length;
if (timestamp <= timestamps[last]) {
clear();
}
}
}
private void doubleCapacityIfFull() {
int capacity = values.length;
if (size < capacity) {
return;
}
int newCapacity = capacity * 2;
long[] newTimestamps = new long[newCapacity];
V[] newValues = newArray(newCapacity);
// Reset the loop starting index to 0 while coping to the new buffer.
// First copy the values from 'first' index to the end of original array.
int length = capacity - first;
System.arraycopy(timestamps, first, newTimestamps, 0, length);
System.arraycopy(values, first, newValues, 0, length);
// Then the values from index 0 to 'first' index.
if (first > 0) {
System.arraycopy(timestamps, 0, newTimestamps, length, first);
System.arraycopy(values, 0, newValues, length, first);
}
timestamps = newTimestamps;
values = newValues;
first = 0;
}
private void addUnchecked(long timestamp, V value) {
int next = (first + size) % values.length;
timestamps[next] = timestamp;
values[next] = value;
size++;
}
@SuppressWarnings("unchecked")
private static <V> V[] newArray(int length) {
return (V[]) new Object[length];
}
}
library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
...@@ -136,6 +136,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -136,6 +136,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
private long lastInputTimeUs; private long lastInputTimeUs;
private long outputStreamOffsetUs; private long outputStreamOffsetUs;
private int pendingOutputStreamOffsetCount; private int pendingOutputStreamOffsetCount;
private @Nullable VideoFrameMetadataListener frameMetadataListener;
/** /**
* @param context A context. * @param context A context.
...@@ -386,6 +387,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -386,6 +387,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
if (codec != null) { if (codec != null) {
codec.setVideoScalingMode(scalingMode); codec.setVideoScalingMode(scalingMode);
} }
} else if (messageType == C.MSG_SET_VIDEO_FRAME_METADATA_LISTENER) {
frameMetadataListener = (VideoFrameMetadataListener) message;
} else { } else {
super.handleMessage(messageType, message); super.handleMessage(messageType, message);
} }
...@@ -587,9 +590,17 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -587,9 +590,17 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
} }
@Override @Override
protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, MediaCodec codec, protected boolean processOutputBuffer(
ByteBuffer buffer, int bufferIndex, int bufferFlags, long bufferPresentationTimeUs, long positionUs,
boolean shouldSkip) throws ExoPlaybackException { long elapsedRealtimeUs,
MediaCodec codec,
ByteBuffer buffer,
int bufferIndex,
int bufferFlags,
long bufferPresentationTimeUs,
boolean shouldSkip,
Format format)
throws ExoPlaybackException {
if (initialPositionUs == C.TIME_UNSET) { if (initialPositionUs == C.TIME_UNSET) {
initialPositionUs = positionUs; initialPositionUs = positionUs;
} }
...@@ -616,8 +627,10 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -616,8 +627,10 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
if (!renderedFirstFrame if (!renderedFirstFrame
|| (isStarted || (isStarted
&& shouldForceRenderOutputBuffer(earlyUs, elapsedRealtimeNowUs - lastRenderTimeUs))) { && shouldForceRenderOutputBuffer(earlyUs, elapsedRealtimeNowUs - lastRenderTimeUs))) {
long releaseTimeNs = System.nanoTime();
notifyFrameMetadataListener(presentationTimeUs, releaseTimeNs, format);
if (Util.SDK_INT >= 21) { if (Util.SDK_INT >= 21) {
renderOutputBufferV21(codec, bufferIndex, presentationTimeUs, System.nanoTime()); renderOutputBufferV21(codec, bufferIndex, presentationTimeUs, releaseTimeNs);
} else { } else {
renderOutputBuffer(codec, bufferIndex, presentationTimeUs); renderOutputBuffer(codec, bufferIndex, presentationTimeUs);
} }
...@@ -653,6 +666,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -653,6 +666,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
if (Util.SDK_INT >= 21) { if (Util.SDK_INT >= 21) {
// Let the underlying framework time the release. // Let the underlying framework time the release.
if (earlyUs < 50000) { if (earlyUs < 50000) {
notifyFrameMetadataListener(presentationTimeUs, adjustedReleaseTimeNs, format);
renderOutputBufferV21(codec, bufferIndex, presentationTimeUs, adjustedReleaseTimeNs); renderOutputBufferV21(codec, bufferIndex, presentationTimeUs, adjustedReleaseTimeNs);
return true; return true;
} }
...@@ -670,6 +684,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -670,6 +684,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
return false; return false;
} }
} }
notifyFrameMetadataListener(presentationTimeUs, adjustedReleaseTimeNs, format);
renderOutputBuffer(codec, bufferIndex, presentationTimeUs); renderOutputBuffer(codec, bufferIndex, presentationTimeUs);
return true; return true;
} }
...@@ -679,10 +694,18 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { ...@@ -679,10 +694,18 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
return false; return false;
} }
private void notifyFrameMetadataListener(
long presentationTimeUs, long releaseTimeNs, Format format) {
if (frameMetadataListener != null) {
frameMetadataListener.onVideoFrameAboutToBeRendered(
presentationTimeUs, releaseTimeNs, format);
}
}
/** /**
* Returns the offset that should be subtracted from {@code bufferPresentationTimeUs} in {@link * Returns the offset that should be subtracted from {@code bufferPresentationTimeUs} in {@link
* #processOutputBuffer(long, long, MediaCodec, ByteBuffer, int, int, long, boolean)} to get the * #processOutputBuffer(long, long, MediaCodec, ByteBuffer, int, int, long, boolean, Format)} to
* playback position with respect to the media. * get the playback position with respect to the media.
*/ */
protected long getOutputStreamOffsetUs() { protected long getOutputStreamOffsetUs() {
return outputStreamOffsetUs; return outputStreamOffsetUs;
......
library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java 0 → 100644
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.exoplayer2.video;
import com.google.android.exoplayer2.Format;
/** A listener for metadata corresponding to video frame being rendered. */
public interface VideoFrameMetadataListener {
/**
* Called when the video frame about to be rendered. This method is called on the playback thread.
*
* @param presentationTimeUs The presentation time of the output buffer, in microseconds.
* @param releaseTimeNs The wallclock time at which the frame should be displayed, in nanoseconds.
* If the platform API version of the device is less than 21, then this is the best effort.
* @param format The format associated with the frame.
*/
void onVideoFrameAboutToBeRendered(long presentationTimeUs, long releaseTimeNs, Format format);
}
library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java 0 → 100644
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.exoplayer2.util;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link TimedValueQueue}. */
@RunWith(RobolectricTestRunner.class)
public class TimedValueQueueTest {
private TimedValueQueue<String> queue;
@Before
public void setUp() throws Exception {
queue = new TimedValueQueue<>();
}
@Test
public void testAddAndPollValues() {
queue.add(0, "a");
queue.add(1, "b");
queue.add(2, "c");
assertThat(queue.poll(0)).isEqualTo("a");
assertThat(queue.poll(1)).isEqualTo("b");
assertThat(queue.poll(2)).isEqualTo("c");
}
@Test
public void testBufferCapacityIncreasesAutomatically() {
queue = new TimedValueQueue<>(1);
for (int i = 0; i < 20; i++) {
queue.add(i, "" + i);
if ((i & 1) == 1) {
assertThat(queue.poll(0)).isEqualTo("" + (i / 2));
}
}
assertThat(queue.size()).isEqualTo(10);
}
@Test
public void testTimeDiscontinuityClearsValues() {
queue.add(1, "b");
queue.add(2, "c");
queue.add(0, "a");
assertThat(queue.size()).isEqualTo(1);
assertThat(queue.poll(0)).isEqualTo("a");
}
@Test
public void testTimeDiscontinuityOnFullBufferClearsValues() {
queue = new TimedValueQueue<>(2);
queue.add(1, "b");
queue.add(3, "c");
queue.add(2, "a");
assertThat(queue.size()).isEqualTo(1);
assertThat(queue.poll(2)).isEqualTo("a");
}
@Test
public void testPollReturnsClosestValue() {
queue.add(0, "a");
queue.add(3, "b");
assertThat(queue.poll(2)).isEqualTo("b");
assertThat(queue.size()).isEqualTo(0);
}
@Test
public void testPollRemovesPreviousValues() {
queue.add(0, "a");
queue.add(1, "b");
queue.add(2, "c");
assertThat(queue.poll(1)).isEqualTo("b");
assertThat(queue.size()).isEqualTo(1);
}
@Test
public void testPollFloorReturnsClosestPreviousValue() {
queue.add(0, "a");
queue.add(3, "b");
assertThat(queue.pollFloor(2)).isEqualTo("a");
assertThat(queue.pollFloor(2)).isEqualTo(null);
assertThat(queue.pollFloor(3)).isEqualTo("b");
assertThat(queue.size()).isEqualTo(0);
}
@Test
public void testPollFloorRemovesPreviousValues() {
queue.add(0, "a");
queue.add(1, "b");
queue.add(2, "c");
assertThat(queue.pollFloor(1)).isEqualTo("b");
assertThat(queue.size()).isEqualTo(1);
}
}
testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java
...@@ -126,17 +126,33 @@ public class DebugRenderersFactory extends DefaultRenderersFactory { ...@@ -126,17 +126,33 @@ public class DebugRenderersFactory extends DefaultRenderersFactory {
} }
@Override @Override
protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, MediaCodec codec, protected boolean processOutputBuffer(
ByteBuffer buffer, int bufferIndex, int bufferFlags, long bufferPresentationTimeUs, long positionUs,
boolean shouldSkip) throws ExoPlaybackException { long elapsedRealtimeUs,
MediaCodec codec,
ByteBuffer buffer,
int bufferIndex,
int bufferFlags,
long bufferPresentationTimeUs,
boolean shouldSkip,
Format format)
throws ExoPlaybackException {
if (skipToPositionBeforeRenderingFirstFrame && bufferPresentationTimeUs < positionUs) { if (skipToPositionBeforeRenderingFirstFrame && bufferPresentationTimeUs < positionUs) {
// After the codec has been initialized, don't render the first frame until we've caught up // After the codec has been initialized, don't render the first frame until we've caught up
// to the playback position. Else test runs on devices that do not support dummy surface // to the playback position. Else test runs on devices that do not support dummy surface
// will drop frames between rendering the first one and catching up [Internal: b/66494991]. // will drop frames between rendering the first one and catching up [Internal: b/66494991].
shouldSkip = true; shouldSkip = true;
} }
return super.processOutputBuffer(positionUs, elapsedRealtimeUs, codec, buffer, bufferIndex, return super.processOutputBuffer(
bufferFlags, bufferPresentationTimeUs, shouldSkip); positionUs,
elapsedRealtimeUs,
codec,
buffer,
bufferIndex,
bufferFlags,
bufferPresentationTimeUs,
shouldSkip,
format);
} }
@Override @Override
......
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