music-metadata 11.12.3 → 11.13.0

package/lib/id3v1/ID3v1Parser.js

@@ -95,8 +95,8 @@ export class ID3v1Parser extends BasicParser {
             debug('Skip checking for ID3v1 because the file-size is unknown');
             return;
         }
-        if (this.apeHeader) {
-            this.tokenizer.ignore(this.apeHeader.offset - this.tokenizer.position);
+        if (this.apeHeader && this.tokenizer.supportsRandomAccess()) {
+            this.tokenizer.setPosition(this.apeHeader.offset);
             const apeParser = new APEv2Parser(this.metadata, this.tokenizer, this.options);
             await apeParser.parseTags(this.apeHeader.footer);
         }

package/lib/mp4/AtomToken.js

@@ -3,6 +3,7 @@ import initDebug from 'debug';
 import { FourCcToken } from '../common/FourCC.js';
 import { makeUnexpectedFileContentError } from '../ParseError.js';
 import * as util from '../common/Util.js';
+import { FieldDecodingError } from '../ParseError.js';
 const debug = initDebug('music-metadata:parser:MP4:atom');
 export class Mp4ContentError extends makeUnexpectedFileContentError('MP4') {
 }
@@ -79,6 +80,13 @@ const SecondsSinceMacEpoch = {
         return new Date(secondsSinceUnixEpoch * 1000);
     }
 };
