diff --git a/RELEASENOTES.md b/RELEASENOTES.md index b9ddba81e5..b440689d2d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -36,6 +36,7 @@ the `Format#id` field of the subtitle track created from the configuration ((#9673)[https://github.com/google/ExoPlayer/issues/9673]). + * Rename `DecoderCounters#inputBufferCount` to `queuedInputBufferCount`. * DRM: * Remove `playbackLooper` from `DrmSessionManager.(pre)acquireSession`. When a `DrmSessionManager` is used by an app in a custom `MediaSource`, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java index c00129b37a..5dfcbf0653 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java @@ -472,7 +472,7 @@ public abstract class DecoderAudioRenderer< onQueueInputBuffer(inputBuffer); decoder.queueInputBuffer(inputBuffer); decoderReceivedBuffers = true; - decoderCounters.inputBufferCount++; + decoderCounters.queuedInputBufferCount++; inputBuffer = null; return true; default: diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java index 8e3d8d9956..48cddf2d50 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java @@ -31,7 +31,7 @@ public final class DecoderCounters { /** The number of times a decoder has been released. */ public int decoderReleaseCount; /** The number of input buffers queued to the decoder. */ - public int inputBufferCount; + public int queuedInputBufferCount; /** * The number of skipped input buffers. * @@ -68,7 +68,7 @@ public final class DecoderCounters { /** * The maximum number of dropped buffers without an interleaving rendered output buffer. * - *

Skipped output buffers are ignored for the purposes of calculating this value. + *

Skipped buffers are ignored for the purposes of calculating this value. */ public int maxConsecutiveDroppedBufferCount; /** @@ -125,7 +125,7 @@ public final class DecoderCounters { public void merge(DecoderCounters other) { decoderInitCount += other.decoderInitCount; decoderReleaseCount += other.decoderReleaseCount; - inputBufferCount += other.inputBufferCount; + queuedInputBufferCount += other.queuedInputBufferCount; skippedInputBufferCount += other.skippedInputBufferCount; renderedOutputBufferCount += other.renderedOutputBufferCount; skippedOutputBufferCount += other.skippedOutputBufferCount; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java index 72497d2771..ebebd0aee6 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java @@ -1342,7 +1342,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer { resetInputBuffer(); codecReceivedBuffers = true; codecReconfigurationState = RECONFIGURATION_STATE_NONE; - decoderCounters.inputBufferCount++; + decoderCounters.queuedInputBufferCount++; return true; } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/DecoderVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/DecoderVideoRenderer.java index 7ccc1ecbe6..d1444eda15 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/DecoderVideoRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/DecoderVideoRenderer.java @@ -757,7 +757,7 @@ public abstract class DecoderVideoRenderer extends BaseRenderer { decoder.queueInputBuffer(inputBuffer); buffersInCodecCount++; decoderReceivedBuffers = true; - decoderCounters.inputBufferCount++; + decoderCounters.queuedInputBufferCount++; inputBuffer = null; return true; default: diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java index a600fc8120..2e6934a8c8 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java @@ -55,7 +55,7 @@ public final class DecoderCountersUtil { int totalInputBufferCount = counters.skippedInputBufferCount + counters.droppedInputBufferCount - + counters.inputBufferCount; + + counters.queuedInputBufferCount; assertTotalBufferCount( name, counters,