sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-06-29 05:39:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stylistic cleanup.

Browse source
This commit is contained in:
Oliver Woodman 2015-09-18 18:23:28 +01:00
parent cf27b83e8a
commit c960636d28
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
library/src/main/java/com/google/android/exoplayer/util/ParsableBitArray.java
View file

@ -127,19 +127,19 @@ public final class ParsableBitArray {
/**
* Reads up to 32 bits.
*
* @param n The number of bits to read.
* @param numBits The number of bits to read.
* @return An integer whose bottom n bits hold the read data.
*/
public int readBits(int n) {
if (n == 0) {
public int readBits(int numBits) {
if (numBits == 0) {
return 0;
}
int returnValue = 0;
// While n >= 8, read whole bytes.
int numBytes = (n / 8);
for (int i = 0; i < numBytes; i ++) {
// Read as many whole bytes as we can.
int wholeBytes = (numBits / 8);
for (int i = 0; i < wholeBytes; i++) {
int byteValue;
if (bitOffset != 0) {
byteValue = ((data[byteOffset] & 0xFF) << bitOffset)
@ -147,14 +147,15 @@ public final class ParsableBitArray {
} else {
byteValue = data[byteOffset];
}
n -= 8;
returnValue |= (byteValue & 0xFF) << n;
numBits -= 8;
returnValue |= (byteValue & 0xFF) << numBits;
byteOffset++;
}
if (n > 0) {
int nextBit = bitOffset + n;
byte writeMask = (byte) (0xFF >> (8 - n));
// Read any remaining bits.
if (numBits > 0) {
int nextBit = bitOffset + numBits;
byte writeMask = (byte) (0xFF >> (8 - numBits));
if (nextBit > 8) {
// Combine bits from current byte and next byte.