mediabunny 1.17.0 → 1.17.2

package/dist/bundles/mediabunny.cjs

@@ -7906,37 +7906,158 @@ ${cue.notes ?? ""}`;
 
   // shared/mp3-misc.ts
   var FRAME_HEADER_SIZE = 4;
-  var MPEG_V1_BITRATES = {
-    // Layer 3
-    1: [-1, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1],
-    // Layer 2
-    2: [-1, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1],
-    // Layer 1
-    3: [-1, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1]
-  };
-  var MPEG_V2_BITRATES = {
-    // Layer 3
-    1: [-1, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1],
-    // Layer 2
-    2: [-1, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1],
-    // Layer 1
-    3: [-1, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1]
-  };
-  var SAMPLING_RATES = {
-    // MPEG Version 2.5
-    0: [11025, 12e3, 8e3, -1],
-    // MPEG Version 2 (ISO/IEC 13818-3)
-    2: [22050, 24e3, 16e3, -1],
-    // MPEG Version 1 (ISO/IEC 11172-3)
-    3: [44100, 48e3, 32e3, -1]
-  };
+  var SAMPLING_RATES = [44100, 48e3, 32e3];
+  var KILOBIT_RATES = [
+    // lowSamplingFrequency === 0
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    // layer = 0
+    -1,
+    32,
+    40,
+    48,
+    56,
+    64,
+    80,
+    96,
+    112,
+    128,
+    160,
+    192,
+    224,
+    256,
+    320,
+    -1,
+    // layer 1
+    -1,
+    32,
+    48,
+    56,
+    64,
+    80,
+    96,
+    112,
+    128,
+    160,
+    192,
+    224,
+    256,
+    320,
+    384,
+    -1,
+    // layer = 2
+    -1,
+    32,
+    64,
+    96,
+    128,
+    160,
+    192,
+    224,
+    256,
+    288,
+    320,
+    352,
+    384,
+    416,
+    448,
+    -1,
+    // layer = 3
+    // lowSamplingFrequency === 1
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    // layer = 0
+    -1,
+    8,
+    16,
+    24,
+    32,
+    40,
+    48,
+    56,
+    64,
+    80,
+    96,
+    112,
+    128,
+    144,
+    160,
+    -1,
+    // layer = 1
+    -1,
+    8,
+    16,
+    24,
+    32,
+    40,
+    48,
+    56,
+    64,
+    80,
+    96,
+    112,
+    128,
+    144,
+    160,
+    -1,
+    // layer = 2
+    -1,
+    32,
+    48,
+    56,
+    64,
+    80,
+    96,
+    112,
+    128,
+    144,
+    160,
+    176,
+    192,
+    224,
+    256,
+    -1
+    // layer = 3
+  ];
   var XING = 1483304551;
   var INFO = 1231971951;
-  var computeMp3FrameSize = (layer, bitrate, sampleRate, padding) => {
-    if (layer === 3) {
-      return Math.floor((12 * bitrate / sampleRate + padding) * 4);
+  var computeMp3FrameSize = (lowSamplingFrequency, layer, bitrate, sampleRate, padding) => {
+    if (layer === 0) {
+      return 0;
+    } else if (layer === 1) {
+      return Math.round(144 * bitrate / (sampleRate << lowSamplingFrequency)) + padding;
+    } else if (layer === 2) {
+      return Math.round(144 * bitrate / sampleRate) + padding;
     } else {
-      return Math.floor(144 * bitrate / sampleRate + padding);
+      return (Math.round(12 * bitrate / sampleRate) + padding) * 4;
     }
   };
   var getXingOffset = (mpegVersionId, channel) => {
@@ -7959,26 +8080,31 @@ ${cue.notes ?? ""}`;
     if ((secondByte & 224) !== 224) {
       return { header: null, bytesAdvanced: 1 };
     }
+    let lowSamplingFrequency = 0;
+    let mpeg25 = 0;
+    if (secondByte & 1 << 4) {
+      lowSamplingFrequency = secondByte & 1 << 3 ? 0 : 1;
+    } else {
+      lowSamplingFrequency = 1;
+      mpeg25 = 1;
+    }
     const mpegVersionId = secondByte >> 3 & 3;
     const layer = secondByte >> 1 & 3;
     const bitrateIndex = thirdByte >> 4 & 15;
