Bug 1269260 - Treat 'iso?' file as MP4 video. r?jya draft
authorJohn Lin <jolin@mozilla.com>
Tue, 03 May 2016 13:52:37 +0800
changeset 362726 cade52fc9cf8e35b9f301bf4a455a4881e3666a0
parent 358327 77cead2cd20300623eea2416bc9bce4d5021df09
child 519876 d50e95c31548c55b314e32089a8e5faa840f9b3e
push id17032
push userbmo:jolin@mozilla.com
push dateTue, 03 May 2016 06:46:42 +0000
reviewersjya
bugs1269260
milestone49.0a1
Bug 1269260 - Treat 'iso?' file as MP4 video. r?jya MozReview-Commit-ID: B4v8LNd479i
toolkit/components/mediasniffer/nsMediaSniffer.cpp
--- a/toolkit/components/mediasniffer/nsMediaSniffer.cpp
+++ b/toolkit/components/mediasniffer/nsMediaSniffer.cpp
@@ -39,16 +39,17 @@ nsMediaSnifferEntry nsMediaSniffer::sSni
 // For a complete list of file types, see http://www.ftyps.com/index.html
 nsMediaSnifferEntry sFtypEntries[] = {
   PATTERN_ENTRY("\xFF\xFF\xFF", "mp4", VIDEO_MP4), // Could be mp41 or mp42.
   PATTERN_ENTRY("\xFF\xFF\xFF", "avc", VIDEO_MP4), // Could be avc1, avc2, ...
   PATTERN_ENTRY("\xFF\xFF\xFF", "3gp", VIDEO_3GPP), // Could be 3gp4, 3gp5, ...
   PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "M4A ", AUDIO_MP4),
   PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "M4P ", AUDIO_MP4),
   PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "qt  ", VIDEO_QUICKTIME),
+  PATTERN_ENTRY("\xFF\xFF\xFF", "iso", VIDEO_MP4), // Could be isom or iso2.
 };
 
 static bool MatchesBrands(const uint8_t aData[4], nsACString& aSniffedType)
 {
   for (size_t i = 0; i < mozilla::ArrayLength(sFtypEntries); ++i) {
     const auto& currentEntry = sFtypEntries[i];
     bool matched = true;
     MOZ_ASSERT(currentEntry.mLength <= 4, "Pattern is too large to match brand strings.");