blackteay/xgplayer
1
0
Fork 0
mirror of https://github.com/bytedance/xgplayer.git synced 2025-04-05 11:18:46 +08:00
Code Issues Projects Releases Wiki Activity

fix fetch loading status

Browse Source
This commit is contained in:
Yuqing Jiang 2019-10-12 12:55:38 +08:00
parent 0763ed09be
commit 3919f1c03b
10 changed files with 27 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lerna.json
View File

@ -1,5 +1,4 @@
{
"lerna": "2.9.0",
"packages": [
"packages/*"
],

2
package.json
View File

@ -17,7 +17,7 @@
"koa": "^2.5.1",
"koa-range": "^0.3.0",
"koa-static": "^4.0.3",
"lerna": "2.9.0",
"lerna": "^3.17.0",
"lerna-changelog": "^0.8.0",
"lint-staged": "^7.2.0",
"style-loader": "^0.21.0",

2
packages/xgplayer-codec/package.json
View File

@ -8,7 +8,7 @@
},
"author": "",
"license": "ISC",
"dependencies": {
"devDependencies": {
"xgplayer-utils": "1.1.6-alpha.0"
}
}

174
packages/xgplayer-hls-live/browser/index.js
View File

File diff suppressed because one or more lines are too long

174
packages/xgplayer-hls-live/dest/index.js
View File

File diff suppressed because one or more lines are too long

5
packages/xgplayer-hls-live/package.json
View File

@ -21,6 +21,11 @@
"xgplayer-utils": "1.1.6-alpha.0"
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-preset-es2015": "^6.24.1",
"webpack": "^4.10.2",
"webpack-merge": "^4.2.2"
}
}

8
packages/xgplayer-hls-live/src/hls-live.js
View File

@ -9,6 +9,7 @@ import {Playlist, M3U8Parser, TsDemuxer} from 'xgplayer-demux';
const LOADER_EVENTS = EVENTS.LOADER_EVENTS;
const REMUX_EVENTS = EVENTS.REMUX_EVENTS;
const DEMUX_EVENTS = EVENTS.DEMUX_EVENTS;
const HLS_EVENTS = EVENTS.HLS_EVENTS;
class HlsLiveController {
constructor (configs) {
@ -73,9 +74,10 @@ class HlsLiveController {
}
_onLoadError (loader, error) {
if (!this._tsloader.loading && !this._m3u8loader.loading && this.retrytimes > 0) {
if (!this._tsloader.loading && !this._m3u8loader.loading && this.retrytimes > 1) {
this.retrytimes--;
} else if (this.retrytimes < 1) {
} else if (this.retrytimes <= 1) {
this.emit(HLS_EVENTS.RETRY_TIME_EXCEEDED);
this.mse.endOfStream();
}
}
@ -94,7 +96,7 @@ class HlsLiveController {
this.retrytimes--;
this._preload();
} else {
console.log('end');
this.emit(HLS_EVENTS.RETRY_TIME_EXCEEDED);
this.mse.endOfStream();
}
}

7
packages/xgplayer-hls-live/src/index.js
View File

@ -11,17 +11,18 @@ export class HlsLivePlayer extends Player {
this.util = Player.util;
this.util.deepCopy(this.hlsOps, options);
this._context = new Context(HlsAllowedEvents);
this._hasStart = false;
this._hasStarted = false;
}
_initEvents () {
this.__core__.once(REMUX_EVENTS.INIT_SEGMENT, () => {
const mse = this._context.getInstance('MSE');
if (!this._hasStart) {
if (!this._hasStarted) {
const live = this.util.createDom('xg-live', '正在直播', {}, 'xgplayer-live');
this.util.addClass(this.root, 'xgplayer-is-live');
this.controls.appendChild(live);
}
this._hasStarted = true;
super.start(mse.url);
});
@ -70,7 +71,7 @@ export class HlsLivePlayer extends Player {
}
play () {
if (this._hasStart) {
if (this._hasStarted) {
this._context.destroy();
this._context = new Context(HlsAllowedEvents);
this.__core__ = this._context.registry('HLS_LIVE_CONTROLLER', HlsLiveController)({container: this.video});

3
packages/xgplayer-hls/package.json
View File

@ -43,10 +43,11 @@
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-loader": "^7.1.4",
"babel-loader": "^7.1.5",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-preset-es2015": "^6.24.1",
"webpack": "^4.10.2",
"webpack-cli": "^3.3.9",
"webpack-merge": "^4.2.2"
}
}

6
packages/xgplayer-loader/src/fetch-loader.js
View File

@ -39,11 +39,11 @@ class FetchLoader {
_this.status = response.status
return _this._onFetchResponse(response);
}
_this.loading = false;
_this.emit(LOADER_EVENTS.LOADER_ERROR, _this, response);
_this.loading = false;
}).catch(function (error) {
_this.emit(LOADER_EVENTS.LOADER_ERROR, _this, error);
_this.loading = false;
_this.emit(LOADER_EVENTS.LOADER_ERROR, _this, error);
throw new Error(error.message)
})
}
@ -133,8 +133,8 @@ class FetchLoader {
_this.emit(LOADER_EVENTS.LOADER_DATALOADED, buffer)
return _this._onReader(reader, taskno)
}).catch((error) => {
_this.emit(LOADER_EVENTS.LOADER_ERROR, _this, error);
_this.loading = false;
_this.emit(LOADER_EVENTS.LOADER_ERROR, _this, error);
})
}