+const SecondsSinceMacEpoch64 = {
+    len: 8,
+    get: (buf, off) => {
+        const secondsSinceUnixEpoch = Number(Token.UINT64_BE.get(buf, off)) - 2082844800;
+        return new Date(secondsSinceUnixEpoch * 1000);
+    }
+};
 /**
  * Token: Media Header Atom
  * Ref:
@@ -90,16 +98,35 @@ export class MdhdAtom extends FixedLengthAtom {
         super(len, 24, 'mdhd');
     }
     get(buf, off) {
-        return {
-            version: Token.UINT8.get(buf, off + 0),
-            flags: Token.UINT24_BE.get(buf, off + 1),
-            creationTime: SecondsSinceMacEpoch.get(buf, off + 4),
-            modificationTime: SecondsSinceMacEpoch.get(buf, off + 8),
-            timeScale: Token.UINT32_BE.get(buf, off + 12),
-            duration: Token.UINT32_BE.get(buf, off + 16),
-            language: Token.UINT16_BE.get(buf, off + 20),
-            quality: Token.UINT16_BE.get(buf, off + 22)
-        };
+        const version = Token.UINT8.get(buf, off + 0);
+        const flags = Token.UINT24_BE.get(buf, off + 1);
+        switch (version) {
+            case 0:
+                // Version 0: 32-bit fields
+                return {
+                    version,
+                    flags,
+                    creationTime: SecondsSinceMacEpoch.get(buf, off + 4),
+                    modificationTime: SecondsSinceMacEpoch.get(buf, off + 8),
+                    timeScale: Token.UINT32_BE.get(buf, off + 12),
+                    duration: Token.UINT32_BE.get(buf, off + 16),
+                    language: Token.UINT16_BE.get(buf, off + 20),
+                    quality: Token.UINT16_BE.get(buf, off + 22)
+                };
+            case 1:
+                return {
+                    version,
+                    flags,
+                    creationTime: SecondsSinceMacEpoch64.get(buf, off + 4),
+                    modificationTime: SecondsSinceMacEpoch64.get(buf, off + 12),
+                    timeScale: Token.UINT32_BE.get(buf, off + 20),
+                    duration: Number(Token.UINT64_BE.get(buf, off + 24)),
+                    language: Token.UINT16_BE.get(buf, off + 32),
+                    quality: Token.UINT16_BE.get(buf, off + 34)
+                };
+            default:
+                throw new FieldDecodingError('Invalid mdhd version header');
+        }
     }
 }
 /**
@@ -110,16 +137,41 @@ export class MvhdAtom extends FixedLengthAtom {
         super(len, 100, 'mvhd');
     }
     get(buf, off) {
+        const version = Token.UINT8.get(buf, off);
+        const flags = Token.UINT24_BE.get(buf, off + 1);
+        if (version === 1) {
+            // Version 1: 64-bit creation/modification times and duration
+            return {
+                version,
+                flags,
+                creationTime: SecondsSinceMacEpoch64.get(buf, off + 4),
+                modificationTime: SecondsSinceMacEpoch64.get(buf, off + 12),
+                timeScale: Token.UINT32_BE.get(buf, off + 20),
+                duration: Number(Token.UINT64_BE.get(buf, off + 24)),
+                preferredRate: Token.UINT32_BE.get(buf, off + 32),
+                preferredVolume: Token.UINT16_BE.get(buf, off + 36),
+                // ignore reserved: 10 bytes
+                // ignore matrix structure: 36 bytes
+                previewTime: Token.UINT32_BE.get(buf, off + 84),
+                previewDuration: Token.UINT32_BE.get(buf, off + 88),
+                posterTime: Token.UINT32_BE.get(buf, off + 92),
+                selectionTime: Token.UINT32_BE.get(buf, off + 96),
+                selectionDuration: Token.UINT32_BE.get(buf, off + 100),
+                currentTime: Token.UINT32_BE.get(buf, off + 104),
+                nextTrackID: Token.UINT32_BE.get(buf, off + 108)
+            };
+        }
+        // Version 0: 32-bit fields
         return {
-            version: Token.UINT8.get(buf, off),
-            flags: Token.UINT24_BE.get(buf, off + 1),
+            version,
+            flags,
             creationTime: SecondsSinceMacEpoch.get(buf, off + 4),
             modificationTime: SecondsSinceMacEpoch.get(buf, off + 8),
             timeScale: Token.UINT32_BE.get(buf, off + 12),
             duration: Token.UINT32_BE.get(buf, off + 16),
             preferredRate: Token.UINT32_BE.get(buf, off + 20),
             preferredVolume: Token.UINT16_BE.get(buf, off + 24),
-            // ignore reserver: 10 bytes
+            // ignore reserved: 10 bytes
             // ignore matrix structure: 36 bytes
             previewTime: Token.UINT32_BE.get(buf, off + 72),
             previewDuration: Token.UINT32_BE.get(buf, off + 76),

package/lib/wav/WaveChunk.d.ts

@@ -21,6 +21,10 @@ export declare const WaveFormat: {
     PCM: number;
     ADPCM: number;
     IEEE_FLOAT: number;
+    ALAW: number;
+    MULAW: number;
+    DVI_ADPCM: number;
+    GSM610: number;
     MPEG_ADTS_AAC: number;
     MPEG_LOAS: number;
     RAW_AAC1: number;
@@ -31,12 +35,17 @@ export declare const WaveFormat: {
     DRM: number;
     DTS2: number;
     MPEG: number;
+    MPEGLAYER3: number;
 };
 export type WaveFormat = typeof WaveFormat[keyof typeof WaveFormat];
 export declare const WaveFormatNameMap: {
     [WaveFormat.PCM]: string;
     [WaveFormat.ADPCM]: string;
     [WaveFormat.IEEE_FLOAT]: string;
+    [WaveFormat.ALAW]: string;
+    [WaveFormat.MULAW]: string;
+    [WaveFormat.DVI_ADPCM]: string;
+    [WaveFormat.GSM610]: string;
     [WaveFormat.MPEG_ADTS_AAC]: string;
     [WaveFormat.MPEG_LOAS]: string;
     [WaveFormat.RAW_AAC1]: string;
@@ -47,6 +56,7 @@ export declare const WaveFormatNameMap: {
     [WaveFormat.DRM]: string;
     [WaveFormat.DTS2]: string;
     [WaveFormat.MPEG]: string;
+    [WaveFormat.MPEGLAYER3]: string;
 };
 /**
  * "fmt"  sub-chunk describes the sound data's format

package/lib/wav/WaveChunk.js

@@ -7,9 +7,13 @@ export class WaveContentError extends makeUnexpectedFileContentError('Wave') {
  */
 export const WaveFormat = {
     PCM: 0x0001,
-    // MPEG-4 and AAC Audio Types
     ADPCM: 0x0002,
     IEEE_FLOAT: 0x0003,
+    ALAW: 0x0006,
+    MULAW: 0x0007,
+    DVI_ADPCM: 0x0011,
+    GSM610: 0x0031,
+    // MPEG-4 and AAC Audio Types
     MPEG_ADTS_AAC: 0x1600,
     MPEG_LOAS: 0x1602,
     RAW_AAC1: 0x00FF,
@@ -20,12 +24,17 @@ export const WaveFormat = {
     ESST_AC3: 0x0241,
     DRM: 0x0009,
     DTS2: 0x2001,
-    MPEG: 0x0050
+    MPEG: 0x0050,
+    MPEGLAYER3: 0x0055
 };
 export const WaveFormatNameMap = {
     [WaveFormat.PCM]: 'PCM',
     [WaveFormat.ADPCM]: 'ADPCM',
     [WaveFormat.IEEE_FLOAT]: 'IEEE_FLOAT',
+    [WaveFormat.ALAW]: 'ALAW',
+    [WaveFormat.MULAW]: 'MULAW',
+    [WaveFormat.DVI_ADPCM]: 'DVI_ADPCM',
+    [WaveFormat.GSM610]: 'GSM610',
     [WaveFormat.MPEG_ADTS_AAC]: 'MPEG_ADTS_AAC',
     [WaveFormat.MPEG_LOAS]: 'MPEG_LOAS',
     [WaveFormat.RAW_AAC1]: 'RAW_AAC1',
@@ -35,7 +44,8 @@ export const WaveFormatNameMap = {
     [WaveFormat.ESST_AC3]: 'ESST_AC3',
     [WaveFormat.DRM]: 'DRM',
     [WaveFormat.DTS2]: 'DTS2',
-    [WaveFormat.MPEG]: 'MPEG'
+    [WaveFormat.MPEG]: 'MPEG',
+    [WaveFormat.MPEGLAYER3]: 'MPEGLAYER3'
 };
 /**
  * format chunk; chunk-id is "fmt "

package/lib/wav/WaveParser.d.ts

@@ -14,6 +14,7 @@ import { BasicParser } from '../common/BasicParser.js';
 export declare class WaveParser extends BasicParser {
     private fact;
     private blockAlign;
+    private avgBytesPerSec;
     private header;
     parse(): Promise<void>;
     parseRiffChunk(chunkSize: number): Promise<void>;

package/lib/wav/WaveParser.js

@@ -25,6 +25,7 @@ export class WaveParser extends BasicParser {
     constructor() {
         super(...arguments);
         this.blockAlign = 0;
+        this.avgBytesPerSec = 0;
     }
     async parse() {
         const riffHeader = await this.tokenizer.readToken(riff.Header);
@@ -76,8 +77,8 @@ export class WaveParser extends BasicParser {
                     this.metadata.setFormat('bitsPerSample', fmt.wBitsPerSample);
                     this.metadata.setFormat('sampleRate', fmt.nSamplesPerSec);
                     this.metadata.setFormat('numberOfChannels', fmt.nChannels);
-                    this.metadata.setFormat('bitrate', fmt.nBlockAlign * fmt.nSamplesPerSec * 8);
                     this.blockAlign = fmt.nBlockAlign;
+                    this.avgBytesPerSec = fmt.nAvgBytesPerSec;
                     break;
                 }
                 case 'id3 ': // The way Picard, FooBar currently stores, ID3 meta-data
@@ -106,11 +107,11 @@ export class WaveParser extends BasicParser {
                             this.metadata.setFormat('duration', numberOfSamples / this.metadata.format.sampleRate);
                         }
                     }
-                    if (this.metadata.format.codec === 'ADPCM') { // ADPCM is 4 bits lossy encoding resulting in 352kbps
-                        this.metadata.setFormat('bitrate', 352000);
+                    if (this.avgBytesPerSec > 0) {
+                        this.metadata.setFormat('bitrate', this.avgBytesPerSec * 8);
                     }
-                    else if (this.metadata.format.sampleRate) {
-                        this.metadata.setFormat('bitrate', this.blockAlign * this.metadata.format.sampleRate * 8);
+                    else if (this.metadata.format.duration) {
+                        this.metadata.setFormat('bitrate', chunkSize * 8 / this.metadata.format.duration);
                     }
                     await this.tokenizer.ignore(header.chunkSize);
                     break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "music-metadata",
   "description": "Music metadata parser for Node.js, supporting virtual any audio and tag format.",
-  "version": "11.12.3",
+  "version": "11.13.0",
   "author": {
     "name": "Borewit",
     "url": "https://github.com/Borewit"
@@ -114,11 +114,11 @@
   "dependencies": {
     "@borewit/text-codec": "^0.2.2",
     "@tokenizer/token": "^0.3.0",
-    "content-type": "^1.0.5",
+    "content-type": "^2.0.0",
     "debug": "^4.4.3",
-    "file-type": "^21.3.1",
-    "media-typer": "^1.1.0",
-    "strtok3": "^10.3.4",
+    "file-type": "^21.3.4",
+    "media-typer": "^2.0.0",
+    "strtok3": "^10.3.5",
     "token-types": "^6.1.2",
     "uint8array-extras": "^1.5.0",
     "win-guid": "^0.2.1"