milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update tabs

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-13 01:28:45 -04:00
parent d808aced1d
commit 9ceaf21b80
37 changed files with 565 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/hls.js/.bower.json vendored
View file

@ -1,6 +1,6 @@
{
"name": "hls.js",
"version": "0.5.19",
"version": "0.5.20",
"license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js",
@ -16,11 +16,11 @@
"test",
"tests"
],
"_release": "0.5.19",
"_release": "0.5.20",
"_resolution": {
"type": "version",
"tag": "v0.5.19",
"commit": "ad5665b216b04d1dd5a44dbf9242664e2da323e0"
"tag": "v0.5.20",
"commit": "3fb06c59d0df49961c057b522dc08eba4b8b0f08"
},
"_source": "git://github.com/dailymotion/hls.js.git",
"_target": "~0.5.7",

2
dashboard-ui/bower_components/hls.js/bower.json vendored
View file

@ -1,6 +1,6 @@
{
"name": "hls.js",
"version": "0.5.19",
"version": "0.5.20",
"license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js",

7
dashboard-ui/bower_components/hls.js/dist/hls.js vendored
View file

@ -454,6 +454,13 @@ var AbrController = function (_EventHandler) {
var hls = this.hls,
v = hls.media,
frag = this.fragCurrent;
// if loader has been destroyed or loading has been aborted, stop timer and return
if (!frag.loader || frag.loader.stats && frag.loader.stats.aborted) {
_logger.logger.warn('frag loader destroy or aborted, disarm abandonRulesCheck');
this.clearTimer();
return;
}
/* only monitor frag retrieval time if
(video not paused OR first fragment being loaded(ready state === HAVE_NOTHING = 0)) AND autoswitching enabled AND not lowest level (=> means that we have several levels) */
if (v && (!v.paused || !v.readyState) && frag.autoLevel && frag.level) {

4
dashboard-ui/bower_components/hls.js/dist/hls.js.map vendored
View file

File diff suppressed because one or more lines are too long

8
dashboard-ui/bower_components/hls.js/dist/hls.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dashboard-ui/bower_components/hls.js/package.json vendored
View file

@ -1,6 +1,6 @@
{
"name": "hls.js",
"version": "0.5.19",
"version": "0.5.20",
"license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js",

7
dashboard-ui/bower_components/hls.js/src/controller/abr-controller.js vendored
View file

@ -53,6 +53,13 @@ class AbrController extends EventHandler {
we compare it to expected time of buffer starvation
*/
let hls = this.hls, v = hls.media,frag = this.fragCurrent;
// if loader has been destroyed or loading has been aborted, stop timer and return
if(!frag.loader || ( frag.loader.stats && frag.loader.stats.aborted)) {
logger.warn(`frag loader destroy or aborted, disarm abandonRulesCheck`);
this.clearTimer();
return;
}
/* only monitor frag retrieval time if
(video not paused OR first fragment being loaded(ready state === HAVE_NOTHING = 0)) AND autoswitching enabled AND not lowest level (=> means that we have several levels) */
if (v && (!v.paused || !v.readyState) && frag.autoLevel && frag.level) {