开个会半天扯皮

numberwolf · Jul 12, 2022 · 6971df6 · 6971df6
1 parent feef3a4
commit 6971df6
Show file tree

Hide file tree

Showing 16 changed files with 190 additions and 186 deletions.
diff --git a/README_EN.MD b/README_EN.MD
@@ -955,6 +955,8 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \
 
 | Update | Content |
 | ---- | ---- |
+| Time | 2022/07/12 |
+| - | 0.Fixed some problem |
 | Time | 2022/07/06-10 |
 | - | 0.Support g711u (http-flv) |
 | - | 1.Fixed: HTTP-FLV(AVC) without Audio |

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

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

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

diff --git a/example_normal/dist/h265webjs-v20220706.js → example_normal/dist/h265webjs-v20220712.js b/example_normal/dist/h265webjs-v20220706.js → example_normal/dist/h265webjs-v20220712.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-v20220706');
+require('./h265webjs-v20220712');
 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-v20220706.js"></script>
+    <script src="dist/h265webjs-v20220712.js"></script>
     <script src="index.js"></script>
 
 </head>

diff --git a/example_vue/public/dist/h265webjs-v20220706.js b/example_vue/public/dist/h265webjs-v20220706.js
diff --git a/example_vue/public/dist/h265webjs-v20220712.js b/example_vue/public/dist/h265webjs-v20220712.js
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-v20220706.js"></script> <!-- IMPORTANT -->
+    <script src="dist/h265webjs-v20220712.js"></script> <!-- IMPORTANT -->
 
     <!--<script src="dist-multi-thread/missile-multi-thread.js"></script>
-    <script src="dist-multi-thread/h265webjs-v20220706.js"></script>-->
+    <script src="dist-multi-thread/h265webjs-v20220712.js"></script>-->
 
     <style>
     </style>

diff --git a/src/src/decoder/c-httplive-core.js b/src/src/decoder/c-httplive-core.js
@@ -74,10 +74,10 @@ const V_CACHE_INTERVAL_PUSH_LOOP_MS = 1;
 // }
 
 class CHttpLiveCoreModule { // export default 
-	constructor(config) {
+    constructor(config) {
         let _this = this;
-		this.config = {
-			width: config.width || def.DEFAULT_WIDTH,
+        this.config = {
+            width: config.width || def.DEFAULT_WIDTH,
             height: config.height || def.DEFAULT_HEIGHT,
             fps: config.fps || def.DEFAULT_FPS,
             sampleRate: config.sampleRate || def.DEFAULT_SAMPLERATE,
@@ -761,7 +761,7 @@ class CHttpLiveCoreModule { // export default
     }
 
     setVoice(voice) {
-        if (this.ignoreAudio < 1) {
+        if (this.config.ignoreAudio < 1) {
             this.audioVoice = voice;
             this.audioWAudio && this.audioWAudio.setVoice(voice);
         }
@@ -835,7 +835,9 @@ class CHttpLiveCoreModule { // export default
     }
 
     pause() {
-        if (this.ignoreAudio < 1) {
+        console.log("audio pause prepare:", this.config.ignoreAudio, this.audioWAudio);
+        if (this.config.ignoreAudio < 1) {
+            console.log("audio pause start");
             this.audioWAudio && this.audioWAudio.pause();
         }
         this.playInterval && clearInterval(this.playInterval);

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

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