loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-04 06:00:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add plumbing for decoderReleased analytics events

Browse Source 
A subsequent CL will plumb a release reason through these
event paths.

PiperOrigin-RevId: 338655603
This commit is contained in:
olly 2020-10-23 13:26:42 +01:00 committed by Oliver Woodman
parent 485949b56c
commit e5434ff4d3
12 changed files with 112 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
View File

@ -215,9 +215,9 @@ public interface Renderer extends PlayerMessage.Target {
@IntDef({STATE_DISABLED, STATE_ENABLED, STATE_STARTED})
@interface State {}
/**
* The renderer is disabled. A renderer in this state may hold resources that it requires for
* rendering (e.g. media decoders), for use if it's subsequently enabled. {@link #reset()} can be
* called to force the renderer to release these resources.
* The renderer is disabled. A renderer in this state will not proactively acquire resources that
* it requires for rendering (e.g., media decoders), but may continue to hold any that it already
* has. {@link #reset()} can be called to force the renderer to release such resources.
*/
int STATE_DISABLED = 0;
/**

14
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
View File

@ -2285,6 +2285,13 @@ public class SimpleExoPlayer extends BasePlayer
}
}
@Override
public void onVideoDecoderReleased(String decoderName) {
for (VideoRendererEventListener videoDebugListener : videoDebugListeners) {
videoDebugListener.onVideoDecoderReleased(decoderName);
}
}
@Override
public void onVideoDisabled(DecoderCounters counters) {
for (VideoRendererEventListener videoDebugListener : videoDebugListeners) {
@ -2351,6 +2358,13 @@ public class SimpleExoPlayer extends BasePlayer
}
}
@Override
public void onAudioDecoderReleased(String decoderName) {
for (AudioRendererEventListener audioDebugListener : audioDebugListeners) {
audioDebugListener.onAudioDecoderReleased(decoderName);
}
}
@Override
public void onAudioDisabled(DecoderCounters counters) {
for (AudioRendererEventListener audioDebugListener : audioDebugListeners) {

12
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
View File

@ -220,6 +220,12 @@ public class AnalyticsCollector
listener.onAudioUnderrun(eventTime, bufferSize, bufferSizeMs, elapsedSinceLastFeedMs));
}
@Override
public final void onAudioDecoderReleased(String decoderName) {
EventTime eventTime = generateReadingMediaPeriodEventTime();
listeners.sendEvent(listener -> listener.onAudioDecoderReleased(eventTime, decoderName));
}
@SuppressWarnings("deprecation")
@Override
public final void onAudioDisabled(DecoderCounters counters) {
@ -307,6 +313,12 @@ public class AnalyticsCollector
listeners.sendEvent(listener -> listener.onDroppedVideoFrames(eventTime, count, elapsedMs));
}
@Override
public final void onVideoDecoderReleased(String decoderName) {
EventTime eventTime = generateReadingMediaPeriodEventTime();
listeners.sendEvent(listener -> listener.onVideoDecoderReleased(eventTime, decoderName));
}
@SuppressWarnings("deprecation")
@Override
public final void onVideoDisabled(DecoderCounters counters) {

16
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
View File

@ -512,6 +512,14 @@ public interface AnalyticsListener {
default void onAudioUnderrun(
EventTime eventTime, int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {}
/**
* Called when an audio renderer releases a decoder.
*
* @param eventTime The event time.
* @param decoderName The decoder that was released.
*/
default void onAudioDecoderReleased(EventTime eventTime, String decoderName) {}
/**
* Called when an audio renderer is disabled.
*
@ -600,6 +608,14 @@ public interface AnalyticsListener {
*/
default void onDroppedVideoFrames(EventTime eventTime, int droppedFrames, long elapsedMs) {}
/**
* Called when a video renderer releases a decoder.
*
* @param eventTime The event time.
* @param decoderName The decoder that was released.
*/
default void onVideoDecoderReleased(EventTime eventTime, String decoderName) {}
/**
* Called when a video renderer is disabled.
*

14
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
View File

@ -87,6 +87,13 @@ public interface AudioRendererEventListener {
*/
default void onAudioUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {}
/**
* Called when a decoder is released.
*
* @param decoderName The decoder that was released.
*/
default void onAudioDecoderReleased(String decoderName) {}
/**
* Called when the renderer is disabled.
*
@ -184,6 +191,13 @@ public interface AudioRendererEventListener {
}
}
/** Invokes {@link AudioRendererEventListener#onAudioDecoderReleased(String)}. */
public void decoderReleased(String decoderName) {
if (handler != null) {
handler.post(() -> castNonNull(listener).onAudioDecoderReleased(decoderName));
}
}
/** Invokes {@link AudioRendererEventListener#onAudioDisabled(DecoderCounters)}. */
public void disabled(DecoderCounters counters) {
counters.ensureUpdated();

5
library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java
View File

@ -632,9 +632,10 @@ public abstract class DecoderAudioRenderer<
decoderReinitializationState = REINITIALIZATION_STATE_NONE;
decoderReceivedBuffers = false;
if (decoder != null) {
decoder.release();
decoder = null;
decoderCounters.decoderReleaseCount++;
decoder.release();
eventDispatcher.decoderReleased(decoder.getName());
decoder = null;
}
setDecoderDrmSession(null);
}

5
library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
View File

@ -391,6 +391,11 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
eventDispatcher.decoderInitialized(name, initializedTimestampMs, initializationDurationMs);
}
@Override
protected void onCodecReleased(String name) {
eventDispatcher.decoderReleased(name);
}
@Override
protected void onInputFormatChanged(FormatHolder formatHolder) throws ExoPlaybackException {
super.onInputFormatChanged(formatHolder);

12
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View File

@ -745,6 +745,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
if (codec != null) {
decoderCounters.decoderReleaseCount++;
codec.release();
onCodecReleased(codecInfo.name);
}
} finally {
codec = null;
@ -1384,6 +1385,17 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
// Do nothing.
}
/**
* Called when a {@link MediaCodec} has been released.
*
* <p>The default implementation is a no-op.
*
* @param name The name of the codec that was released.
*/
protected void onCodecReleased(String name) {
// Do nothing.
}
/**
* Called when a new {@link Format} is read from the upstream {@link MediaPeriod}.
*

10
library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
View File

@ -342,6 +342,11 @@ public class EventLogger implements AnalyticsListener {
/* throwable= */ null);
}
@Override
public void onAudioDecoderReleased(EventTime eventTime, String decoderName) {
logd(eventTime, "audioDecoderReleased", decoderName);
}
@Override
public void onAudioDisabled(EventTime eventTime, DecoderCounters counters) {
logd(eventTime, "audioDisabled");
@ -397,6 +402,11 @@ public class EventLogger implements AnalyticsListener {
logd(eventTime, "droppedFrames", Integer.toString(count));
}
@Override
public void onVideoDecoderReleased(EventTime eventTime, String decoderName) {
logd(eventTime, "videoDecoderReleased", decoderName);
}
@Override
public void onVideoDisabled(EventTime eventTime, DecoderCounters counters) {
logd(eventTime, "videoDisabled");

23
library/core/src/main/java/com/google/android/exoplayer2/video/DecoderVideoRenderer.java
View File

@ -311,22 +311,6 @@ public abstract class DecoderVideoRenderer extends BaseRenderer {
super.onStreamChanged(formats, startPositionUs, offsetUs);
}
/**
* Called when a decoder has been created and configured.
*
* <p>The default implementation is a no-op.
*
* @param name The name of the decoder that was initialized.
* @param initializedTimestampMs {@link SystemClock#elapsedRealtime()} when initialization
* finished.
* @param initializationDurationMs The time taken to initialize the decoder, in milliseconds.
*/
@CallSuper
protected void onDecoderInitialized(
String name, long initializedTimestampMs, long initializationDurationMs) {
eventDispatcher.decoderInitialized(name, initializedTimestampMs, initializationDurationMs);
}
/**
* Flushes the decoder.
*
@ -358,9 +342,10 @@ public abstract class DecoderVideoRenderer extends BaseRenderer {
decoderReceivedBuffers = false;
buffersInCodecCount = 0;
if (decoder != null) {
decoder.release();
decoder = null;
decoderCounters.decoderReleaseCount++;
decoder.release();
eventDispatcher.decoderReleased(decoder.getName());
decoder = null;
}
setDecoderDrmSession(null);
}
@ -690,7 +675,7 @@ public abstract class DecoderVideoRenderer extends BaseRenderer {
decoder = createDecoder(inputFormat, mediaCrypto);
setDecoderOutputMode(outputMode);
long decoderInitializedTimestamp = SystemClock.elapsedRealtime();
onDecoderInitialized(
eventDispatcher.decoderInitialized(
decoder.getName(),
decoderInitializedTimestamp,
decoderInitializedTimestamp - decoderInitializingTimestamp);

5
library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
View File

@ -616,6 +616,11 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
Assertions.checkNotNull(getCodecInfo()).isHdr10PlusOutOfBandMetadataSupported();
}
@Override
protected void onCodecReleased(String name) {
eventDispatcher.decoderReleased(name);
}
@Override
protected void onInputFormatChanged(FormatHolder formatHolder) throws ExoPlaybackException {
super.onInputFormatChanged(formatHolder);

14
library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
View File

@ -120,6 +120,13 @@ public interface VideoRendererEventListener {
*/
default void onRenderedFirstFrame(@Nullable Surface surface) {}
/**
* Called when a decoder is released.
*
* @param decoderName The decoder that was released.
*/
default void onVideoDecoderReleased(String decoderName) {}
/**
* Called when the renderer is disabled.
*
@ -211,6 +218,13 @@ public interface VideoRendererEventListener {
}
}
/** Invokes {@link VideoRendererEventListener#onVideoDecoderReleased(String)}. */
public void decoderReleased(String decoderName) {
if (handler != null) {
handler.post(() -> castNonNull(listener).onVideoDecoderReleased(decoderName));
}
}
/** Invokes {@link VideoRendererEventListener#onVideoDisabled(DecoderCounters)}. */
public void disabled(DecoderCounters counters) {
counters.ensureUpdated();