Brion VIBBER has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370854 )
Change subject: [WIP] Enable WebM playback via ogv.js ...................................................................... [WIP] Enable WebM playback via ogv.js Do not merge before ready to deploy! 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. Bug: T172444 Change-Id: I68f22d7cb0cee4fe3f5742a742d45189b617fe07 --- M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js M MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js 3 files changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/54/370854/1 diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js index 7cd9420..0eb8b31 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..398a87e 100644 --- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js +++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js @@ -94,6 +94,13 @@ ], 'IEWebMPrompt' ); var ogvJsPlayer = new mw.MediaPlayer( 'ogvJsPlayer', [ + 'video/webm', + 'video/webm; codecs="vp8"', + 'video/webm; codecs="vp8, 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/370854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68f22d7cb0cee4fe3f5742a742d45189b617fe07 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Brion VIBBER <br...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits