From 1c4ba5d9f6cb0b868eb383611d1c67c16195375c Mon Sep 17 00:00:00 2001 From: ibaker Date: Wed, 1 Mar 2023 11:06:37 +0000 Subject: [PATCH] Delete VorbisUtil.CodeBook since it's not used PiperOrigin-RevId: 513186205 --- .../androidx/media3/extractor/VorbisUtil.java | 42 ++++--------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/VorbisUtil.java b/libraries/extractor/src/main/java/androidx/media3/extractor/VorbisUtil.java index 68832975f1..eedcb30185 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/VorbisUtil.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/VorbisUtil.java @@ -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; - } - } }