loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-17 12:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test for Decoder with Mp4WebvttParser corrected

Browse Source 
PiperOrigin-RevId: 549629289
This commit is contained in:
jbibik 2023-07-20 15:53:19 +01:00 committed by Rohit Singh
parent e11e484bc3
commit 1c1b78e635
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/text/DelegatingSubtitleDecoderWithMp4WebvttParserTest.java
View File

@ -166,7 +166,9 @@ public final class DelegatingSubtitleDecoderWithMp4WebvttParserTest {
DelegatingSubtitleDecoder decoder = DelegatingSubtitleDecoder decoder =
new DelegatingSubtitleDecoder( new DelegatingSubtitleDecoder(
"DelegatingSubtitleDecoderWithMp4WebvttParser", new Mp4WebvttParser()); "DelegatingSubtitleDecoderWithMp4WebvttParser", new Mp4WebvttParser());
Subtitle result = decoder.decode(SINGLE_CUE_SAMPLE, SINGLE_CUE_SAMPLE.length, false); Subtitle result = decoder.decode(SINGLE_CUE_SAMPLE, SINGLE_CUE_SAMPLE.length, false);
// Line feed must be trimmed by the decoder // Line feed must be trimmed by the decoder
Cue expectedCue = WebvttCueParser.newCueForText("Hello World"); Cue expectedCue = WebvttCueParser.newCueForText("Hello World");
assertMp4WebvttSubtitleEquals(result, expectedCue); assertMp4WebvttSubtitleEquals(result, expectedCue);
@ -177,7 +179,9 @@ public final class DelegatingSubtitleDecoderWithMp4WebvttParserTest {
DelegatingSubtitleDecoder decoder = DelegatingSubtitleDecoder decoder =
new DelegatingSubtitleDecoder( new DelegatingSubtitleDecoder(
"DelegatingSubtitleDecoderWithMp4WebvttParser", new Mp4WebvttParser()); "DelegatingSubtitleDecoderWithMp4WebvttParser", new Mp4WebvttParser());
Subtitle result = decoder.decode(DOUBLE_CUE_SAMPLE, DOUBLE_CUE_SAMPLE.length, false); Subtitle result = decoder.decode(DOUBLE_CUE_SAMPLE, DOUBLE_CUE_SAMPLE.length, false);
Cue firstExpectedCue = WebvttCueParser.newCueForText("Hello World"); Cue firstExpectedCue = WebvttCueParser.newCueForText("Hello World");
Cue secondExpectedCue = WebvttCueParser.newCueForText("Bye Bye"); Cue secondExpectedCue = WebvttCueParser.newCueForText("Bye Bye");
assertMp4WebvttSubtitleEquals(result, firstExpectedCue, secondExpectedCue); assertMp4WebvttSubtitleEquals(result, firstExpectedCue, secondExpectedCue);
@ -188,8 +192,12 @@ public final class DelegatingSubtitleDecoderWithMp4WebvttParserTest {
DelegatingSubtitleDecoder decoder = DelegatingSubtitleDecoder decoder =
new DelegatingSubtitleDecoder( new DelegatingSubtitleDecoder(
"DelegatingSubtitleDecoderWithMp4WebvttParser", new Mp4WebvttParser()); "DelegatingSubtitleDecoderWithMp4WebvttParser", new Mp4WebvttParser());
Subtitle result = decoder.decode(NO_CUE_SAMPLE, NO_CUE_SAMPLE.length, false); Subtitle result = decoder.decode(NO_CUE_SAMPLE, NO_CUE_SAMPLE.length, false);
assertThat(result.getEventTimeCount()).isEqualTo(0);
assertThat(result.getEventTimeCount()).isEqualTo(1);
assertThat(result.getEventTime(0)).isEqualTo(0);
assertThat(result.getCues(0)).isEmpty();
} }
// Negative tests. // Negative tests.
@ -199,6 +207,7 @@ public final class DelegatingSubtitleDecoderWithMp4WebvttParserTest {
DelegatingSubtitleDecoder decoder = DelegatingSubtitleDecoder decoder =
new DelegatingSubtitleDecoder( new DelegatingSubtitleDecoder(
"DelegatingSubtitleDecoderWithMp4WebvttParser", new Mp4WebvttParser()); "DelegatingSubtitleDecoderWithMp4WebvttParser", new Mp4WebvttParser());
assertThrows( assertThrows(
IllegalArgumentException.class, IllegalArgumentException.class,
() -> decoder.decode(INCOMPLETE_HEADER_SAMPLE, INCOMPLETE_HEADER_SAMPLE.length, false)); () -> decoder.decode(INCOMPLETE_HEADER_SAMPLE, INCOMPLETE_HEADER_SAMPLE.length, false));

6
libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/Mp4WebvttParser.java
View File

@ -72,10 +72,8 @@ public final class Mp4WebvttParser implements SubtitleParser {
parsableByteArray.skipBytes(boxSize - BOX_HEADER_SIZE); parsableByteArray.skipBytes(boxSize - BOX_HEADER_SIZE);
} }
} }
return cues.isEmpty() return ImmutableList.of(
? ImmutableList.of() new CuesWithTiming(cues, /* startTimeUs= */ C.TIME_UNSET, /* durationUs= */ C.TIME_UNSET));
: ImmutableList.of(
new CuesWithTiming(cues, /* startTimeUs= */ 0, /* durationUs= */ C.TIME_UNSET));
} }
@Override @Override

