Merge pull request #189 from girlbymirror/master

fixed:play hls(Avc) stream error without autoplay
numberwolf · Sep 16, 2022 · 8d47475 · 8d47475
2 parents 17102ae + 2a43a44
commit 8d47475
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 17 deletions.
diff --git a/README_EN.MD b/README_EN.MD
@@ -998,6 +998,8 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \
 
 | Update | Content |
 | ---- | ---- |
+| Time | 2022/09/13 |
+| - | 0.Fixed: AVC stream loop buffer error without autoplay |
 | Time | 2022/09/12 |
 | - | 0.Fixed: hevc url cannot play without text of "http" |
 | Time | 2022/08/24 |

diff --git a/dist-multi-thread/h265webjs-v20220912.js → dist-multi-thread/h265webjs-v20220916.js b/dist-multi-thread/h265webjs-v20220912.js → dist-multi-thread/h265webjs-v20220916.js
diff --git a/dist-multi-thread/index.js b/dist-multi-thread/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220912');
+require('./h265webjs-v20220916');
 export default class h265webjs {
  static createPlayer(videoURL, config) {
  return window.new265webjs(videoURL, config);

diff --git a/...le_vue/public/dist/h265webjs-v20220912.js → dist/h265webjs-v20220916.js b/...le_vue/public/dist/h265webjs-v20220912.js → dist/h265webjs-v20220916.js
diff --git a/dist/index.js b/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220912');
+require('./h265webjs-v20220916');
 export default class h265webjs {
  static createPlayer(videoURL, config) {
  return window.new265webjs(videoURL, config);

diff --git a/.../dist-multi-thread/h265webjs-v20220912.js → .../dist-multi-thread/h265webjs-v20220916.js b/.../dist-multi-thread/h265webjs-v20220912.js → .../dist-multi-thread/h265webjs-v20220916.js
diff --git a/example_normal/dist-multi-thread/index.js b/example_normal/dist-multi-thread/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220912');
+require('./h265webjs-v20220916');
 export default class h265webjs {
  static createPlayer(videoURL, config) {
  return window.new265webjs(videoURL, config);

diff --git a/dist/h265webjs-v20220912.js → example_normal/dist/h265webjs-v20220916.js b/dist/h265webjs-v20220912.js → example_normal/dist/h265webjs-v20220916.js
diff --git a/example_normal/dist/index.js b/example_normal/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220912');
+require('./h265webjs-v20220916');
 export default class h265webjs {
  static createPlayer(videoURL, config) {
  return window.new265webjs(videoURL, config);

diff --git a/example_normal/index.html b/example_normal/index.html
@@ -37,7 +37,7 @@
  <link rel="stylesheet" type="text/css" href='player-view/css/button.css'>
  <link rel="stylesheet" type="text/css" href='player-view/css/progress.css'>
  <script src="dist/missile.js"></script>
- <script src="dist/h265webjs-v20220912.js"></script>
+ <script src="dist/h265webjs-v20220916.js"></script>
  <script src="index.js"></script>
 
 </head>

diff --git a/...vue_ts/public/dist/h265webjs-v20220912.js → ...le_vue/public/dist/h265webjs-v20220916.js b/...vue_ts/public/dist/h265webjs-v20220912.js → ...le_vue/public/dist/h265webjs-v20220916.js
diff --git a/example_vue/public/dist/index.js b/example_vue/public/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220828');
+require('./h265webjs-v20220916');
 export default class h265webjs {
  static createPlayer(videoURL, config) {
  return window.new265webjs(videoURL, config);

diff --git a/index-debug.html b/index-debug.html
@@ -33,10 +33,10 @@
  <meta charset="utf-8" name="github" content="https://github.com/numberwolf/h265web.js">
 
  <script src="dist/missile.js"></script> <!-- IMPORTANT -->
- <script src="dist/h265webjs-v20220912.js"></script> <!-- IMPORTANT -->
+ <script src="dist/h265webjs-v20220916.js"></script> <!-- IMPORTANT -->
 
  <!--<script src="dist-multi-thread/missile-multi-thread.js"></script>
- <script src="dist-multi-thread/h265webjs-v20220912.js"></script>-->
+ <script src="dist-multi-thread/h265webjs-v20220916.js"></script>-->
 
  <style>
  </style>

diff --git a/src/src/h265webjs.js b/src/src/h265webjs.js
@@ -2558,6 +2558,7 @@ class H265webjsModule {
  playerId: this.configFormat.playerId,
  ignoreAudio : this.configFormat.extInfo.ignoreAudio,
  autoPlay: this.configFormat.extInfo.autoPlay,
+ playMode: this.playMode,
  }; // playerConfig
  this.player = new NvVideoJSCore.NvVideojsCore(playerConfig);
  this.player.onMakeItReady = () => {

diff --git a/src/src/index.js b/src/src/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220912');
+require('./h265webjs-v20220916');
 export default class h265webjs {
  static createPlayer(videoURL, config) {
  return window.new265webjs(videoURL, config);

diff --git a/src/src/native/nv-videojs-core.js b/src/src/native/nv-videojs-core.js
@@ -308,6 +308,11 @@ class NvVideojsCoreModule {
  _this.bufferInterval = null;
  }
 
+ alert("probeDurationMS:" + _this.configFormat.probeDurationMS);
+ if (_this.configFormat.probeDurationMS <= 0 || _this.duration <= 0) {
+ return;
+ }
+
  _this.bufferInterval = window.setInterval(function() {
  const bufProgress = _this.videoTag.buffered.end(0);
  console.log("bufProgress", bufProgress);

diff --git a/src/version.sh b/src/version.sh
@@ -19,5 +19,5 @@
 # * Github: https://github.com/numberwolf/h265web.js
 # * 
 # **********************************************************/
-VERSION='v20220912' # output version + index.js
+VERSION='v20220916' # output version + index.js
 WASM_VERSION='v20220706'
diff --git a/example_normal/dist/h265webjs-v20220912.js → ...vue_ts/public/dist/h265webjs-v20220916.js b/example_normal/dist/h265webjs-v20220912.js → ...vue_ts/public/dist/h265webjs-v20220916.js
diff --git a/vite_vue_ts/public/dist/index.js b/vite_vue_ts/public/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220828');
+require('./h265webjs-v20220916');
 export default class h265webjs {
  static createPlayer(videoURL, config) {
  return window.new265webjs(videoURL, config);