R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,485 Commits 16 Branches 113 Tags 351 MiB
02653ce2aa
Commit Graph

3300 Commits

Author SHA1 Message Date
john
7c353b5986 RTC: Fix memory leak when replace rtp packet in cache. (#2771). v4.0.205 
* fix memory leak when replace rtp packet in cache.
 2021-12-07 09:11:01 +08:00
winlin
8576fa7052 Squash: Merge v4.0.203 2021-12-04 11:21:35 +08:00
john
f3c4023c25
Fix bugs for RTC2RTMP. (#2768) 
1. Cache IDR frame's rtp timestamp instead of avsync timestamp.
2. Cache clock rate calculate by sender report.
3. Using srs_rtp_seq_distance instead of direct minus.
4. Add utest of av timestamp sync when duplicated sender report.
 2021-12-04 11:15:02 +08:00
winlin
b807ef9049 Fix dead links 2021-12-04 11:08:42 +08:00
winlin
4e64c66e02 RTC: Ignore empty audio packet when transcoding (#2757). v4.0.202 2021-12-04 10:56:37 +08:00
James
2c0cd9b58d
fix #2690, 如果发现音频包为空，则不送解码，以免提前结束了解码上下文 (#2757) 
* fix #2690, 如果发现音频包为空，则不送解码，以免提前结束了解码上下文

* fix #2690，出错信息中，显示相关参数名称

Co-authored-by: jiankai <wangjiankai@cmhi.chinamobile.com>
 2021-12-04 10:46:17 +08:00
johzzy
ff8657e1c5 RTC: Fix crash when pkt->payload() if pkt is nullptr (#2751). v4.0.199 2021-11-25 07:36:12 +08:00
johzzy
a862573220
RTC: Fix crash when pkt->payload() if pkt is nullptr (#2751) 2021-11-25 07:33:41 +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
93242918ad Squash: For #1708 2021-11-15 11:10:44 +08:00
winlin
93964bb037 ST: Print log when multiple thread stop one coroutine. (#1708) 2021-11-15 09:35:23 +08:00
winlin
5f85d405e7 Squash: Merge #2721, #2729 2021-11-13 19:36:43 +08:00
john
469bd8cfe2
RTC: check audio track exist when negotiate (#2729) 2021-11-13 19:09:45 +08:00
john
878833bb95
Rtc2Rtmp: Using rtp timestamp to distinguish different video frame (#2721) 2021-11-09 07:35:00 +08:00
winlin
6cde9a0230 Squash: Guess config files by FHS 2021-11-07 18:53:21 +08:00
winlin
1f4dad024e Config: Guess config files by FHS. v4.0.194 (#2711) 2021-11-07 17:39:58 +08:00
Haibo Chen
b06661539c DVR: Copy req from publish. v4.0.193 (#2714) 
* DVR: copy req from publish

* DVR: copy req from publish
 2021-11-07 17:01:45 +08:00
Haibo Chen
3974b319d1
DVR: Copy req from publish (#2714) 
* DVR: copy req from publish

* DVR: copy req from publish
 2021-11-07 16:59:33 +08:00
winlin
84a16774b2 Fix build fail for CentOS6, without SO_REUSEPORT 2021-11-05 18:32:06 +08:00
winlin
523b055c06 Squash: Support RPM. Fix bugs. 2021-11-04 07:37:17 +08:00
Haibo Chen
27083430ce Edge: Refuse edge request when state is stopping (#2707) 2021-11-04 07:30:30 +08:00
Haibo Chen
a01354a595
Edge: Refuse edge request when state is stopping (#2707) 2021-11-04 07:28:48 +08:00
john
2d6ec03c5b
RTC: Remove no need code when check sdp. (#2702) 2021-11-03 07:45:37 +08:00
winlin
ab5079909d For #2369, #1708, #1941: Check errno when close fd or stop thread 2021-10-31 19:33:27 +08:00
winlin
8125dd4dd1 Forward: Fast quit when cycle fail. v4.0.188 (#2284) 2021-10-30 07:59:57 +08:00
winlin
da7fac0939 Release SRS v5.0.19, develop version, not stable 2021-10-28 08:06:26 +08:00
winlin
ed1c499bd3 Gop: Ignore zero timestamp when shrinking. v4.0.187 (#2186) 2021-10-28 07:52:24 +08:00
Haibo Chen
ced518ea92 STAT: Add server_id into http_hooks (#2692) v4.0.185 2021-10-25 14:14:06 +08:00
Haibo Chen
88cdba6965
STAT: Add server_id into http_hooks (#2692) 2021-10-25 14:11:15 +08:00
winlin
5783c4420f For #2689: Support stat for CPU archs. 2021-10-24 18:45:47 +08:00
winlin
99904f9ec2 For #2689: Support stat for CPU archs. 2021-10-24 18:41:12 +08:00
Haibo Chen
592d4964ef API: Always stat client event if auth fail. v4.0.183 2021-10-22 08:06:39 +08:00
Haibo Chen
a86f3905b2
Put the statistics code after http callback (#2687) 2021-10-22 08:03:49 +08:00
winlin
f0910cf9b7 Squash: For #1758: Fix bug for marshal JSON with SDP. 2021-10-21 09:03:17 +08:00
winlin
31693d4b61 For #1758: Fix bug for marshal JSON with SDP. 2021-10-21 07:36:01 +08:00
Haibo Chen
7fd5e8607c DVR: support mp3 audio codec. (#2593) v5.0.17 2021-10-16 14:06:43 +08:00
Haibo Chen
3fc287f7de API: Fix the same 'client_id' error when asynchronous call (#2665) v4.0.179 2021-10-16 07:53:18 +08:00
Haibo Chen
974bed6b26
API: Fix the same 'client_id' error when asynchronous call (#2665) 2021-10-16 07:50:47 +08:00
winlin
cd7e5a131e Squash: SRS 4.0, Stat the oc(origin cluster). 2021-10-13 09:03:47 +08:00
winlin
18a155bf31 API: Stat the oc(origin cluster). 2021-10-13 08:13:00 +08:00
winlin
533e86eaf8 API: Stat the oc(origin cluster). 2021-10-12 21:40:46 +08:00
Haibo Chen
a2003b3a85 API: Use publish param instead of play (#2550) v4.0.177 2021-10-12 14:07:16 +08:00
Haibo Chen
579b90dc1e
on_dvr: use publish param instead of play (#2550) 2021-10-12 14:04:22 +08:00
winlin
4e6a3321cd Squash: Merge SRS 4.0 2021-10-12 14:04:02 +08:00
winlin
5d5df7923b Config: If docker.conf does not exists, try srs.conf 2021-10-12 14:02:35 +08:00
Haibo Chen
eb3bbf1bca For #2549: Fix duration issue for HLS on_hls. v4.0.176 2021-10-12 09:18:39 +08:00
Haibo Chen
93cd025e2a
replace the placeholder of ts url in m3u8 (#2549) 2021-10-12 09:15:21 +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
9c315c94fc For #1641, Support RTMP publish and play regression test. v4.0.173 2021-10-10 18:09:52 +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
cf99ebf186 Fix #2653: Remove HTTP RAW API. v4.0.170 2021-10-10 10:23:27 +08:00
winlin
19e857ada4 Remove dead link for issues 2021-10-10 09:31:06 +08:00
winlin
55d8cb4b7b Default to log to console for docker. v4.0.168 2021-10-08 21:58:33 +08:00
winlin
5042117034 Squash: Merge SRS 4.0 2021-10-07 21:10:44 +08:00
ChenGH
7a4de9ffe7
Fix #2415, refine dtls fragment and rtp payload size (#2652) 2021-10-07 21:05:30 +08:00
ChenGH
0093a54b34
fix bandwidth kbps caculate bug (#2648) 2021-10-04 13:40:17 +08:00
winlin
a19c0fa121 OpenWRT: Try to create dir for pidfile 2021-10-03 20:51:07 +08:00
winlin
7d3ec991e1 Squash: Merge SRS 4.0 2021-09-26 17:12:55 +08:00
winlin
ad4b648ed2 For #2545, Refine code with space lines. 2021-09-26 17:07:59 +08:00
johzzy
ee23e3abed fix some crash in rtc. (#2545) 2021-09-26 17:04:00 +08:00
johzzy
dc778020fc
fix some crash in rtc. (#2545) 2021-09-26 17:01:53 +08:00
winlin
34cd7b2586 Squash: Merge SRS 4.0 2021-09-23 22:35:52 +08:00
winlin
79d73bafcf Refine code space 2021-09-23 22:04:14 +08:00
winlin
c8d3542979 Fix build failed. 2021-09-23 22:04:08 +08:00
winlin
f01c9638f1 Support http callback on_play/stop. 5.0.12 2021-09-23 13:38:04 +08:00
Haibo Chen
36b813b971 Enhance HLS: support http callback on_play/stop, support statistic (#2578) 
* Enhance HLS: support http callback on_play/stop, support statistic

* make code readable

* make code readable

* rename secret
 2021-09-23 13:32:15 +08:00
Haibo Chen
f901831362
Enhance HLS: support http callback on_play/stop, support statistic (#2578) 
* Enhance HLS: support http callback on_play/stop, support statistic

* make code readable

* make code readable

* rename secret
 2021-09-23 13:31:45 +08:00
zozobreakzou
46adcfb6c9
[rtc] *Fix Fua package bug(payload size minus one). (#2618) 
* This can cause webrtc video PacketBuffer assemble corrupt when (nal size - 1) % 1300 == 0
* issues about webrtc all caused by this bug
 2021-09-23 11:10:16 +08:00
winlin
40f8460929 Squash: Merge SRS 4.0 2021-09-17 14:48:22 +08:00
winlin
4456a275b6 PushFLV: Fix bug, add stat 2021-09-17 14:20:35 +08:00
Winlin
560e7c3c2f
Fix #2613, Try libopus and opus for ARM (#2614) 
* Fix #2613, Try libopus and opus for ARM

* Refine code
 2021-09-15 21:44:13 +08:00
winlin
a830289d97 Squash: Merge SRS4.0 2021-09-07 08:20:43 +08:00
Huachao Mao
ff9e2339c1
Fix stream api iterator not incremented (#2582) 2021-09-07 08:14:40 +08:00
Huachao Mao
53cb333713
Support pagination for stream api (#2572) 2021-09-06 10:10:53 +08:00
winlin
19c0a9eb4b Suqash: Merge 4.0 2021-09-05 14:17:41 +08:00
ChenGH
3f94d26ca4
For #1920, refine rtmp listen ip and port check (#2581) 2021-09-05 14:05:28 +08:00
winlin
6bb11a72d0 For #2282, #2181, Move DVR async worker from SrsDvrPlan to global. 2021-09-04 12:42:23 +08:00
winlin
90b5ed2202 For #2282, #2181, Remove reload for dvr_apply. 4.0.160 2021-09-04 12:29:07 +08:00
winlin
cf3129220d Log: Refine the tail help log, show last 30 lines 2021-08-31 17:54:01 +08:00
winlin
7ab3e4a86c Squash: Merge SRS 4.0 2021-08-28 09:03:06 +08:00
Matin Zadeh Dolatabad
7b14281367
Enhancement: Add param and stream to on_connect (#1859) 
Add stream and param to hook call on_connect for better use
 2021-08-28 08:55:26 +08:00
Haibo Chen
c4a64ee470 Use SrsAsyncCallWorker in http hooks instead, to covert to async call. (#2542) 
* Use SrsAsyncCallWorker in http hooks instead, to covert to async call.

* delete invalid function
 2021-08-27 07:49:33 +08:00
Haibo Chen
a7feedabc6
Use SrsAsyncCallWorker in http hooks instead, to covert to async call. (#2542) 
* Use SrsAsyncCallWorker in http hooks instead, to covert to async call.

* delete invalid function
 2021-08-27 07:44:19 +08:00
winlin
38b0b1dab2 Squash: Fix ingest bug. Refine AUTHORS. 2021-08-25 08:11:44 +08:00
rise
a00b4d2014
Ingest: Exit if child process redirect io failed (#2540) 
* 修复子进程无法打开日志输出重定向导致的fork错误

srs进程fork后，未能输出重定向而返回错误，导致fork的子进程未能出。

* remove the var child_err

* Fixed IO redirection error detection

* Fixed BUG where lost during logs on normal start
 2021-08-25 07:16:46 +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
e22035b749 Squash: Fix RTC session info bug 2021-08-14 14:45:12 +08:00
Johnny
7c1d3edd36 RTC: fix SrsSessionInfo about copy assignment operator and comparison operator. 2021-08-14 14:39:01 +08:00
winlin
36cbe851ca RTC: Fix reousrce find bug 2021-08-14 14:37:05 +08:00
winlin
7c899a0afd Squash: Update version query. 2021-08-14 11:53:27 +08:00
winlin
34b97bf68d Release v4.0-d3, v4.0.153 2021-08-14 11:50:33 +08:00
winlin
24431d35ac Squash: Merge SRS4 2021-08-13 14:29:32 +08:00
Haibo Chen
ab988abc59 For #2516, fix codec issue for G.711 or H.263. 4.0.152 2021-08-13 12:08:10 +08:00
Haibo Chen
aad90c7f42
fix coredump bug: caused by publish stream that codec is unsupport, sush as G.711, H.263 (#2526) 2021-08-13 12:05:28 +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
29dea37dbb Squash: Merge SRS4 2021-08-10 12:10:35 +08:00
Haibo Chen
dffc344747 RTC: For #1657, support http hooks n_play/stop/publish/unpublish (#2509) 
* support http hooks for rtc: on_play/stop/publish/unpublish

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_conn.cpp
 2021-08-10 09:47:48 +08:00
Haibo Chen
345b691895
support http hooks for rtc: on_play/stop/publish/unpublish (#2509) 
* support http hooks for rtc: on_play/stop/publish/unpublish

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_conn.cpp
 2021-08-10 09:41:20 +08:00
winlin
9bf5005bdd Squash: Merge SRS4 2021-08-08 00:30:08 +08:00
Haibo Chen
c048731049 Get original ip instead of proxy ip, for rtc api (#2514) v4.0.150 2021-08-07 23:41:16 +08:00
Haibo Chen
84d04adfff
get original ip instead of proxy ip, for rtc api (#2514) 2021-08-07 23:37:18 +08:00
winlin
92cbb1f072 Refine code 2021-08-07 23:33:20 +08:00
winlin
adf0043cbc Fix #2508, Support features query by API. 5.0.10 2021-08-07 23:21:23 +08:00
winlin
ee376da0c6 Fix #2508, Support features query by API. 4.0.149 2021-08-07 23:17:15 +08:00
winlin
69faf06f0f API: For #2508, query feature docker and packager. 2021-08-07 21:35:00 +08:00
winlin
86e506e6ec API: For #2508, query feature docker and packager. v4.0.148 2021-08-07 19:03:13 +08:00
winlin
983d521987 API: Use libuuid to generate uuid. v5.0.9 2021-08-06 22:02:46 +08:00
winlin
48ef3dcd83 API: Use libuuid to generate uuid. v4.0.147 2021-08-06 21:53:16 +08:00
Haibo Chen
529b89a29e Fix #2504 coredump bug: caused by publish stream that codec is h.263 (#2505) 2021-08-04 17:14:41 +08:00
Haibo Chen
06f10b1894
fix coredump bug: caused by publish stream that codec is h.263 (#2505) 2021-08-04 17:06:55 +08:00
Haibo Chen
82c149c9c8 correct the client ip of http-flv player, for statistic (#2491) 2021-07-26 20:07:45 +08:00
Haibo Chen
f62a4c4893
correct the client ip of http-flv player, for statistic (#2491) 2021-07-26 20:01:29 +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
Haibo Chen
43bb9660ca explicitly enable nack, for firefox (#2373) 2021-07-24 20:49:12 +08:00
Haibo Chen
fb73d42c38
explicitly enable nack, for firefox (#2373) 2021-07-24 20:47:34 +08:00
Haibo Chen
86c67f7d95 RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483) v4.0.144 
* commit message for your changes. Lines starting

* Update srs_app_rtc_api.cpp

* add SrsRtcConnPlay and SrsRtcConnPublish, in enum SrsRtmpConnType

* Update srs_rtmp_stack.cpp

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_api.cpp

* update utest

* Update srs_utest_app.cpp
 2021-07-24 08:08:35 +08:00
Haibo Chen
0efd7b1bbc
RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483) 
* commit message for your changes. Lines starting

* Update srs_app_rtc_api.cpp

* add SrsRtcConnPlay and SrsRtcConnPublish, in enum SrsRtmpConnType

* Update srs_rtmp_stack.cpp

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_api.cpp

* update utest

* Update srs_utest_app.cpp
 2021-07-24 08:05:10 +08:00
winlin
97c627f9d4 Squash: Support CLion 2021-07-17 19:43:22 +08:00
winlin
afa32910c9 Fix bugs and enhance code. 4.0.142 2021-07-17 19:16:26 +08:00
winlin
8f91a90f28 Squash: Fix padding packets for RTMP2RTC 2021-07-08 14:37:18 +08:00
Winlin
c8a1e0f3da
Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8 (#2464) 
* Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8

* Update README.md

* Update README.md

* Refine format for AUTHORS.md
 2021-07-08 14:30:47 +08:00
Haibo Chen
90b7933dbb For #2403, fix padding packets for RTMP2RTC. 4.0.140. 
Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy (#2461)

* Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy

* make clear for magic number

make clear for magic number

* Update srs_app_rtc_source.cpp
 2021-07-08 14:27:51 +08:00
winlin
10b9a81061 RTC: Support eip/candidate to set the eip of server 2021-07-08 14:25:38 +08:00
Haibo Chen
7eee9aa598
Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy (#2461) 
* Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy

* make clear for magic number

make clear for magic number

* Update srs_app_rtc_source.cpp
 2021-07-08 14:23:53 +08:00
Winlin
77c958ad1c
RTC: Trim SDP line space for pion/webrtc client. (#2466) 2021-07-08 09:54:55 +08:00
winlin
5a7a742f36 Squash: Update README 2021-07-06 11:37:31 +08:00
winlin
67ebd08342 Add role(srs) to query versions 2021-07-06 11:22:16 +08:00
winlin
13d015b8fd Squash: Fix random bug 2021-07-04 16:04:51 +08:00
winlin
642359a50e For #2424, use srandom/random to generate. 4.0.139 2021-07-04 15:50:29 +08:00
Haibo Chen
03c5f76e64 update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452) 2021-07-01 06:23:29 +08:00
Haibo Chen
d32d8c0da6
update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452) 2021-07-01 06:22:16 +08:00
winlin
75530efbc4 Squash: Merge #2448, #2440 2021-06-30 07:32:28 +08:00
long
cff4c07be4
打开rtmp转rtc，当rtmp重复推流时，第2路会影响第1路流的正常播放。 (#2448) 
* Update srs_app_rtmp_conn.cpp

修复推重复的RTMP流导致的RTC和RTMP播放的问题

* change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY

change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY

Co-authored-by: Haibo Chen <495810242@qq.com>
 2021-06-30 07:24:12 +08:00
winlin
98e56f5325 Refine the random id by srs_random_str 2021-06-28 08:34:00 +08:00
Xiaoniu
31679c46d4 check 'vhost' validity in 'http raw dvr api' (#2435) 2021-06-28 07:53:16 +08:00
Xiaoniu
f986b5956b
check 'vhost' validity in 'http raw dvr api' (#2435) 2021-06-28 07:51:57 +08:00
winlin
5ee20613ca Squash: Support query lastest available version. 5.0.6 2021-06-28 07:33:24 +08:00
Xiaoniu
7bf03ef2ba Fix #2068, losing of last HLS ts file 4.0.133 
fix bug: last segment of ts not trigger 'on_hls',
because of 'on_unpublish' earlier than 'segment_close' (#2438)
 2021-06-28 07:28:46 +08:00
Xiaoniu
d987e194ff
fix bug: last segment of ts not trigger 'on_hls', because of 'on_unpublish' earlier than 'segment_close' (#2438) 2021-06-28 07:25:25 +08:00
winlin
aa12251084 Fix bug for v3.0-r6 2021-06-27 10:11:15 +08:00
winlin
da763e43d5 Squash for #2424, query the latest available version. 4.0.132 2021-06-27 08:56:41 +08:00
winlin
a594678e3d Squash #1685, #1282, #1547: Support ARM platform. 5.0.5 2021-06-22 07:49:48 +08:00
john
1347da81f8
Check audio/video track when rtc stream updated (#2418) 2021-06-21 14:35:37 +08:00
winlin
1e9de0e191 For #1685: Cross build RTC with FFmpeg 2021-06-19 21:55:12 +08:00
winlin
1c75a270b3 RTC: Eliminate dead code. 2021-06-17 10:52:00 +08:00
winlin
efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 2021-06-16 14:03:55 +08:00
winlin
df20fe6c9d Fix build fail 2021-06-16 14:02:48 +08:00
winlin
68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 2021-06-16 08:27:37 +08:00
winlin
15901cacee SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3 2021-05-31 13:42:20 +08:00
winlin
3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 2021-05-31 12:59:21 +08:00
johzzy
7be6025546 fix: fix typo about inactive. (#2380) 2021-05-28 22:20:36 +08:00
johzzy
2aad8ad5bd
fix: fix typo about inactive. (#2380) 2021-05-28 22:20:04 +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
a9f171144d SquashSRS4: Eliminate dead code 2021-05-24 08:17:59 +08:00
winlin
8e79b90bc3 RTC: Eliminate dead code. 4.0.122 2021-05-24 08:11:42 +08:00
winlin
e50582f9c7 SquashSRS4: Refine SDK 2021-05-21 19:57:59 +08:00
winlin
5df90a2a1c Fix #2370 bug for Firefox play stream(published by Chrome). 4.0.121 2021-05-21 18:56:19 +08:00
winlin
6dc8d9dd6f SquashSRS4: Remove srs-librtmp 2021-05-20 20:07:13 +08:00
winlin
9e5c4e2c5b RTC: Fix build fail 2021-05-20 19:56:23 +08:00
winlin
fc9363e7df Fix build fail when disable RTC by --rtc=off. 4.0.118 2021-05-20 19:06:45 +08:00
winlin
af04285baa Tools: Remove srs-librtmp 2021-05-20 18:52:21 +08:00
chenhaibo
bd506da070 Fix #2366, bug when disabled gb28181. 2021-05-20 17:27:32 +08:00
winlin
f043a7eb48 SquashSRS4: Allow RTC play before publish. 2021-05-19 21:06:17 +08:00
root
d55af6be44 Fix #2362: Allow WebRTC to play before publishing, for GB28181 as such. 4.0.117 2021-05-19 20:54:22 +08:00
Xiaoniu
75607d0723 Fix #2364: Live: Fail for stream busy if GB28181 is publishing. 2021-05-19 20:54:22 +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
xialixin
2e14d80aa4 SquashSRS4: Refine GB28181 2021-05-18 09:11:57 +08:00
winlin
1bd6bfd142 GB28181: Rename sip and jitter file. 2021-05-18 09:03:16 +08:00
xialixin
4c2b19a264 GB28181: Refine for bad network, we can wait for more incomplete frames 2021-05-18 08:53:51 +08:00
xialixin
7d8bde3cdb Fix #2355: GB28181: Fix play by RTC bug. 4.0.116 2021-05-18 08:42:01 +08:00
winlin
4639510f1b RTC: Allow config perf_stat and queue_length of rtc_server 2021-05-17 18:23:54 +08:00
winlin
e3bca883e1 SuqashSRS4: Build SRT native 2021-05-16 16:14:00 +08:00
winlin
3dce568b9c Rename SrsConsumer* to SrsLiveConsumer*. 4.0.114 2021-05-15 12:36:53 +08:00
winlin
dae6dc5395 Rename SrsRtcStream* to SrsRtcSource*. 4.0.113 2021-05-15 12:33:02 +08:00
winlin
2dd58665fa Rename SrsSource* to SrsLiveSource*. 4.0.112 2021-05-15 12:30:13 +08:00
winlin
9b6a1b16e1 RTC: Eliminate unused perf_stat 2021-05-15 12:04:21 +08:00
winlin
a1d7fe46c1 SquashSRS4: Rename SrsRtpPacket2 to SrsRtpPacket. 2021-05-15 08:53:54 +08:00
winlin
ddd7a378b1 Rename SrsRtpPacket2 to SrsRtpPacket. 4.0.111 2021-05-15 08:47:09 +08:00
winlin
6a980683f7 SquashSRS4: Remove object cache and stat api 2021-05-14 18:17:42 +08:00
winlin
f7b32252b0 RTC: Remove Object Cache Pool, no effect. 4.0.110 2021-05-14 16:12:11 +08:00
winlin
717e811002 Change virtual public to public. 4.0.109 2021-05-14 09:13:15 +08:00
winlin
53e20d4a37 RTC: Eliminate unused stat code 2021-05-14 09:06:12 +08:00
winlin
cd45750c9d RTC: Eliminate unused stat API 2021-05-14 08:56:41 +08:00
winlin
f711eb79ed SquashSRS4: Refine stat id. Fix SRT build bug 2021-05-14 08:26:07 +08:00
winlin
06f7d7d11b Refine id and vid for statistic. 4.0.108 2021-05-14 08:21:16 +08:00
winlin
393d976685 SquashSRS4: Fix memory leak 2021-05-13 22:32:29 +08:00
winlin
47f3f4da5c SquashSRS4: fix bugs 2021-05-12 21:50:57 +08:00
winlin
996c7d5697 SquashSRS3: Fix bug 2021-05-12 21:48:11 +08:00
winlin
8895d36746 SquashSRS4: Refine shared fast timer 2021-05-08 17:44:15 +08:00
winlin
2ad24b2313 Refine shared fast timer. 4.0.105 2021-05-08 16:50:26 +08:00
winlin
3256c7c2fa SquashSRS4: Refine the init of global objects 2021-05-08 11:51:54 +08:00
winlin
f370259c9d Fix build fail 2021-05-08 11:42:50 +08:00
winlin
4cf6da107c Refine init of global objects 2021-05-08 11:29:19 +08:00
winlin
8b58d18a5a Refine init of global objects 2021-05-08 11:25:48 +08:00
winlin
b1e85664a1 Refine init of global SrsPps 2021-05-08 11:11:13 +08:00
winlin
e8f7c913b0 Refine global or thread-local variables initialize. 4.0.104 2021-05-08 10:16:40 +08:00
winlin
276bd2223e SquashSRS4: Support circuit breaker 2021-05-08 10:04:44 +08:00
winlin
e7cce88912 RTC: Refine timer stat 2021-05-07 19:01:25 +08:00
winlin
25f17c32e9 RTC: Refine fast timer 2021-05-07 18:42:36 +08:00
winlin
92fc0af8f4 RTC: Support circuit breaker. 4.0.103 2021-05-07 17:43:05 +08:00
winlin
fd6c653d3c SquashSRS4: Refine performance for FastTimer 2021-05-07 11:25:37 +08:00
winlin
46c980c70a RTC: Eliminate unused code 2021-05-07 10:57:25 +08:00
winlin
4527a91545 RTC: Refine play stream find track. 4.0.102 2021-05-07 10:50:51 +08:00
winlin
b823dcdfd7 RTC: Refine FastTimer to fixed interval. 4.0.101 2021-05-07 10:20:00 +08:00
winlin
f995bf7ca8 SquashSRS4: Transform config for nack/twcc. 2021-05-06 17:39:10 +08:00
winlin
0c0b467917 RTC: Transform config for nack/twcc. 4.0.100 2021-05-06 17:24:20 +08:00
winlin
f41c0b42b1 SquashSRS4: Fix config bug for nack and twcc. 2021-05-06 13:50:28 +08:00
winlin
4f48ad7a8b RTC: Fix config check bug for nack and twcc 2021-05-06 11:41:11 +08:00
winlin
becbe45bcd SquashSRS4: Add demo for RTC 2021-05-05 13:26:25 +08:00
winlin
9fb2b69212 Add RTC stream merging demo by FFmpeg. 4.0.97 2021-05-03 15:53:55 +08:00
winlin
206d95879f SquashSRS4: Add one to one RTC demo. 2021-05-02 21:46:41 +08:00
winlin
5a611e0c4b Add one to one demo. 4.0.96 2021-05-02 19:35:03 +08:00
winlin
74bb47c13f SquashSRS4: Support RTC2RTMP. 2021-05-01 22:15:57 +08:00
winlin
8a30cc86d9 Bridger: Fix build fail if disable rtc and ffmpeg-fit 2021-05-01 18:16:51 +08:00
winlin
3d225973ef Bridger: Support RTC2RTMP bridger and shared FastTimer. 4.0.95 2021-05-01 18:16:51 +08:00
winlin
c770e6d7bc Bridger: Start RTMP2RTC bridger in RTMP publisher 2021-05-01 18:16:51 +08:00
winlin
c10232b4e2 Bridger: Refine transcoder to support aac2opus and opus2aac. 4.0.94 2021-05-01 18:16:51 +08:00
winlin
00c192ede1 Timer: Apply shared FastTimer to RTC server. 4.0.93 2021-05-01 18:16:51 +08:00
winlin
8747dd6630 Timer: Extract shared FastTimer to use one timer for all connections 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
0b62216999 SquashSRS4: Support av1 for Chrome M90 enabled it. 2021-04-30 08:13:38 +08:00
Winlin
e8fe66e3ba
RTC: Support av1 for Chrome M90 enabled it. 4.0.91 (#2324) 
* RTC: Support av1 for Chrome M90 enabled it. 4.0.91

* RTC: Show codec for WebRTC publisher
 2021-04-30 08:09:01 +08:00
winlin
a9d39f6946 RTC: Refine API params to create connection 2021-04-29 20:30:24 +08:00
winlin
a300d1fc54 Fix bug for alone pithy print 2021-04-27 18:34:51 +08:00
winlin
c2229d392a Add alone pithy print 2021-04-27 17:05:26 +08:00
winlin
eba78149ad SquashSRS4: Change push-RTSP as deprecated feature. 2021-04-24 21:40:09 +08:00
winlin
5516d3751f Change push-RTSP as deprecated feature. 2021-04-24 21:33:44 +08:00
winlin
c95bfc4a46 Timer: Apply shared FastTimer to RTC server 2021-04-23 11:17:58 +08:00
winlin
7b413edbb7 Timer: Extract shared FastTimer to use one timer for all connections 2021-04-23 11:04:05 +08:00
winlin
aa07f45545 SquashSRS4: Happy 2021 2021-04-20 19:03:02 +08:00
winlin
cec0191b16 Happy 2021 2021-04-20 19:00:14 +08:00
winlin
8b74c7cb89 SquashSRS4: Happy 2021 2021-04-16 09:29:43 +08:00
winlin
d01e603b25 Happy 2021 2021-04-16 09:25:55 +08:00
stone
3eb3cb9b51 For #2275, fix bug for transcode engine config param. 2021-04-09 07:22:15 +08:00
stone
6da91f7dea For #2275, fix bug for transcode engine config param. 2021-04-09 07:19:31 +08:00
winlin
323306149d SquashSRS4: Eliminate the dup code 2021-04-06 11:22:12 +08:00
winlin
aae0f61165 RTC: Eliminate the dup code 2021-04-06 10:56:40 +08:00
winlin
55426c6331 SquashSRS4: Fix RTC connection dispose bug 2021-04-06 10:51:42 +08:00
winlin
061f367a82 RTC: Fix RTC connection dispose bug 2021-04-06 10:50:23 +08:00
winlin
237c1e4d3d SquashSRS4: Fix DTLS warnings for HTTP api 2021-04-05 08:29:29 +08:00
winlin
db7e820f04 RTC: Fix DTLS warnings for HTTP api 2021-04-05 08:28:16 +08:00
winlin
fcf72b48f9 SquashSRS4: Fix republish bug 2021-04-04 19:05:44 +08:00
winlin
96003d4a52 RTC: Fix bug for republish stream. 4.0.89 2021-04-04 19:01:42 +08:00
winlin
52644f50c9 SquashSRS4: Fix republish bug 2021-04-04 18:50:59 +08:00
winlin
8d9dd532b9 RTC: Fix bug for republish stream. 4.0.89 2021-04-04 18:35:02 +08:00
winlin
d80ba9d284 SquashSRS4: Fix memory leak 2021-04-01 17:35:40 +08:00
winlin
3c59fedab6 RTC: Fix memory leak 2021-04-01 17:34:47 +08:00
winlin
fa2fec3247 SquashSRS4: Refine payload NALU type parser 2021-04-01 14:48:41 +08:00
winlin
7823d75a38 RTC: Refine payload NALU type parser 2021-04-01 14:46:28 +08:00
winlin
0cc3063703 SquashSRS4: Refine TWCC and SDP exchange. 4.0.88 2021-04-01 10:55:03 +08:00
winlin
bd1752a4b2 RTC: Fix TWCC send bug 2021-04-01 10:47:50 +08:00
winlin
7ac4a4f4ca RTC: Fix audio track description bug 2021-04-01 10:24:37 +08:00
winlin
4692e8b8ad SquashSRS4: Support WebRTC re-publish stream. 2021-03-26 14:59:25 +08:00
winlin
d6c16a7e23 RTC: Support WebRTC re-publish stream. 4.0.87 2021-03-24 20:12:31 +08:00
winlin
ff268dca23 SquashSRS4: Eliminate dead code, we never offer 2021-03-24 15:27:07 +08:00
winlin
6c7e24fc6d RTC: Eliminate dead code, we nerver send offer 2021-03-24 15:21:40 +08:00
winlin
ecd4527342 SquashSRS4: Use fast parse TWCCID, ignore in packet parsing 2021-03-24 14:17:52 +08:00
winlin
4c39cc7c2f RTC: Use fast parse TWCCID, ignore in packet parsing. 4.0.86 
1. TWCC should not be passed from end to end.
2. Publisher TWCC information, should be ignore when pass to player
3. Player should regenerate its own TWCC.
 2021-03-24 12:29:17 +08:00
winlin
b7b474deba SquashSRS4: Update srs-bench. 2021-03-24 11:05:25 +08:00
winlin
f5ff28d47a RTC: Refine play stream init 2021-03-24 10:50:13 +08:00
winlin
3fea5c0ec3 Test: Add republish regression test, should fail 2021-03-23 19:32:59 +08:00
winlin
25145b945d RTC: Use send_rtcp to encrypt and send RTCP bytes 2021-03-22 16:25:08 +08:00
winlin
4f1d213c91 Live: Support follow HTTP/302 for HTTP/HTTPS FLV edge. 2021-03-17 16:53:39 +08:00
winlin
35431749c4 Live: Support follow client protocol for edge. 2021-03-17 16:48:18 +08:00
winlin
4f1aa924e6 SquashSRS4: Add security scan. Feed TWCC before drop PT. 2021-03-11 16:55:05 +08:00
winlin
a53fe451ff RTC: Feed TWCC then drop the specified PT packet. 
1. Sometimes we might drop RTP packets, by PT(payload type).
2. For example, the padding packets from client.
3. We should feed these packets to TWCC, then drop it.
 2021-03-11 16:48:29 +08:00
winlin
e74810230a SquashSRS4: Regine DTLS and add regression tests. 4.0.84 2021-03-10 08:29:40 +08:00
winlin
d4d11c2c18 DTLS: Change max loop to larger 2021-03-09 22:19:32 +08:00
winlin
62987aa01f DTLS: Refine retransmit between ClientHello and Certificate. 2021-03-09 22:12:23 +08:00
winlin
02aac0fea4 DTLS: Fix ARQ bug, use openssl timeout. 4.0.84 2021-03-09 19:36:45 +08:00
winlin
dc93836489 SquashSRS4: Refine DTLS init, use specified API by role 2021-03-09 12:01:23 +08:00
winlin
3c6e466280 DTLS: Use specified init API, to decrease packet size 2021-03-09 11:54:27 +08:00
winlin
3a5d88b435 DTLS: Disable QueryMTU for openssl, or the packet get fragmented 2021-03-09 07:22:11 +08:00
winlin
079c54bbe7 Add important comment for ST 2021-03-09 07:21:07 +08:00
winlin
55bdc354f5 Add important comment for disposing and thread stop 2021-03-08 21:05:02 +08:00
winlin
de65a331f1 SquashSRS4: Fix DTLS config bug, dup Alert bug. 4.0.83 2021-03-08 12:39:25 +08:00
winlin
1ed567a005 DTLS: Fix dead loop by duplicated Alert message 2021-03-08 12:34:15 +08:00
winlin
43028c99c8 Fix bug when client DTLS is passive. 4.0.82 2021-03-08 10:41:42 +08:00
winlin
fc4f539907 Should check bridger status when publish stream. 2021-03-05 16:47:47 +08:00
winlin
3bb1b673c5 Merge SRS4, lots of features 2021-03-04 14:49:03 +08:00
Pieere Pi
4ba485002c Fix #2106, #2011, RTMP/AAC transcode to Opus bug. 4.0.81 2021-03-04 14:17:36 +08:00
winlin
98839d3d53 RTC: Fix TWCC enable bug 2021-03-04 14:13:40 +08:00
winlin
8f1c992379 Refine code, rename drop to loss 2021-03-04 14:12:39 +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
171ae5dd2d RTC: Fix shared msg cache bug 2021-03-02 19:34:37 +08:00
winlin
11454b3ced Perf: Avoid RTP packet copy for player NACK. 2021-03-02 19:34:12 +08:00
winlin
51a5e283fc Perf: Avoid RTP packet copy for publisher NACK. 2021-03-02 19:34:10 +08:00
winlin
74f63d6b14 RTC: Ignore NACK when disable for player. 2021-03-02 19:34:08 +08:00
winlin
0aeaf442f7 RTC: Ignore NACK when disable for player. 2021-03-02 19:34:04 +08:00