Skip to content

Commit ba28336

Browse files
committed
Simplify computeFinalIndexSeekerDurationUs
1 parent 84dfe2b commit ba28336

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

libraries/extractor/src/main/java/androidx/media3/extractor/mp3/Mp3Extractor.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -399,18 +399,11 @@ private long computeTimeUs(long samplesRead) {
399399
* initially gapless Xing/Info duration with the longer encoded duration.
400400
*/
401401
private long computeFinalIndexSeekerDurationUs(long samplesRead) {
402-
long durationUs = computeTimeUs(samplesRead);
403-
if (!gaplessInfoHolder.hasGaplessInfo()) {
404-
return durationUs;
405-
}
406402
long finalGaplessSampleIndex =
407-
Util.durationUsToSampleCount(durationUs, synchronizedHeader.sampleRate)
408-
- gaplessInfoHolder.encoderDelay
409-
- gaplessInfoHolder.encoderPadding
410-
- 1;
411-
return finalGaplessSampleIndex >= 0
412-
? Util.sampleCountToDurationUs(finalGaplessSampleIndex, synchronizedHeader.sampleRate)
413-
: C.TIME_UNSET;
403+
gaplessInfoHolder.hasGaplessInfo()
404+
? samplesRead - gaplessInfoHolder.encoderDelay - gaplessInfoHolder.encoderPadding - 1
405+
: samplesRead;
406+
return finalGaplessSampleIndex >= 0 ? computeTimeUs(finalGaplessSampleIndex) : C.TIME_UNSET;
414407
}
415408

416409
private boolean synchronize(ExtractorInput input, boolean sniffing) throws IOException {

0 commit comments

Comments
 (0)