-    const frequencyIndex = thirdByte >> 2 & 3;
+    const frequencyIndex = (thirdByte >> 2 & 3) % 3;
     const padding = thirdByte >> 1 & 1;
     const channel = fourthByte >> 6 & 3;
     const modeExtension = fourthByte >> 4 & 3;
     const copyright = fourthByte >> 3 & 1;
     const original = fourthByte >> 2 & 1;
     const emphasis = fourthByte & 3;
-    const kilobitRate = mpegVersionId === 3 ? MPEG_V1_BITRATES[layer]?.[bitrateIndex] : MPEG_V2_BITRATES[layer]?.[bitrateIndex];
-    if (!kilobitRate || kilobitRate === -1) {
+    const kilobitRate = KILOBIT_RATES[lowSamplingFrequency * 16 * 4 + layer * 16 + bitrateIndex];
+    if (kilobitRate === -1) {
       return { header: null, bytesAdvanced: 1 };
     }
     const bitrate = kilobitRate * 1e3;
-    const sampleRate = SAMPLING_RATES[mpegVersionId]?.[frequencyIndex];
-    if (!sampleRate || sampleRate === -1) {
-      return { header: null, bytesAdvanced: 1 };
-    }
-    const frameLength = computeMp3FrameSize(layer, bitrate, sampleRate, padding);
+    const sampleRate = SAMPLING_RATES[frequencyIndex] >> lowSamplingFrequency + mpeg25;
+    const frameLength = computeMp3FrameSize(lowSamplingFrequency, layer, bitrate, sampleRate, padding);
     if (remainingBytes !== null && remainingBytes < frameLength) {
       return { header: null, bytesAdvanced: 1 };
     }
@@ -8758,6 +8884,65 @@ ${cue.notes ?? ""}`;
       }
       this.writer.write(this.helper.subarray(0, text.length));
     }
+    writeXingFrame(data) {
+      const startPos = this.writer.getPos();
+      const firstByte = 255;
+      const secondByte = 224 | data.mpegVersionId << 3 | data.layer << 1;
+      let lowSamplingFrequency;
+      if (data.mpegVersionId & 2) {
+        lowSamplingFrequency = data.mpegVersionId & 1 ? 0 : 1;
+      } else {
+        lowSamplingFrequency = 1;
+      }
+      const padding = 0;
+      const neededBytes = 155;
+      let bitrateIndex = -1;
+      const bitrateOffset = lowSamplingFrequency * 16 * 4 + data.layer * 16;
+      for (let i = 0; i < 16; i++) {
+        const kbr = KILOBIT_RATES[bitrateOffset + i];
+        const size = computeMp3FrameSize(lowSamplingFrequency, data.layer, 1e3 * kbr, data.sampleRate, padding);
+        if (size >= neededBytes) {
+          bitrateIndex = i;
+          break;
+        }
+      }
+      if (bitrateIndex === -1) {
+        throw new Error("No suitable bitrate found.");
+      }
+      const thirdByte = bitrateIndex << 4 | data.frequencyIndex << 2 | padding << 1;
+      const fourthByte = data.channel << 6 | data.modeExtension << 4 | data.copyright << 3 | data.original << 2 | data.emphasis;
+      this.helper[0] = firstByte;
+      this.helper[1] = secondByte;
+      this.helper[2] = thirdByte;
+      this.helper[3] = fourthByte;
+      this.writer.write(this.helper.subarray(0, 4));
+      const xingOffset = getXingOffset(data.mpegVersionId, data.channel);
+      this.writer.seek(startPos + xingOffset);
+      this.writeU32(XING);
+      let flags = 0;
+      if (data.frameCount !== null) {
+        flags |= 1;
+      }
+      if (data.fileSize !== null) {
+        flags |= 2;
+      }
+      if (data.toc !== null) {
+        flags |= 4;
+      }
+      this.writeU32(flags);
+      this.writeU32(data.frameCount ?? 0);
+      this.writeU32(data.fileSize ?? 0);
+      this.writer.write(data.toc ?? new Uint8Array(100));
+      const kilobitRate = KILOBIT_RATES[bitrateOffset + bitrateIndex];
+      const frameSize = computeMp3FrameSize(
+        lowSamplingFrequency,
+        data.layer,
+        1e3 * kilobitRate,
+        data.sampleRate,
+        padding
+      );
+      this.writer.seek(startPos + frameSize);
+    }
     writeSynchsafeU32(value) {
       this.writeU32(encodeSynchsafe(value));
     }
@@ -8846,54 +9031,6 @@ ${cue.notes ?? ""}`;
       }
       this.writer.write(imageData);
     }
