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

Update DelegatingSubtitleDecoder to handle startTimeUs = TIME_UNSET

Browse Source 
Also add a test to enforce this when `Tx3gDecoder` is migrated to
`Tx3gParser`.

PiperOrigin-RevId: 547856968
This commit is contained in:
ibaker 2023-07-13 19:07:09 +01:00 committed by Rohit Singh
parent da68b9391d
commit 06132c6778
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/text/DelegatingSubtitleDecoder.java
View File

@ -74,8 +74,6 @@ import java.util.List;
return new SubtitleFromCuesWithTiming(cuesWithTiming); return new SubtitleFromCuesWithTiming(cuesWithTiming);
} }
// TODO: ImmutableLongArray is no longer Beta, remove suppression when we upgrade Guava dep
@SuppressWarnings("UnstableApiUsage")
private static final class SubtitleFromCuesWithTiming implements Subtitle { private static final class SubtitleFromCuesWithTiming implements Subtitle {
private final ImmutableList<ImmutableList<Cue>> cuesListForUniqueStartTimes; private final ImmutableList<ImmutableList<Cue>> cuesListForUniqueStartTimes;
@ -83,7 +81,7 @@ import java.util.List;
/** Ordering of two CuesWithTiming objects based on their startTimeUs values. */ /** Ordering of two CuesWithTiming objects based on their startTimeUs values. */
private static final Ordering<CuesWithTiming> CUES_BY_START_TIME_ASCENDING = private static final Ordering<CuesWithTiming> CUES_BY_START_TIME_ASCENDING =
Ordering.natural().onResultOf(c -> c.startTimeUs); Ordering.natural().onResultOf(c -> normalizeUnsetStartTimeToZero(c.startTimeUs));
SubtitleFromCuesWithTiming(List<CuesWithTiming> cuesWithTimingList) { SubtitleFromCuesWithTiming(List<CuesWithTiming> cuesWithTimingList) {
this.cuesStartTimesUs = new long[cuesWithTimingList.size()]; this.cuesStartTimesUs = new long[cuesWithTimingList.size()];
@ -93,7 +91,8 @@ import java.util.List;
ImmutableList.sortedCopyOf(CUES_BY_START_TIME_ASCENDING, cuesWithTimingList); ImmutableList.sortedCopyOf(CUES_BY_START_TIME_ASCENDING, cuesWithTimingList);
for (int i = 0; i < sortedCuesWithTimingList.size(); i++) { for (int i = 0; i < sortedCuesWithTimingList.size(); i++) {
cuesListForUniqueStartTimes.add(sortedCuesWithTimingList.get(i).cues); cuesListForUniqueStartTimes.add(sortedCuesWithTimingList.get(i).cues);
cuesStartTimesUs[i] = sortedCuesWithTimingList.get(i).startTimeUs; cuesStartTimesUs[i] =
normalizeUnsetStartTimeToZero(sortedCuesWithTimingList.get(i).startTimeUs);
} }
this.cuesListForUniqueStartTimes = cuesListForUniqueStartTimes.build(); this.cuesListForUniqueStartTimes = cuesListForUniqueStartTimes.build();
} }
@ -134,5 +133,13 @@ import java.util.List;
return cuesListForUniqueStartTimes.get(index); return cuesListForUniqueStartTimes.get(index);
} }
} }
// SubtitleParser can return CuesWithTiming with startTimeUs == TIME_UNSET, indicating the
// start time should be derived from the surrounding sample timestamp. In the context of the
// Subtitle interface, this means starting at zero, so we can just always interpret TIME_UNSET
// as zero here.
private static long normalizeUnsetStartTimeToZero(long startTime) {
return startTime == C.TIME_UNSET ? 0 : startTime;
}
} }
} }

11
libraries/extractor/src/test/java/androidx/media3/extractor/text/tx3g/Tx3gDecoderTest.java
View File

@ -78,6 +78,17 @@ public final class Tx3gDecoderTest {
assertFractionalLinePosition(subtitle.getCues(0).get(0), 0.85f); assertFractionalLinePosition(subtitle.getCues(0).get(0), 0.85f);
} }
@Test
public void decode_noCuesBeforeStartTIme() throws Exception {
Tx3gDecoder decoder = new Tx3gDecoder(ImmutableList.of());
byte[] bytes =
TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), SAMPLE_JUST_TEXT);
Subtitle subtitle = decoder.decode(bytes, bytes.length, /* reset= */ false);
assertThat(subtitle.getCues(/* timeUs= */ -1)).isEmpty();
}
@Test @Test
public void decodeWithStyl() throws Exception { public void decodeWithStyl() throws Exception {
Tx3gDecoder decoder = new Tx3gDecoder(ImmutableList.of()); Tx3gDecoder decoder = new Tx3gDecoder(ImmutableList.of());