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

6273 commits

Author SHA1 Message Date
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
df7faa1603 For #2369, #1708, #1941: Add utest to cover fail for close or stop 2021-11-04 08:47:40 +08:00
winlin
f4e87b17a3 AUTHORS: Update new contributors. 2021-11-04 07:38:19 +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
Purple Grape
948a3c84eb
RPM: Use user no-body to start SRS (#2706) 
1、修正启动身份问题
2、其它改进
 2021-11-04 07:26:37 +08:00
john
2d6ec03c5b
RTC: Remove no need code when check sdp. (#2702) 2021-11-03 07:45:37 +08:00
winlin
3df92bf30f RPM: Add RTC for rpm for CentOS/RHEL (#2701) 2021-11-03 07:40:56 +08:00
Purple Grape
75909c82d0
Package rpm support for CentOS/RHEL (#2701) 
* rpm support

提供全套rpm打包方案，降低软件使用的入门难度：
1、FHS路径标准化
2、全新的init/systemd启动脚本，同时支持el6和el7
3、普通用户身份运行
4、开箱即用的默认配置文件
5、自动日志轮转

* Create srs.spec
 2021-11-03 07:36:54 +08:00
winlin
eb20458d23 Auto create package by github actions. v4.0.191 2021-11-02 07:34:45 +08:00
winlin
ab5079909d For #2369, #1708, #1941: Check errno when close fd or stop thread 2021-10-31 19:33:27 +08:00
qingfuliao
60ab81a5c7 IDE: Fix build problem caused by ffmpeg/pthread dependency. (#2579) 2021-10-30 12:13:37 +08:00
马文武
54b706d36e Script: Refine CentOS7 service script to restart SRS. v4.0.190 (#2552) 2021-10-30 12:09:22 +08:00
Abrar Ahmed
b9288668a7 SRT: Type from shoulde to should. (#2455) 
Change word typo from shoulde to should
 2021-10-30 11:42:24 +08:00
HungMingWu
cc99226ed5 SRTP: Patch libsrtp2 to fix GCC10 build fail. v4.0.189 2021-10-30 08:40:25 +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
winlin
e8380cda29 Demos: Remove the unused H5 demo files. (#2469) 2021-10-27 18:40:43 +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
3c4b9be76b For #2689, Refine the patches for loongarch 2021-10-26 07:15:11 +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
a6c4cc9692 Squash: Merge SRS 4.0, API: Always stat client event if auth fail. 2021-10-24 20:58:34 +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
winlin
5b44cc6a17 For #2689, Support loongarch, loongson CPU. v5.0.19 2021-10-24 18:00:54 +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
winlin
665b5f48f7 Squash: JSON: Support escape special chars. (#1758) 2021-10-20 09:16:18 +08:00
xmedia-systems
34b968aabf JSON: Support escape special chars. (#1758) v4.0.182 2021-10-20 08:57:40 +08:00
Matheus Macabu
061d544195 RTMP: If port is explicity set to 0, use default 1935 (#1754). v4.0.181 2021-10-19 08:24:37 +08:00
Matheus Macabu
9a017f4037
RTMP: If port is explicity set to 0, use default 1935 (#1754) 2021-10-19 08:20:28 +08:00
winlin
85131dad63 Squash: Update SRS 4.0 version 2021-10-18 15:10:05 +08:00
Alex.CR
bb7cd6af3a SRT: Solve mpegts demux assert bug (#2670) v4.0.180 
* solve mpegts demux bug

* remove assert

* add error log in mpegts demux

* sovle compile problem

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-10-18 15:07:33 +08:00
Alex.CR
60c8724879
SRT: Solve mpegts demux assert bug (#2670) 
* solve mpegts demux bug

* remove assert

* add error log in mpegts demux

* sovle compile problem

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-10-18 15:03:47 +08:00
winlin
596dd8c523 Support daemon(fork twice) for Darwin/OSX. v5.0.18 2021-10-17 16:53:39 +08:00
Haibo Chen
7fd5e8607c DVR: support mp3 audio codec. (#2593) v5.0.17 2021-10-16 14:06:43 +08:00
winlin
e03ada39a1 Squash: SRS v4.0.179 2021-10-16 08:07:57 +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
9517ef123d Squash: Update SRS 4.0 version 2021-10-14 18:33:31 +08:00
Alex.CR
1649386ed5 SRT: Pes error when mpegts demux in srt. v4.0.178 
* solve mpegts demux bug

* solve pes error when mpegts demux
 2021-10-13 19:53:20 +08:00
Alex.CR
44f1d8ed6d
SRT: Pes error when mpegts demux in srt (#2671) 
* solve mpegts demux bug

* solve pes error when mpegts demux
 2021-10-13 19:51:05 +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
winlin
135bef2182 Test: Update srs-bench depends 2021-10-12 20:30:40 +08:00
winlin
e127880ec2 Squash: Merge SRS 4.0 2021-10-12 15:09:52 +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
d6064ac608 UTest: Fix utest fail for config 2021-10-11 23:28:37 +08:00
winlin
29cf13afa0 Fix #1641, HLS/RTC picture corrupt for SPS/PPS lost. v4.0.175 2021-10-11 23:16:05 +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
0b99f06eff Test: Add RTMP to RTC regression test. 2021-10-11 09:34:08 +08:00
winlin
f8b4121497 Test: Add Multiple Sequence test for RTMP 2021-10-11 08:04:12 +08:00
winlin
29b98c49cc Test: Refine RTMP regression test. 2021-10-10 18:41:14 +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
9edf63bd30 3rdparty: Sync httpx-static 2021-10-10 11:37:19 +08:00
winlin
df53c801b2 For #2653: Update config for HTTP RAW API removed. 2021-10-10 10:28:19 +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
2ac214fdc6 For #2654: Parse width and width from SPS/PPS. v4.0.169 2021-10-08 22:18:02 +08:00
bepartofyou
286a605c63 Fix #2654: Parse width and width from SPS/PPS. Fix #471, #1335, #2539, #1316, #1421 2021-10-08 22:04:13 +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
6c597facfb Squash: Merge SRS 4.0 2021-10-07 21:39:58 +08:00
winlin
4f77ddbc06 Fix bugs #2648, #2415. v4.0.167 2021-10-07 21:33:25 +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
8ea9783de7 OpenWRT: Disable mprotect of ST. 5.0.16 2021-10-03 20:24:57 +08:00
winlin
9d54bcd114 Actions: Show commit and messages. 2021-10-03 16:52:46 +08:00
winlin
cae35d7a6e Actions: Show commit and messages. Fix MIPS build fail. 2021-10-03 16:45:59 +08:00
winlin
8685c9c12c OpenWRT: Support cross-compile SRS 2021-10-03 14:17:53 +08:00
winlin
b6d02a51b8 OpenWRT: Fix build issues 2021-10-03 14:15:23 +08:00
winlin
c48c9603c0 Actions: Create source tar lik srs-server-5.0.14.tar.gz 2021-10-03 07:49:02 +08:00
winlin
efbff98046 Actions: Create source tar lik srs-server-4.0.165.tar.gz 2021-10-03 07:40:29 +08:00
winlin
4b37f650f7 Actions: Support create release with source tar automatically. v5.0.13 2021-10-03 07:12:34 +08:00
winlin
38f0109b21 Actions: Support create release with source tar automatically. v4.0.164 2021-10-02 21:32:38 +08:00
winlin
96a33b5748 ST: Support Cygwin64 and MIPS. 5.0.13 2021-10-02 08:56:40 +08:00
winlin
1836847269 ST: Support Cygwin64 and MIPS 2021-10-02 08:54:53 +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
81fa762b4f Update the SRS logo 2021-09-25 10:21:24 +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
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
winlin
31672806aa For #2618, #2578, SRS 4.0.163 2021-09-23 13:34:45 +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
5828d64a3d For #2613, #2614, #2454, v4.0.162 2021-09-15 21:46:59 +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
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
a830289d97 Squash: Merge SRS4.0 2021-09-07 08:20:43 +08:00
Justin Kromlinger
a583d7efb4 Set empty HTTP paths to '/' to avoid malformed requests (#2329) 
This resolves #1610.
 2021-09-07 08:17:53 +08:00
Justin Kromlinger
8aee0169ce
Set empty HTTP paths to '/' to avoid malformed requests (#2329) 
This resolves #1610.
 2021-09-07 08:15:27 +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
winlin
ec554e14d0 Merge #2581, Fix listen ipv6 and port. 4.0.161 2021-09-05 14:10:53 +08:00
ChenGH
3f94d26ca4
For #1920, refine rtmp listen ip and port check (#2581) 2021-09-05 14:05:28 +08:00
ChenGH
714e182096
fix srs_string_replace deap loop when new_str inclue old_str (#2580) 2021-09-04 22:29:21 +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
BoringWednesday
1db155fa2f
SRT: Add member of adaptation_field and fix pos not add after memcpy. (#2066) 2021-09-04 10:26: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
winlin
b6d0c73cda For #1859, Enhancement: Add param and stream to on_connect. 4.0.159 2021-08-28 09:00:25 +08:00
pyw
7abc9b640a
SRT: fix srt stream play map error (#1890) 
* fix url_sz memory out of bounds

* fix srt play map error

Co-authored-by: pengyouwei <pengyouwei@comtom.cn>
 2021-08-28 08:56:20 +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
winlin
f86d6fd073 Squash: Merge SRS 4.0 2021-08-27 07:57:02 +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
Haibo Chen
c8bf98e8e2 Support for multiple SPS/PPS, then pick the first one. (#2544) 2021-08-27 07:32:02 +08:00
Haibo Chen
826f5121c5
Support for multiple SPS/PPS, then pick the first one. (#2544) 2021-08-27 07:27:33 +08:00
winlin
38b0b1dab2 Squash: Fix ingest bug. Refine AUTHORS. 2021-08-25 08:11:44 +08:00
winlin
23730fa483 Update AUTHORS 2021-08-25 07:43:35 +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
winlin
0123125ec2 RTC: Fix rtc to rtmp sync timestamp using sender report. #2470 2021-08-17 07:20:34 +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
5e876277b6 Update README, move docs to trunk. 2021-08-16 09:15:02 +08:00
winlin
3d58e98d1c Squash: Support github actions for CI 2021-08-15 21:51:50 +08:00
winlin
5fc455ba3b RTC: Remove TestRtcBasic_Republish for random fail 2021-08-15 21:19:02 +08:00
winlin
140d180d08 Actions: Support push and pullrequest 2021-08-15 20:12:31 +08:00
winlin
d08f8fab8c Refine Dockerfile 2021-08-15 11:48:25 +08:00
winlin
a2df2a2402 Refine Dockerfile 2021-08-15 11:21:36 +08:00
winlin
2fdb06299c Support utest and regression-test when release. v4.0.156 2021-08-14 22:24:23 +08:00
winlin
640436d8a6 Refine expose ports for SRS 4.0 2021-08-14 21:10:42 +08:00
winlin
785d1744fc Expose live streaming ports for SRS 3.0 2021-08-14 21:10:11 +08:00
winlin
cadefc34ae Support release SRS 4.0 2021-08-14 21:06:49 +08:00
winlin
becfb517bd Support Github Actions 2021-08-14 21:05:27 +08:00
winlin
32c79b49cc Support Github Actions to publish SRS. 4.0.155 2021-08-14 20:38:01 +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
winlin
57f6eb09c1 Use 4.0 docker srs:4 2021-08-08 00:24:01 +08:00
winlin
42872e2500 Release v4.0.150 dev2 2021-08-07 23:43:24 +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
winlin
6ddef894d9 ST: Refine OSX asm. 2021-07-29 08:46:38 +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
7d4cae45c5 Release 4.0 dev1, v4.0.146 2021-07-25 08:43:00 +08:00
winlin
ed6f8689b4 Release 4.0 dev1, v4.0.146 2021-07-25 08:42:19 +08:00
winlin
301a8ceadb Squash: Merge SRS 4.0 2021-07-24 21:10:35 +08:00
winlin
40e649dfbc RTC: Fix NACK negotiation bug for Firefox. 4.0.145 2021-07-24 21:07:28 +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
Winlin
fe5a14568b
For #2483, add regression test for RTC stat API (#2486) 2021-07-24 20:46:58 +08:00
winlin
1c80b529f8 Squash: Merge SRS 4.0 2021-07-24 08:20:05 +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
33610c6865 Squash: Merge SRS 4.0 2021-07-21 10:36:07 +08:00
Alex.CR
af05f89925 SRT: Use thread-safe log for multiple-threading SRT module. (#2474) v4.0.143 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* optimize srt log system

* update conf

* update srt hpp

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-07-21 10:28:42 +08:00
Alex.CR
4b7ba0e1e9 SRT: Use thread-safe log for multiple-threading SRT module. (#2474) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* optimize srt log system

* update conf

* update srt hpp

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-07-21 10:23:25 +08:00
winlin
4ca433d3f8 Refine push script 2021-07-19 07:51:35 +08:00
winlin
6c40419de7 Fix configure bug 2021-07-19 07:49:57 +08:00
winlin
beea3216fe Squash: Refine IDE 2021-07-17 19:50:35 +08:00
winlin
169f08bae1 [IDE] We should always configure SRS for switching between branches. 2021-07-17 19:48:14 +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
66a696efe0 [IDE] Refine .gitignore for cmake from ide/srs_clion 2021-07-16 22:37:09 +08:00
winlin
2e222d369d [IDE] Refine CMakeLists.txt, use absolute path 2021-07-16 22:29:51 +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
12ba584ea3 Fix build failed 2021-07-09 09:00:35 +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
winlin
db3e11152e Move AUTHORS.txt to trunk for docker. 5.0.7 2021-07-01 06:30:24 +08:00
winlin
e802fe5bd6 Release 4.0.138 2021-07-01 06:25:36 +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
9f5d011687 Squash: Fix build fail for arm/aarch64 2021-06-30 10:28:23 +08:00
winlin
b8dcf20237 Fix build fail for arm/aarch64 2021-06-30 10:02:05 +08:00
winlin
81a5c1b8da Move AUTHORS.txt to trunk for docker to access it 2021-06-30 08:20:53 +08:00
winlin
75530efbc4 Squash: Merge #2448, #2440 2021-06-30 07:32:28 +08:00
winlin
ef43532cf4 Merge #2440, fix #2390, SRT bug for zerolatency. 4.0.137 2021-06-30 07:26:45 +08:00
Alex.CR
7e164b0061 SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-30 07:26:40 +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
Alex.CR
346cc96d7a
SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-30 07:14:56 +08:00
winlin
98e56f5325 Refine the random id by srs_random_str 2021-06-28 08:34:00 +08:00
winlin
0391e71682 Squash: Merge SRS4 2021-06-28 08:02:49 +08:00
winlin
6ea270adf3 Merge #2435, fix #2015, fix bug for HTTP-RAW-API to check vhost. 4.0.136 2021-06-28 07:54:50 +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
d02ba80db1 Squash: Fix bug for building FFmpeg 2021-06-28 07:51:02 +08:00
winlin
bfae75077e Fix #2431, configure FFmpeg bug. 4.0.135 2021-06-28 07:46:13 +08:00
winlin
c8d8581d4b For #2444, add libavcodec/crystalhd.c for FFmpeg. 4.0.134 2021-06-28 07:39:24 +08:00
Hung-Yi Chen
bbd9d864d5
Add missing ffmpeg-4-fit/libavcodec/crystalhd.c from ffmpeg 4.2, #2271 (#2444) 2021-06-28 07:35:52 +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