diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DecoderCounters.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DecoderCounters.java index 5ccd8376b4..b5a54d1e45 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DecoderCounters.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DecoderCounters.java @@ -34,7 +34,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. * @@ -71,7 +71,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; /** @@ -128,7 +128,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/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java index ea7435730d..3d6404a8ec 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java @@ -476,7 +476,7 @@ public abstract class DecoderAudioRenderer< onQueueInputBuffer(inputBuffer); decoder.queueInputBuffer(inputBuffer); decoderReceivedBuffers = true; - decoderCounters.inputBufferCount++; + decoderCounters.queuedInputBufferCount++; inputBuffer = null; return true; default: diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java index ef093a2815..939383ff17 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java @@ -1344,7 +1344,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer { resetInputBuffer(); codecReceivedBuffers = true; codecReconfigurationState = RECONFIGURATION_STATE_NONE; - decoderCounters.inputBufferCount++; + decoderCounters.queuedInputBufferCount++; return true; } diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DecoderVideoRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DecoderVideoRenderer.java index 310f6bafe6..a7b2c9ce86 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DecoderVideoRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DecoderVideoRenderer.java @@ -760,7 +760,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/libraries/test_utils/src/main/java/androidx/media3/test/utils/DecoderCountersUtil.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DecoderCountersUtil.java index af4fb08554..26a4362187 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DecoderCountersUtil.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DecoderCountersUtil.java @@ -57,7 +57,7 @@ public final class DecoderCountersUtil { int totalInputBufferCount = counters.skippedInputBufferCount + counters.droppedInputBufferCount - + counters.inputBufferCount; + + counters.queuedInputBufferCount; assertTotalBufferCount( name, counters,