Merge branch 'refactor-live' of https://github.com/bytedance/xgplayer …

…into refactor-live-loaderbuffer
lidihao · Sep 20, 2019 · c7596a0 · c7596a0
2 parents 70c7c1d + 6e528d3
commit c7596a0
Show file tree

Hide file tree

Showing 26 changed files with 8,433 additions and 106 deletions.
diff --git a/packages/xgplayer-flv/browser/index.dev.js b/packages/xgplayer-flv/browser/index.dev.js
diff --git a/packages/xgplayer-flv/dist/index.dev.js b/packages/xgplayer-flv/dist/index.dev.js
diff --git a/packages/xgplayer-flv/package.json b/packages/xgplayer-flv/package.json
@@ -36,7 +36,11 @@
     "webpack": "^4.12.0",
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^2.11.1",
-    "webpack-merge": "^4.2.2"
+    "webpack-merge": "^4.2.2",
+    "xgplayer-buffer": "^1.0.0",
+    "xgplayer-loader-fetch": "^1.0.0",
+    "xgplayer-utils": "^1.0.0",
+    "xgplayer-remux": "^1.0.0"
   },
   "peerDependency": {
     "xgplayer": "^0.1.0"

diff --git a/packages/xgplayer-flv/src/Flv.js b/packages/xgplayer-flv/src/Flv.js
@@ -1,9 +1,9 @@
 import FlvDemuxer from './parse/demux'
 import Mp4Remuxer from 'xgplayer-remux/src/mp4'
-import FetchLoader from 'xgplayer-loader-fetch/src/index'
-import { XgBuffer } from 'xgplayer-buffer/src/index'
-import { Tracks } from 'xgplayer-buffer/src/track'
-import { REMUX_EVENTS, DEMUX_EVENTS } from '../../xgplayer-utils/src/constants/events'
+import FetchLoader from 'xgplayer-loader-fetch'
+import { XgBuffer } from 'xgplayer-buffer/dist/index'
+import { Tracks } from 'xgplayer-buffer/dist/track'
+import { REMUX_EVENTS, DEMUX_EVENTS } from 'xgplayer-utils/dist/constants/events'
 import MSE from './parse/MSE'
 
 const Tag = 'FLVController'

diff --git a/packages/xgplayer-flv/src/index.js b/packages/xgplayer-flv/src/index.js
@@ -1,7 +1,7 @@
 import Player from 'xgplayer'
-import Context from '../../xgplayer-utils/src/Context'
+import Context from 'xgplayer-utils/dist/Context'
 import FLV from './Flv'
-import allEvents, { flvAllowedEvents } from '../../xgplayer-utils/src/constants/events'
+import allEvents, { flvAllowedEvents } from 'xgplayer-utils/dist/constants/events'
 
 const isEnded = (player, flv) => {
   if (!player.config.isLive) {