@carbonenginejs/runtime 0.1.0-alpha.0 → 0.1.0-alpha.2

package/dist/resource/formats/ogg/core/vorbis.js

@@ -1,23 +1,24 @@
+import { CjsBitReader } from '../../../format/CjsBitReader.js';
 import { imdct, vorbisWindowSlope } from './imdct.js';
 
-/**
- * Pure-JS Ogg Vorbis PCM decoder.
- *
- * Implements Vorbis I decode: setup-header codebooks (huffman + VQ), floor
- * type 1 with the spec's exact integer line rendering, residue types 0/1/2,
- * square-polar channel de-coupling, IMDCT, and windowed center-aligned
- * overlap-add with final granule trimming. Behavior follows the Vorbis I
- * specification with stb_vorbis (public domain) consulted as a reference;
- * floor type 0 streams are rejected (never produced by modern encoders).
+/**
+ * Pure-JS Ogg Vorbis PCM decoder.
+ *
+ * Implements Vorbis I decode: setup-header codebooks (huffman + VQ), floor
+ * type 1 with the spec's exact integer line rendering, residue types 0/1/2,
+ * square-polar channel de-coupling, IMDCT, and windowed center-aligned
+ * overlap-add with final granule trimming. Behavior follows the Vorbis I
+ * specification with stb_vorbis (public domain) consulted as a reference;
+ * floor type 0 streams are rejected (never produced by modern encoders).
  */
 
 const NO_CODE = 255;
 const FAST_BITS = 10;
 const FAST_SIZE = 1 << FAST_BITS;
 
