.NET detects MP4 correctly

drewnoakes · May 5, 2020 · 9581e2e · 9581e2e
1 parent 0c57f61
commit 9581e2e
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 62 deletions.
diff --git a/m4v/metadata/diff/sample_iPod.m4v.txt b/m4v/metadata/diff/sample_iPod.m4v.txt
@@ -1,6 +1,5 @@
        FILE: sample_iPod.m4v
-JAVA   TYPE: MP4
-DOTNET TYPE: QUICKTIME
+       TYPE: MP4
 
 JAVA   [ERROR: MP4] End of data reached.
 DOTNET [QuickTime File Type - 0x0001] Major Brand = M4V 
@@ -84,14 +83,10 @@ DOTNET [QuickTime Track Header - 0x000a] Width = 320
 DOTNET [QuickTime Track Header - 0x000b] Height = 240
 DOTNET [QuickTime Track Header - 0x000d] Rotation = 0
 
-JAVA   [File Type - 0x0001] Detected File Type Name = MP4
-JAVA   [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
-JAVA   [File Type - 0x0003] Detected MIME Type = video/mp4
-JAVA   [File Type - 0x0004] Expected File Name Extension = mp4
-DOTNET [File Type - 0x0001] Detected File Type Name = QuickTime
-DOTNET [File Type - 0x0002] Detected File Type Long Name = QuickTime
-DOTNET [File Type - 0x0003] Detected MIME Type = video/quicktime
-DOTNET [File Type - 0x0004] Expected File Name Extension = mov
+       [File Type - 0x0001] Detected File Type Name = MP4
+       [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+       [File Type - 0x0003] Detected MIME Type = video/mp4
+       [File Type - 0x0004] Expected File Name Extension = mp4
 
        [File - 0x0001] File Name = sample_iPod.m4v
        [File - 0x0002] File Size = 2236480 bytes

diff --git a/m4v/metadata/dotnet/sample_iPod.m4v.txt b/m4v/metadata/dotnet/sample_iPod.m4v.txt
@@ -1,5 +1,5 @@
 FILE: sample_iPod.m4v
-TYPE: QUICKTIME
+TYPE: MP4
 
 [QuickTime File Type - 0x0001] Major Brand = M4V 
 [QuickTime File Type - 0x0002] Minor Version = 1
@@ -49,10 +49,10 @@ TYPE: QUICKTIME
 [QuickTime Track Header - 0x000b] Height = 240
 [QuickTime Track Header - 0x000d] Rotation = 0
 
-[File Type - 0x0001] Detected File Type Name = QuickTime
-[File Type - 0x0002] Detected File Type Long Name = QuickTime
-[File Type - 0x0003] Detected MIME Type = video/quicktime
-[File Type - 0x0004] Expected File Name Extension = mov
+[File Type - 0x0001] Detected File Type Name = MP4
+[File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+[File Type - 0x0003] Detected MIME Type = video/mp4
+[File Type - 0x0004] Expected File Name Extension = mp4
 
 [File - 0x0001] File Name = sample_iPod.m4v
 [File - 0x0002] File Size = 2236480 bytes

diff --git a/mp4/metadata/diff/Issue 306.mp4.txt b/mp4/metadata/diff/Issue 306.mp4.txt
@@ -1,6 +1,5 @@
        FILE: Issue 306.mp4
-JAVA   TYPE: MP4
-DOTNET TYPE: QUICKTIME
+       TYPE: MP4
 
 JAVA   [ERROR: MP4] End of data reached.
 DOTNET [QuickTime File Type - 0x0001] Major Brand = MSNV
@@ -78,13 +77,9 @@ DOTNET [QuickTime Track Header - 0x000c] Matrix = 1 0 0 0 1 0 0 0 1
 DOTNET [QuickTime Track Header - 0x000a] Width = 0
 DOTNET [QuickTime Track Header - 0x000b] Height = 0
 JAVA   [MP4 Video - 0x00d6] Frame Rate = 25
-       
+JAVA   
 JAVA   [UUID - 0x0385] UUID = 55534d54-21d2-4fce-bb88-695cfac9c740
 JAVA   [UUID - 0x0386] Data = [28 values]
-DOTNET [File Type - 0x0001] Detected File Type Name = QuickTime
-DOTNET [File Type - 0x0002] Detected File Type Long Name = QuickTime
-DOTNET [File Type - 0x0003] Detected MIME Type = video/quicktime
-DOTNET [File Type - 0x0004] Expected File Name Extension = mov
 
 JAVA   [MP4 Sound - 0x0065] Creation Time = Thu Nov 16 19:24:56 +11:00 2017
 JAVA   [MP4 Sound - 0x0066] Modification Time = Thu Nov 16 19:25:00 +11:00 2017
@@ -98,11 +93,11 @@ JAVA
 JAVA   [UUID - 0x0385] UUID = 55534d54-21d2-4fce-bb88-695cfac9c740
 JAVA   [UUID - 0x0386] Data = [28 values]
 JAVA   
-JAVA   [File Type - 0x0001] Detected File Type Name = MP4
-JAVA   [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
-JAVA   [File Type - 0x0003] Detected MIME Type = video/mp4
-JAVA   [File Type - 0x0004] Expected File Name Extension = mp4
-JAVA   
+       [File Type - 0x0001] Detected File Type Name = MP4
+       [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+       [File Type - 0x0003] Detected MIME Type = video/mp4
+       [File Type - 0x0004] Expected File Name Extension = mp4
+       
        [File - 0x0001] File Name = Issue 306.mp4
        [File - 0x0002] File Size = 4327588 bytes
        [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>

diff --git a/mp4/metadata/diff/sample_mpeg4.mp4.txt b/mp4/metadata/diff/sample_mpeg4.mp4.txt
@@ -1,6 +1,5 @@
        FILE: sample_mpeg4.mp4
-JAVA   TYPE: MP4
-DOTNET TYPE: QUICKTIME
+       TYPE: MP4
 
 JAVA   [ERROR: MP4] End of data reached.
 DOTNET [QuickTime File Type - 0x0001] Major Brand = mp42
@@ -84,14 +83,10 @@ DOTNET [QuickTime Track Header - 0x000a] Width = 190
 DOTNET [QuickTime Track Header - 0x000b] Height = 240
 DOTNET [QuickTime Track Header - 0x000d] Rotation = 0
 
-JAVA   [File Type - 0x0001] Detected File Type Name = MP4
-JAVA   [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
-JAVA   [File Type - 0x0003] Detected MIME Type = video/mp4
-JAVA   [File Type - 0x0004] Expected File Name Extension = mp4
-DOTNET [File Type - 0x0001] Detected File Type Name = QuickTime
-DOTNET [File Type - 0x0002] Detected File Type Long Name = QuickTime
-DOTNET [File Type - 0x0003] Detected MIME Type = video/quicktime
-DOTNET [File Type - 0x0004] Expected File Name Extension = mov
+       [File Type - 0x0001] Detected File Type Name = MP4
+       [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+       [File Type - 0x0003] Detected MIME Type = video/mp4
+       [File Type - 0x0004] Expected File Name Extension = mp4
 
        [File - 0x0001] File Name = sample_mpeg4.mp4
        [File - 0x0002] File Size = 245779 bytes

diff --git a/mp4/metadata/diff/uuid540.mp4.txt b/mp4/metadata/diff/uuid540.mp4.txt
@@ -1,6 +1,5 @@
        FILE: uuid540.mp4
-JAVA   TYPE: MP4
-DOTNET TYPE: QUICKTIME
+       TYPE: MP4
 
 JAVA   [ERROR: MP4] End of data reached.
 DOTNET [QuickTime File Type - 0x0001] Major Brand = mp42
@@ -86,14 +85,10 @@ DOTNET [QuickTime Track Header - 0x000d] Rotation = 0
        [XMPMeta - ] dc:subject[2] = keyword2
        [XMPMeta - ] dc:subject[3] = keyword3
 
-JAVA   [File Type - 0x0001] Detected File Type Name = MP4
-JAVA   [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
-JAVA   [File Type - 0x0003] Detected MIME Type = video/mp4
-JAVA   [File Type - 0x0004] Expected File Name Extension = mp4
-DOTNET [File Type - 0x0001] Detected File Type Name = QuickTime
-DOTNET [File Type - 0x0002] Detected File Type Long Name = QuickTime
-DOTNET [File Type - 0x0003] Detected MIME Type = video/quicktime
-DOTNET [File Type - 0x0004] Expected File Name Extension = mov
+       [File Type - 0x0001] Detected File Type Name = MP4
+       [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+       [File Type - 0x0003] Detected MIME Type = video/mp4
+       [File Type - 0x0004] Expected File Name Extension = mp4
 
        [File - 0x0001] File Name = uuid540.mp4
        [File - 0x0002] File Size = 688780 bytes

diff --git a/mp4/metadata/dotnet/Issue 306.mp4.txt b/mp4/metadata/dotnet/Issue 306.mp4.txt
@@ -1,5 +1,5 @@
 FILE: Issue 306.mp4
-TYPE: QUICKTIME
+TYPE: MP4
 
 [QuickTime File Type - 0x0001] Major Brand = MSNV
 [QuickTime File Type - 0x0002] Minor Version = 19595376
@@ -49,10 +49,10 @@ TYPE: QUICKTIME
 [QuickTime Track Header - 0x000a] Width = 0
 [QuickTime Track Header - 0x000b] Height = 0
 
-[File Type - 0x0001] Detected File Type Name = QuickTime
-[File Type - 0x0002] Detected File Type Long Name = QuickTime
-[File Type - 0x0003] Detected MIME Type = video/quicktime
-[File Type - 0x0004] Expected File Name Extension = mov
+[File Type - 0x0001] Detected File Type Name = MP4
+[File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+[File Type - 0x0003] Detected MIME Type = video/mp4
+[File Type - 0x0004] Expected File Name Extension = mp4
 
 [File - 0x0001] File Name = Issue 306.mp4
 [File - 0x0002] File Size = 4327588 bytes

diff --git a/mp4/metadata/dotnet/sample_mpeg4.mp4.txt b/mp4/metadata/dotnet/sample_mpeg4.mp4.txt
@@ -1,5 +1,5 @@
 FILE: sample_mpeg4.mp4
-TYPE: QUICKTIME
+TYPE: MP4
 
 [QuickTime File Type - 0x0001] Major Brand = mp42
 [QuickTime File Type - 0x0002] Minor Version = 1
@@ -49,10 +49,10 @@ TYPE: QUICKTIME
 [QuickTime Track Header - 0x000b] Height = 240
 [QuickTime Track Header - 0x000d] Rotation = 0
 
-[File Type - 0x0001] Detected File Type Name = QuickTime
-[File Type - 0x0002] Detected File Type Long Name = QuickTime
-[File Type - 0x0003] Detected MIME Type = video/quicktime
-[File Type - 0x0004] Expected File Name Extension = mov
+[File Type - 0x0001] Detected File Type Name = MP4
+[File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+[File Type - 0x0003] Detected MIME Type = video/mp4
+[File Type - 0x0004] Expected File Name Extension = mp4
 
 [File - 0x0001] File Name = sample_mpeg4.mp4
 [File - 0x0002] File Size = 245779 bytes

diff --git a/mp4/metadata/dotnet/uuid540.mp4.txt b/mp4/metadata/dotnet/uuid540.mp4.txt
@@ -1,5 +1,5 @@
 FILE: uuid540.mp4
-TYPE: QUICKTIME
+TYPE: MP4
 
 [QuickTime File Type - 0x0001] Major Brand = mp42
 [QuickTime File Type - 0x0002] Minor Version = 1
@@ -59,10 +59,10 @@ TYPE: QUICKTIME
 [XMPMeta - ] dc:subject[2] = keyword2
 [XMPMeta - ] dc:subject[3] = keyword3
 
-[File Type - 0x0001] Detected File Type Name = QuickTime
-[File Type - 0x0002] Detected File Type Long Name = QuickTime
-[File Type - 0x0003] Detected MIME Type = video/quicktime
-[File Type - 0x0004] Expected File Name Extension = mov
+[File Type - 0x0001] Detected File Type Name = MP4
+[File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+[File Type - 0x0003] Detected MIME Type = video/mp4
+[File Type - 0x0004] Expected File Name Extension = mp4
 
 [File - 0x0001] File Name = uuid540.mp4
 [File - 0x0002] File Size = 688780 bytes