github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,531 Commits
14 Branches
107 Tags
374 MiB
6.0release
5.0release
develop
duiniuluantanqin-patch-1
4.0release
feature/simulcast
feature/gb28181
feature/h265
master
fossa
3.0release
2.0release
min
1.0release
v2.0-r2
v2.0-r1
v2.0-r0
v2.0-b4
v2.0-b3
v2.0-b2
v2.0-b1
v2.0-b0
v2.0-a3
v2.0-a2
v2.0-a1
v2.0-a0
v1.0-r4
v1.0-r3
v1.0-r2
v1.0-r1
v1.0-r0
v0.9.0
v0.8.0
v0.7.0
v0.6.0
v0.5.0
v0.4.0
v0.3.0
v0.2.0
v0.1.0
v2.0-r10
v2.0-r11
v2.0-r3
v2.0-r4
v2.0-r5
v2.0-r6
v2.0-r7
v2.0-r8
v2.0-r9
v3.0-a0
v3.0-a1
v3.0-a2
v3.0-a3
v3.0-a4
v3.0-a5
v3.0-a6
v3.0-a7
v3.0-a8
v3.0-a9
v3.0-b0
v3.0-b1
v3.0-b2
v3.0-b3
v3.0-b4
v3.0-r0
v3.0-r1
v3.0-r2
v3.0-r3
v3.0-r4
v3.0-r5
v3.0-r6
v3.0-r7
v3.0-r8
v4.0-b0
v4.0-b1
v4.0-b10
v4.0-b2
v4.0-b3
v4.0-b4
v4.0-b5
v4.0-b6
v4.0-b7
v4.0-b8
v4.0-b9
v4.0-r0
v4.0-r1
v4.0-r2
v4.0-r3
v4.0-r4
v4.0-r5
v5.0-a0
v5.0-a1
v5.0-a2
v5.0-a3
v5.0-a4
v5.0-a5
v5.0-b0
v5.0-b1
v5.0-b2
v5.0-b3
v5.0-b4
v5.0-b5
v5.0-b6
v5.0-b7
v5.0-r0
v5.0-r1
v5.0-r2
v5.0-r3
v6.0-a0
v6.0-a1
v6.0-d0
v6.0-d1
v6.0-d2
v6.0-d3
v6.0-d4
v6.0-d5
v6.0-d6
v6.0.10
v6.0.36
v6.0.45
v6.0.48
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '104cf14d68'
${ noResults }
Commit Graph

6656 Commits (104cf14d689e40c83b0b1d1d225edfe151f1b7e8)

