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

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

Browse Source
This commit is contained in:
Mayur K 2023-02-24 16:45:55 +05:30
parent 0c17605ff0
commit 0761641d9f
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java
View File

@ -970,6 +970,23 @@ public class FragmentedMp4Extractor implements Extractor {
return version == 1 ? tfdt.readUnsignedLongToLong() : tfdt.readUnsignedInt(); 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). * Parses a trun atom (defined in 14496-12).
* *
@ -1017,11 +1034,8 @@ public class FragmentedMp4Extractor implements Extractor {
// ensure that the first frame's presentation timestamp is zero. // ensure that the first frame's presentation timestamp is zero.
long edtsOffset = 0; long edtsOffset = 0;
// Currently we only support a single edit that moves the entire media timeline (indicated by // Currently we only support a single edit that moves the entire media timeline.
// duration == 0). Other uses of edit lists are uncommon and unsupported. if (isEdtsListDurationForEntireMediaTimeline(track)) {
if (track.editListDurations != null
&& track.editListDurations.length == 1
&& track.editListDurations[0] == 0) {
edtsOffset = castNonNull(track.editListMediaTimes)[0]; edtsOffset = castNonNull(track.editListMediaTimes)[0];
} }