Merge pull request #162 from girlbymirror/master

日料就是不停压榨客人的剩余价值
numberwolf · Jul 10, 2022 · f460ff0 · f460ff0
2 parents 60a094c + 85b15c5
commit f460ff0
Show file tree

Hide file tree

Showing 79 changed files with 1,204 additions and 1,184 deletions.
diff --git a/README.MD b/README.MD
@@ -51,11 +51,11 @@
 | <img src="resource/icon-hevc.png" width="100"> | <img src="resource/icon-websockethevc.png" width="100"> | <img src="resource/icon-mkv.png" width="100"><br> | <img src="resource/icon-aac.png" width="100"> |
 | HTTP-HEVC | WS-HEVC | MKV(HEVC) | AAC(MAIN/LC) |
 | <br> | <br> | <br> | <br> |
-| <img src="resource/icon-thread.png" width="100"> | <img src="resource/icon-pcm.png" width="100"> | <img src="resource/icon-hevc-s.png" width="100"> | <img src="resource/icon-avc-s.png" width="100"> |
-| Multi-Thread<br><font color="red">(only:<br>https+nginx conf)</font> | G711A(HTTP-FLV) | HEVC/H.265 | AVC/H.264 |
+| <img src="resource/icon-thread.png" width="100"> | <img src="resource/icon-single-thread.png" width="100"> | <img src="resource/icon-pcm.png" width="100"> | <img src="resource/icon-pcm.png" width="100"> | <img src="resource/icon-mediainfo.png" width="100">  |
+| Multi-Thread<br><font color="red">(only:<br>https+nginx conf)</font> | Single-Thread | G711A(HTTP-FLV) | G711U(HTTP-FLV) |
 | <br> | <br> | <br> | <br> |
-| <img src="resource/icon-single-thread.png" width="100"> | <img src="resource/icon-mediainfo.png" width="100"> | - | - |
-| Single-Thread | MediaInfo | - | - |
+| <img src="resource/icon-mediainfo.png" width="100"> | <img src="resource/icon-hevc-s.png" width="100"> | <img src="resource/icon-avc-s.png" width="100"> | - |
+| MediaInfo | HEVC/H.265 | AVC/H.264 | - |
 
 </font>
 </strong>
@@ -102,6 +102,7 @@
 | HEVC/H.265 |  是  | ---- |
 | AAC |  是  | ---- |
 | G711A |  是  | HTTP-FLV |
+| G711U |  是  | HTTP-FLV |
 | AV1 |  是  | Chrome |
 
 * 能力

diff --git a/README_EN.MD b/README_EN.MD
@@ -38,11 +38,11 @@ A hevc/h.265 web player, easy to play 1080P. `~^_^~ For love` if <a href="https:
 | <img src="resource/icon-hevc.png" width="100"> | <img src="resource/icon-websockethevc.png" width="100"> | <img src="resource/icon-mkv.png" width="100"><br> | <img src="resource/icon-aac.png" width="100"> |
 | HTTP-HEVC | WS-HEVC | MKV(HEVC) | AAC(MAIN/LC) |
 | <br> | <br> | <br> | <br> |
-| <img src="resource/icon-thread.png" width="100"> | <img src="resource/icon-pcm.png" width="100"> | <img src="resource/icon-hevc-s.png" width="100"> | <img src="resource/icon-avc-s.png" width="100"> |
-| Multi-Thread<br><font color="red">(only:<br>https+nginx conf)</font> | G711A(HTTP-FLV) | HEVC/H.265 | AVC/H.264 |
+| <img src="resource/icon-thread.png" width="100"> | <img src="resource/icon-single-thread.png" width="100"> | <img src="resource/icon-pcm.png" width="100"> | <img src="resource/icon-pcm.png" width="100"> | <img src="resource/icon-mediainfo.png" width="100">  |
+| Multi-Thread<br><font color="red">(only:<br>https+nginx conf)</font> | Single-Thread | G711A(HTTP-FLV) | G711U(HTTP-FLV) |
 | <br> | <br> | <br> | <br> |
-| <img src="resource/icon-single-thread.png" width="100"> | <img src="resource/icon-mediainfo.png" width="100"> | - | - |
-| Single-Thread | MediaInfo | - | - |
+| <img src="resource/icon-mediainfo.png" width="100"> | <img src="resource/icon-hevc-s.png" width="100"> | <img src="resource/icon-avc-s.png" width="100"> | - |
+| MediaInfo | HEVC/H.265 | AVC/H.264 | - |
 
 </font>
 </strong>
@@ -211,6 +211,7 @@ Notice：
 | HEVC/H.265 |  Y  | ---- |
 | AAC |  Y  | ---- |
 | G711A |  Y  | HTTP-FLV |
+| G711U |  Y  | HTTP-FLV |
 | AV1 |  Y  | Chrome |
 
 
@@ -954,6 +955,9 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \
 
 | Update | Content |
 | ---- | ---- |
+| Time | 2022/07/06-10 |
+| - | 0.Support g711u (http-flv) |
+| - | 1.Fixed: HTTP-FLV(AVC) without Audio |
 | Time | 2022/07/01 |
 | - | 0.Feature: HTTP-FLV(Without audio) Stream Performance optimizing |
 | Time | 2022/06/27 |

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