bytedance · jiuyuetianjiuyuetian · Aug 30, 2023 · Nov 20, 2023 · Nov 20, 2023 · Dec 19, 2023
diff --git a/fixtures/mp4/index.html b/fixtures/mp4/index.html
@@ -73,9 +73,9 @@
   let player = new Player({
     id: 'vs',
     autoplay: true,
-    volume: 1,
-    url: '',
-    //url: './video/output.m4a',//'./video/1080p.mp4',
+    volume: 0.2,
+    // url: 'http://tosv.byted.org/obj/media-fe/badcase/av-not-sync-hevc.mp4',
+    url: './video/1080p.mp4',//'./video/1080p.mp4',
     // url:'https://lf3-static.bytednsdoc.com/obj/eden-cn/nupenuvpxnuvo/xgplayer_doc/xgplayer-demo-720p.mp4',
     poster: "//lf3-static.bytednsdoc.com/obj/eden-cn/nupenuvpxnuvo/xgplayer_doc/poster.jpg",
     playsinline: true,
@@ -100,7 +100,12 @@
     // },
     height: window.innerHeight -300,
     width: window.innerWidth,
-    plugins: [Mp4Plugin]
+    plugins: [Mp4Plugin],
+    mp4plugin: {
+      // enableWorker:true,
+      disableBufferBreakCheck:true,
+      memoryOpt:true,
+    }
   });
   window.player = player
 
@@ -116,7 +121,8 @@
   }
   window.playNext = playNext
   player.on('ended', () => {
-    player.replay()
+    console.log('duration:', player.duration)
+    // player.replay()
   })
 </script>
 <!--<script type="module" src="./index.js"></script>-->

diff --git a/fixtures/xgplayer/index.html b/fixtures/xgplayer/index.html
@@ -1,145 +1,29 @@
 <!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="referrer" content="no-referrer" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Document</title>
-    <script src="https://unpkg.com/vconsole/dist/vconsole.min.js"></script>
-  <script>
-    var ua = navigator.userAgent.toLowerCase()
-    console.log('ua', ua, (ua.indexOf('mobile') > -1 || ua.indexOf('ipad') > -1) && location.href.indexOf('vconsole=1') > -1)
-    if ((ua.indexOf('mobile') > -1 || ua.indexOf('ipad') > -1) && location.href.indexOf('vconsole=1') > -1) {
-      var vConsole = new window.VConsole();
-    }
-  </script>
-    <style>
-      .pannel {
-        margin: 20px 0;
-        padding: 20px;
-        background: #72a0c8;
-      }
-      .message-pannel {
-        margin-top: 20px;
-        color: #333a3c;
-      }
-      .message-info {
-        margin-top: 20px;
-        border: 1px solid #728bb8;
-        padding: 10px 10px;
-      }
-      h4 {
-        margin-block-start: 0.2em;
-        margin-block-end: 0.2em;
-      }
-      p {
-        line-height: 18px;
-        display: block;
-        line-height: 16px;
-        /* margin: 10px; */
-        margin-block-start: 0.4em;
-        margin-block-end: 0.4em;
-      }
-      .ext-controls0 {
-        height: 80px !important;
-        background-color: #000;
-      }
-      .xgplayer .my-pop {
-        height: 100px;
-        width: 400px;
-        background-color: #72a0c8;
-        border: 2px solid red;
-        box-sizing: border-box;
-      }
-    </style>
-  </head>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,minimal-ui">
+  <meta name="referrer" content="no-referrer">
+  <title>xgplayer</title>
+  <style type="text/css">
+    html, body {width:100%;height:100%;margin:auto;overflow: hidden;}
+  </style>
+</head>
+<body>
+<div id="mse"></div>
+<link rel="stylesheet" href="https://unpkg.byted-static.com/xgplayer/3.0.10/dist/index.min.css"/>
+<script charset="utf-8" src="https://unpkg.byted-static.com/xgplayer/3.0.10/dist/index.min.js"></script>
 
-  <body>
-    <div id="video0" style="margin: 0 auto"></div>
-    <div class="pannel">
-      <div class="tool">
-        <button type="submit" class="btn" id="js-destroy0" onclick="window.destroy(0)">
-          销毁
-        </button>
-        <button type="submit" class="btn" id="js-reinit0" onclick="window.init(0)">
-          重新初始化
-        </button>
-        <button type="submit" class="btn" id="js-playnext0" onclick="window.playNext(0)">
-          播放下一个
-        </button>
-        <button
-          type="submit"
-          class="btn"
-          id="js-changelang0"
-          onclick="window.changeLang(0)"
-        >
-          切换语言
-        </button>
-        <button
-          type="submit"
-          class="btn"
-          id="js-changelang0"
-          onclick="window.createDot(0)"
-        >
-          添加预览点
-        </button>
-      </div>
-      <div class="message-pannel">
-        <div class="message-info" id="js-show-lang0">
-          <h4>current lang:</h4>
-        </div>
+<script>
+  const config = {
+    "id": "mse",
+    "url": "https://lf3-static.bytednsdoc.com/obj/eden-cn/7221eh7pxhfuloj/wangziyi5.23.mp4",
+    "playsinline": true,
+    "poster": "//lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/byted-player-videos/1.0.0/poster.jpg",
+    "plugins": []
+  }
 
