Merge pull request #1212 from Borewit/fix-uncompressed-aiff-c

Fix parsing uncompressed AIFF-C audio file

Author: Borewit

lib/aiff/AiffParser.ts

@@ -11,6 +11,18 @@ import * as iff from '../iff';
 
 const debug = initDebug('music-metadata:parser:aiff');
 
+const compressionTypes = {
+  NONE:	'not compressed	PCM	Apple Computer',
+  sowt:	'PCM (byte swapped)',
+  fl32:	'32-bit floating point IEEE 32-bit float',
+  fl64:	'64-bit floating point IEEE 64-bit float	Apple Computer',
+  alaw:	'ALaw 2:1	8-bit ITU-T G.711 A-law',
+  ulaw:	'µLaw 2:1	8-bit ITU-T G.711 µ-law	Apple Computer',
+  ULAW:	'CCITT G.711 u-law 8-bit ITU-T G.711 µ-law',
+  ALAW:	'CCITT G.711 A-law 8-bit ITU-T G.711 A-law',
+  FL32:	'Float 32	IEEE 32-bit float '
+};
+
 /**
  * AIFF - Audio Interchange File Format
  *
@@ -75,7 +87,7 @@ export class AIFFParser extends BasicParser {
         this.metadata.setFormat('numberOfChannels', common.numChannels);
         this.metadata.setFormat('numberOfSamples', common.numSampleFrames);
         this.metadata.setFormat('duration', common.numSampleFrames / common.sampleRate);
-        this.metadata.setFormat('codec', common.compressionName);
+        this.metadata.setFormat('codec', common.compressionName ?? compressionTypes[common.compressionType]);
         return header.chunkSize;
 
       case 'ID3 ': // ID3-meta-data

lib/aiff/AiffToken.ts

@@ -45,11 +45,15 @@ export class Common implements IGetToken<ICommon> {
       res.compressionType = FourCcToken.get(buf, off + 18);
       if (this.len > 22) {
         const strLen = buf.readInt8(off + 22);
-        const padding = (strLen + 1) % 2;
-        if (23 + strLen + padding === this.len) {
-          res.compressionName = new Token.StringType(strLen, 'binary').get(buf, off + 23);
+        if (strLen > 0) {
+          const padding = (strLen + 1) % 2;
+          if (23 + strLen + padding === this.len) {
+            res.compressionName = new Token.StringType(strLen, 'binary').get(buf, off + 23);
+          } else {
+            throw new Error('Illegal pstring length');
+          }
         } else {
-          throw new Error('Illegal pstring length');
+          res.compressionName = undefined;
         }
       }
     } else {

test/samples/aiff/hit-broken.aif

@@ -46,6 +46,19 @@ describe('Parse AIFF (Audio Interchange File Format)', () => {
         checkFormat(metadata.format, 'Alaw 2:1', 8000, 2, 16, 23493);
       });
     });
+
+    // Issue: https://github.com/Borewit/music-metadata/issues/1211
+    it('Uncompressed AIFC', async () => {
+
+      const filePath = path.join(aiffSamplePath, 'hit-broken.aif');
+
+      const {format} = await mm.parseFile(filePath);
+
+      assert.strictEqual(format.container, 'AIFF-C', 'format.container');
+      assert.strictEqual(format.codec, '32-bit floating point IEEE 32-bit float', 'format.codec');
+      assert.strictEqual(format.sampleRate, 44100, 'format.sampleRate');
+    });
+
   });
 
   describe('Parse perverse Files', () => {