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
8543 commits 14 branches 107 tags 377 MiB
Commit graph

689 commits

Author SHA1 Message Date
winlin
4110fb14cb Squash: Fix bugs. v5.0.20 2022-01-11 08:40:37 +08:00
winlin
fbb6d9464c Discover api server and ip as candidates. v4.0.218 2022-01-04 22:31:27 +08:00
winlin
013fa8ac6c Install test-on self-sign certificate. v4.0.217 2022-01-04 16:47:38 +08:00
winlin
7808bd7ca8 Support config in_docker to fix the detect fail. (#2824). v4.0.216 2022-01-03 16:55:52 +08:00
winlin
716e578a19 Squash: Fix bugs 2021-12-26 17:30:51 +08:00
winlin
faf5fb0a83 Refine the config 2021-12-24 10:37:58 +08:00
winlin
f05e67e1a6 Squash: Fix bugs 2021-12-13 09:24:16 +08:00
winlin
027715e4ea RTC: Update config 2021-12-12 15:53:08 +08:00
winlin
e16830e989 Squash: Merge 4.0.201 2021-12-04 10:43:04 +08:00
winlin
1167f68165 FLV: Add realtime HTTP-FLV config 2021-11-20 09:54:42 +08:00
winlin
66435d583a Squash: Fix stat bug 2021-11-15 20:39:35 +08:00
winlin
f3380d2ec0 Fix bug for CPU arch info 2021-11-15 20:35:20 +08:00
winlin
e1f65478af Sqush: Refine config for origin cluster 2021-10-27 17:34:03 +08:00
lvndry
e176401499 Cluster: Origin server shouldn't be it's own coworker. v4.0.186 (#1963) 2021-10-27 07:46:24 +08:00
winlin
b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 2021-10-12 08:36:24 +08:00
winlin
71ed6e5dc5 RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174 2021-10-11 22:14:45 +08:00
winlin
fe9e43b6d4 RTC: Refine config for RTC 2021-10-11 16:36:05 +08:00
winlin
f8b4121497 Test: Add Multiple Sequence test for RTMP 2021-10-11 08:04:12 +08:00
winlin
0f9b9505a8 RTC: Change rtc.aac to discard by default. v4.0.172 2021-10-10 17:17:14 +08:00
winlin
a81aa2edc5 Squash: Merge SRS 4.0 2021-10-10 12:05:26 +08:00
winlin
2fa5a0bee8 Fix #2304, Remove Push RTSP feature. v4.0.171 2021-10-10 11:50:07 +08:00
winlin
df53c801b2 For #2653: Update config for HTTP RAW API removed. 2021-10-10 10:28:19 +08:00
winlin
55d8cb4b7b Default to log to console for docker. v4.0.168 2021-10-08 21:58:33 +08:00
winlin
1acb80b9c8 Enable WebRTC for srs.conf 2021-10-08 21:22:34 +08:00
winlin
a19c0fa121 OpenWRT: Try to create dir for pidfile 2021-10-03 20:51:07 +08:00
winlin
8ea9783de7 OpenWRT: Disable mprotect of ST. 5.0.16 2021-10-03 20:24:57 +08:00
winlin
149ad80b5d Squash: Merge SRS 4.0 2021-09-25 10:09:25 +08:00
winlin
10fe04ac18 LIVE: Add conf/live.conf for RTMP/FLV/HLS 2021-09-25 09:01:15 +08:00
winlin
28e3a1ca69 Squash: Merge SRS 4.0 2021-09-13 09:57:47 +08:00
winlin
501b3833a1 RTMP: Remove bandwidth test 2021-09-13 09:41:21 +08:00
winlin
19c0a9eb4b Suqash: Merge 4.0 2021-09-05 14:17:41 +08:00
winlin
90b5ed2202 For #2282, #2181, Remove reload for dvr_apply. 4.0.160 2021-09-04 12:29:07 +08:00
winlin
85620a34f5 Squash: Fix rtc to rtmp sync timestamp using sender report. #2470 2021-08-17 07:25:03 +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
24431d35ac Squash: Merge SRS4 2021-08-13 14:29:32 +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
301a8ceadb Squash: Merge SRS 4.0 2021-07-24 21:10:35 +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
97c627f9d4 Squash: Support CLion 2021-07-17 19:43:22 +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
5ee20613ca Squash: Support query lastest available version. 5.0.6 2021-06-28 07:33:24 +08:00
winlin
da763e43d5 Squash for #2424, query the latest available version. 4.0.132 2021-06-27 08:56:41 +08:00
winlin
efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 2021-06-16 14:03:55 +08:00
winlin
68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 2021-06-16 08:27:37 +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
louis.xia
cc52e5b27c
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:12 +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
cfw11
4d6f00e6bf
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:19:05 +08:00
winlin
34aa11b72a SquashSRS4: Update doc 2021-05-18 11:47:50 +08:00
winlin
0d14c4b073 System: Fail if use use full.conf 2021-05-18 11:06:14 +08:00