From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Sat, 14 Jan 2017 20:21:37 +0000 (-0800)
Subject: Special case opus mime detction
X-Git-Tag: 1.31.0-rc.0~4267^2~1
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/Foo_bar_baz?a=commitdiff_plain;h=a95673a694ba750ead28edefe2cc6595060f63d3;p=lhc%2Fweb%2Fwiklou.git

Special case opus mime detction

Bug: T151352
Change-Id: I44be5d6b407752b39fc8148d31e9f01de28014dc
---

diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php
index e42d1a95c1..6ea3c215bc 100644
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -83,7 +83,7 @@ class MimeAnalyzer implements LoggerAwareInterface {
 	 * what will break? In practice this probably isn't a problem anyway -- Bryan)
 	 */
 	protected static $wellKnownTypes = <<<EOT
-application/ogg ogx ogg ogm ogv oga spx
+application/ogg ogx ogg ogm ogv oga spx opus
 application/pdf pdf
 application/vnd.oasis.opendocument.chart odc
 application/vnd.oasis.opendocument.chart-template otc
@@ -108,7 +108,8 @@ audio/midi mid midi kar
 audio/mpeg mpga mpa mp2 mp3
 audio/x-aiff aif aiff aifc
 audio/x-wav wav
-audio/ogg oga spx ogg
+audio/ogg oga spx ogg opus
+audio/opus opus ogg oga ogg spx
 image/x-bmp bmp
 image/gif gif
 image/jpeg jpeg jpg jpe
@@ -526,7 +527,7 @@ EOT;
 			'xbm',
 
 			// Formats we recognize magic numbers for
-			'djvu', 'ogx', 'ogg', 'ogv', 'oga', 'spx',
+			'djvu', 'ogx', 'ogg', 'ogv', 'oga', 'spx', 'opus',
 			'mid', 'pdf', 'wmf', 'xcf', 'webm', 'mkv', 'mka',
 			'webp',
 
@@ -1054,6 +1055,8 @@ EOT;
 				return MEDIATYPE_AUDIO;
 			} elseif ( strpos( $head, 'speex' ) !== false ) {
 				return MEDIATYPE_AUDIO;
+			} elseif ( strpos( $head, 'opus' ) !== false ) {
+				return MEDIATYPE_AUDIO;
 			} else {
 				return MEDIATYPE_MULTIMEDIA;
 			}
diff --git a/includes/libs/mime/mime.info b/includes/libs/mime/mime.info
index b04d3c68a2..5edd8897ef 100644
--- a/includes/libs/mime/mime.info
+++ b/includes/libs/mime/mime.info
@@ -35,6 +35,7 @@ audio/wav audio/x-wav audio/wave	[AUDIO]
 audio/midi audio/mid	[AUDIO]
 audio/basic		[AUDIO]
 audio/ogg		[AUDIO]
+audio/opus		[AUDIO]
 audio/x-aiff		[AUDIO]
 audio/x-pn-realaudio	[AUDIO]
 audio/x-realaudio	[AUDIO]
diff --git a/includes/libs/mime/mime.types b/includes/libs/mime/mime.types
index b4f515af58..f1cd59d18f 100644
--- a/includes/libs/mime/mime.types
+++ b/includes/libs/mime/mime.types
@@ -72,6 +72,7 @@ audio/basic au snd
 audio/midi mid midi kar
 audio/mpeg mpga mp2 mp3
 audio/ogg oga ogg spx opus
+audio/opus opus oga ogg
 video/webm webm
 audio/webm webm
 audio/x-aiff aif aiff aifc