From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Fri, 19 May 2017 11:33:25 +0000 (+0200)
Subject: MimeAnalyzer: Detect magic bytes for mp3
X-Git-Tag: 1.31.0-rc.0~3227^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=0a9008cbe1e49fd548c965f0af1a55b85ff2f604;p=lhc%2Fweb%2Fwiklou.git

MimeAnalyzer: Detect magic bytes for mp3

Unit tests in follow up patch

Bug: T115170
Change-Id: Ie1a63aa319cebbb2efb3cdc478416f5947078cbe
---

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.