Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288345
Change subject: [WIP] Update ogv.js to 1.1.1-alpha.0
......................................................................
[WIP] Update ogv.js to 1.1.1-alpha.0
Update ogv.js to upstream 1.1.1 (currently in testing)
Resolves a couple issues with source switcher in videojs mode.
Bug: T135098
Bug: T135097
Change-Id: Id767cb5194dcb96cda4f65a72e0b8206a230e931
---
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-audio.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-video.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/readme.md
6 files changed, 38 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/45/288345/1
diff --git a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js
b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js
index 1ba7345..603068c 100644
--- a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js
+++ b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js
@@ -53,7 +53,7 @@
(function() {
var OGVCompat = __webpack_require__(1),
- OGVVersion = ("1.1.0-20160511164402-3888a9b");
+ OGVVersion = ("1.1.1-alpha.0-20160512042807-17a616b");
if (window) {
// 1.0-compat globals
diff --git a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js
b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js
index 2ddbc1d..475994e 100644
--- a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js
+++ b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js
@@ -52,7 +52,7 @@
(function() {
- var OGVVersion = ("1.1.0-20160511164402-3888a9b");
+ var OGVVersion = ("1.1.1-alpha.0-20160512042807-17a616b");
if (window) {
// 1.0-compat globals
diff --git a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-audio.js
b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-audio.js
index f14a4dd..92e2692 100644
--- a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-audio.js
+++ b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-audio.js
@@ -246,7 +246,7 @@
/* 3 */
/***/ function(module, exports, __webpack_require__) {
- var OGVVersion = ("1.1.0-20160511164402-3888a9b");
+ var OGVVersion = ("1.1.1-alpha.0-20160512042807-17a616b");
(function() {
var global = this;
diff --git a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-video.js
b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-video.js
index 99c175e..41f328d 100644
--- a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-video.js
+++ b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-video.js
@@ -245,7 +245,7 @@
/* 3 */
/***/ function(module, exports, __webpack_require__) {
- var OGVVersion = ("1.1.0-20160511164402-3888a9b");
+ var OGVVersion = ("1.1.1-alpha.0-20160512042807-17a616b");
(function() {
var global = this;
diff --git a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js
b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js
index 52f0554..b4496bd 100644
--- a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js
+++ b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js
@@ -64,7 +64,7 @@
OGVLoader = __webpack_require__(3),
OGVMediaType = __webpack_require__(7),
OGVPlayer = __webpack_require__(8),
- OGVVersion = ("1.1.0-20160511164402-3888a9b");
+ OGVVersion = ("1.1.1-alpha.0-20160512042807-17a616b");
// Version 1.0's web-facing and test-facing interfaces
if (window) {
@@ -287,7 +287,7 @@
/* 3 */
/***/ function(module, exports, __webpack_require__) {
- var OGVVersion = ("1.1.0-20160511164402-3888a9b");
+ var OGVVersion = ("1.1.1-alpha.0-20160512042807-17a616b");
(function() {
var global = this;
@@ -778,6 +778,7 @@
INITIAL: 'INITIAL',
SEEKING_END: 'SEEKING_END',
LOADED: 'LOADED',
+ PRELOAD: 'PRELOAD',
READY: 'READY',
PLAYING: 'PLAYING',
SEEKING: 'SEEKING',
@@ -1025,6 +1026,8 @@
if (codec) {
codec.close();
codec = null;
+ pendingFrame = 0;
+ pendingAudio = 0;
}
videoInfo = null;
audioInfo = null;
@@ -1044,6 +1047,8 @@
yCbCrBuffer = null;
}
// @todo set playback position, may need to fire
timeupdate if wasnt previously 0
+ initialPlaybackPosition = 0;
+ initialPlaybackOffset = 0;
duration = null; // do not fire durationchange
// timeline offset to 0?
}
@@ -1498,19 +1503,33 @@
} else if (state == State.LOADED) {
- state = State.READY;
- if (paused) {
- // Paused? stop here.
- log('pausing stopping at loaded');
- } else {
- // Not paused? Continue on to play
processing.
- log('not paused so continuing');
- pingProcessing(0);
- }
+ state = State.PRELOAD;
fireEvent('loadedmetadata');
fireEvent('durationchange');
if (codec.hasVideo) {
fireEvent('resize');
+ }
+ pingProcessing(0);
+
+ } else if (state == State.PRELOAD) {
+
+ if ((codec.frameReady || !codec.hasVideo) &&
+ (codec.audioReady || !codec.hasAudio)) {
+
+ state = State.READY;
+ fireEvent('loadeddata');
+ pingProcessing(0);
+ } else {
+ codec.process(function
doProcessPreload(more) {
+ if (more) {
+ pingProcessing();
+ } else if (streamEnded) {
+ // Ran out of data
before data available...?
+ ended = true;
+ } else {
+ readBytesAndWait();
+ }
+ });
}
} else if (state == State.READY) {
@@ -5758,7 +5777,7 @@
var OGVWrapperCodec = (function(options) {
options = options || {};
var self = this,
- suffix = '?version=' +
encodeURIComponent(("1.1.0-20160511164402-3888a9b")),
+ suffix = '?version=' +
encodeURIComponent(("1.1.1-alpha.0-20160512042807-17a616b")),
base = (typeof options.base === 'string') ?
(options.base + '/') : '',
type = (typeof options.type === 'string') ?
options.type : 'video/ogg',
processing = false,
diff --git a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/readme.md
b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/readme.md
index a2b96c4..f329140 100644
--- a/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/readme.md
+++ b/MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/readme.md
@@ -7,6 +7,9 @@
## Updates
+* 1.1.1-alpha.0
+ * fix occasional loss of a/v sync after source switch
+ * loadeddata event now fired
* 1.1.0 - 2016-05-10
* fixed background tab audio performance
* fixed race condition in poster removal
--
To view, visit https://gerrit.wikimedia.org/r/288345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id767cb5194dcb96cda4f65a72e0b8206a230e931
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
