uploads: fix .mp4 filetype detection.

Fix a bug where MP4 files with major brand "iso4" weren't detected as
MP4, so they couldn't be uploaded.

This switches our MP4 detection code to something very similar to Firefox's
MP4 sniffing algorithm. Ours is slightly wrong because a) we only check
the major_brand, not the minor_brands, and b) we falsely detect certain 3GP
videos as MP4. 3GP is a very similar format to MP4, close enough that it
can be played by Chrome (but not Firefox), but it's technically not MP4
and should not have a .mp4 file extension. We leave it alone because we
have two existing 3GP media assets that were falsely detected as MP4.

https://danbooru.donmai.us/forum_topics/22356
https://github.com/mozilla/gecko-dev/blob/master/toolkit/components/mediasniffer/nsMediaSniffer.cpp#L78
https://mimesniff.spec.whatwg.org/#signature-for-mp4

app/logical/media_file.rb

@@ -67,14 +67,20 @@ class MediaFile
       :webp
 
     # https://www.ftyps.com
+    # https://cconcolato.github.io/mp4ra/filetype.html
+    # https://github.com/mozilla/gecko-dev/blob/master/toolkit/components/mediasniffer/nsMediaSniffer.cpp#L78
+    # https://mimesniff.spec.whatwg.org/#signature-for-mp4
+    #
     # isom (common) - MP4 Base Media v1 [IS0 14496-12:2003]
     # mp42 (common) - MP4 v2 [ISO 14496-14]
+    # iso4 (rare) - MP4 Base Media v4
     # iso5 (rare) - MP4 Base Media v5 (used by Twitter)
-    # 3gp5 (rare) - 3GPP Media (.3GP) Release 5
+    # 3gp5 (rare) - 3GPP Media (.3GP) Release 5 (XXX technically this should be .3gp, not .mp4. Supported by Chrome but not Firefox)
     # avc1 (rare) - MP4 Base w/ AVC ext [ISO 14496-12:2005]
     # M4V (rare) - Apple iTunes Video (https://en.wikipedia.org/wiki/M4V)
-    when /\A....ftyp(?:isom|iso5|3gp5|mp42|avc1|M4V)/
+    when /\A....ftyp(?:mp4|avc|iso|3gp5|M4V)/
       :mp4
+
     # https://aomediacodec.github.io/av1-avif/#brands-overview
     when /\A....ftyp(?:avif|avis)/
       :avif

test/functional/uploads_controller_test.rb

@@ -372,8 +372,10 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest
         should_upload_successfully("test/files/mp4/test-300x300.mp4")
         should_upload_successfully("test/files/mp4/test-300x300-vp9.mp4")
         should_upload_successfully("test/files/mp4/test-300x300-yuvj420p-h264.mp4")
+        should_upload_successfully("test/files/mp4/test-300x300-iso4.mp4")
         should_upload_successfully("test/files/mp4/test-audio.mp4")
         should_upload_successfully("test/files/mp4/test-audio.m4v")
+        should_upload_successfully("test/files/mp4/test-iso5.mp4")
         should_upload_successfully("test/files/webm/test-512x512.webm")
         should_upload_successfully("test/files/webm/test-gbrp-vp9.webm")
         # should_upload_successfully("test/files/compressed.swf")

test/unit/media_file_test.rb

@@ -221,6 +221,7 @@ class MediaFileTest < ActiveSupport::TestCase
       assert_equal("yuv420p", MediaFile.open("test/files/mp4/test-300x300.mp4").pix_fmt)
       assert_equal("yuv420p", MediaFile.open("test/files/mp4/test-audio.m4v").pix_fmt)
       assert_equal("yuv420p", MediaFile.open("test/files/mp4/test-audio.mp4").pix_fmt)
+      assert_equal("yuv420p", MediaFile.open("test/files/mp4/test-300x300-iso4.mp4").pix_fmt)
       assert_equal("yuv420p", MediaFile.open("test/files/mp4/test-iso5.mp4").pix_fmt)
       assert_equal("yuv444p", MediaFile.open("test/files/mp4/test-300x300-yuv444p-h264.mp4").pix_fmt)
       assert_equal("yuvj420p", MediaFile.open("test/files/mp4/test-300x300-yuvj420p-h264.mp4").pix_fmt)
@@ -237,6 +238,8 @@ class MediaFileTest < ActiveSupport::TestCase
       assert_equal(true, MediaFile.open("test/files/mp4/test-300x300.mp4").is_supported?)
       assert_equal(true, MediaFile.open("test/files/mp4/test-300x300-vp9.mp4").is_supported?)
       assert_equal(true, MediaFile.open("test/files/mp4/test-300x300-yuvj420p-h264.mp4").is_supported?)
+      assert_equal(true, MediaFile.open("test/files/mp4/test-300x300-iso4.mp4").is_supported?)
+      assert_equal(true, MediaFile.open("test/files/mp4/test-300x300-3gp5.mp4").is_supported?)
 
       assert_equal(false, MediaFile.open("test/files/mp4/test-300x300-h265.mp4").is_supported?)
       assert_equal(false, MediaFile.open("test/files/mp4/test-300x300-av1.mp4").is_supported?)