-    writeXingFrame(data) {
-      const startPos = this.writer.getPos();
-      const firstByte = 255;
-      const secondByte = 224 | data.mpegVersionId << 3 | data.layer << 1;
-      const bitrateGroup = data.mpegVersionId === 3 ? MPEG_V1_BITRATES : MPEG_V2_BITRATES;
-      const bitrates = bitrateGroup?.[data.layer];
-      if (!bitrates) {
-        throw new Error("Invalid MPEG version and layer combination.");
-      }
-      const sampleRate = SAMPLING_RATES[data.mpegVersionId]?.[data.frequencyIndex];
-      if (!sampleRate || sampleRate === -1) {
-        throw new Error("Invalid MPEG version and frequency index combination.");
-      }
-      const padding = 0;
-      const neededBytes = 155;
-      const bitrateIndex = bitrates.findIndex((kbr) => {
-        return computeMp3FrameSize(data.layer, 1e3 * kbr, sampleRate, padding) >= neededBytes;
-      });
-      if (bitrateIndex === -1) {
-        throw new Error("No suitable bitrate found.");
-      }
-      const thirdByte = bitrateIndex << 4 | data.frequencyIndex << 2 | padding << 1;
-      const fourthByte = data.channel << 6 | data.modeExtension << 4 | data.copyright << 3 | data.original << 2 | data.emphasis;
-      this.helper[0] = firstByte;
-      this.helper[1] = secondByte;
-      this.helper[2] = thirdByte;
-      this.helper[3] = fourthByte;
-      this.writer.write(this.helper.subarray(0, 4));
-      const xingOffset = getXingOffset(data.mpegVersionId, data.channel);
-      this.writer.seek(startPos + xingOffset);
-      this.writeU32(XING);
-      let flags = 0;
-      if (data.frameCount !== null) {
-        flags |= 1;
-      }
-      if (data.fileSize !== null) {
-        flags |= 2;
-      }
-      if (data.toc !== null) {
-        flags |= 4;
-      }
-      this.writeU32(flags);
-      this.writeU32(data.frameCount ?? 0);
-      this.writeU32(data.fileSize ?? 0);
-      this.writer.write(data.toc ?? new Uint8Array(100));
-      const frameSize = computeMp3FrameSize(data.layer, 1e3 * bitrates[bitrateIndex], sampleRate, padding);
-      this.writer.seek(startPos + frameSize);
-    }
   };
 
   // src/mp3/mp3-muxer.ts
@@ -8945,6 +9082,7 @@ ${cue.notes ?? ""}`;
             mpegVersionId: header.mpegVersionId,
             layer: header.layer,
             frequencyIndex: header.frequencyIndex,
+            sampleRate: header.sampleRate,
             channel: header.channel,
             modeExtension: header.modeExtension,
             copyright: header.copyright,
@@ -20790,9 +20928,14 @@ ${cue.notes ?? ""}`;
       if (!this.firstFrameHeader) {
         this.firstFrameHeader = header;
       }
-      const sampleDuration = header.audioSamplesInFrame / header.sampleRate;
+      if (header.sampleRate !== this.firstFrameHeader.sampleRate) {
+        console.warn(
+          `MP3 changed sample rate mid-file: ${this.firstFrameHeader.sampleRate} Hz to ${header.sampleRate} Hz. Might be a bug, so please report this file.`
+        );
+      }
+      const sampleDuration = header.audioSamplesInFrame / this.firstFrameHeader.sampleRate;
       const sample = {
-        timestamp: this.nextTimestampInSamples / header.sampleRate,
+        timestamp: this.nextTimestampInSamples / this.firstFrameHeader.sampleRate,
         duration: sampleDuration,
         dataStart: result.startPos,
         dataSize: header.totalSize