loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename DecoderCounters#inputBufferCount to queuedInputBufferCount

Browse Source 
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 Ian Baker
parent 87510592bb
commit d0c59eb5f1
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DecoderCounters.java
View File

@ -34,7 +34,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.
* *
@ -71,7 +71,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;
/** /**
@ -128,7 +128,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;

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java
View File

@ -476,7 +476,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:

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java
View File

@ -1344,7 +1344,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;
} }

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DecoderVideoRenderer.java
View File

@ -760,7 +760,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:

2
libraries/test_utils/src/main/java/androidx/media3/test/utils/DecoderCountersUtil.java
View File

@ -57,7 +57,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,