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

Fix threading issueis in SequenceAssetLoaderListener

Browse Source 
Callbacks onTrackCount and onTrackAdded can be called simultaneously
from different threads.

Before this fix, it was possible for the MuxerWrapper and
FallbackListener track count to never be set, or to be set
with incorrect values.

PiperOrigin-RevId: 514779719
This commit is contained in:
kimvde 2023-03-07 18:48:31 +00:00 committed by tonihei
parent 62c0352416
commit 67d15ec575
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java
View File

@ -440,8 +440,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
ERROR_CODE_FAILED_RUNTIME_CHECK)); ERROR_CODE_FAILED_RUNTIME_CHECK));
return; return;
} }
trackCountsToReport.decrementAndGet();
tracksToAdd.addAndGet(trackCount); tracksToAdd.addAndGet(trackCount);
trackCountsToReport.decrementAndGet();
} }
@Override @Override
@ -465,12 +465,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
} else { } else {
outputHasVideo.set(true); outputHasVideo.set(true);
} }
if (trackCountsToReport.get() == 0 && tracksToAdd.get() == 1) { if (trackCountsToReport.get() == 0 && tracksToAdd.decrementAndGet() == 0) {
int outputTrackCount = (outputHasAudio.get() ? 1 : 0) + (outputHasVideo.get() ? 1 : 0); int outputTrackCount = (outputHasAudio.get() ? 1 : 0) + (outputHasVideo.get() ? 1 : 0);
muxerWrapper.setTrackCount(outputTrackCount); muxerWrapper.setTrackCount(outputTrackCount);
fallbackListener.setTrackCount(outputTrackCount); fallbackListener.setTrackCount(outputTrackCount);
} }
tracksToAdd.decrementAndGet();
return trackInfo.shouldTranscode; return trackInfo.shouldTranscode;
} }