TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332072 )
Change subject: Special case opus mime detction
......................................................................
Special case opus mime detction
Bug: T151352
Change-Id: I44be5d6b407752b39fc8148d31e9f01de28014dc
---
M includes/libs/mime/MimeAnalyzer.php
M includes/libs/mime/mime.info
M includes/libs/mime/mime.types
3 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/72/332072/1
diff --git a/includes/libs/mime/MimeAnalyzer.php
b/includes/libs/mime/MimeAnalyzer.php
index e42d1a9..6ea3c21 100644
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -83,7 +83,7 @@
* 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/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 @@
'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 @@
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 b04d3c6..5edd889 100644
--- a/includes/libs/mime/mime.info
+++ b/includes/libs/mime/mime.info
@@ -35,6 +35,7 @@
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 b4f515a..f1cd59d 100644
--- a/includes/libs/mime/mime.types
+++ b/includes/libs/mime/mime.types
@@ -72,6 +72,7 @@
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
--
To view, visit https://gerrit.wikimedia.org/r/332072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44be5d6b407752b39fc8148d31e9f01de28014dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
