diff --git a/libraries/extractor/src/androidTest/java/androidx/media3/extractor/text/CueSerializationTest.java b/libraries/extractor/src/androidTest/java/androidx/media3/extractor/text/CueSerializationTest.java index 2b6c5ba5fa..817ac15e00 100644 --- a/libraries/extractor/src/androidTest/java/androidx/media3/extractor/text/CueSerializationTest.java +++ b/libraries/extractor/src/androidTest/java/androidx/media3/extractor/text/CueSerializationTest.java @@ -72,7 +72,8 @@ public class CueSerializationTest { // encoding and decoding byte[] encodedCues = encoder.encode(ImmutableList.of(cue), /* durationUs= */ 2000); - CuesWithTiming cuesAfterDecoding = decoder.decode(/* startTimeUs= */ 1000, encodedCues); + CuesWithTiming cuesAfterDecoding = + decoder.decode(/* startTimeUs= */ 1000, encodedCues, /* offset= */ 0, encodedCues.length); assertThat(cuesAfterDecoding.startTimeUs).isEqualTo(1000); assertThat(cuesAfterDecoding.durationUs).isEqualTo(2000); @@ -115,7 +116,8 @@ public class CueSerializationTest { // encoding and decoding byte[] encodedCues = encoder.encode(ImmutableList.of(bitmapCue), /* durationUs= */ 2000); - CuesWithTiming cuesAfterDecoding = decoder.decode(/* startTimeUs= */ 1000, encodedCues); + CuesWithTiming cuesAfterDecoding = + decoder.decode(/* startTimeUs= */ 1000, encodedCues, /* offset= */ 0, encodedCues.length); assertThat(cuesAfterDecoding.startTimeUs).isEqualTo(1000); assertThat(cuesAfterDecoding.durationUs).isEqualTo(2000); @@ -140,7 +142,8 @@ public class CueSerializationTest { // encoding and decoding byte[] encodedCues = encoder.encode(ImmutableList.of(mixedSpansCue), /* durationUs= */ 2000); - CuesWithTiming cuesAfterDecoding = decoder.decode(/* startTimeUs= */ 1000, encodedCues); + CuesWithTiming cuesAfterDecoding = + decoder.decode(/* startTimeUs= */ 1000, encodedCues, /* offset= */ 0, encodedCues.length); assertThat(cuesAfterDecoding.startTimeUs).isEqualTo(1000); assertThat(cuesAfterDecoding.durationUs).isEqualTo(2000); diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/CueDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/CueDecoder.java index e64f9d8308..7bba225991 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/CueDecoder.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/CueDecoder.java @@ -34,18 +34,6 @@ public final class CueDecoder { /** Key under which the duration is saved in the {@link Bundle}. */ /* package */ static final String BUNDLE_FIELD_DURATION_US = "d"; - /** - * Decodes a byte array into a {@link CuesWithTiming} instance. - * - * @param startTimeUs The value for {@link CuesWithTiming#startTimeUs} (this is not encoded in - * {@code bytes}). - * @param bytes Byte array produced by {@link CueEncoder#encode(List, long)} - * @return Decoded {@link CuesWithTiming} instance. - */ - public CuesWithTiming decode(long startTimeUs, byte[] bytes) { - return decode(startTimeUs, bytes, /* offset= */ 0, bytes.length); - } - /** * Decodes a byte array into a {@link CuesWithTiming} instance. * diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/text/SubtitleExtractorTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/text/SubtitleExtractorTest.java index 2c9aa02d89..f7f8aecf8f 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/text/SubtitleExtractorTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/text/SubtitleExtractorTest.java @@ -284,7 +284,8 @@ public class SubtitleExtractorTest { } private CuesWithTiming decodeSample(FakeTrackOutput trackOutput, int sampleIndex) { + byte[] sampleData = trackOutput.getSampleData(sampleIndex); return decoder.decode( - trackOutput.getSampleTimeUs(sampleIndex), trackOutput.getSampleData(sampleIndex)); + trackOutput.getSampleTimeUs(sampleIndex), sampleData, /* offset= */ 0, sampleData.length); } }