loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Delete VorbisUtil.CodeBook since it's not used

Browse Source 
PiperOrigin-RevId: 513186205
This commit is contained in:
ibaker 2023-03-01 11:06:37 +00:00 committed by tonihei
parent c07cf3dc41
commit 1c4ba5d9f6
1 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libraries/extractor/src/main/java/androidx/media3/extractor/VorbisUtil.java
View File

@ -372,7 +372,7 @@ public final class VorbisUtil {
bitArray.skipBits(headerData.getPosition() * 8);
for (int i = 0; i < numberOfBooks; i++) {
readBook(bitArray);
skipBook(bitArray);
}
int timeCount = bitArray.readBits(6) + 1;
@ -536,7 +536,7 @@ public final class VorbisUtil {
}
}
private static CodeBook readBook(VorbisBitArray bitArray) throws ParserException {
private static void skipBook(VorbisBitArray bitArray) throws ParserException {
if (bitArray.readBits(24) != 0x564342) {
throw ParserException.createForMalformedContainer(
"expected code book to start with [0x56, 0x43, 0x42] at " + bitArray.getPosition(),
@ -544,30 +544,23 @@ public final class VorbisUtil {
}
int dimensions = bitArray.readBits(16);
int entries = bitArray.readBits(24);
long[] lengthMap = new long[entries];
boolean isOrdered = bitArray.readBit();
if (!isOrdered) {
boolean isSparse = bitArray.readBit();
for (int i = 0; i < lengthMap.length; i++) {
for (int i = 0; i < entries; i++) {
if (isSparse) {
if (bitArray.readBit()) {
lengthMap[i] = (long) (bitArray.readBits(5) + 1);
} else { // entry unused
lengthMap[i] = 0;
bitArray.skipBits(5); // lengthMap entry
}
} else { // not sparse
lengthMap[i] = (long) (bitArray.readBits(5) + 1);
bitArray.skipBits(5); // lengthMap entry
}
}
} else {
int length = bitArray.readBits(5) + 1;
for (int i = 0; i < lengthMap.length; ) {
int num = bitArray.readBits(iLog(entries - i));
for (int j = 0; j < num && i < lengthMap.length; i++, j++) {
lengthMap[i] = length;
}
length++;
bitArray.skipBits(5); // length
for (int i = 0; i < entries; ) {
i += bitArray.readBits(iLog(entries - i)); // num
}
}
@ -593,7 +586,6 @@ public final class VorbisUtil {
// discard (no decoding required yet)
bitArray.skipBits((int) (lookupValuesCount * valueBits));
}
return new CodeBook(dimensions, entries, lengthMap, lookupType, isOrdered);
}
/**
@ -607,22 +599,4 @@ public final class VorbisUtil {
private VorbisUtil() {
// Prevent instantiation.
}
private static final class CodeBook {
public final int dimensions;
public final int entries;
public final long[] lengthMap;
public final int lookupType;
public final boolean isOrdered;
public CodeBook(
int dimensions, int entries, long[] lengthMap, int lookupType, boolean isOrdered) {
this.dimensions = dimensions;
this.entries = entries;
this.lengthMap = lengthMap;
this.lookupType = lookupType;
this.isOrdered = isOrdered;
}
}
}