-/**
- * The floor1 amplitude table from the Vorbis I specification
- * (inverse_db_table); indexed by the integer floor curve value.
+/**
+ * The floor1 amplitude table from the Vorbis I specification
+ * (inverse_db_table); indexed by the integer floor curve value.
  */
 const INVERSE_DB_TABLE = new Float32Array([1.0649863e-07, 1.1341951e-07, 1.2079015e-07, 1.2863978e-07, 1.3699951e-07, 1.4590251e-07, 1.5538408e-07, 1.6548181e-07, 1.7623575e-07, 1.8768855e-07, 1.9988561e-07, 2.1287530e-07, 2.2670913e-07, 2.4144197e-07, 2.5713223e-07, 2.7384213e-07, 2.9163793e-07, 3.1059021e-07, 3.3077411e-07, 3.5226968e-07, 3.7516214e-07, 3.9954229e-07, 4.2550680e-07, 4.5315863e-07, 4.8260743e-07, 5.1396998e-07, 5.4737065e-07, 5.8294187e-07, 6.2082472e-07, 6.6116941e-07, 7.0413592e-07, 7.4989464e-07, 7.9862701e-07, 8.5052630e-07, 9.0579828e-07, 9.6466216e-07, 1.0273513e-06, 1.0941144e-06, 1.1652161e-06, 1.2409384e-06, 1.3215816e-06, 1.4074654e-06, 1.4989305e-06, 1.5963394e-06, 1.7000785e-06, 1.8105592e-06, 1.9282195e-06, 2.0535261e-06, 2.1869758e-06, 2.3290978e-06, 2.4804557e-06, 2.6416497e-06, 2.8133190e-06, 2.9961443e-06, 3.1908506e-06, 3.3982101e-06, 3.6190449e-06, 3.8542308e-06, 4.1047004e-06, 4.3714470e-06, 4.6555282e-06, 4.9580707e-06, 5.2802740e-06, 5.6234160e-06, 5.9888572e-06, 6.3780469e-06, 6.7925283e-06, 7.2339451e-06, 7.7040476e-06, 8.2047000e-06, 8.7378876e-06, 9.3057248e-06, 9.9104632e-06, 1.0554501e-05, 1.1240392e-05, 1.1970856e-05, 1.2748789e-05, 1.3577278e-05, 1.4459606e-05, 1.5399272e-05, 1.6400004e-05, 1.7465768e-05, 1.8600792e-05, 1.9809576e-05, 2.1096914e-05, 2.2467911e-05, 2.3928002e-05, 2.5482978e-05, 2.7139006e-05, 2.8902651e-05, 3.0780908e-05, 3.2781225e-05, 3.4911534e-05, 3.7180282e-05, 3.9596466e-05, 4.2169667e-05, 4.4910090e-05, 4.7828601e-05, 5.0936773e-05, 5.4246931e-05, 5.7772202e-05, 6.1526565e-05, 6.5524908e-05, 6.9783085e-05, 7.4317983e-05, 7.9147585e-05, 8.4291040e-05, 8.9768747e-05, 9.5602426e-05, 0.00010181521, 0.00010843174, 0.00011547824, 0.00012298267, 0.00013097477, 0.00013948625, 0.00014855085, 0.00015820453, 0.00016848555, 0.00017943469, 0.00019109536, 0.00020351382, 0.00021673929, 0.00023082423, 0.00024582449, 0.00026179955, 0.00027881276, 0.00029693158, 0.00031622787, 0.00033677814, 0.00035866388, 0.00038197188, 0.00040679456, 0.00043323036, 0.00046138411, 0.00049136745, 0.00052329927, 0.00055730621, 0.00059352311, 0.00063209358, 0.00067317058, 0.00071691700, 0.00076350630, 0.00081312324, 0.00086596457, 0.00092223983, 0.00098217216, 0.0010459992, 0.0011139742, 0.0011863665, 0.0012634633, 0.0013455702, 0.0014330129, 0.0015261382, 0.0016253153, 0.0017309374, 0.0018434235, 0.0019632195, 0.0020908006, 0.0022266726, 0.0023713743, 0.0025254795, 0.0026895994, 0.0028643847, 0.0030505286, 0.0032487691, 0.0034598925, 0.0036847358, 0.0039241906, 0.0041792066, 0.0044507950, 0.0047400328, 0.0050480668, 0.0053761186, 0.0057254891, 0.0060975636, 0.0064938176, 0.0069158225, 0.0073652516, 0.0078438871, 0.0083536271, 0.0088964928, 0.0094746370, 0.0100903520, 0.0107460800, 0.0114444210, 0.0121881440, 0.0129801980, 0.0138237250, 0.0147220680, 0.0156787910, 0.0166976870, 0.0177827970, 0.0189384230, 0.0201691490, 0.0214798540, 0.0228757350, 0.0243623300, 0.0259455310, 0.0276316180, 0.0294272760, 0.0313396260, 0.0333762520, 0.0355452280, 0.0378551570, 0.0403151990, 0.0429351080, 0.0457252730, 0.0486967580, 0.0518613480, 0.0552315910, 0.0588208500, 0.0626433610, 0.0667142790, 0.0710497490, 0.0756669620, 0.0805842270, 0.0858210440, 0.0913981790, 0.0973377470, 0.1036633000, 0.1103999300, 0.1175743400, 0.1252149800, 0.1333521500, 0.1420181300, 0.1512472700, 0.1610761700, 0.1715438000, 0.1826916800, 0.1945640200, 0.2072078800, 0.2206734200, 0.2350140200, 0.2502865600, 0.2665515900, 0.2838736100, 0.3023213200, 0.3219678600, 0.3428911400, 0.3651741400, 0.3889052100, 0.4141784700, 0.4410941200, 0.4697589000, 0.5002864800, 0.5327979100, 0.5674221200, 0.6042964000, 0.6435669900, 0.6853895900, 0.7299300700, 0.7773650400, 0.8278826000, 0.8816830700, 0.9389798000, 1.0]);
 function decodeError(message) {
@@ -58,43 +59,38 @@ function lookup1Values(entries, dimensions) {
   }
 }
 
-/**
- * LSB-first bit reader over one Vorbis packet; reading past the end sets
- * `eop` instead of throwing (end-of-packet is a defined decode condition).
+/**
+ * LSB-first bit reader over one Vorbis packet; reading past the end sets
+ * `eop` instead of throwing (end-of-packet is a defined decode condition).
  */
