Merge pull request #143 from girlbymirror/master

hevc/mkv
numberwolf · May 7, 2022 · efb3891 · efb3891
2 parents 85c646a + 7e58735
commit efb3891
Show file tree

Hide file tree

Showing 97 changed files with 1,301 additions and 769 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ example/dist/missile-512mb*
 example/dist/missile-256mb*
 example_normal/dist/missile-512mb*
 example_normal/dist/missile-256mb*
+src/src/decoder/dc-worker*
diff --git a/README.MD b/README.MD
@@ -34,8 +34,8 @@
 | <img src="resource/icon-ts.png" width="100"> | <img src="resource/icon-mpegps.png" width="100"> | <img src="resource/icon-av1.png" width="100"> | <img src="resource/icon-mov-h265.png" width="100">|
 | MPEG-TS(VOD) | MPEG-PS(VOD) | AV1(Chrome) | MOV(H.265) |
 | <br> | <br> | <br> | <br> |
-| <img src="resource/icon-todo.png" width="100"> | <img src="resource/icon-todo.png" width="100"><br> |
-| G711A | HDR10(BT2020) |
+| <img src="resource/icon-hevc.png" width="100"> | <img src="resource/icon-mkv.png" width="100"><br> | <img src="resource/icon-todo.png" width="100"> | <img src="resource/icon-todo.png" width="100"><br> |
+| HTTP-HEVC | MKV(HEVC) | G711A | HDR10(BT2020) |
 
 </font>
 </strong>
@@ -178,6 +178,7 @@
 | ---- | ---- |  ----  | ---- |
 | mp4 | 点播 |  是  | ---- |
 | mov | 点播 |  是  | HEVC/H.265 |
+| mkv | 点播 |  是  | HEVC/H.265 |
 | av1 | 点播 |  是  | Chrome |
 | mpeg-ts | 点播 |  是  | ---- |
 | mpeg-ps | 点播 |  是  | ---- |
