jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373127 )
Change subject: Enable WebM playback via ogv.js
......................................................................
Enable WebM playback via ogv.js
WebM is now fairly stable in ogv.js, though current version spams console
a bit. Allow WebM to play back via the shim on Safari/IE/Edge.
This is prep for removing the Ogg Theora video transcodes from Wikimedia
in favor of WebM due to ongoing tooling issues.
Note that due to ordering of codecs, this will cause WebM versions to
play back preferably to the Ogg versions as soon as it goes out.
Bug: T172444
Change-Id: I68f22d7cb0cee4fe3f5742a742d45189b617fe07
(cherry picked from commit a6f23cae887e638e3e08794f2520446d40e45d84)
---
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
M MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
3 files changed, 15 insertions(+), 3 deletions(-)
Approvals:
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
index 44f3371..3626307 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
@@ -41,7 +41,9 @@
* @return OGVPlayer
*/
_ogvJsInit: function() {
- var options = {};
+ var options = {
+ enableWebM: true
+ };
if ( this._iOSAudioContext ) {
// Reuse the audio context we opened earlier
options.audioContext = this._iOSAudioContext;
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
index b0a2aff..e22fc85 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
@@ -94,6 +94,16 @@
], 'IEWebMPrompt' );
var ogvJsPlayer = new mw.MediaPlayer( 'ogvJsPlayer', [
+ 'video/webm',
+ 'video/webm; codecs="vp8"',
+ 'video/webm; codecs="vp8, vorbis"',
+ 'video/webm; codecs="vp8, opus"',
+ 'video/webm; codecs="vp9"',
+ 'video/webm; codecs="vp9, vorbis"',
+ 'video/webm; codecs="vp9, opus"',
+ 'audio/webm',
+ 'audio/webm; codecs="vorbis"',
+ 'audio/webm; codecs="opus"',
'video/ogg',
'video/ogg; codecs="theora"',
'video/ogg; codecs="theora, vorbis"',
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
index 9d1e34f..bf68ae6 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
@@ -34,8 +34,8 @@
this.defaultPlayers['application/vnd.apple.mpegurl'] =
['Native'];
this.defaultPlayers['video/ogg'] = ['Native', 'Vlc', 'OgvJs',
'Generic', 'VLCApp'];
- this.defaultPlayers['audio/webm'] = ['Native', 'Vlc', 'VLCApp',
'IEWebMPrompt'];
- this.defaultPlayers['video/webm'] = ['Native', 'Vlc', 'VLCApp',
'IEWebMPrompt'];
+ this.defaultPlayers['audio/webm'] = ['Native', 'Vlc', 'OgvJs',
'VLCApp', 'IEWebMPrompt'];
+ this.defaultPlayers['video/webm'] = ['Native', 'Vlc', 'OgvJs',
'VLCApp', 'IEWebMPrompt'];
this.defaultPlayers['application/ogg'] = ['Native', 'Vlc',
'OgvJs', 'Generic', 'VLCApp'];
this.defaultPlayers['audio/ogg'] = ['Native', 'Vlc', 'OgvJs',
'VLCApp'];
this.defaultPlayers['audio/mpeg']= ['Native', 'Kplayer'];
--
To view, visit https://gerrit.wikimedia.org/r/373127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68f22d7cb0cee4fe3f5742a742d45189b617fe07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Niharika29 <nko...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