-class PacketReader {
-  /** Creates a PacketReader over caller-provided Ogg bytes and reader options. */
+class PacketReader extends CjsBitReader {
+  /** True once a read has run past the end of the packet. */
+  eop = false;
+
+  /** Creates a PacketReader over caller-provided Ogg bytes. */
   constructor(bytes) {
-    this.bytes = bytes;
-    this.position = 0;
-    this.bitBuffer = 0;
-    this.bitsLeft = 0;
-    this.eop = false;
+    super(bytes, {
+      source: "ogg"
+    });
   }
 
-  /** Reads bits from the current Ogg binary reader. */
-  readBits(count) {
-    let value = 0;
-    for (let i = 0; i < count; i++) {
-      if (this.bitsLeft === 0) {
-        if (this.position >= this.bytes.length) {
-          this.eop = true;
-          return -1;
-        }
-        this.bitBuffer = this.bytes[this.position++];
-        this.bitsLeft = 8;
-      }
-      value |= (this.bitBuffer & 1) << i;
-      this.bitBuffer >>= 1;
-      this.bitsLeft--;
-    }
-    return value >>> 0;
+  /**
+   * End of packet is a DEFINED decode condition in Vorbis, not a truncated
+   * file: a packet legitimately runs out mid-read and the decoder must see
+   * that rather than unwinding. So this overrides the shared cursor's throw
+   * with the sentinel every caller here already tests for.
+   *
+   * @returns {number} -1, the end-of-packet sentinel.
+   */
+  Exhausted() {
+    this.eop = true;
+    return -1;
   }
 }
 
-/**
- * Vorbis codebook that builds Huffman decode trees and VQ lookup vectors for
- * scalar and vector packet decoding.
+/**
+ * Vorbis codebook that builds Huffman decode trees and VQ lookup vectors for
+ * scalar and vector packet decoding.
  */
 class Codebook {
   /** Creates a Codebook with caller-provided initial state. */
@@ -110,9 +106,9 @@ class Codebook {
     this.maxLength = 0;
   }
 
-  /**
-   * Builds the canonical Vorbis Huffman decode tree for this codebook for the
-   * Ogg decoder.
+  /**
+   * Builds the canonical Vorbis Huffman decode tree for this codebook for the
+   * Ogg decoder.
    */
   buildHuffman(lengths) {
     const available = new Uint32Array(33);
@@ -177,30 +173,28 @@ class Codebook {
     // fast path: peek up to FAST_BITS without consuming
     let peek = 0;
     let peekBits = 0;
-    const savedPosition = reader.position;
-    const savedBuffer = reader.bitBuffer;
-    const savedLeft = reader.bitsLeft;
+    // One cursor position is the whole of the saved state now; the previous
+    // three-field save/restore was the refill buffer leaking into callers.
+    const savedPosition = reader.bitPosition;
     while (peekBits < FAST_BITS) {
-      const bit = reader.readBits(1);
+      const bit = reader.ReadBits(1);
       if (bit < 0) break;
       peek |= bit << peekBits;
       peekBits++;
     }
-    reader.position = savedPosition;
-    reader.bitBuffer = savedBuffer;
-    reader.bitsLeft = savedLeft;
+    reader.bitPosition = savedPosition;
     reader.eop = false;
     if (peekBits === FAST_BITS) {
       const hit = this.fastTable[peek];
       if (hit >= 0) {
-        reader.readBits(hit & 63);
+        reader.ReadBits(hit & 63);
         return hit >> 6;
       }
     } else {
       // short remainder: try fast table over what's left
       const hit = this.fastTable[peek];
       if (hit >= 0 && (hit & 63) <= peekBits) {
-        reader.readBits(hit & 63);
+        reader.ReadBits(hit & 63);
         return hit >> 6;
       }
     }
@@ -208,7 +202,7 @@ class Codebook {
     // slow path: walk the trie bit by bit
     let node = 0;
     for (let i = 0; i < this.maxLength; i++) {
-      const bit = reader.readBits(1);
+      const bit = reader.ReadBits(1);
       if (bit < 0) return -1;
       const value = this.treeNodes[node * 2 + bit];
       if (value < 0) return -value - 1;
@@ -229,18 +223,18 @@ class Codebook {
   }
 }
 function parseCodebook(reader) {
-  const sync = reader.readBits(24);
+  const sync = reader.ReadBits(24);
   if (sync !== 0x564342) throw decodeError("invalid codebook sync pattern");
   const book = new Codebook();
-  book.dimensions = reader.readBits(16);
-  book.entries = reader.readBits(24);
+  book.dimensions = reader.ReadBits(16);
+  book.entries = reader.ReadBits(24);
   const lengths = new Uint8Array(book.entries);
-  const ordered = reader.readBits(1);
+  const ordered = reader.ReadBits(1);
   if (ordered) {
     let currentEntry = 0;
-    let currentLength = reader.readBits(5) + 1;
+    let currentLength = reader.ReadBits(5) + 1;
     while (currentEntry < book.entries) {
-      const number = reader.readBits(ilog(book.entries - currentEntry));
+      const number = reader.ReadBits(ilog(book.entries - currentEntry));
       if (reader.eop) throw decodeError("codebook lengths truncated");
       for (let i = 0; i < number; i++) lengths[currentEntry + i] = currentLength;
       currentEntry += number;
@@ -248,38 +242,38 @@ function parseCodebook(reader) {
       if (currentEntry > book.entries) throw decodeError("codebook entry overflow");
     }
   } else {
-    const sparse = reader.readBits(1);
+    const sparse = reader.ReadBits(1);
     for (let i = 0; i < book.entries; i++) {
-      const present = sparse ? reader.readBits(1) : 1;
-      lengths[i] = present ? reader.readBits(5) + 1 : NO_CODE;
+      const present = sparse ? reader.ReadBits(1) : 1;
+      lengths[i] = present ? reader.ReadBits(5) + 1 : NO_CODE;
     }
   }
   if (reader.eop) throw decodeError("codebook lengths truncated");
   book.buildHuffman(lengths);
-  book.lookupType = reader.readBits(4);
+  book.lookupType = reader.ReadBits(4);
   if (book.lookupType > 2) throw decodeError(`invalid codebook lookup type ${book.lookupType}`);
   if (book.lookupType > 0) {
-    const minimum = float32Unpack(reader.readBits(32));
-    const delta = float32Unpack(reader.readBits(32));
-    const valueBits = reader.readBits(4) + 1;
-    book.sequenceP = reader.readBits(1) === 1;
+    const minimum = float32Unpack(reader.ReadBits(32));
+    const delta = float32Unpack(reader.ReadBits(32));
+    const valueBits = reader.ReadBits(4) + 1;
+    book.sequenceP = reader.ReadBits(1) === 1;
     const count = book.lookupType === 1 ? lookup1Values(book.entries, book.dimensions) : book.entries * book.dimensions;
     book.quantvals = book.lookupType === 1 ? count : 0;
     book.values = new Float32Array(count);
     for (let i = 0; i < count; i++) {
-      book.values[i] = minimum + reader.readBits(valueBits) * delta;
+      book.values[i] = minimum + reader.ReadBits(valueBits) * delta;
     }
     if (reader.eop) throw decodeError("codebook lookup values truncated");
   }
   return book;
 }
 function parseFloor(reader, codebooks) {
-  const type = reader.readBits(16);
+  const type = reader.ReadBits(16);
   if (type !== 1) {
     throw decodeError(`floor type ${type} is not supported (only floor 1)`);
   }
   const floor = {
-    partitions: reader.readBits(5),
+    partitions: reader.ReadBits(5),
     partitionClassList: [],
     classDimensions: [],
     classSubclasses: [],
@@ -291,27 +285,27 @@ function parseFloor(reader, codebooks) {
   };
   let maximumClass = -1;
   for (let i = 0; i < floor.partitions; i++) {
-    const partitionClass = reader.readBits(4);
+    const partitionClass = reader.ReadBits(4);
     floor.partitionClassList.push(partitionClass);
     if (partitionClass > maximumClass) maximumClass = partitionClass;
   }
   for (let i = 0; i <= maximumClass; i++) {
-    floor.classDimensions.push(reader.readBits(3) + 1);
-    const subclasses = reader.readBits(2);
+    floor.classDimensions.push(reader.ReadBits(3) + 1);
+    const subclasses = reader.ReadBits(2);
     floor.classSubclasses.push(subclasses);
-    floor.classMasterbooks.push(subclasses ? reader.readBits(8) : -1);
+    floor.classMasterbooks.push(subclasses ? reader.ReadBits(8) : -1);
     const books = [];
     for (let j = 0; j < 1 << subclasses; j++) {
-      books.push(reader.readBits(8) - 1);
+      books.push(reader.ReadBits(8) - 1);
     }
     floor.subclassBooks.push(books);
   }
-  floor.multiplier = reader.readBits(2) + 1;
-  floor.rangebits = reader.readBits(4);
+  floor.multiplier = reader.ReadBits(2) + 1;
+  floor.rangebits = reader.ReadBits(4);
   floor.xList = [0, 1 << floor.rangebits];
   for (let i = 0; i < floor.partitions; i++) {
     for (let j = 0; j < floor.classDimensions[floor.partitionClassList[i]]; j++) {
-      floor.xList.push(reader.readBits(floor.rangebits));
+      floor.xList.push(reader.ReadBits(floor.rangebits));
     }
   }
   if (reader.eop) throw decodeError("floor configuration truncated");
@@ -341,30 +335,30 @@ function parseFloor(reader, codebooks) {
   return floor;
 }
 function parseResidue(reader, codebooks) {
-  const type = reader.readBits(16);
+  const type = reader.ReadBits(16);
   if (type > 2) throw decodeError(`invalid residue type ${type}`);
   const residue = {
     type,
-    begin: reader.readBits(24),
-    end: reader.readBits(24),
-    partSize: reader.readBits(24) + 1,
-    classifications: reader.readBits(6) + 1,
-    classbook: reader.readBits(8),
+    begin: reader.ReadBits(24),
+    end: reader.ReadBits(24),
+    partSize: reader.ReadBits(24) + 1,
+    classifications: reader.ReadBits(6) + 1,
+    classbook: reader.ReadBits(8),
     books: []
   };
   if (residue.classbook >= codebooks.length) throw decodeError("residue classbook out of range");
   const cascades = [];
   for (let i = 0; i < residue.classifications; i++) {
-    const lowBits = reader.readBits(3);
-    const flag = reader.readBits(1);
-    const highBits = flag ? reader.readBits(5) : 0;
+    const lowBits = reader.ReadBits(3);
+    const flag = reader.ReadBits(1);
+    const highBits = flag ? reader.ReadBits(5) : 0;
     cascades.push(highBits * 8 + lowBits);
   }
   for (let i = 0; i < residue.classifications; i++) {
     const passBooks = [];
     for (let pass = 0; pass < 8; pass++) {
       if (cascades[i] & 1 << pass) {
-        const bookIndex = reader.readBits(8);
+        const bookIndex = reader.ReadBits(8);
         if (bookIndex >= codebooks.length) throw decodeError("residue book out of range");
         if (codebooks[bookIndex].lookupType === 0) throw decodeError("residue book has no lookup values");
         passBooks.push(bookIndex);
@@ -378,7 +372,7 @@ function parseResidue(reader, codebooks) {
   return residue;
 }
 function parseMapping(reader, channels, floorCount, residueCount) {
-  const type = reader.readBits(16);
+  const type = reader.ReadBits(16);
   if (type !== 0) throw decodeError(`invalid mapping type ${type}`);
   const mapping = {
     submaps: 1,
@@ -387,13 +381,13 @@ function parseMapping(reader, channels, floorCount, residueCount) {
     submapFloor: [],
     submapResidue: []
   };
-  if (reader.readBits(1)) mapping.submaps = reader.readBits(4) + 1;
-  if (reader.readBits(1)) {
-    const steps = reader.readBits(8) + 1;
+  if (reader.ReadBits(1)) mapping.submaps = reader.ReadBits(4) + 1;
+  if (reader.ReadBits(1)) {
+    const steps = reader.ReadBits(8) + 1;
     const bits = ilog(channels - 1);
     for (let i = 0; i < steps; i++) {
-      const magnitude = reader.readBits(bits);
-      const angle = reader.readBits(bits);
+      const magnitude = reader.ReadBits(bits);
+      const angle = reader.ReadBits(bits);
       if (magnitude === angle || magnitude >= channels || angle >= channels) {
         throw decodeError("invalid channel coupling");
       }
@@ -403,17 +397,17 @@ function parseMapping(reader, channels, floorCount, residueCount) {
       });
     }
   }
-  if (reader.readBits(2) !== 0) throw decodeError("mapping reserved bits nonzero");
+  if (reader.ReadBits(2) !== 0) throw decodeError("mapping reserved bits nonzero");
   if (mapping.submaps > 1) {
     for (let i = 0; i < channels; i++) {
-      mapping.mux[i] = reader.readBits(4);
+      mapping.mux[i] = reader.ReadBits(4);
       if (mapping.mux[i] >= mapping.submaps) throw decodeError("mapping mux out of range");
     }
   }
   for (let i = 0; i < mapping.submaps; i++) {
-    reader.readBits(8);
-    const floorIndex = reader.readBits(8);
-    const residueIndex = reader.readBits(8);
+    reader.ReadBits(8);
+    const floorIndex = reader.ReadBits(8);
+    const residueIndex = reader.ReadBits(8);
     if (floorIndex >= floorCount || residueIndex >= residueCount) {
       throw decodeError("mapping references invalid floor or residue");
     }
@@ -430,12 +424,12 @@ function renderPoint(x0, y0, x1, y1, x) {
   return dy < 0 ? y0 - err : y0 + err;
 }
 function decodeFloor1Posts(reader, floor, codebooks) {
-  if (reader.readBits(1) !== 1) return null;
+  if (reader.ReadBits(1) !== 1) return null;
   const range = FLOOR1_RANGES[floor.multiplier - 1];
   const posts = new Int32Array(floor.xList.length);
   const yBits = ilog(range - 1);
-  posts[0] = reader.readBits(yBits);
-  posts[1] = reader.readBits(yBits);
+  posts[0] = reader.ReadBits(yBits);
+  posts[1] = reader.ReadBits(yBits);
   let offset = 2;
   for (let i = 0; i < floor.partitions; i++) {
     const partitionClass = floor.partitionClassList[i];
@@ -678,11 +672,11 @@ function getWindow(n, blockflag, prevFlag, nextFlag, blocksize0) {
   return window;
 }
 
-/**
- * Split an Ogg stream into the first logical stream's packets.
- *
- * @param {Uint8Array} bytes Ogg bytes (already CRC-validated by inspection).
- * @returns {object} `{ packets, lastGranule }` for the first stream.
+/**
+ * Split an Ogg stream into the first logical stream's packets.
+ *
+ * @param {Uint8Array} bytes Ogg bytes (already CRC-validated by inspection).
+ * @returns {object} `{ packets, lastGranule }` for the first stream.
  */
 function extractOggPackets(bytes) {
   const packets = [];
@@ -741,22 +735,22 @@ function expectHeader(packet, type) {
     throw decodeError(`missing vorbis header packet type ${type}`);
   }
   const reader = new PacketReader(packet);
-  reader.readBits(8);
-  for (let i = 0; i < 6; i++) reader.readBits(8);
+  reader.ReadBits(8);
+  for (let i = 0; i < 6; i++) reader.ReadBits(8);
   return reader;
 }
 function parseComments(packet) {
   const reader = new PacketReader(packet);
-  reader.readBits(8);
-  for (let i = 0; i < 6; i++) reader.readBits(8);
+  reader.ReadBits(8);
+  for (let i = 0; i < 6; i++) reader.ReadBits(8);
   const readString = () => {
-    const length = reader.readBits(32);
+    const length = reader.ReadBits(32);
     let text = "";
-    for (let i = 0; i < length; i++) text += String.fromCharCode(reader.readBits(8));
+    for (let i = 0; i < length; i++) text += String.fromCharCode(reader.ReadBits(8));
     return text;
   };
   const vendor = readString();
-  const count = reader.readBits(32);
+  const count = reader.ReadBits(32);
   const comments = [];
   for (let i = 0; i < count && !reader.eop; i++) comments.push(readString());
   let loop = null;
@@ -778,11 +772,11 @@ function parseComments(packet) {
   };
 }
 
-/**
- * Decode an Ogg Vorbis stream to planar float PCM.
- *
- * @param {Uint8Array} bytes Complete Ogg Vorbis stream bytes.
- * @returns {object} `{ channels, sampleRate, sampleCount, channelData, vendor, comments, loop, packetCount }`.
+/**
+ * Decode an Ogg Vorbis stream to planar float PCM.
+ *
+ * @param {Uint8Array} bytes Complete Ogg Vorbis stream bytes.
+ * @returns {object} `{ channels, sampleRate, sampleCount, channelData, vendor, comments, loop, packetCount }`.
  */
 function decodeVorbis(bytes) {
   const {
@@ -793,14 +787,14 @@ function decodeVorbis(bytes) {
 
   // identification header
   const identReader = expectHeader(packets[0], 1);
-  if (identReader.readBits(32) !== 0) throw decodeError("unsupported vorbis version");
-  const channels = identReader.readBits(8);
-  const sampleRate = identReader.readBits(32);
-  identReader.readBits(32);
-  identReader.readBits(32);
-  identReader.readBits(32);
-  const blocksize0 = 1 << identReader.readBits(4);
-  const blocksize1 = 1 << identReader.readBits(4);
+  if (identReader.ReadBits(32) !== 0) throw decodeError("unsupported vorbis version");
+  const channels = identReader.ReadBits(8);
+  const sampleRate = identReader.ReadBits(32);
+  identReader.ReadBits(32);
+  identReader.ReadBits(32);
+  identReader.ReadBits(32);
+  const blocksize0 = 1 << identReader.ReadBits(4);
+  const blocksize1 = 1 << identReader.ReadBits(4);
   if (!channels || !sampleRate) throw decodeError("invalid identification header");
   if (blocksize0 > blocksize1 || blocksize0 < 64 || blocksize1 > 8192) {
     throw decodeError("invalid blocksizes");
@@ -814,36 +808,36 @@ function decodeVorbis(bytes) {
   // setup header
   const setup = expectHeader(packets[2], 5);
   const codebooks = [];
-  const codebookCount = setup.readBits(8) + 1;
+  const codebookCount = setup.ReadBits(8) + 1;
   for (let i = 0; i < codebookCount; i++) codebooks.push(parseCodebook(setup));
-  const timeCount = setup.readBits(6) + 1;
+  const timeCount = setup.ReadBits(6) + 1;
   for (let i = 0; i < timeCount; i++) {
-    if (setup.readBits(16) !== 0) throw decodeError("nonzero time-domain transform");
+    if (setup.ReadBits(16) !== 0) throw decodeError("nonzero time-domain transform");
   }
   const floors = [];
-  const floorCount = setup.readBits(6) + 1;
+  const floorCount = setup.ReadBits(6) + 1;
   for (let i = 0; i < floorCount; i++) floors.push(parseFloor(setup, codebooks));
   const residues = [];
-  const residueCount = setup.readBits(6) + 1;
+  const residueCount = setup.ReadBits(6) + 1;
   for (let i = 0; i < residueCount; i++) residues.push(parseResidue(setup, codebooks));
   const mappings = [];
-  const mappingCount = setup.readBits(6) + 1;
+  const mappingCount = setup.ReadBits(6) + 1;
   for (let i = 0; i < mappingCount; i++) mappings.push(parseMapping(setup, channels, floorCount, residueCount));
   const modes = [];
-  const modeCount = setup.readBits(6) + 1;
+  const modeCount = setup.ReadBits(6) + 1;
   for (let i = 0; i < modeCount; i++) {
-    const blockflag = setup.readBits(1) === 1;
-    if (setup.readBits(16) !== 0 || setup.readBits(16) !== 0) {
+    const blockflag = setup.ReadBits(1) === 1;
+    if (setup.ReadBits(16) !== 0 || setup.ReadBits(16) !== 0) {
       throw decodeError("nonzero mode window/transform type");
     }
-    const mapping = setup.readBits(8);
+    const mapping = setup.ReadBits(8);
     if (mapping >= mappingCount) throw decodeError("mode references invalid mapping");
     modes.push({
       blockflag,
       mapping
     });
   }
-  if (setup.readBits(1) !== 1) throw decodeError("missing setup framing bit");
+  if (setup.ReadBits(1) !== 1) throw decodeError("missing setup framing bit");
   const modeBits = ilog(modeCount - 1);
 
   // synthesis state
@@ -866,8 +860,8 @@ function decodeVorbis(bytes) {
   let packetCount = 0;
   for (let p = 3; p < packets.length; p++) {
     const reader = new PacketReader(packets[p]);
-    if (reader.readBits(1) !== 0) continue;
-    const modeNumber = reader.readBits(modeBits);
+    if (reader.ReadBits(1) !== 0) continue;
+    const modeNumber = reader.ReadBits(modeBits);
     if (modeNumber < 0 || modeNumber >= modeCount) continue;
     const mode = modes[modeNumber];
     const mapping = mappings[mode.mapping];
@@ -876,8 +870,8 @@ function decodeVorbis(bytes) {
     let prevFlag = false;
     let nextFlag = false;
     if (mode.blockflag) {
-      prevFlag = reader.readBits(1) === 1;
-      nextFlag = reader.readBits(1) === 1;
+      prevFlag = reader.ReadBits(1) === 1;
+      nextFlag = reader.ReadBits(1) === 1;
     }
 
     // floors