10
libraries/extractor/src/test/java/androidx/media3/extractor/text/webvtt/Mp4WebvttParserTest.java
View File

@ -18,6 +18,7 @@ package androidx.media3.extractor.text.webvtt;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertThrows;
import androidx.media3.common.C;
import androidx.media3.common.text.Cue; import androidx.media3.common.text.Cue;
import androidx.media3.extractor.text.CuesWithTiming; import androidx.media3.extractor.text.CuesWithTiming;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@ -181,8 +182,13 @@ public final class Mp4WebvttParserTest {
@Test @Test
public void noCueSample() { public void noCueSample() {
Mp4WebvttParser parser = new Mp4WebvttParser(); Mp4WebvttParser parser = new Mp4WebvttParser();
List<CuesWithTiming> result = parser.parse(NO_CUE_SAMPLE); List<CuesWithTiming> result = parser.parse(NO_CUE_SAMPLE);
assertThat(result).isEmpty();
assertThat(result).hasSize(1);
assertThat(result.get(0).cues).isEmpty();
assertThat(result.get(0).startTimeUs).isEqualTo(C.TIME_UNSET);
assertThat(result.get(0).durationUs).isEqualTo(C.TIME_UNSET);
} }
// Negative tests. // Negative tests.
@ -205,7 +211,7 @@ public final class Mp4WebvttParserTest {
private void assertMp4WebvttSubtitleEquals( private void assertMp4WebvttSubtitleEquals(
List<CuesWithTiming> cuesWithTimings, Cue... expectedCues) { List<CuesWithTiming> cuesWithTimings, Cue... expectedCues) {
assertThat(cuesWithTimings).hasSize(1); assertThat(cuesWithTimings).hasSize(1);
assertThat(cuesWithTimings.get(0).startTimeUs).isEqualTo(0); assertThat(cuesWithTimings.get(0).startTimeUs).isEqualTo(C.TIME_UNSET);
ImmutableList<Cue> allCues = cuesWithTimings.get(0).cues; ImmutableList<Cue> allCues = cuesWithTimings.get(0).cues;
assertThat(allCues).hasSize(expectedCues.length); assertThat(allCues).hasSize(expectedCues.length);
for (int i = 0; i < allCues.size(); i++) { for (int i = 0; i < allCues.size(); i++) {