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

Fix stuck muxer

Browse Source 
Unstuck the muxer if the next timestamp in the track with the minimum
timestamp is larger than this minimum timestamp plus
MAX_TRACK_WRITE_AHEAD_US.

PiperOrigin-RevId: 510977088
This commit is contained in:
kimvde 2023-02-20 13:57:38 +00:00 committed by tonihei
parent e282c0ad67
commit ac12b96f11
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java
View File

@ -20,7 +20,6 @@ import static androidx.media3.common.util.Assertions.checkArgument;
import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkState;
import static java.lang.Math.max; import static java.lang.Math.max;
import static java.lang.Math.min;
import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS;
import android.util.SparseArray; import android.util.SparseArray;
@ -254,8 +253,16 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
if (trackTypeToInfo.size() == 1) { if (trackTypeToInfo.size() == 1) {
return true; return true;
} }
if (presentationTimeUs - trackTypeToInfo.get(trackType).timeUs > MAX_TRACK_WRITE_AHEAD_US) {
TrackInfo trackInfoWithMinTimeUs = checkNotNull(getTrackInfoWithMinTimeUs(trackTypeToInfo));
if (MimeTypes.getTrackType(trackInfoWithMinTimeUs.format.sampleMimeType) == trackType) {
// Unstuck the muxer if consecutive timestamps from the same track are more than
// MAX_TRACK_WRITE_AHEAD_US apart.
return true;
}
}
if (trackType != previousTrackType) { if (trackType != previousTrackType) {
minTrackTimeUs = getMinTrackTimeUs(trackTypeToInfo); minTrackTimeUs = checkNotNull(getTrackInfoWithMinTimeUs(trackTypeToInfo)).timeUs;
} }
return presentationTimeUs - minTrackTimeUs <= MAX_TRACK_WRITE_AHEAD_US; return presentationTimeUs - minTrackTimeUs <= MAX_TRACK_WRITE_AHEAD_US;
} }
@ -301,16 +308,20 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
return fileSize > 0 ? fileSize : C.LENGTH_UNSET; return fileSize > 0 ? fileSize : C.LENGTH_UNSET;
} }
private static long getMinTrackTimeUs(SparseArray<TrackInfo> trackTypeToInfo) { @Nullable
private static TrackInfo getTrackInfoWithMinTimeUs(SparseArray<TrackInfo> trackTypeToInfo) {
if (trackTypeToInfo.size() == 0) { if (trackTypeToInfo.size() == 0) {
return C.TIME_UNSET; return null;
} }
long minTrackTimeUs = Long.MAX_VALUE; TrackInfo trackInfoWithMinTimeUs = trackTypeToInfo.valueAt(0);
for (int i = 0; i < trackTypeToInfo.size(); i++) { for (int i = 1; i < trackTypeToInfo.size(); i++) {
minTrackTimeUs = min(minTrackTimeUs, trackTypeToInfo.valueAt(i).timeUs); TrackInfo trackInfo = trackTypeToInfo.valueAt(i);
if (trackInfo.timeUs < trackInfoWithMinTimeUs.timeUs) {
trackInfoWithMinTimeUs = trackInfo;
} }
return minTrackTimeUs; }
return trackInfoWithMinTimeUs;
} }
private static final class TrackInfo { private static final class TrackInfo {