fixed:httpflv/ws ignoreAudio problem

numberwolf · Nov 25, 2021 · 6b7167d · 6b7167d
1 parent 8930940
commit 6b7167d
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 22 deletions.
diff --git a/README.MD b/README.MD
@@ -915,6 +915,8 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \
 
 | 更新日志 | 内容 |
 | ---- | ---- |
+| 时间 | 2021/11/25 - 夜 |
+| - | 0.修复 httpflv/ws直播 ignoreAudio配置失效问题 |
 | 时间 | 2021/11/23 - 夜 |
 | - | 0.修复 https://github.com/numberwolf/h265web.js/issues/90 |
 | 时间 | 2021/11/21 - 凌晨 |

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/11/25 - Night |
+| - | 0.Fixed httpflv/ws LIVE ignoreAudio problem |
 | Time | 2021/11/23 - Night |
 | - | 0.Fixed https://github.com/numberwolf/h265web.js/issues/90 |
 | Time | 2021/11/21 - In the small hours |

diff --git a/dist/h265webjs-v20211123.js → dist/h265webjs-v20211125.js b/dist/h265webjs-v20211123.js → dist/h265webjs-v20211125.js
diff --git a/dist/index.js b/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20211123');
+require('./h265webjs-v20211125');
 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-v20211123.js → example/dist/h265webjs-v20211125.js b/example/dist/h265webjs-v20211123.js → example/dist/h265webjs-v20211125.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-v20211123');
+require('./h265webjs-v20211125');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/example_normal/dist/h265webjs-v20211123.js → example_normal/dist/h265webjs-v20211125.js b/example_normal/dist/h265webjs-v20211123.js → example_normal/dist/h265webjs-v20211125.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-v20211123');
+require('./h265webjs-v20211125');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/example_normal/example.js b/example_normal/example.js
@@ -77,7 +77,7 @@ window.onload = function() {
     // var url = "ws://127.0.0.1/live/test.live.ts";
 
     /******** HTTP FLV/TS/HLS ********/
-    // var url = "http://127.0.0.1/live/test.flv";
+    var url = "http://127.0.0.1/live/test.flv";
     // var url = "http://127.0.0.1/live/test.live.ts";
     // var url = "http://127.0.0.1/live/test/hls.m3u8";
     var config = {
@@ -87,7 +87,8 @@ window.onload = function() {
         token : token,
         extInfo : {
             coreProbePart : 0.4,
-            probeSize : 8192
+            probeSize : 8192,
+            ignoreAudio : 0
         }
     }; // config
     let playerId        = config.player;

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-v20211123.js"></script> <!-- IMPORTANT -->
+    <script src="dist/h265webjs-v20211125.js"></script> <!-- IMPORTANT -->
     <script src="example.js"></script> <!-- IMPORTANT -->
     <style>
     </style>

diff --git a/src/src/decoder/c-httplive-core.js b/src/src/decoder/c-httplive-core.js
@@ -80,9 +80,10 @@ class CHttpLiveCoreModule { // export default
             playerId: config.playerId || def.DEFAILT_WEBGL_PLAY_ID,
             token: config.token || null,
             probeSize: config.probeSize || 4096,
+            ignoreAudio : config.ignoreAudio || 0
         }; // end this.config
 
-        alert("this.config.probeSize" + this.config.probeSize);
+        alert("this.config.probeSize" + this.config.probeSize + " ignoreAudio:" + this.config.ignoreAudio);
 
         this.mediaInfo = {
             noFPS : false,
@@ -340,7 +341,7 @@ class CHttpLiveCoreModule { // export default
             }
         } // end set canvas size
 
-        if (audioIdx >= 0 && this.mediaInfo.noFPS === false) {
+        if (audioIdx >= 0 && this.mediaInfo.noFPS === false && this.config.ignoreAudio < 1) {
             if (undefined !== this.audioWAudio && null !== this.audioWAudio) {
                 this.audioWAudio.stop();
                 this.audioWAudio = null;

diff --git a/src/src/decoder/c-wslive-core.js b/src/src/decoder/c-wslive-core.js
@@ -80,9 +80,10 @@ class CWsLiveCoreModule { // export default
             playerId: config.playerId || def.DEFAILT_WEBGL_PLAY_ID,
             token: config.token || null,
             probeSize: config.probeSize || 4096,
+            ignoreAudio : config.ignoreAudio || 0
         }; // end this.config
 
-        alert("this.config.probeSize" + this.config.probeSize);
+        alert("this.config.probeSize" + this.config.probeSize + " ignoreAudio:" + this.config.ignoreAudio);
 
         this.mediaInfo = {
             noFPS : false,
@@ -340,7 +341,8 @@ class CWsLiveCoreModule { // export default
             }
         } // end set canvas size
 
-        if (audioIdx >= 0 && this.mediaInfo.noFPS === false) {
+        if (audioIdx >= 0 && this.mediaInfo.noFPS === false && this.config.ignoreAudio < 1) 
+        {
             if (undefined !== this.audioWAudio && null !== this.audioWAudio) {
                 this.audioWAudio.stop();
                 this.audioWAudio = null;

diff --git a/src/src/decoder/missile-256mb.js b/src/src/decoder/missile-256mb.js
diff --git a/src/src/decoder/missile-512mb.js b/src/src/decoder/missile-512mb.js
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-v20211123');
+require('./h265webjs-v20211125');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/src/version.sh b/src/version.sh
@@ -19,4 +19,4 @@
 #  * Github: https://github.com/numberwolf/h265web.js
 #  * 
 #  **********************************************************/
-VERSION='v20211123' # output version + index.js
+VERSION='v20211125' # output version + index.js