TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174325
Change subject: Support WebM Vorbis files in the player
......................................................................
Support WebM Vorbis files in the player
Bug: 72996
Change-Id: I905b076378a428e0b7ad038df9f28de83852ef11
---
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
M MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
M TimedMediaHandler.hooks.php
M handlers/WebMHandler/WebMHandler.php
4 files changed, 9 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/25/174325/1
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
index 3749f80..6665080 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
@@ -63,7 +63,9 @@
var webmNativePlayer = new mw.MediaPlayer( 'webmNative', [
'video/webm',
'video/webm; codecs="vp8"',
- 'video/webm; codecs="vp8, vorbis"'
+ 'video/webm; codecs="vp8, vorbis"',
+ 'audio/webm',
+ 'audio/webm; codecs="vorbis"'
], 'Native' );
// Image Overlay player ( extends native )
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
index 19e7fde..2080056 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
@@ -34,6 +34,7 @@
this.defaultPlayers['application/vnd.apple.mpegurl'] =
['Native'];
this.defaultPlayers['video/ogg'] = ['Native', 'Vlc', 'Java',
'Generic', 'VLCApp'];
+ this.defaultPlayers['audio/webm'] = ['Native', 'Vlc', 'VLCApp'];
this.defaultPlayers['video/webm'] = ['Native', 'Vlc', 'VLCApp'];
this.defaultPlayers['application/ogg'] = ['Native', 'Vlc',
'Java', 'Generic', 'VLCApp'];
this.defaultPlayers['audio/ogg'] = ['Native', 'Vlc', 'Java',
'VLCApp'];
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index a403e05..1597c0f 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -37,6 +37,7 @@
// Setup media Handlers:
$wgMediaHandlers['application/ogg'] = 'OggHandlerTMH';
+ $wgMediaHandlers['audio/webm'] = 'WebMHandler';
$wgMediaHandlers['video/webm'] = 'WebMHandler';
$wgMediaHandlers['video/mp4'] = 'Mp4Handler';
$wgMediaHandlers['audio/x-flac'] = 'FLACHandler';
diff --git a/handlers/WebMHandler/WebMHandler.php
b/handlers/WebMHandler/WebMHandler.php
index e0dec3c..3e89cef 100644
--- a/handlers/WebMHandler/WebMHandler.php
+++ b/handlers/WebMHandler/WebMHandler.php
@@ -89,14 +89,16 @@
* @return String
*/
function getWebType( $file ) {
+ $baseType = ( $file->getWidth() == 0 && $file->getHeight() ==
0 )? 'audio' : 'video';
+
$streams = $this->getStreamTypes( $file );
if ( count( $streams ) === 0 ) {
- return 'video/webm';
+ return $baseType . '/webm';
}
$codecs = strtolower( implode( ', ', $streams ) );
- return 'video/webm; codecs="' . $codecs . '"';
+ return $baseType . '/webm; codecs="' . $codecs . '"';
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/174325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I905b076378a428e0b7ad038df9f28de83852ef11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
