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
7602 commits 13 branches 107 tags 375 MiB
Commit graph

562 commits

Author SHA1 Message Date
winlin
f2ff4800fe Merge branch '4.0release' into merge/develop 2021-09-25 09:04:43 +08:00
winlin
10fe04ac18 LIVE: Add conf/live.conf for RTMP/FLV/HLS 2021-09-25 09:01:15 +08:00
winlin
6b20f4a787 Merge branch '4.0release' into merge/develop 2021-09-13 09:57:12 +08:00
winlin
501b3833a1 RTMP: Remove bandwidth test 2021-09-13 09:41:21 +08:00
winlin
e5373c9390 Merge branch '4.0release' into merge/develop 2021-09-05 14:15:59 +08:00
winlin
90b5ed2202 For #2282, #2181, Remove reload for dvr_apply. 4.0.160 2021-09-04 12:29:07 +08:00
winlin
7ae9c882b4 Merge 2021-08-17 07:24:20 +08:00
john
ea8cff6163
RTC: Fix rtc to rtmp sync timestamp using sender report. (#2470) 
* fix annotation spell failed

* RTC to RTMP using SenderReport to sync av timestamp

* update pion/webrtc versio from v3.0.4 -> v3.0.13, auto config sender/receiver report

* Add rtc push flv play regression test

* Add unit test of ntp and av sync time

* Take flag CXX to makefile of utest

* Add annotation about rtc unit test

* Fix compiler error in C++98

* Add FFmpeg log callback funciton.
 2021-08-17 06:32:35 +08:00
winlin
e05acbfcad Merge branch '4.0release' into merge/develop 2021-08-13 14:04:56 +08:00
matthew1838
452ca7e88f
add server_id into http_hooks (#2521) 
Co-authored-by: SK <liemlhd@LiemLes-Mac-Pro.local>
 2021-08-11 10:38:22 +08:00
winlin
128d3484cb Merge branch '4.0release' into merge/develop 2021-07-24 21:03:33 +08:00
Winlin
8c7ba05f9a
For #2371: Add regression test for SDP nack (#2487) 
* explicitly enable nack, for firefox (#2373)

* For #2371: Add regression test for SDP nack

1. Refine API to change defaule decodes.
2. Add test for publish SDP nack.
3. Add test for play SDP nack.

Co-authored-by: Haibo Chen <495810242@qq.com>
 2021-07-24 21:03:00 +08:00
winlin
8e66e2ac96 Merge branch '4.0release' into merge/develop 2021-07-17 19:38:41 +08:00
winlin
c209e547a8 [IDE] Support CLion and cmake to build and debug SRS. 4.0.141 
1. Remove all except JetBrains clion by cmake
2. Add .run/srs.run.xml for debugging for CLion.
3. Auto configure SRS when load CMakeLists.txt
 2021-07-16 11:38:12 +08:00
winlin
6dc9ac311a Merge 2021-06-28 07:31:58 +08:00
winlin
da763e43d5 Squash for #2424, query the latest available version. 4.0.132 2021-06-27 08:56:41 +08:00
winlin
d2a4e08ba0 Merge 2021-06-16 13:39:22 +08:00
winlin
68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 2021-06-16 08:27:37 +08:00
winlin
4e79e91ede Merge branch '4.0release' into merge/develop 2021-05-28 21:43:08 +08:00
louis.xia
1c7c74b01a GB28181: Fix parse rtp tcp failed (#2382) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

* fix gb28181 support tcp stack is setup:passive

* Update push.gb28181.tcp.conf

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
 2021-05-28 21:38:52 +08:00
cfw11
3e7536c493 GB28181: fix parse rtp-tcp failed (#2378) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
 2021-05-28 21:20:41 +08:00
winlin
98cd8145cc Merge branch '4.0release' into merge/develop 2021-05-18 11:46:46 +08:00
winlin
0d14c4b073 System: Fail if use use full.conf 2021-05-18 11:06:14 +08:00
winlin
d8e41cd283 Merge branch '4.0release' into merge/develop 2021-05-16 13:50:08 +08:00
hondaxiao
90f1b482ab SRT: Build SRT from source by SRS. 4.0.115 2021-05-16 08:23:26 +08:00
winlin
262f0fc8c8 SRT: Enable HTTP-FLV for SRT 2021-05-15 16:44:43 +08:00
winlin
9b6a1b16e1 RTC: Eliminate unused perf_stat 2021-05-15 12:04:21 +08:00
winlin
72a48f6115 Merge branch '4.0release' into merge/develop 2021-05-14 18:15:41 +08:00
winlin
f7b32252b0 RTC: Remove Object Cache Pool, no effect. 4.0.110 2021-05-14 16:12:11 +08:00
winlin
fa235a81aa Merge branch '4.0release' into merge/develop 2021-05-08 09:59:32 +08:00
winlin
92fc0af8f4 RTC: Support circuit breaker. 4.0.103 2021-05-07 17:43:05 +08:00
winlin
2efeb33d14 Merge branch '4.0release' into merge/develop 2021-05-01 22:15:08 +08:00
winlin
f7473c90bc For #2303: Add conf for RTC2RTMP 2021-05-01 18:19:17 +08:00
winlin
3d225973ef Bridger: Support RTC2RTMP bridger and shared FastTimer. 4.0.95 2021-05-01 18:16:51 +08:00
winlin
659e173e15 RTC: Refine for writing doc. 4.0.92 2021-05-01 16:42:09 +08:00
winlin
86f1a8b528 Merge branch '4.0release' into merge/develop 2021-04-24 21:38:48 +08:00
winlin
5516d3751f Change push-RTSP as deprecated feature. 2021-04-24 21:33:44 +08:00
winlin
35431749c4 Live: Support follow client protocol for edge. 2021-03-17 16:48:18 +08:00
winlin
56b64689bf SquashSRS4: Docker: Add conf/docker.conf, daemon off, log console, enable RTC 2021-03-04 23:06:08 +08:00
winlin
83c615aa8a SquashSRS3: Docker: Add conf/docker.conf, daemon off, log console, enable RTC 2021-03-04 22:45:43 +08:00
winlin
3bb1b673c5 Merge SRS4, lots of features 2021-03-04 14:49:03 +08:00
winlin
bb3bd1705e Refine the regression test tool, add missing files 2021-03-04 14:19:39 +08:00
winlin
5a66d15e85 Support regression test in CI. 2021-03-04 14:18:52 +08:00
winlin
dd8f7ff09a Enable HTTP-FLV for conf/rtc.conf 2021-03-04 14:16:03 +08:00
winlin
d4b8a57cf7 Enable Object Cache and Zero Copy Nack by default. 4.0.77 2021-03-04 14:12:31 +08:00
winlin
f63441413d RTC: Support disable the NACK no-copy, enable copy by default 2021-03-02 19:34:56 +08:00
winlin
29b33e6303 RTC: Disable player perf stat, because it should be refined. 2021-03-02 19:33:29 +08:00
winlin
8d7a201742 RTC: Remove unused config 2021-03-02 19:33:12 +08:00
winlin
501104e728 Perf: Limit the size of object cache pool 2021-03-02 19:32:56 +08:00
winlin
3989f2d553 RTC: Refine the stat logs, limit the object cache pool 2021-03-02 19:32:52 +08:00