fix(media): correct ambiguous M4A aliases

steipete · YangManBOBO · web-flow · commit 0029122bf1ac · 2026-07-19T22:08:31.000-07:00
Co-authored-by: 潘晓波0668000512 &lt;pan.xiaobo@xydigit.com&gt;
diff --git a/packages/media-core/src/mime.test.ts b/packages/media-core/src/mime.test.ts
@@ -26,6 +26,12 @@ async function makeOoxmlZip(opts: { mainMime: string; partPath: string }): Promi
   return await zip.generateAsync({ type: "nodebuffer" });
 }
 
+// file-type classifies this generic ISO-BMFF brand as video/mp4 without track metadata.
+const ISOM_BRAND_BUFFER = Buffer.from(
+  "0000001c6674797069736f6d0000000069736f6d0000000000000000",
+  "hex",
+);
+
 describe("mime detection", () => {
   async function expectDetectedMime(params: {
     input: Parameters<typeof detectMime>[0];
@@ -221,37 +227,51 @@ describe("mime detection", () => {
     });
   });
 
-  it("preserves audio metadata when an MP4 extension cannot identify track kind", async () => {
-    await expectDetectedMime({
-      input: { filePath: "voice.mp4", headerMime: "audio/mp4" },
+  it.each([
+    {
+      name: "audio/mp4 header",
+      filePath: "voice.mp4",
+      headerMime: "audio/mp4",
       expected: "audio/mp4",
-    });
-  });
-
-  it("preserves audio/x-m4a header for isom-brand ISO-BMFF bytes (Android/ffmpeg m4a)", async () => {
-    // Non-Apple m4a files use "isom" as the ftyp major brand;
-    // file-type sniffs those as video/mp4 regardless of audio content.
-    const isomBrand = Buffer.from(
-      // 28-byte ftyp box: size=28, "ftyp", major="isom", minor=0, compat=["isom"]
-      "0000001c6674797069736f6d0000000069736f6d0000000000000000",
-      "hex",
-    );
-
-    await expectDetectedMime({
-      input: { buffer: isomBrand, filePath: "voice.m4a", headerMime: "audio/x-m4a" },
+    },
+    {
+      name: "audio/x-m4a header",
+      filePath: "voice.m4a",
+      headerMime: "audio/x-m4a",
       expected: "audio/x-m4a",
-    });
-  });
-
-  it("uses the file extension to rescue isom-brand bytes when no header exists", async () => {
-    const isomBrand = Buffer.from(
-      "0000001c6674797069736f6d0000000069736f6d0000000000000000",
-      "hex",
-    );
-
-    await expectDetectedMime({
-      input: { buffer: isomBrand, filePath: "voice.m4a" },
+    },
+    {
+      name: "audio/m4a header",
+      filePath: "voice.m4a",
+      headerMime: "audio/m4a",
+      expected: "audio/m4a",
+    },
+    {
+      name: "m4a extension",
+      filePath: "voice.m4a",
+      headerMime: undefined,
       expected: "audio/x-m4a",
+    },
+    {
+      name: "mp4 extension without an audio hint",
+      filePath: "clip.mp4",
+      headerMime: undefined,
+      expected: "video/mp4",
+    },
+    {
+      name: "audio/aac elementary-stream metadata",
+      filePath: "voice.aac",
+      headerMime: "audio/aac",
+      expected: "video/mp4",
+    },
+  ] as const)("resolves ambiguous isom-brand bytes from $name", async (testCase) => {
+    await expectDetectedMime({
+      input: {
+        buffer: ISOM_BRAND_BUFFER,
+        filePath: testCase.filePath,
+        headerMime: testCase.headerMime,
+      },
+      expected: testCase.expected,
     });
   });
 
@@ -408,6 +428,7 @@ describe("extensionForMime", () => {
     { mime: "audio/x-wav", expected: ".wav" },
     { mime: "audio/webm", expected: ".webm" },
     { mime: "audio/x-m4a", expected: ".m4a" },
+    { mime: "audio/m4a", expected: ".m4a" },
     { mime: "audio/mp4", expected: ".m4a" },
     { mime: "video/x-msvideo", expected: ".avi" },
     { mime: "video/mp4", expected: ".mp4" },
diff --git a/packages/media-core/src/mime.ts b/packages/media-core/src/mime.ts
@@ -28,6 +28,7 @@ const EXT_BY_MIME: Record<string, string> = {
   "audio/opus": ".opus",
   "audio/webm": ".webm",
   "audio/x-m4a": ".m4a",
+  "audio/m4a": ".m4a",
   "audio/mp4": ".m4a",
   "audio/x-caf": ".caf",
   "video/x-msvideo": ".avi",
@@ -90,7 +91,6 @@ const AMBIGUOUS_VIDEO_MIME_BY_AUDIO_MIME: Readonly<Record<string, string>> = {
   "audio/mp4": "video/mp4",
   "audio/x-m4a": "video/mp4",
   "audio/m4a": "video/mp4",
-  "audio/aac": "video/mp4",
   "audio/webm": "video/webm",
 };
 