-        <div class="message-info" id="js-show-log0">
-          <h4>log info:</h4>
-        </div>
-      </div>
-    </div>
-    <div id="video1" style="margin: 0 auto"></div>
-    <!-- <div class="pannel">
-      <div class="tool">
-        <button type="submit" class="btn" id="js-destroy0" onclick="window.destroy(0)">
-          销毁
-        </button>
-        <button type="submit" class="btn" id="js-reinit0" onclick="window.init(0)">
-          重新初始化
-        </button>
-        <button type="submit" class="btn" id="js-playnext0" onclick="window.playNext(0)">
-          播放下一个
-        </button>
-        <button
-          type="submit"
-          class="btn"
-          id="js-changelang0"
-          onclick="window.changeLang(0)"
-        >
-          切换语言
-        </button>
-        <button
-          type="submit"
-          class="btn"
-          id="js-changelang0"
-          onclick="window.createDot(0)"
-        >
-          添加预览点
-        </button>
-      </div>
-      <div class="message-pannel">
-        <div class="message-info" id="js-show-lang0">
-          <h4>current lang:</h4>
-        </div>
+  let player = new Player(config)
 
-        <div class="message-info" id="js-show-log0">
-          <h4>log info:</h4>
-        </div>
-      </div>
-    </div> -->
-    <script></script>
-    <script type="module" defer src="./index.js"></script>
-    <script>
-      // window.onload = function(){
-      //   window.initPlayer()
-      // }
-    </script>
-  </body>
+</script>  </body>
 </html>
diff --git a/fixtures/xgplayer/index.js b/fixtures/xgplayer/index.js
@@ -41,7 +41,7 @@ function init(index = 0, config = {}) {
         url: url
       }
     },
-    url: "",
+    url: "https://lf3-static.bytednsdoc.com/obj/eden-cn/7221eh7pxhfuloj/wangziyi5.23.mp4",
     DynamicBg: {
       disable: false
     },

diff --git a/packages/xgplayer-mp4-loader/package.json b/packages/xgplayer-mp4-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xgplayer-mp4-loader",
-  "version": "3.0.11-alpha.10",
+  "version": "3.0.9-rc.20",
   "main": "dist/index.min.js",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -15,15 +15,15 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public",
-    "tag": "alpha"
+    "tag": "rc"
   },
   "license": "MIT",
   "unpkgFiles": [
     "dist"
   ],
   "dependencies": {
-    "xgplayer-transmuxer": "3.0.11-alpha.10",
-    "xgplayer-streaming-shared": "3.0.11-alpha.10",
+    "xgplayer-transmuxer": "3.0.9-rc.12",
+    "xgplayer-streaming-shared": "3.0.11-rc.3",
     "eventemitter3": "^4.0.7"
   },
   "peerDependencies": {

diff --git a/packages/xgplayer-mp4-loader/src/config.js b/packages/xgplayer-mp4-loader/src/config.js
@@ -1,10 +1,14 @@
 export function getConfig (cfg) {
+  if (typeof cfg.fixEditListOffset !== 'boolean') {
+    delete cfg.fixEditListOffset
+  }
   return {
     vid: '',
     moovEnd: 80000,
     segmentDuration: 2,
     maxDownloadInfoSize: 30,
     responseType: 'arraybuffer',
+    fixEditListOffset: true,
     cache: null,
     // ...xgplayer-streaming-shared/src/net/config
     ...cfg

diff --git a/packages/xgplayer-mp4-loader/src/gopItem.js b/packages/xgplayer-mp4-loader/src/gopItem.js
@@ -0,0 +1,21 @@
+export default class GopItem {
+  constructor () {
+    this.frames = []
+    this.dur = 0
+    this.minPts = Number.MAX_VALUE
+    this.maxPts = 0
+  }
+  appendFrame (frame) {
+    this.frames.push(frame)
+    this.dur += frame.duration
+  }
+  calMinMaxPts (frame) {
+    if (frame.pts < this.minPts){
+      this.minPts = frame.pts
+    }
+    const pts = frame.pts + frame.duration
+    if (pts > this.maxPts){
+      this.maxPts = pts
+    }
+  }
+}