Skip to content

Use edts media time offset if edits list duration is entire media duration. #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2023
Merged

Use edts media time offset if edits list duration is entire media duration. #255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,23 @@ private static long parseTfdt(ParsableByteArray tfdt) {
return version == 1 ? tfdt.readUnsignedLongToLong() : tfdt.readUnsignedInt();
}

private static boolean isEdtsListDurationForEntireMediaTimeline(Track track) {
// Currently we only support a single edit that moves the entire media timeline (indicated by
// duration == 0 or (editListDurationUs + editListMediaTimeUs) >= track duration.
// Other uses of edit lists are uncommon and unsupported.
if (track.editListDurations != null && track.editListDurations.length == 1
&& track.editListMediaTimes != null) {
long editListDurationUs = Util.scaleLargeTimestamp(track.editListDurations[0],
C.MICROS_PER_SECOND, track.movieTimescale);
long editListMediaTimeUs = Util.scaleLargeTimestamp(track.editListMediaTimes[0],
C.MICROS_PER_SECOND, track.timescale);

return editListDurationUs == 0
|| ((editListDurationUs + editListMediaTimeUs) >= track.durationUs);
}
return false;
}

/**
* Parses a trun atom (defined in 14496-12).
*
Expand Down Expand Up @@ -1017,11 +1034,8 @@ private static int parseTrun(
// ensure that the first frame's presentation timestamp is zero.
long edtsOffset = 0;

// Currently we only support a single edit that moves the entire media timeline (indicated by
// duration == 0). Other uses of edit lists are uncommon and unsupported.
if (track.editListDurations != null
&& track.editListDurations.length == 1
&& track.editListDurations[0] == 0) {
// Currently we only support a single edit that moves the entire media timeline.
if (isEdtsListDurationForEntireMediaTimeline(track)) {
edtsOffset = castNonNull(track.editListMediaTimes)[0];
}

Expand Down