Rename DecoderCounters#inputBufferCount to queuedInputBufferCount

This more accurately reflects the value stored in this field.

PiperOrigin-RevId: 414762892
This commit is contained in:
ibaker 2021-12-07 18:20:54 +00:00 committed by Oliver Woodman
parent e5c598468e
commit eaa4ab59a9
6 changed files with 8 additions and 7 deletions

View File

@ -36,6 +36,7 @@
the `Format#id` field of the subtitle track created from the the `Format#id` field of the subtitle track created from the
configuration configuration
((#9673)[https://github.com/google/ExoPlayer/issues/9673]). ((#9673)[https://github.com/google/ExoPlayer/issues/9673]).
* Rename `DecoderCounters#inputBufferCount` to `queuedInputBufferCount`.
* DRM: * DRM:
* Remove `playbackLooper` from `DrmSessionManager.(pre)acquireSession`. * Remove `playbackLooper` from `DrmSessionManager.(pre)acquireSession`.
When a `DrmSessionManager` is used by an app in a custom `MediaSource`, When a `DrmSessionManager` is used by an app in a custom `MediaSource`,

View File

@ -472,7 +472,7 @@ public abstract class DecoderAudioRenderer<
onQueueInputBuffer(inputBuffer); onQueueInputBuffer(inputBuffer);
decoder.queueInputBuffer(inputBuffer); decoder.queueInputBuffer(inputBuffer);
decoderReceivedBuffers = true; decoderReceivedBuffers = true;
decoderCounters.inputBufferCount++; decoderCounters.queuedInputBufferCount++;
inputBuffer = null; inputBuffer = null;
return true; return true;
default: default:

View File

@ -31,7 +31,7 @@ public final class DecoderCounters {
/** The number of times a decoder has been released. */ /** The number of times a decoder has been released. */
public int decoderReleaseCount; public int decoderReleaseCount;
/** The number of input buffers queued to the decoder. */ /** The number of input buffers queued to the decoder. */
public int inputBufferCount; public int queuedInputBufferCount;
/** /**
* The number of skipped input buffers. * 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. * The maximum number of dropped buffers without an interleaving rendered output buffer.
* *
* <p>Skipped output buffers are ignored for the purposes of calculating this value. * <p>Skipped buffers are ignored for the purposes of calculating this value.
*/ */
public int maxConsecutiveDroppedBufferCount; public int maxConsecutiveDroppedBufferCount;
/** /**
@ -125,7 +125,7 @@ public final class DecoderCounters {
public void merge(DecoderCounters other) { public void merge(DecoderCounters other) {
decoderInitCount += other.decoderInitCount; decoderInitCount += other.decoderInitCount;
decoderReleaseCount += other.decoderReleaseCount; decoderReleaseCount += other.decoderReleaseCount;
inputBufferCount += other.inputBufferCount; queuedInputBufferCount += other.queuedInputBufferCount;
skippedInputBufferCount += other.skippedInputBufferCount; skippedInputBufferCount += other.skippedInputBufferCount;
renderedOutputBufferCount += other.renderedOutputBufferCount; renderedOutputBufferCount += other.renderedOutputBufferCount;
skippedOutputBufferCount += other.skippedOutputBufferCount; skippedOutputBufferCount += other.skippedOutputBufferCount;

View File

@ -1342,7 +1342,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
resetInputBuffer(); resetInputBuffer();
codecReceivedBuffers = true; codecReceivedBuffers = true;
codecReconfigurationState = RECONFIGURATION_STATE_NONE; codecReconfigurationState = RECONFIGURATION_STATE_NONE;
decoderCounters.inputBufferCount++; decoderCounters.queuedInputBufferCount++;
return true; return true;
} }

View File

@ -757,7 +757,7 @@ public abstract class DecoderVideoRenderer extends BaseRenderer {
decoder.queueInputBuffer(inputBuffer); decoder.queueInputBuffer(inputBuffer);
buffersInCodecCount++; buffersInCodecCount++;
decoderReceivedBuffers = true; decoderReceivedBuffers = true;
decoderCounters.inputBufferCount++; decoderCounters.queuedInputBufferCount++;
inputBuffer = null; inputBuffer = null;
return true; return true;
default: default:

View File

@ -55,7 +55,7 @@ public final class DecoderCountersUtil {
int totalInputBufferCount = int totalInputBufferCount =
counters.skippedInputBufferCount counters.skippedInputBufferCount
+ counters.droppedInputBufferCount + counters.droppedInputBufferCount
+ counters.inputBufferCount; + counters.queuedInputBufferCount;
assertTotalBufferCount( assertTotalBufferCount(
name, name,
counters, counters,