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

6072 commits

Author SHA1 Message Date
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