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

Clarify purpose of omitting zero duration clipped audio samples

Browse Source 
When applying edit lists, we need to output the last partial samples
to have all the necessary data needed for rendering.

The only case where we can omit the sample is for zero duration
audio data that has no additional information.

The current comment and variable name doesn't make this very clear
and this change improves the naming and the comment.

PiperOrigin-RevId: 608579746
This commit is contained in:
tonihei 2024-02-20 06:13:45 -08:00 committed by Copybara-Service
parent 8dd6590fe9
commit 711d24a12f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
View File

@ -677,8 +677,11 @@ import java.util.Objects;
track, offsets, sizes, maximumSize, timestamps, flags, durationUs);
}
// Omit any sample at the end point of an edit for audio tracks.
boolean omitClippedSample = track.type == C.TRACK_TYPE_AUDIO;
// When applying edit lists, we need to include any partial clipped samples at the end to ensure
// the final output is rendered correctly (see https://github.com/google/ExoPlayer/issues/2408).
// For audio only, we can omit any sample that starts at exactly the end point of an edit as
// there is no partial audio in this case.
boolean omitZeroDurationClippedSample = track.type == C.TRACK_TYPE_AUDIO;
// Count the number of samples after applying edits.
int editedSampleCount = 0;
@ -707,7 +710,7 @@ import java.util.Objects;
Util.binarySearchCeil(
timestamps,
editMediaTime + editDuration,
/* inclusive= */ omitClippedSample,
/* inclusive= */ omitZeroDurationClippedSample,
/* stayInBounds= */ false);
while (startIndices[i] < endIndices[i]
&& (flags[startIndices[i]] & C.BUFFER_FLAG_KEY_FRAME) == 0) {