external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
8392 commits 13 branches 107 tags 375 MiB
Commit graph

6539 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
winlin
4ada0bc629 Asan: Cleanup for testing for asan. 2022-11-22 12:26:05 +08:00
winlin
cdbebb3729 Merge branch '4.0release' into develop 2022-11-22 11:25:06 +08:00
johzzy
e529536563 WebRTC: Fix no audio and video issue for Firefox. (#3079) v4.0.268 
* Remove extern SrsPps* duplicate declarations

* fix(rtmp2rtc): fix video payload type for rtmp to rtc bridge (#3041)

* Revert changes not belongs to this PR.

* Fix naming issue, follow SRS style.

* Use srs_assert instead of assert.

* Fix firefox no audio issue.

Co-authored-by: winlin <winlin@vip.126.com>
 2022-11-22 10:58:48 +08:00
Winlin
b72ad85502
Asan: Check libasan and show tips. v5.0.92 (#3266) 2022-11-22 10:40:18 +08:00
ChenGH
6b130d4205
Asan: Try to fix st_memory_leak for asan check (#3264) 
* asan: try to fix st_memory_leak for asan check

* asan: srs_st_unit should be call in hybrid server stop

* Rename st_uninit to st_destroy. v5.0.91

Co-authored-by: winlin <winlin@vip.126.com>
 2022-11-21 23:49:38 +08:00
chengh
6fa17aa3f8 ST: Support st_destroy to free resources for asan. 2022-11-21 22:26:46 +08:00
johzzy
6eb10afca2
WebRTC: Fix no audio and video issue for Firefox. (#3079) 
* Remove extern SrsPps* duplicate declarations

* fix(rtmp2rtc): fix video payload type for rtmp to rtc bridge (#3041)

* Revert changes not belongs to this PR.

* Fix naming issue, follow SRS style.

* Use srs_assert instead of assert.

* Fix firefox no audio issue.

Co-authored-by: winlin <winlin@vip.126.com>
 2022-11-21 22:01:01 +08:00
mingo-wu
62ab1a1c69 Fix the recursively included issue for srs_core_time.hpp (#3159) 
* Update srs_core_time.hpp

In included file: main file cannot be included recursively when building a preambleclang(pp_including_mainfile_in_preamble)
srs_core.hpp(43, 10): Error occurred here

* Update srs_core_time.hpp

Reference to trunk/src/protocol/srs_protocol_http_stack.hpp
  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
typedef __int8 int8_t;
typedef unsigned __int8 uint8_t;
typedef __int16 int16_t;
typedef unsigned __int16 uint16_t;
typedef __int32 int32_t;
typedef unsigned __int32 uint32_t;
typedef __int64 int64_t;
typedef unsigned __int64 uint64_t;
 2022-11-21 20:33:55 +08:00
ChenGH
f4f9c70d79
Asan: Fix global ip address leak check bug. v5.0.90 (#3248) 
* asan: fix global ips memory leak bug

* Asan: Fix global ip address leak check. v5.0.90

* Asan: Directly start SRS for daemon error fixed.

Co-authored-by: winlin <winlin@vip.126.com>
 2022-11-21 20:22:13 +08:00
Winlin
9191217e27
Player: Use xqq/mpegts.js to play HTTP-TS/HTTP-FLV (#3263) 
1. Replace flv.js with mpegts.js
2. Use mpegts.js to play HTTP-FLV.
3. Use mpegts.js to play HTTP-TS.
 2022-11-21 19:16:44 +08:00
Winlin
59d37abc2b
Player: Use H5 native to play mp4. (#3262) 2022-11-21 19:00:33 +08:00
Winlin
057b1392c0
Windows: Refine cygwin pipeline (#3260) 
1. When cleanup, remove srs.exe
2. Refine NSIS command.
 2022-11-21 14:32:26 +08:00
dev-clavis
fe9e7abd84
SRT: Config file does not enable srt for srt2rtc.conf (#3250) 
* adding enable stm

* SRT: Enable rtmp to rtc.

Co-authored-by: winlin <winlin@vip.126.com>
 2022-11-21 13:35:29 +08:00
winlin
b9284b6cc6 Windows: Support cygwin cache for test. (#3259) 2022-11-20 19:58:21 +08:00
Winlin
b18ee398ed
Windows: Support cygwin pipline and packager. v5.0.89 (#3257) 
1. Support github actions on Windows Server 2022.
2. Use cygwin64 in windows-latest to build SRS.
3. Package SRS-xxx-setup.exe by NSIS.exe
4. Patch crypto/include/config.h for libsrtp.
5. Support run as administrator.
6. Apply utest for cygwin.
7. Enable srtp over openssl.
 2022-11-20 15:02:08 +08:00