Author SHA1 Message Date
stone 748aa8508f SRS5: Improve file writer performance by fwrite with cache. v5.0.133 (#3308) 
* SrsFileWriter leverages libc buffer to boost dvr write speed.

* Refactor SrsFileWriter to use libc file functions mockable

* Add utest and refine code.

Co-authored-by: winlin <winlin@vip.126.com>

PICK 25eb21efe8
 2 years ago
Winlin f06a2d61f7 SRS5: DVR: Support blackbox test based on hooks. v5.0.132 (#3365) 
PICK e655948e96
 2 years ago
winlin 3c6ade8721 SRS5: FFmpeg: Support build with FFmpeg native opus. v5.0.131 (#3140) 
PICK a27ce1d50f
 2 years ago
winlin ef533853c0 SRS5: Build: Refine install tips. 
PICK 372390f8d1
 2 years ago
feng eeb42f7e4a
HTTP: Add CORS Header for private network access. v6.0.13 (#3363) 
Co-authored-by: winlin <winlin@vip.126.com>
 2 years ago
winlin 35e01906f2 SRS5: CORS: Refine HTTP CORS headers. v5.0.130 
PICK 3612473516
 2 years ago
winlin 232de03c56 SRS5: Test: Add blackbox test for SRT. 
PICK 62963b206f
 2 years ago
john fe086dfc31
SRT: Upgrade libsrt from 1.4.1 to 1.5.1. v6.0.12 (#3362) 
Co-authored-by: winlin <winlin@vip.126.com>
 2 years ago
winlin 7a56208f2f Test: Use long duration for HLS balckbox test. 2 years ago
winlin b104826a96 SRS5: Test: Run fast and slow blackbox tests seperately. 
PICK 95b534ff10
 2 years ago
winlin 57d205d5a0 Test: Use the fatest preset for HEVC blackbox test. 2 years ago
winlin 81969b3dbf SRS5: Test: Add chunksize and atc blackbox test for RTMP. 
PICK c31a8076bb
 2 years ago
winlin 99f61cb225 Test: Add RTMP/FLV/TS blackbox test for HEVC. (#465) 2 years ago
winlin 7b27410ac9 SRS4: Security: Enable CIDR for allow/deny play/publish. (#2914) 
PICK 55ca61ec9c
 2 years ago
Winlin 3e5362fbff SRS5: Test: Add blackbox for MP3 audio codec. v5.0.129 (#296) (#465) 
PICK e3a4ff9fa1
PICK 3b59972a90
 2 years ago
Winlin c68db59eeb
Test: Add blackbox for HEVC over HLS. (#3356) 2 years ago
winlin 2cab98aa68 SRS5: Test: Add blackbox for HLS. 
PICK 30779f3b5a
 2 years ago
Winlin 4c2db0073a SRS5: Test: Support blackbox test by FFmpeg. v5.0.128 (#3355) 
1. Enable blackbox test for each PR and push.
2. Refine Makefile and README for srs-bench.
3. Add blackbox using FFmpeg and ffprobe.
4. Add blackbox basic test for RTMP stream.
5. Add blackbox basic test for HTTP-FLV stream.
6. Fix utest rand seed issue.

PICK 2141d220b4
 2 years ago
ChenGH e1f6661d1f SRS5: Asan: Disable asan for CentOS and use statically link if possible. v5.0.127 (#3347) (#3352) 
* Asan: Disable asan for CentOS and use statically link if possible. v5.0.127 (#3347)

1. Disable asan for all CentOS by default, however user could enable it.
2. Link asan statically if possible.

* Update version to v5.0.127

Co-authored-by: winlin <winlin@vip.126.com>

PICK dd0f398296
 2 years ago
chundonglinlin fff8d9863c
H265: Support HEVC over HLS. v6.0.11 (#465) (#3354) 
* H265: Support HEVC over HLS.(#465)

* HLS: Support HEVC over HLS. v6.0.11 (#465)

Co-authored-by: winlin <winlin@vip.126.com>
 2 years ago
winlin 4bfc4de710 SRS5: MP3: Upgrade mpegts.js to support HTTP-TS with mp3. v5.0.126 (#296) 
PICK 02a18b328c
 2 years ago
Haibo Chen 57cc843000 SRS5: API: Fix duplicated on_stop callback event bug. v5.0.125 (#3349) 
* fix hls bug:Duplicated on_stop callback

* improve utest

* Refine magic number.

* API: Fix duplicated on_stop callback event bug. v5.0.125

Co-authored-by: winlin <winlin@vip.126.com>

PICK 3727d0527c
 2 years ago
winlin e4e87c0403 SRS5: Live: Refine log for monotonically increase. 
PICK 6caca900b3
 2 years ago
winlin 7bd8682d40 SRS5: Script: Refine depends tools. v5.0.124 
1. Never auto install tools now, user should do it.
2. Support --help and --version for SRS.
3. Install tools for cygwin64.

PICK e690c93bcf
 2 years ago
winlin c46ef81ff2 SRS5: Update license date to 2023. v5.0.123 
PICK 72f8ed4916
 2 years ago
winlin 6ad7787c14 Asan: Refine asan warning message for macOS. 
PICK 7bdb7270cf
 2 years ago
winlin 3f7c4a7ff4 GB28181: Enable regression test for gb28181. v5.0.122 
1. Build regression test tool for gb28181.
2. Run regression test for gb28181.
3. Format go code and eliminate logs.
4. Change base docker to ubuntu20.

PICK 7750bdae10
 2 years ago
winlin bc381a0242 SRS5: Configure: Reorder the functions, nothing changed. 
PICK 4b09a7d686
 2 years ago
winlin 41f7951481 SRS5: Refine configure to guess OS automatically. v5.0.121 
1. Guess for macOS and cygwin64.
2. Refine options for configure.

PICK 5559ac25fe
 2 years ago
winlin 1e079d2860 SRS5: Update new authors. 
PICK 6299dee1b6
 2 years ago
winlin 4045971dea SRS5: Refine default config file for SRS. v5.0.120 
1. Docker use srs.conf and env variables.
2. Show help if run SRS without any options.
3. Do not guess config file, use whatever from user.

PICK 07a9a005d5
 2 years ago
winlin 39c9487a73 Support first SRS6 version. v6.0.10 2 years ago
winlin e4a9ff54f9 SRS5: Asan: Only link by statically for asan. 
PICK ae3b367487
 2 years ago
winlin 351f7590db SRS5: Script: Discover version from code. 
PICK 87a2ef100a
 2 years ago
winlin d5bf0ba2da TS: Support disable audio or video to make mpegts.js happy. v6.0.9 (#465) (#939) 2 years ago
winlin 4b6f1b0fd6 TS: Fix bug for codec detecting for HTTP-TS. v6.0.8 (#465) 2 years ago
winlin a6c926f985 SRS5: FLV: Fix bug for header flag gussing. v5.0.119 (#939) 
PICK 8a0ac8e3a1
 2 years ago
winlin bec23fc247 SRS5: Script: Fix configure help bug. 
PICK 386bb41f63
 2 years ago
winlin 6875876349 SRS5: MP3: Convert RTMP(MP3) to WebRTC(OPUS). v5.0.118 (#296) (#3340) 
PICK 37867533cd
 2 years ago
winlin f82f265ece SRS5: MP3: Support decode mp3 by FFmpeg natively. (#296) (#3340) 
PICK 1c5788c638
 2 years ago
winlin 35c89cc436 SRS5: MP3: Support dump stream information. v5.0.117 (#296) (#3339) 
PICK 95defe6dad
 2 years ago
winlin 2e1d99002f SRS5: Actions: Fix GitHub actions warnings. 
PICK 23b7939574
 2 years ago
winlin 5d48c9ce1b Refine code to allow search for conflicts. 2 years ago
winlin ead49e747b MP3: Support play HTTP-MP3 by H5(srs-player). v6.0.7 (#296) (#3338) 2 years ago
winlin b5aaf67c93 Merge branch v5.0.116 into develop 
1. MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 (#296) (#3333)
2. MP3: Add config examples for MP3. #296
3. Script: Refine GitHub actions.
 2 years ago
winlin f6e0b1c894 MP3: Support mp3 for RTMP/HLS/HTTP-FLV/HTTP-TS/HLS etc. v5.0.116 2 years ago
winlin 0a49638f54 MP3: Add config examples for MP3. #296 2 years ago
winlin 05d7400cd5 Merge branch v4.0.269 into 5.0release 
1. MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 (#296) (#3333)
 2 years ago
Winlin 577cd299e1
MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 (#296) (#3333) 
* MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 (#296)

1. Refresh HLS audio codec if changed in stream.
2. Refresh TS audio codec if changed in stream.
3. Fix mp3 demux bug in SrsFormat::audio_mp3_demux.
4. Use 3(MPEG1) not 4(MPEG2) as PMT stream type, follow FFmpeg.
5. MP3: Update utest for mp3 sample parsing.
6. MP3: Ignore empty frame sample.
7. UTest: Fix utest failed, do not copy files.
 2 years ago
winlin 518c25aec3 Print version and signature to stdout. 2 years ago
winlin e45563e925 Merge branch v5.0.115 into develop 
1. Asan: Support parse asan symbol backtrace log. v5.0.113 (#3324)
2. GB: Refine lazy object GC. v5.0.114 (#3321)
3. Fix #3328: Docker: Avoiding duplicated copy files. v5.0.115
 2 years ago
winlin 5dcd6637e3 Fix #3328: Docker: Avoiding duplicated copy files. v5.0.115 2 years ago
Winlin 6f3d6b9b65
GB: Refine lazy object GC. v5.0.114 (#3321) 
* GB: Refine lazy object GC.

1. Remove gc_set_creator_wrapper, pass by resource constructor.
2. Remove SRS_LAZY_WRAPPER_GENERATOR macro, use template directly.
3. Remove interfaces ISrsGbSipConn and ISrsGbSipConnWrapper.
4. Remove ISrsGbMediaConn and ISrsGbMediaConnWrapper.

* GC: Refine wrapper constructor.

* GB: Refine lazy object GC. v5.0.114
 2 years ago
ChenGH 7eaee46f1f
Asan: Support parse asan symbol backtrace log. v5.0.113 (#3324) 
* asan: support parse asan symbol log

* asan: refine srs_parse_asan_backtrace_symbols error code

* asan: Refine code, extract asan log to error file.

Co-authored-by: winlin <winlin@vip.126.com>
 2 years ago
winlin 2daf637aaa Merge 5.0: FLV header and SRT bugfix. v6.0.6 
1. SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112 (#3323)
2. GB28181: Fix memory overlap for small packets. v5.0.111 (#3315)
3. FLV: Support set default has_av and disable guessing. v5.0.110 (#3311)
4. FLV: Drop packet if header flag is not matched. v5.0.109 (#3306)
5. FLV: Reset has_audio or has_video if only sequence header. (#3310)
 2 years ago
winlin 2f7e474853 Merge branch v5.0.112 into develop 
1. SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112 (#3323)
2. GB28181: Fix memory overlap for small packets. v5.0.111 (#3315)
3. FLV: Support set default has_av and disable guessing. v5.0.110 (#3311)
4. FLV: Drop packet if header flag is not matched. v5.0.109 (#3306)
5. FLV: Reset has_audio or has_video if only sequence header. (#3310)
 2 years ago
john 09a96175e8
SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112 (#3323) 
* SRT: fix crash when sps/pps empty. v5.0.112

Co-authored-by: winlin <winlin@vip.126.com>
 2 years ago
Winlin 56040cab42
GB28181: Fix memory overlap for small packets. v5.0.111 (#3315) 2 years ago
Winlin a36cb57949
FLV: Support set default has_av and disable guessing. v5.0.110 (#3311) 
* FLV: Support set default has_av and disable guessing. v5.0.110

1. Support config default has_audio and has_video.
2. Support disable guessing has_audio or has_video.

* FLV: Reset to false if start to guess has_av.

* FLV: Add regression test for FLV header av metadata.
 2 years ago
Winlin 4551200e95
FLV: Drop packet if header flag is not matched. v5.0.109 (#3306) 
1. Ignore audo or video packets if FLV header disable it.
2. Run: Add regression test config and run for IDEA.
3. Test: Refine regression test to allow no audio/video for FLV
4. Config: Whether drop packet if not match header.
 2 years ago
Winlin 35185cf844
FLV: Reset has_audio or has_video if only sequence header. (#3310) 
1. Reset has_audio if got some video frames but no audio frames.
2. Reset has_video if got some audio frames but no video frames.
3. Note that audio/video frames are not sequence header.
 2 years ago
Winlin c39edf4788
Player: Support nginx-http-flv-module stream url. (#3305) 2 years ago
Winlin 476a32d417
Build: Fix build warnings (#3302) 
1. Avoid default guess for expression.
2. Force to void* for memset.
 2 years ago
winlin 72182865ef Merge branch v5.0.108 into develop 
* DASH: Fix dash crash bug when writing file. v5.0.108 (#3301)
* Test: Refine cache for cygwin64 test.
 2 years ago
john d1bc155c8b
DASH: Fix dash crash bug when writing file. v5.0.108 (#3301) 
Co-authored-by: winlin <winlin@vip.126.com>
 2 years ago
winlin 4f8f6ca6f8 Merge v5.0.107 into develop 
* SRT: Support SRT to RTMP to WebRTC. v5.0.107 (#3296)
 2 years ago
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>
 2 years ago
winlin 3049fa70eb Merge branch v5.0.106 into develop 
* Build: Refine cygwin64 test script.
* API: Parse fragment of URI. v5.0.106 (#3295)
 2 years ago
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>
 2 years ago
winlin 7ac1475c39 Merge #3271: H265: The codec information is incorrect. v6.0.5 2 years ago
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>
 2 years ago
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
 2 years ago
winlin 0e550d496b Cygwin: Enable gb28181 for Windows. v5.0.105 2 years ago
chengh 8be4c8e334 Asan: Set asan loging callback. v5.0.104 2 years ago
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
 2 years ago
winlin 41769308d2 GB28181: Enable GB for CentOS 7 package. v5.0.103 2 years ago
winlin 4b5ae7b3d2 Package script support extra options. v5.0.102 2 years ago
winlin e86e0c8999 Disable CLS and APM by default. v5.0.101 2 years ago
winlin fa177679a6 Merge 5.0.100, v5.0-a1 into develop. 2 years ago
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>
 2 years ago
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>
 2 years ago
Winlin e83fc2388b
Docker: Remove CentOS 6 support. (#3287) 
1. Remove CentOS 6 for test and utest.
2. Statically build FFmpeg, no so depends.
 2 years ago
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
 2 years ago
Winlin 5cadfff2e5
SRT: Support transform tlpkdrop to tlpktdrop. 5.0.98 (#3279) 2 years ago
Winlin fdbfe59784
Config: Add ENV tips for config. 5.0.97 (#3278) 2 years ago
winlin 9b7db9aa68 DASH: Update README for MPEG-DASH. 2 years ago
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>
 2 years ago
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>
 2 years ago
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.
 2 years ago
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.
 2 years ago
winlin e17f2fc675 Config: Add hevc.ts.conf for HEVC over HTTP-TS. 2 years ago
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>
 2 years ago
winlin 8debbe6db8 Asan: Fix utest bug. 2 years ago
winlin f10412d289 Asan: Fix utest bug. 2 years ago
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.
 2 years ago
winlin 02d47c5c21 Docs: Update features with version. 2 years ago
Winlin 96b4918c25 For #3236: Live: Change gop cache limits to 2500. v5.0.94 (#3273) 2 years ago
Winlin 13918ed81f
For #3236: Live: Change gop cache limits to 2500. v5.0.94 (#3273) 2 years ago
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>
 2 years ago
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.
 2 years ago