diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java index 7cb6fd8be7..d3f19355ed 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java @@ -89,11 +89,11 @@ public abstract class SimpleSubtitleDecoder * Decodes data into a {@link Subtitle}. * * @param data An array holding the data to be decoded, starting at position 0. - * @param size The size of the data to be decoded. + * @param length The number of bytes from {@code data} to be decoded. * @param reset Whether the decoder must be reset before decoding. * @return The decoded {@link Subtitle}. * @throws SubtitleDecoderException If a decoding error occurs. */ - protected abstract Subtitle decode(byte[] data, int size, boolean reset) + protected abstract Subtitle decode(byte[] data, int length, boolean reset) throws SubtitleDecoderException; } diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java index 47dd6e2fdf..5aa3768df9 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java @@ -54,8 +54,9 @@ public final class PgsDecoder extends SimpleSubtitleDecoder { } @Override - protected Subtitle decode(byte[] data, int size, boolean reset) throws SubtitleDecoderException { - buffer.reset(data, size); + protected Subtitle decode(byte[] data, int length, boolean reset) + throws SubtitleDecoderException { + buffer.reset(data, length); maybeInflateData(buffer); cueBuilder.reset(); ArrayList cues = new ArrayList<>(); diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java index ba6b70499e..241300ea2d 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java @@ -108,15 +108,15 @@ public final class SsaDecoder extends SimpleSubtitleDecoder { } @Override - protected Subtitle decode(byte[] bytes, int length, boolean reset) { + protected Subtitle decode(byte[] data, int length, boolean reset) { List> cues = new ArrayList<>(); List cueTimesUs = new ArrayList<>(); - ParsableByteArray data = new ParsableByteArray(bytes, length); + ParsableByteArray parsableData = new ParsableByteArray(data, length); if (!haveInitializationData) { - parseHeader(data); + parseHeader(parsableData); } - parseEventBody(data, cues, cueTimesUs); + parseEventBody(parsableData, cues, cueTimesUs); return new SsaSubtitle(cues, cueTimesUs); } diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java index 2ae22bacd2..f88574dcd5 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java @@ -70,10 +70,10 @@ public final class SubripDecoder extends SimpleSubtitleDecoder { } @Override - protected Subtitle decode(byte[] bytes, int length, boolean reset) { + protected Subtitle decode(byte[] data, int length, boolean reset) { ArrayList cues = new ArrayList<>(); LongArray cueTimesUs = new LongArray(); - ParsableByteArray subripData = new ParsableByteArray(bytes, length); + ParsableByteArray subripData = new ParsableByteArray(data, length); @Nullable String currentLine; while ((currentLine = subripData.readLine()) != null) { diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java index 6a57e14970..272fa7734f 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java @@ -113,7 +113,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder { } @Override - protected Subtitle decode(byte[] bytes, int length, boolean reset) + protected Subtitle decode(byte[] data, int length, boolean reset) throws SubtitleDecoderException { try { XmlPullParser xmlParser = xmlParserFactory.newPullParser(); @@ -121,7 +121,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder { Map regionMap = new HashMap<>(); Map imageMap = new HashMap<>(); regionMap.put(TtmlNode.ANONYMOUS_REGION_ID, new TtmlRegion(TtmlNode.ANONYMOUS_REGION_ID)); - ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes, 0, length); + ByteArrayInputStream inputStream = new ByteArrayInputStream(data, 0, length); xmlParser.setInput(inputStream, null); @Nullable TtmlSubtitle ttmlSubtitle = null; ArrayDeque nodeStack = new ArrayDeque<>(); diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java index 4b8f539f42..e1757b711b 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java @@ -123,9 +123,9 @@ public final class Tx3gDecoder extends SimpleSubtitleDecoder { } @Override - protected Subtitle decode(byte[] bytes, int length, boolean reset) + protected Subtitle decode(byte[] data, int length, boolean reset) throws SubtitleDecoderException { - parsableByteArray.reset(bytes, length); + parsableByteArray.reset(data, length); String cueTextString = readSubtitleText(parsableByteArray); if (cueTextString.isEmpty()) { return Tx3gSubtitle.EMPTY; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java index caaa7869ee..4ceb431d44 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java @@ -49,11 +49,11 @@ public final class Mp4WebvttDecoder extends SimpleSubtitleDecoder { } @Override - protected Subtitle decode(byte[] bytes, int length, boolean reset) + protected Subtitle decode(byte[] data, int length, boolean reset) throws SubtitleDecoderException { // Webvtt in Mp4 samples have boxes inside of them, so we have to do a traditional box parsing: // first 4 bytes size and then 4 bytes type. - sampleData.reset(bytes, length); + sampleData.reset(data, length); List resultingCueList = new ArrayList<>(); while (sampleData.bytesLeft() > 0) { if (sampleData.bytesLeft() < BOX_HEADER_SIZE) { diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java index d6cc014b2d..2e3a7fdafc 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java @@ -51,9 +51,9 @@ public final class WebvttDecoder extends SimpleSubtitleDecoder { } @Override - protected Subtitle decode(byte[] bytes, int length, boolean reset) + protected Subtitle decode(byte[] data, int length, boolean reset) throws SubtitleDecoderException { - parsableWebvttData.reset(bytes, length); + parsableWebvttData.reset(data, length); List definedStyles = new ArrayList<>(); // Validate the first line of the header, and skip the remainder.