From 0a9008cbe1e49fd548c965f0af1a55b85ff2f604 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Fri, 19 May 2017 13:33:25 +0200 Subject: [PATCH] MimeAnalyzer: Detect magic bytes for mp3 Unit tests in follow up patch Bug: T115170 Change-Id: Ie1a63aa319cebbb2efb3cdc478416f5947078cbe --- includes/libs/mime/MimeAnalyzer.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php index 6ea3c215bc..f4f8bdfc4c 100644 --- a/includes/libs/mime/MimeAnalyzer.php +++ b/includes/libs/mime/MimeAnalyzer.php @@ -529,7 +529,7 @@ EOT; // Formats we recognize magic numbers for 'djvu', 'ogx', 'ogg', 'ogv', 'oga', 'spx', 'opus', 'mid', 'pdf', 'wmf', 'xcf', 'webm', 'mkv', 'mka', - 'webp', + 'webp', 'mp3', // XML formats we sure hope we recognize reliably 'svg', @@ -670,6 +670,10 @@ EOT; // Multimedia... 'MThd' => 'audio/midi', 'OggS' => 'application/ogg', + 'ID3' => 'audio/mpeg', + "\xff\xfb" => 'audio/mpeg', // MPEG-1 layer 3 + "\xff\xf3" => 'audio/mpeg', // MPEG-2 layer 3 (lower sample rates) + "\xff\xe3" => 'audio/mpeg', // MPEG-2.5 layer 3 (very low sample rates) // Image formats... // Note that WMF may have a bare header, no magic number. -- 2.20.1