2022新计划

numberwolf · Dec 31, 2021 · 90d7567 · 90d7567
1 parent 6bea883
commit 90d7567
Show file tree

Hide file tree

Showing 14 changed files with 315 additions and 153 deletions.
diff --git a/README.MD b/README.MD
@@ -915,6 +915,8 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \
 
 | 更新日志 | 内容 |
 | ---- | ---- |
+| 时间 | 2021/12/31 |
+| - | 0.增加 H.264 HTTP-FLV 失败后Retry |
 | 时间 | 2021/12/24 |
 | - | 0.修复 H.264 HTTP-FLV 部分流无回调问题 |
 | 时间 | 2021/12/19 |

diff --git a/README_EN.MD b/README_EN.MD
@@ -906,6 +906,8 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \
 
 | Update | Content |
 | ---- | ---- |
+| Time | 2021/12/31 |
+| - | 0.Add H.264 HTTP-FLV Retry after error |
 | Time | 2021/12/24 |
 | - | 0.Fixed H.264 HTTP-FLV Some Badcase with callback |
 | Time | 2021/12/19 |

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

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

diff --git a/example_normal/dist/h265webjs-v20211224.js → example_normal/dist/h265webjs-v20211231.js b/example_normal/dist/h265webjs-v20211224.js → example_normal/dist/h265webjs-v20211231.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-v20211224');
+require('./h265webjs-v20211231');
 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
@@ -36,7 +36,7 @@
     <link rel="stylesheet" type="text/css" href='player-view/css/progress.css'>
     <script src="dist/missile.js"></script> <!-- IMPORTANT -->
     <!--<script src="dist/missile-256mb-v20211104.js"></script>--> <!-- wasm for 265mb memory(with grow) -->
-    <script src="dist/h265webjs-v20211224.js"></script> <!-- IMPORTANT -->
+    <script src="dist/h265webjs-v20211231.js"></script> <!-- IMPORTANT --> 
     <script src="example.js"></script> <!-- IMPORTANT -->
     <style>
     </style>

diff --git a/src/src/h265webjs.js b/src/src/h265webjs.js
@@ -1529,7 +1529,7 @@ class H265webjsModule {
             };
             _this.playParam.audioNone = _this.player.mediaInfo.audioNone;
 
-            console.log("_this.player.mediaInfo", _this.player.mediaInfo);
+            console.log("_cLiveFLVDecoderEntry _this.player.mediaInfo", _this.player.mediaInfo);
 
             if (_this.player.vCodecID === def.V_CODEC_NAME_HEVC) {
                 if (_this.playParam.audioIdx < 0) {
@@ -1544,7 +1544,7 @@ class H265webjsModule {
                 let releaseRet = _this.player.release();
                 console.log("releaseRet ===> ", releaseRet);
                 _this.player = null;
-                _this._flvJsPlayer();
+                _this._flvJsPlayer(_this.playParam.durationMs);
             }
             // _this.onLoadFinish && _this.onLoadFinish();
         }; // onProbeFinish
@@ -1625,7 +1625,7 @@ class H265webjsModule {
                 let releaseRet = _this.player.release();
                 console.log("releaseRet ===> ", releaseRet);
                 _this.player = null;
-                _this._flvJsPlayer();
+                _this._flvJsPlayer(_this.playParam.durationMs);
             }
             // _this.onLoadFinish && _this.onLoadFinish();
         }; // onProbeFinish
@@ -1952,14 +1952,15 @@ class H265webjsModule {
 
     } // _videoJsPlayer
 
-    _flvJsPlayer() {
+    _flvJsPlayer(durParams=-1) {
         console.log("_flvJsPlayer");
         let _this = this;
         let playerConfig = {
             width: this.configFormat.playerW,
             height: this.configFormat.playerH,
             playerId: this.configFormat.playerId,
             ignoreAudio : this.configFormat.extInfo.ignoreAudio,
+            duration: durParams
         }; // playerConfig
         this.player = new NvFlvJSCore.NvFlvjsCore(playerConfig);
         this.player.onLoadFinish = () => {

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-v20211224');
+require('./h265webjs-v20211231');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);