From e6c7defc7930254d18a74088ea46add0e7e18838 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Fri, 1 May 2015 20:21:36 +0100 Subject: [PATCH] Make ParsableBitArray.data public, like ParsableByteArray. --- .../android/exoplayer/extractor/ts/Ac3Reader.java | 2 +- .../android/exoplayer/extractor/ts/AdtsReader.java | 2 +- .../android/exoplayer/extractor/ts/TsExtractor.java | 4 ++-- .../android/exoplayer/util/ParsableBitArray.java | 11 +---------- .../android/exoplayer/util/ParsableByteArray.java | 2 +- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/Ac3Reader.java b/library/src/main/java/com/google/android/exoplayer/extractor/ts/Ac3Reader.java index f3c42a4b5b..9a57acbc72 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/Ac3Reader.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ts/Ac3Reader.java @@ -53,7 +53,7 @@ import com.google.android.exoplayer.util.ParsableByteArray; public Ac3Reader(TrackOutput output) { super(output); headerScratchBits = new ParsableBitArray(new byte[HEADER_SIZE]); - headerScratchBytes = new ParsableByteArray(headerScratchBits.getData()); + headerScratchBytes = new ParsableByteArray(headerScratchBits.data); state = STATE_FINDING_SYNC; } diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java b/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java index 2c732dcb54..5f9af63643 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java @@ -89,7 +89,7 @@ import java.util.Collections; break; case STATE_READING_HEADER: int targetLength = hasCrc ? HEADER_SIZE + CRC_SIZE : HEADER_SIZE; - if (continueRead(data, adtsScratch.getData(), targetLength)) { + if (continueRead(data, adtsScratch.data, targetLength)) { parseHeader(); bytesRead = 0; state = STATE_READING_SAMPLE; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java index 34c1251c11..a7ea2d4483 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java @@ -357,14 +357,14 @@ public final class TsExtractor implements Extractor { data.skipBytes(data.bytesLeft()); break; case STATE_READING_HEADER: - if (continueRead(data, pesScratch.getData(), HEADER_SIZE)) { + if (continueRead(data, pesScratch.data, HEADER_SIZE)) { setState(parseHeader() ? STATE_READING_HEADER_EXTENSION : STATE_FINDING_HEADER); } break; case STATE_READING_HEADER_EXTENSION: int readLength = Math.min(MAX_HEADER_EXTENSION_SIZE, extendedHeaderLength); // Read as much of the extended header as we're interested in, and skip the rest. - if (continueRead(data, pesScratch.getData(), readLength) + if (continueRead(data, pesScratch.data, readLength) && continueRead(data, null, extendedHeaderLength)) { parseHeaderExtension(); bodyStarted = false; diff --git a/library/src/main/java/com/google/android/exoplayer/util/ParsableBitArray.java b/library/src/main/java/com/google/android/exoplayer/util/ParsableBitArray.java index a1f224a1f0..98e4cc7160 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ParsableBitArray.java +++ b/library/src/main/java/com/google/android/exoplayer/util/ParsableBitArray.java @@ -20,7 +20,7 @@ package com.google.android.exoplayer.util; */ public final class ParsableBitArray { - private byte[] data; + public byte[] data; // The offset within the data, stored as the current byte offset, and the bit offset within that // byte (from 0 to 7). @@ -50,15 +50,6 @@ public final class ParsableBitArray { bitOffset = 0; } - /** - * Gets the backing byte array. - * - * @return The backing byte array. - */ - public byte[] getData() { - return data; - } - /** * Gets the current bit offset. * diff --git a/library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java b/library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java index b4400d6c5e..563b9ebe13 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java +++ b/library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java @@ -135,7 +135,7 @@ public final class ParsableByteArray { * @param length The number of bytes to write. */ public void readBytes(ParsableBitArray bitArray, int length) { - readBytes(bitArray.getData(), 0, length); + readBytes(bitArray.data, 0, length); bitArray.setPosition(0); }