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

7597 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
7ab3e4a86c Squash: Merge SRS 4.0 2021-08-28 09:03:06 +08:00
winlin
749a98acd6 Merge branch '4.0release' into merge/develop 2021-08-28 09:01:49 +08:00
winlin
a018bf8409 Merge branch 'develop' into merge/develop 2021-08-28 09:01:38 +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
winlin
4d6daeae23 Merge branch '4.0release' into merge/develop 2021-08-27 07:56:25 +08:00
winlin
a598d5ff62 Merge branch 'develop' into merge/develop 2021-08-27 07:56:21 +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
6e9f1a864c Merge 2021-08-25 08:04:23 +08:00
winlin
23730fa483 Update AUTHORS 2021-08-25 07:43:35 +08:00
winlin
2e8766515e Merge 2021-08-25 07:37:42 +08:00
winlin
573e3236da Merge branch 'develop' into merge/develop 2021-08-25 07:35:37 +08:00
winlin
ef2442b666 Update AUTHORS 2021-08-25 07:35:27 +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
0859fb5298 Update issue template 2021-08-18 08:12:37 +08:00
winlin
cee38ab1e6 Update issue template 2021-08-18 08:11:50 +08:00
winlin
be7b71294d Update issue template 2021-08-18 07:50:05 +08:00
winlin
85620a34f5 Squash: Fix rtc to rtmp sync timestamp using sender report. #2470 2021-08-17 07:25:03 +08:00
winlin
7ae9c882b4 Merge 2021-08-17 07:24:20 +08:00
winlin
e5f8825584 Merge branch 'develop' into merge/develop 2021-08-17 07:21:09 +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
1c825ce831 Merge 2021-08-15 21:51:05 +08:00
winlin
6cd7a8cc04 Merge branch 'develop' into merge/develop 2021-08-15 21:50:08 +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
445bbc9dda Merge 2021-08-15 11:33:07 +08:00
winlin
0f6be65b37 Merge branch 'develop' into merge/develop 2021-08-15 11:32:31 +08:00
winlin
a2df2a2402 Refine Dockerfile 2021-08-15 11:21:36 +08:00
winlin
121fed57d3 Actions: Remove v3 in 4.0, never trigger it 2021-08-15 08:09:42 +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
7efae1b1d6 Squash: Update CodeQL 2021-08-14 16:43:46 +08:00
winlin
02ca63c546 Merge 2021-08-14 16:36:53 +08:00
winlin
18d76156a3 Merge branch 'develop' into merge/develop 2021-08-14 16:28:59 +08:00
winlin
94308253b7 Actions: Add github actions for CI 2021-08-14 16:16:56 +08:00
winlin
26de8c65ad Actions: Add github actions for CI 2021-08-14 15:57:46 +08:00