external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity
8697 commits 14 branches 107 tags 377 MiB
Commit graph

8697 commits

This branch
This branch
All branches
Author SHA1 Message Date
john
d1bc155c8b
DASH: Fix dash crash bug when writing file. v5.0.108 (#3301) 
Co-authored-by: winlin <winlin@vip.126.com>
 2022-12-13 00:42:46 +08:00
winlin
61d3815fdf Test: Refine cache for cygwin64 test. 2022-12-13 00:30:38 +08:00
winlin
4f8f6ca6f8 Merge v5.0.107 into develop 
* SRT: Support SRT to RTMP to WebRTC. v5.0.107 (#3296)
 2022-12-09 08:09:37 +08:00
winlin
56be854f36 Update README. 2022-12-09 08:04:58 +08:00
john
bbe333d3ca
SRT: Support SRT to RTMP to WebRTC. v5.0.107 (#3296) 
* SRT: Support SRT to RTMP to WebRTC. v5.0.107

Co-authored-by: winlin <winlin@vip.126.com>
 2022-12-09 08:01:12 +08:00
winlin
3049fa70eb Merge branch v5.0.106 into develop 
* Build: Refine cygwin64 test script.
* API: Parse fragment of URI. v5.0.106 (#3295)
 2022-12-08 18:56:53 +08:00
winlin
539f5975d6 Build: Refine cygwin64 test script. 2022-12-08 16:24:27 +08:00
Haibo Chen
c5a0c5947f
API: Parse fragment of URI. v5.0.106 (#3295) 
* parse fragment of uri
* adapt FMLE URL: 'rtmp://ip/app/app2#k=v/stream', then add more test case

Co-authored-by: winlin <winlin@vip.126.com>
 2022-12-08 15:48:10 +08:00
winlin
7ac1475c39 Merge #3271: H265: The codec information is incorrect. v6.0.5 2022-12-04 22:51:45 +08:00
chundonglinlin
a0803b556b
H265: Demux sps for log print and statistic streams.(#3271) (#3286) 
* BitBuffer: add method to implement bit read operation.

* Codec: demux hevc sps for profile level resolution.

* Statistic: refine hevc profile level resolution.

* Kernel: return error code for demux hevc.

* Kernel: check bitstream length for hevc sps.

* UTest: add BitBuffer read bits utest.

* Kernel: refine print log and utest.

* Kernel: add comment for hevc sps.

Co-authored-by: winlin <winlin@vip.126.com>
 2022-12-04 22:46:14 +08:00
winlin
e6c395e473 Merge branch v5.0.105 into develop. 
* v5.0, 2022-12-04, Cygwin: Enable gb28181 for Windows. v5.0.105
* v5.0, 2022-12-04, Asan: Set asan loging callback. v5.0.104
 2022-12-04 22:39:30 +08:00
winlin
0e550d496b Cygwin: Enable gb28181 for Windows. v5.0.105 2022-12-04 22:34:36 +08:00
chengh
8be4c8e334 Asan: Set asan loging callback. v5.0.104 2022-12-04 22:24:37 +08:00
winlin
5999e446de Merge branch v5.0.103 into develop 
1. GB28181: Enable GB for CentOS 7 package. v5.0.103
2. Package script support extra options. v5.0.102
3. Disable CLS and APM by default. v5.0.101
 2022-12-03 21:15:22 +08:00
winlin
41769308d2 GB28181: Enable GB for CentOS 7 package. v5.0.103 2022-12-03 18:56:55 +08:00
winlin
4b5ae7b3d2 Package script support extra options. v5.0.102 2022-12-03 18:56:21 +08:00
winlin
e86e0c8999 Disable CLS and APM by default. v5.0.101 2022-12-03 18:35:41 +08:00
winlin
fa177679a6 Merge 5.0.100, v5.0-a1 into develop. 2022-12-01 23:13:56 +08:00
winlin
8adb1693cc Release v5.0-a1, 5.0 alpha1, v5.0.100, 160817 lines. 2022-12-01 23:10:21 +08:00
mapengfei53
c7b7921712
Config: Add utest for configuring with ENV variables. v5.0.100 (#3284) 
* Config: Add utest for configuring with ENV variables.

Co-authored-by: pengfei.ma <pengfei.ma@ctechm.com>
Co-authored-by: winlin <winlin@vip.126.com>
 2022-12-01 23:03:50 +08:00
stone
a4d9e45545
Live: Fix bug for gop cache limits. v5.0.99 (#3289) 
* bugfix: setting srt bridge to rtmp gop cache limit while SrsMpegtsSrtConn::acquire_publish 

* setting http_stream gop cache limit while SrsHttpStreamServer::hijack

* if gop_cache_max_frames_ == 0, don't enable the got cache max frames limit

Co-authored-by: winlin <winlin@vip.126.com>
 2022-12-01 22:07:11 +08:00
Winlin
e83fc2388b
Docker: Remove CentOS 6 support. (#3287) 
1. Remove CentOS 6 for test and utest.
2. Statically build FFmpeg, no so depends.
 2022-12-01 21:32:08 +08:00
winlin
79d096ae91 Merge branch 5.0.98 into develop 
1. Release v5.0-a0, 5.0 alpha0, v5.0.98, 159813 lines.
 2022-11-25 16:46:26 +08:00
winlin
aa5496aa69 Release v5.0-a0, 5.0 alpha0, v5.0.98, 159813 lines. 2022-11-25 13:41:38 +08:00
winlin
152099b734 Merge branch v5.0.98 into develop. 
1. Config: Add ENV tips for config. 5.0.97
2. SRT: Support transform tlpkdrop to tlpktdrop. 5.0.98
 2022-11-25 11:36:45 +08:00
Winlin
5cadfff2e5
SRT: Support transform tlpkdrop to tlpktdrop. 5.0.98 (#3279) 2022-11-25 11:28:49 +08:00
Winlin
fdbfe59784
Config: Add ENV tips for config. 5.0.97 (#3278) 2022-11-25 10:46:09 +08:00
winlin
9b7db9aa68 DASH: Update README for MPEG-DASH. 2022-11-24 18:45:52 +08:00
winlin
0dd4dae59b Merge 5.0release 2022-11-24 18:14:52 +08:00
john
d927996890 DASH: Fix number mode bug to make it run. v5.0.96 (#3240) 
* Add utc time utility
* Fix calculate duration in fmp4
* Refine dash code, use segment template timeline
* Shrink m4s file and cleanup
* Support play by dash.js
* Use SegmentTemplate timeline mode with $Number$

Co-authored-by: winlin <winlin@vip.126.com>
 2022-11-24 18:13:49 +08:00
john
271afbbf82
DASH: Fix number mode bug to make it run. v5.0.96 (#3240) 
* Add utc time utility
* Fix calculate duration in fmp4
* Refine dash code, use segment template timeline
* Shrink m4s file and cleanup
* Support play by dash.js
* Use SegmentTemplate timeline mode with $Number$

Co-authored-by: winlin <winlin@vip.126.com>
 2022-11-24 18:09:50 +08:00
Winlin
e6ccd8ec9a For #3176: GB28181: Error and logging for HEVC. v5.0.95 (#3276) 
1. Parse video codec from PSM packet.
2. Return error and logging if HEVC packet.
3. Ignore invalid AVC NALUs, drop AVC AUD and SEI.
4. Disconnect TCP connection if HEVC.
 2022-11-24 09:04:15 +08:00
Winlin
af192d6184
For #3176: GB28181: Error and logging for HEVC. v5.0.95 (#3276) 
1. Parse video codec from PSM packet.
2. Return error and logging if HEVC packet.
3. Ignore invalid AVC NALUs, drop AVC AUD and SEI.
4. Disconnect TCP connection if HEVC.
 2022-11-24 09:01:01 +08:00
winlin
56bf2a421f Merge 5.0release 2022-11-23 18:53:52 +08:00
winlin
237d60a55d Coverage: Refine the codecov link. 2022-11-23 18:30:47 +08:00
winlin
e17f2fc675 Config: Add hevc.ts.conf for HEVC over HTTP-TS. 2022-11-23 17:24:03 +08:00
Winlin
70d5618979
H265: Support HEVC over HTTP-TS. v6.0.4 (#3275) 
1. Update TS video codec to HEVC during streaming.
2. Return error when HEVC is disabled.
3. Parse HEVC NALU type by SrsHevcNaluTypeParse.
4. Show message when codec change for TS.

Co-authored-by: runner365 <shi.weibd@hotmail.com>
 2022-11-23 17:05:21 +08:00
winlin
8debbe6db8 Asan: Fix utest bug. 2022-11-23 16:51:09 +08:00
winlin
f10412d289 Asan: Fix utest bug. 2022-11-23 16:46:57 +08:00
Winlin
f316e9a0de
H265: Support parse multiple NALUs in a frame. v6.0.3 (#3274) 
1. Fix parsing multiple NALUs bug.
2. Eliminate duplicated code for parsing NALU.
3. Return error when HEVC not enabled.
 2022-11-23 12:13:53 +08:00
winlin
02d47c5c21 Docs: Update features with version. 2022-11-23 11:56:37 +08:00
Winlin
96b4918c25 For #3236: Live: Change gop cache limits to 2500. v5.0.94 (#3273) 2022-11-23 09:52:27 +08:00
Winlin
13918ed81f
For #3236: Live: Change gop cache limits to 2500. v5.0.94 (#3273) 2022-11-23 09:50:19 +08:00
Winlin
178e40a5fc
H265: Support HEVC over RTMP or HTTP-FLV. (#3272) 
1. Support configure with --h265=on.
2. Parse HEVC(H.265) from FLV or RTMP packet.
3. Support HEVC over RTMP or HTTP-FLV.

Co-authored-by: runner365 <shi.weibd@hotmail.com>
 2022-11-23 08:34:13 +08:00
Winlin
7e02d972ea
H265: Update mpegts.js to play HEVC over HTTP-TS/FLV. v6.0.1 (#3268) 
1. Update mpegts.js to support HEVC over HTTP-TS.
2. Merge https://github.com/xqq/mpegts.js/pull/68 for HEVC over HTTP-FLV.
 2022-11-22 22:23:14 +08:00
Winlin
4b3fe68973
Init SRS 6. v6.0.0 (#3269) 2022-11-22 22:20:19 +08:00
winlin
0b955b4166 Update README for SRS 6.0 2022-11-22 12:49:19 +08:00
winlin
d2a526ae6a Develop is SRS 6.0 now. 
This reverts commit daa7fd2247.
 2022-11-22 12:44:49 +08:00
winlin
daa7fd2247 Create 5.0release branch, features freezed. 2022-11-22 12:41:57 +08:00
stone
ec76512e42
Live: Limit cached max frames by gop_cache_max_frames (#3236) 
* add gop_cache_max_frames

* Live: Limit cached max frames by gop_cache_max_frames. v5.0.93

Co-authored-by: wanglei <wanglei@unicloud.com>
Co-authored-by: winlin <winlin@vip.126.com>
 2022-11-22 12:31:45 +08:00