@@ -405,7 +406,6 @@ var config = {
 
 		```javascript
 		let config = {
-		    type: "raw265",
 		    player: "glplayer",
 		    width: 960,
 		    height: 540,
@@ -456,7 +456,8 @@ var config = {
 		let player = H265webjsModule.createPlayer(videoURL, config);
 		```
 
-		* 3. 如果创建的是`raw265`类型的裸流数据播放 请注意
+		* 3. 如果创建的是`raw265`类型的Websocket等直播裸流数据播放 请注意
+			(普通265点播流直接填写url播放就可以，不需要走如下流程)
 			> 这部分fetch请求网络数据以及异步喂数据的过程 请自行改写,下面给出的仅仅是一个demo,网络IO和解析265流为帧数据会非常耗时。
 			>   
 			> 如果你可以通过websocket直接一帧一帧传输的话，那么只需要调用喂265数据的函数即可。
@@ -981,6 +982,10 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \
 
 | 更新日志 | 内容 |
 | ---- | ---- |
+| 时间 | 2022/05/07 |
+| - | 0.点播内核错误优化 |
+| - | 1.265裸流点播流程优化，只需要填写url和rawFps即可播放 |
+| - | 2.支持MKV格式 |
 | 时间 | 2022/04/21 |
 | - | 0.播放器内核性能优化 |
 | 时间 | 2022/04/17 |

diff --git a/README_EN.MD b/README_EN.MD
@@ -35,8 +35,8 @@ A hevc/h.265 web player, easy to play 1080P. `~^_^~ For love` if <a href="https:
 | <img src="resource/icon-ts.png" width="100"> | <img src="resource/icon-mpegps.png" width="100"> | <img src="resource/icon-av1.png" width="100"> | <img src="resource/icon-mov-h265.png" width="100">|
 | MPEG-TS(VOD) | MPEG-PS(VOD) | AV1(Chrome) | MOV(H.265) |
 | <br> | <br> | <br> | <br> |
-| <img src="resource/icon-todo.png" width="100"> | <img src="resource/icon-todo.png" width="100"><br> |
-| G711A | HDR10(BT2020) |
+| <img src="resource/icon-hevc.png" width="100"> | <img src="resource/icon-mkv.png" width="100"><br> | <img src="resource/icon-todo.png" width="100"> | <img src="resource/icon-todo.png" width="100"><br> |
+| HTTP-HEVC | MKV(HEVC) | G711A | HDR10(BT2020) |
 
 </font>
 </strong>
@@ -177,6 +177,7 @@ Notice：
 | ---- | ---- |  ----  | ---- |
 | mp4 | Video on demand |  Y  | ---- |
 | mov | Video on demand |  Y  | HEVC/H.265 |
+| mkv | Video on demand |  Y  | HEVC/H.265 |
 | av1 | Video on demand |  Y  | Chrome |
 | mpeg-ts | Video on demand |  Y  | ---- |
 | mpeg-ps | Video on demand |  Y  | ---- |
@@ -400,7 +401,6 @@ let config = {
 		```javascript
 		let videoURL = "demo/res/raw.h265";
 		let config = {
-		    type: "raw265",
 		    player: "glplayer",
 		    width: 960,
 		    height: 540,
@@ -456,6 +456,7 @@ let config = {
 		```
 
 		* 3. NOTICE! If you want to create `raw265` stream player
+			(Do not need execute with this step when you play 265 vod stream)
 
 			* `raw265` type，feed byte data
 
@@ -966,6 +967,10 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \
 
 | Update | Content |
 | ---- | ---- |
+| Time | 2022/05/07 |
+| - | 0.Fixed:MP4(VOD) retry error |
+| - | 1.Support:HEVC raw stream(VOD), create with url |
+| - | 2.Support:MKV format |
 | Time | 2022/04/21 |
 | - | 0.Performance optimizing |
 | Time | 2022/04/17 |

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

diff --git a/dist/missile-120func-v20220421.js b/dist/missile-120func-v20220421.js
diff --git a/dist/missile-120func-v20220507.js b/dist/missile-120func-v20220507.js
diff --git a/example/dist/missile-120func-v20220421.wasm → dist/missile-120func-v20220507.wasm b/example/dist/missile-120func-v20220421.wasm → dist/missile-120func-v20220507.wasm
diff --git a/dist/missile-120func.js b/dist/missile-120func.js
diff --git a/dist/missile-256mb-v20220421.js b/dist/missile-256mb-v20220421.js
diff --git a/dist/missile-256mb-v20220507.js b/dist/missile-256mb-v20220507.js
diff --git a/src/src/decoder/missile-256mb-v20220421.wasm → dist/missile-256mb-v20220507.wasm b/src/src/decoder/missile-256mb-v20220421.wasm → dist/missile-256mb-v20220507.wasm
diff --git a/dist/missile-256mb.js b/dist/missile-256mb.js
diff --git a/dist/missile-512mb-v20220421.js b/dist/missile-512mb-v20220421.js
diff --git a/dist/missile-512mb-v20220507.js b/dist/missile-512mb-v20220507.js
diff --git a/dist/missile-512mb-v20220421.wasm → dist/missile-512mb-v20220507.wasm b/dist/missile-512mb-v20220421.wasm → dist/missile-512mb-v20220507.wasm
diff --git a/dist/missile-512mb.js b/dist/missile-512mb.js
diff --git a/dist/missile-v20220421.js b/dist/missile-v20220421.js
diff --git a/dist/missile-v20220421.wasm b/dist/missile-v20220421.wasm
diff --git a/dist/missile-v20220507.js b/dist/missile-v20220507.js
diff --git a/dist/missile-v20220507.wasm b/dist/missile-v20220507.wasm
diff --git a/dist/missile.js b/dist/missile.js
diff --git a/example/dist/dist-play.js b/example/dist/dist-play.js
diff --git a/example/dist/h265webjs-v20220422.js → example/dist/h265webjs-v20220507.js b/example/dist/h265webjs-v20220422.js → example/dist/h265webjs-v20220507.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-v20220422');
+require('./h265webjs-v20220507');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/example/dist/missile-120func-v20220421.js b/example/dist/missile-120func-v20220421.js
diff --git a/example/dist/missile-120func-v20220507.js b/example/dist/missile-120func-v20220507.js
diff --git a/...ormal/dist/missile-120func-v20220421.wasm → example/dist/missile-120func-v20220507.wasm b/...ormal/dist/missile-120func-v20220421.wasm → example/dist/missile-120func-v20220507.wasm
diff --git a/example/dist/missile-120func.js b/example/dist/missile-120func.js
diff --git a/example/dist/missile-v20220421.js b/example/dist/missile-v20220421.js
diff --git a/example/dist/missile-v20220421.wasm b/example/dist/missile-v20220421.wasm
diff --git a/example/dist/missile-v20220507.js b/example/dist/missile-v20220507.js
diff --git a/example/dist/missile-v20220507.wasm b/example/dist/missile-v20220507.wasm
diff --git a/example/dist/missile.js b/example/dist/missile.js
diff --git a/example/index.html b/example/index.html
@@ -34,7 +34,7 @@
     <link rel="stylesheet" type="text/css" href='player-view/css/index.css'>
     <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-v20220421.js"></script> <!-- IMPORTANT -->
+    <script src="dist/missile.js"></script> <!-- IMPORTANT -->
     <script src='dist/dist-play.js'></script>
     <style>
     </style>

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

diff --git a/example_normal/dist/missile-120func-v20220421.js b/example_normal/dist/missile-120func-v20220421.js
diff --git a/example_normal/dist/missile-120func-v20220507.js b/example_normal/dist/missile-120func-v20220507.js
diff --git a/dist/missile-120func-v20220421.wasm → ...ormal/dist/missile-120func-v20220507.wasm b/dist/missile-120func-v20220421.wasm → ...ormal/dist/missile-120func-v20220507.wasm
diff --git a/example_normal/dist/missile-120func.js b/example_normal/dist/missile-120func.js
diff --git a/example_normal/dist/missile-v20220421.js b/example_normal/dist/missile-v20220421.js
diff --git a/example_normal/dist/missile-v20220421.wasm b/example_normal/dist/missile-v20220421.wasm
diff --git a/example_normal/dist/missile-v20220507.js b/example_normal/dist/missile-v20220507.js
diff --git a/example_normal/dist/missile-v20220507.wasm b/example_normal/dist/missile-v20220507.wasm
diff --git a/example_normal/dist/missile.js b/example_normal/dist/missile.js
diff --git a/example_normal/index.html b/example_normal/index.html
@@ -34,9 +34,9 @@
     <link rel="stylesheet" type="text/css" href='player-view/css/index.css'>
     <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-v20220421.js"></script> <!-- IMPORTANT -->
+    <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-v20220422.js"></script> <!-- IMPORTANT --> 
+    <script src="dist/h265webjs-v20220507.js"></script> <!-- IMPORTANT --> 
     <script src="example.js"></script> <!-- IMPORTANT -->
     <style>
     </style>

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

diff --git a/example_vue/public/dist/missile-120func-v20220507.js b/example_vue/public/dist/missile-120func-v20220507.js
diff --git a/...rc/decoder/missile-120func-v20220421.wasm → ...ublic/dist/missile-120func-v20220507.wasm b/...rc/decoder/missile-120func-v20220421.wasm → ...ublic/dist/missile-120func-v20220507.wasm
diff --git a/example_vue/public/dist/missile-120func.js b/example_vue/public/dist/missile-120func.js
diff --git a/example_vue/public/dist/missile-256mb-v20220507.js b/example_vue/public/dist/missile-256mb-v20220507.js
diff --git a/dist/missile-256mb-v20220421.wasm → .../public/dist/missile-256mb-v20220507.wasm b/dist/missile-256mb-v20220421.wasm → .../public/dist/missile-256mb-v20220507.wasm
diff --git a/example_vue/public/dist/missile-256mb.js b/example_vue/public/dist/missile-256mb.js
diff --git a/example_vue/public/dist/missile-512mb-v20220507.js b/example_vue/public/dist/missile-512mb-v20220507.js
diff --git a/example_vue/public/dist/missile-512mb-v20220507.wasm b/example_vue/public/dist/missile-512mb-v20220507.wasm
diff --git a/example_vue/public/dist/missile-512mb.js b/example_vue/public/dist/missile-512mb.js
diff --git a/example_vue/public/dist/missile-v20220421.js b/example_vue/public/dist/missile-v20220421.js
diff --git a/example_vue/public/dist/missile-v20220421.wasm b/example_vue/public/dist/missile-v20220421.wasm
diff --git a/example_vue/public/dist/missile-v20220507.js b/example_vue/public/dist/missile-v20220507.js
diff --git a/example_vue/public/dist/missile-v20220507.wasm b/example_vue/public/dist/missile-v20220507.wasm
diff --git a/example_vue/public/dist/missile.js b/example_vue/public/dist/missile.js
diff --git a/example_vue/public/index.html b/example_vue/public/index.html
@@ -16,7 +16,7 @@
       >
     </noscript>
 
-    <script src="/dist/missile-v20220421.js"></script>
+    <script src="/dist/missile.js"></script>
     <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>

diff --git a/index-debug.html b/index-debug.html
@@ -31,9 +31,9 @@
     <meta charset="utf-8" name="email" content="[email protected]">
     <meta charset="utf-8" name="discord" content="numberwolf#8694">
     <meta charset="utf-8" name="github" content="https://github.com/numberwolf/h265web.js">
-    <script src="dist/missile-v20220421.js"></script> <!-- IMPORTANT -->
+    <script src="dist/missile.js"></script> <!-- IMPORTANT -->
     <!--<script src="dist/missile-120func-v20220117.js"></script>--> <!-- IMPORTANT -->
-    <script src="dist/h265webjs-v20220422.js"></script> <!-- IMPORTANT -->
+    <script src="dist/h265webjs-v20220507.js"></script> <!-- IMPORTANT -->
     <style>
     </style>
 </head>

diff --git a/resource/icon-hevc.png b/resource/icon-hevc.png
diff --git a/resource/icon-mkv.png b/resource/icon-mkv.png
diff --git a/src/build.sh b/src/build.sh
@@ -26,6 +26,43 @@ source ./version.sh
     "start": "cp src/decoder/missile* ./dist/ && cp src/demuxer/missile* ./dist/ && cp -r src/assets dist && browserify src/h265webjs.js -o ./dist/h265webjs_tmp.js && terser ./dist/h265webjs_tmp.js -c pure_funcs=[],toplevel=true -m -o ./dist/h265webjs.js && rm ./dist/h265webjs_tmp.js && cp -r ./dist/* ./demo/dist/ && browserify play.js -o ./dist/play.js && node server.js",
 !
 
+# # REMOVE_FUNCS='"console.log","console.warn","alert"'
+# # REMOVE_FUNCS='"alert"'
+# REMOVE_FUNCS='"console.warn","alert"'
+# # REMOVE_FUNCS='"console.log","alert"'
+# # REMOVE_FUNCS=''
+
+# rm ./dist/*.js
+# rm ./dist/*.wasm
+
+# cmd[0]="cp src/decoder/missile* ./dist/"
+# # cmd[1]="cp src/demuxer/missile* ./dist/"
+# cmd[1]="cp -r src/assets dist"
+# cmd[2]="browserify src/h265webjs.js -o ./dist/h265webjs_tmp.js"
+# cmd[3]="terser ./dist/h265webjs_tmp.js -c pure_funcs=[${REMOVE_FUNCS}],toplevel=true -m -o ./dist/h265webjs-${VERSION}.js"
+# cmd[4]="cp -r src/index.js dist/"
+# cmd[5]="rm ./dist/h265webjs_tmp.js"
+# cmd[6]="cp -r ./dist/* ./demo/dist/"
+# cmd[7]="cp ./src/decoder/raw-parser.js ./dist/" # extension module
+
+# cmd[8]="browserify worker-fetch.js -o ./dist/worker-fetch-dist.js"
+# cmd[9]="browserify worker-parse.js -o ./dist/worker-parse-dist.js"
+
+# cmd[10]="cat src/decoder/missile.js src/decoder/dc-worker.js > ./dist/dc-worker-dist.tmp.js"
+# cmd[11]="terser ./dist/dc-worker-dist.tmp.js -c pure_funcs=[${REMOVE_FUNCS}],toplevel=true -m -o ./dist/dc-worker-dist.js"
+
+# cmd[12]="browserify play.js -o ./dist/dist-play.js"
+# # cmd[9]="cp raw-worker.js ./dist/raw-worker.js"
+# # cmd[10]="cp parse-worker.js ./dist/parse-worker.js"
+
+
+# cmdLen=${#cmd[@]}
+
+# for ((i=0; i<$cmdLen; i++)); do
+# 	echo ${cmd[$i]}
+# 	${cmd[$i]}
+# done
+
 REMOVE_FUNCS='"console.log","console.warn","alert"'
 # REMOVE_FUNCS='"alert"'
 # REMOVE_FUNCS='"console.warn","alert"'
@@ -35,31 +72,23 @@ REMOVE_FUNCS='"console.log","console.warn","alert"'
 rm ./dist/*.js
 rm ./dist/*.wasm
 
-cmd[0]="cp src/decoder/missile* ./dist/"
-# cmd[1]="cp src/demuxer/missile* ./dist/"
-cmd[1]="cp -r src/assets dist"
-cmd[2]="browserify src/h265webjs.js -o ./dist/h265webjs_tmp.js"
-cmd[3]="terser ./dist/h265webjs_tmp.js -c pure_funcs=[${REMOVE_FUNCS}],toplevel=true -m -o ./dist/h265webjs-${VERSION}.js"
-cmd[4]="cp -r src/index.js dist/"
-cmd[5]="rm ./dist/h265webjs_tmp.js"
-cmd[6]="cp -r ./dist/* ./demo/dist/"
-cmd[7]="cp ./src/decoder/raw-parser.js ./dist/" # extension module
-
-cmd[8]="browserify worker-fetch.js -o ./dist/worker-fetch-dist.js"
-cmd[9]="browserify worker-parse.js -o ./dist/worker-parse-dist.js"
-
-cmd[10]="browserify play.js -o ./dist/dist-play.js"
-# cmd[9]="cp raw-worker.js ./dist/raw-worker.js"
-# cmd[10]="cp parse-worker.js ./dist/parse-worker.js"
-
+cp src/decoder/missile* ./dist/
+# cmd[1]="cp src/demuxer/missile* ./dist/
+cp -r src/assets dist
+browserify src/h265webjs.js -o ./dist/h265webjs_tmp.js
+terser ./dist/h265webjs_tmp.js -c pure_funcs=[${REMOVE_FUNCS}],toplevel=true -m -o ./dist/h265webjs-${VERSION}.js
+cp -r src/index.js dist/
+rm ./dist/h265webjs_tmp.js
+cp -r ./dist/* ./demo/dist/
+cp ./src/decoder/raw-parser.js ./dist/ # extension module
 
-cmdLen=${#cmd[@]}
+browserify worker-fetch.js -o ./dist/worker-fetch-dist.js
+browserify worker-parse.js -o ./dist/worker-parse-dist.js
 
-for ((i=0; i<$cmdLen; i++)); do
-	echo ${cmd[$i]}
-	${cmd[$i]}
-done
+cat src/decoder/missile.js src/decoder/dc-worker.js > ./dist/dc-worker-dist.tmp.js
+terser ./dist/dc-worker-dist.tmp.js -c pure_funcs=[${REMOVE_FUNCS}],toplevel=true -m -o ./dist/dc-worker-dist.js
 
+browserify play.js -o ./dist/dist-play.js