xgplayer-mp4 2.0.4 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xgplayer-mp4",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "xgplayer plugin for mp4 transform to fmp4",
   "main": "./dist/index.js",
   "scripts": {
@@ -8,7 +8,6 @@
     "build": "node ./src/version.js && webpack --progress --display-chunks -p",
     "watch": "webpack --progress --display-chunks -p --watch",
     "test": "karma start --single-run",
-    "release": "npm publish --registry=https://registry.npmjs.org",
     "test:watch": "karma start"
   },
   "repository": {

package/src/index.js

@@ -13,9 +13,9 @@ const DESTROYED = 'DESTROYED';
 const sniffer = Player.sniffer;
 
 let isEnded = (player, mp4) => {
-  if (mp4.meta.endTime - player.currentTime < 0.5) {
+  if (player.mse && mp4.meta.endTime - player.currentTime < 0.5) {
     // let range = player.getBufferedRange(player.buffered2)
-    let offsetTime =  player.duration - player.currentTime
+    let offsetTime = player.duration - player.currentTime
     if (offsetTime < 0.5) {
       player.mse.endOfStream()
       player._stopProgress()
@@ -62,7 +62,7 @@ class Mp4Player extends Player {
     })
   }
 
-  _initMp4Kernal(){
+  _initMp4Kernal (){
     let player = this;
     let rule = player.config.pluginRule || function () { return true }
     if (MSE.isSupported('video/mp4; codecs="avc1.64001E, mp4a.40.5"')) {
@@ -74,7 +74,9 @@ class Mp4Player extends Player {
           return player.currentSrc
         },
         set (url) {
-          player.mse.endOfStream()
+          if (player.mse) {
+            player.mse.endOfStream()
+          }
           player._onDestroy();
           player.config.autoplay = player.autoplay = true
           player.config.url = url

package/src/media/task.js

@@ -110,7 +110,8 @@ class Task {
   }
 
   run () {
-    if (this.xhr.readyState === 1) {
+    // 兼容有些情况下调用open方法后，readyState为0的问题
+    if (this.xhr.readyState === 1 || this.xhr.OPENED === 1) {
       this.running = true
       this.xhr.send()
     } else {

package/src/mp4.js

@@ -254,7 +254,13 @@ class MP4 {
         if (nextBox) {
           if (nextBox.type === 'moov') {
             self.getData(moovStart, moovStart + nextBox.size + 28).then(res => {
-              let parsed = new Parser(res)
+              let parsed
+              // try {
+                parsed = new Parser(res)
+              // }catch(e) {
+
+              // }
+              
               self._boxes = self._boxes.concat(parsed.boxes)
               moov = parsed.boxes.filter(box => box.type === 'moov')
               if (moov.length) {
@@ -301,7 +307,6 @@ class MP4 {
     let stsz = util.findBox(trak, 'stsz') // sample-size
     let stts = util.findBox(trak, 'stts') // sample-time
     let stco = util.findBox(trak, 'stco') // chunk-offset
-
     let cttsObj = type === 'video' ? this._cttsObj : null;
     let stscObj = type === 'video' ? this._stscVideoObj : this._stscAudioObj;
     let mdatStart = this.mdatStart
@@ -328,11 +333,12 @@ class MP4 {
         })
       }
     } else {
+      let offset = util.seekSampleOffset(stsc, stco, stsz, start, mdatStart, stscObj)
       samples = {
         idx: start,
         size: stsz.entries[start],
         time: util.seekSampleTime(stts, cttsObj, start),
-        offset: util.seekSampleOffset(stsc, stco, stsz, start, mdatStart, stscObj)
+        offset: offset
       }
     }
     return samples
@@ -475,7 +481,7 @@ class MP4 {
       end = videoNextFrame.offset
       if (this.audioTrak) {
         let audioNextFrame = this.getSamplesByOrders('audio', this.audioKeyFrames[fragIndex + 1].order, 0)
-        end = Math.max(end, audioNextFrame.offset)
+        end = Math.max(end, audioNextFrame.offset || 0)
       }
     }
     if (window.isNaN(start) || (end !== undefined && window.isNaN(end))) {
@@ -487,7 +493,10 @@ class MP4 {
   loadFragment (fragIndex) {
     let self = this
     let range = this.getFragRange(fragIndex)
-    if(range === [0, 0]) return false;
+    if(range === [0, 0]) {
+      debugger
+      return false;
+    }
     return this.getData(range[0], range[1]).then((dat) => {
       return self.createFragment(new Uint8Array(dat), range[0] - this.mdatStart, fragIndex)
     })

package/src/parse/box/MP4DecConfigDescrTag.js

@@ -5,6 +5,9 @@ Box.MP4DecConfigDescrTag = function (stream) {
   let box = new Box()
   let size
   box.type = stream.readUint8()
+  if (box.type !== 4) {
+    return box
+  }
   size = stream.readUint8()
   if (size === 0x80) {
     box.extend = true

package/src/parse/box/MP4DecSpecificDescrTag.js

@@ -4,6 +4,10 @@ Box.MP4DecSpecificDescrTag = function (stream) {
   let box = new Box()
   let size, dataSize
   box.type = stream.readUint8()
+  if (box.type !== 5) {
+    stream.position = stream.position - 1
+    return box
+  }
   size = stream.readUint8()
   if (size === 0x80) {
     box.extend = true

package/src/parse/box/esds.js

@@ -5,8 +5,13 @@ Box.esds = function () {
   let stream = new Stream(this.data)
   this.version = stream.readUint8()
   this.flag = Stream.readByte(stream.dataview, 3)
-  let box = Box.MP4ESDescrTag(stream)
-  this.subBox.push(box)
-  delete this.data
-  stream = null
+  try {
+    let box = Box.MP4ESDescrTag(stream)
+    this.subBox.push(box)
+    delete this.data
+    stream = null
+  }catch(e) {
+    console.error(e)
+  }
+  
 }

package/src/util/index.js

@@ -69,12 +69,11 @@ util.stscOffset = function (stsc, sample_order, stscObj) {
   // let chunk_start = stsc.entries.filter((item) => {
   //   return item.first_sample <= sample_order && sample_order < item.first_sample + item.chunk_count * item.samples_per_chunk
   // })[0]
-  let chunk_start = stscObj[sample_order]
+  let chunk_start = stscObj[sample_order];
   if (!chunk_start) {
     let last_chunk = stsc.entries.pop()
     stsc.entries.push(last_chunk)
     let chunk_offset = Math.floor((sample_order - last_chunk.first_sample) / last_chunk.samples_per_chunk)
-    chunk_offset = Math.min(chunk_offset, last_chunk.chunk_count)
     let last_chunk_index = last_chunk.first_chunk + chunk_offset
     let last_chunk_first_sample = last_chunk.first_sample + last_chunk.samples_per_chunk * chunk_offset
     return {
@@ -95,7 +94,9 @@ util.stscOffset = function (stsc, sample_order, stscObj) {
 
 util.seekSampleOffset = function (stsc, stco, stsz, order, mdatStart, stscObj) {
   let chunkOffset = util.stscOffset(stsc, order + 1, stscObj)
-  let result = stco.entries[chunkOffset.chunk_index - 1] + util.sum.apply(null, stsz.entries.slice(chunkOffset.samples_offset[0] - 1, chunkOffset.samples_offset[1] - 1)) - mdatStart
+  let sum =  util.sum.apply(null, stsz.entries.slice(chunkOffset.samples_offset[0] - 1, chunkOffset.samples_offset[1] - 1))
+  let ss = stco.entries[chunkOffset.chunk_index - 1]
+  let result = ss + sum - mdatStart
   if (result === undefined) {
     throw `result=${result},stco.length=${stco.entries.length},sum=${util.sum.apply(null, stsz.entries.slice(0, order))}`
   } else if (result < 0) {
@@ -118,7 +119,7 @@ util.seekSampleTime = function (stts, cttsObj, order) {
     }
   })
   if (cttsObj) {
-    if (cttsObj[order]) {
+    if(cttsObj[order]){
       offset = cttsObj[order]
     }
   }
@@ -240,11 +241,11 @@ util.toUTF8 = function (str) {
 }
 
 util.bufferToString = function (value) {
-  return ('0' + (Number(value).toString(16))).slice(-2).toUpperCase()
+  return ("0"+(Number(value).toString(16))).slice(-2).toUpperCase()
 }
 util.strToBuf = function (str) {
   let buffer = []
-  for (let i = 0; i < str.length; i = i + 2) {
+  for(let i = 0; i < str.length; i = i + 2) {
     buffer.push(
       parseInt(str[i] + str[i + 1], 16)
     )
@@ -252,20 +253,20 @@ util.strToBuf = function (str) {
   return new Uint8Array(buffer)
 }
 util.str2hex = function (str) {
-  if (str === '') {
-    return ''
+  if(str === "") {
+    return ""
   }
-  let arr = []
-  for (let i = 0; i < str.length; i++) {
+  let arr = [];
+  for(let i = 0; i < str.length; i++) {
     arr.push(str.charCodeAt(i))
   }
   return arr
 }
 util.parse = function (a) {
   if (!Array.isArray(a)) {
-    let arr = []
-    let value = ''
-    for (let i = 0; i < a.length; i++) {
+    let arr = [];
+    let value = '';
+    for(let i = 0; i < a.length; i++) {
       if (i % 2) {
         value = a[i - 1] + a[ i ]
         arr.push(parseInt(value, 16))
@@ -274,6 +275,6 @@ util.parse = function (a) {
     }
     return arr
   }
-  return a.map(item => { return parseInt(item, 16) })
+  return a.map(item => {return parseInt(item, 16)})
 }
 export default util

package/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.0.4"
+  "version": "2.0.5"
 }

package/webpack.config.js

@@ -41,7 +41,7 @@ const client = {
     library: 'Mp4Player',
     libraryTarget: 'window'
   },
-  devtool: argv.watch ? 'source-map' : 'none',
+  // devtool: argv.watch ? 'source-map' : 'none',
   module: {
     rules: [
       {