Skip to content

Commit

Permalink
Merge pull request #195 from girlbymirror/master
Browse files Browse the repository at this point in the history
Support Hard-Decode
  • Loading branch information
girlbymirror authored Oct 23, 2022
2 parents dd7b5d9 + eb66784 commit e72bdca
Show file tree
Hide file tree
Showing 204 changed files with 213,598 additions and 2,215 deletions.
12 changes: 7 additions & 5 deletions README.MD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# h265web.js
# h265web.js - 适配浏览器HEVC硬解码

<a href="README.MD">中文</a> | <a href="README_EN.MD">English</a>

Expand Down Expand Up @@ -28,8 +28,9 @@
| <br> | <br> | <br> | <br> | <br> | <br> | <br> | <br> |
| <img width="100" alt="山东呢沃尔德workd-group cn" src="https://user-images.githubusercontent.com/101395606/175974059-c9a7cff5-ca8a-4540-8b3f-f559e5b867fb.png"> | <img width="100" alt="上海联通" src="https://user-images.githubusercontent.com/101395606/175974083-cdb98f54-d2a6-42e1-9129-d2934608f887.png"> | <img width="100" alt="西安思华www sihua tech" src="https://user-images.githubusercontent.com/101395606/175974092-90bc48c4-2874-417e-a7b5-2ded8e06c29c.png"> | <br> | <br> | <br> | <br> | <br> |
| 山东呢尔德 | 上海联通 | 西安思华 | <br> | <br> | <br> | <br> | <br> |
</strong>
</font>

</strong>
</font>

<hr>
<h3>能力矩阵</h3>
Expand All @@ -54,8 +55,8 @@
| <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-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 | - |
| <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"> | <img src="resource/icon-hdecode.png" width="100"> |
| MediaInfo | HEVC/H.265 | AVC/H.264 | Hardware decoder<br>硬解码<br>(FLV/HTTP-FLV/MP4) |

</font>
</strong>
Expand Down Expand Up @@ -109,6 +110,7 @@

| 能力 | 是否支持 | 其他 |
| ---- | ---- | ---- |
| 硬解码 || 适配Chrome/Safari等 |
| 直播 || ---- |
| 点播 || ---- |
| Seek跳转 || ---- |
Expand Down
13 changes: 9 additions & 4 deletions README_EN.MD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# h265web.js - Will support HDR10!
# h265web.js - Support Hard-Decode

<a href="README.MD">中文</a> | <a href="README_EN.MD">English</a>

Expand Down Expand Up @@ -41,8 +41,9 @@ A hevc/h.265 web player, easy to play 1080P. `~^_^~ For love` if <a href="https:
| <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-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 | - |
| <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"> | <img src="resource/icon-hdecode.png" width="100"> |
| MediaInfo | HEVC/H.265 | AVC/H.264 | Hardware decoder<br>(FLV/HTTP-FLV/MP4) |


</font>
</strong>
Expand Down Expand Up @@ -225,6 +226,7 @@ Notice:

| Feature | Support | Desc |
| ---- | ---- | ---- |
| Hardware-Decode | Y | For Chrome/Safari etc... |
| Video on demand | Y | ---- |
| Live | Y | ---- |
| Seek | Y | ---- |
Expand Down Expand Up @@ -960,7 +962,7 @@ ffmpeg -i input.mp4 \
-vcodec libx265 -pix_fmt \
-acodec aac -ac 2 -ar 44100 \
-preset medium -maxrate 1000k -bufsize 1000k \
-vtag hev1 \
-vtag hvc1 \
-movflags faststart \
-y video.mp4
```
Expand Down Expand Up @@ -998,6 +1000,9 @@ ffmpeg -ss 20 -t 10 -i ./res/xinxiaomen.mp4 \

| Update | Content |
| ---- | ---- |
| Time | 2022/10/22 |
| - | 0.Support: Hard-Decode for FLV/HTTP-FLV/MP4 |
| - | 1.Support: AVC with Mpeg-TS |
| Time | 2022/09/13 |
| - | 0.Fixed: AVC stream loop buffer error without autoplay |
| Time | 2022/09/12 |
Expand Down
Loading

0 comments on commit e72bdca

Please sign in to comment.