Commit Graph

7561 Commits (7f6185b127e5a3c1190e05bed9e7ea6595d2c359)
 

Author SHA1 Message Date
winlin 7f6185b127 Merge branch '4.0release' into merge/develop 4 years ago
winlin da6f70f73b Merge branch 'develop' into merge/develop 4 years ago
winlin eff225a800 Refine dockerfile 4 years ago
winlin 19c0a9eb4b Suqash: Merge 4.0 4 years ago
winlin e5373c9390 Merge branch '4.0release' into merge/develop 4 years ago
winlin fd32617677 Merge branch 'develop' into merge/develop 4 years ago
winlin f316b8fbdf Release 4.0 dev5, v4.0.161 4 years ago
winlin ec554e14d0 Merge #2581, Fix listen ipv6 and port. 4.0.161 4 years ago
ChenGH 3f94d26ca4
For #1920, refine rtmp listen ip and port check (#2581) 4 years ago
ChenGH 714e182096
fix srs_string_replace deap loop when new_str inclue old_str (#2580) 4 years ago
winlin 6bb11a72d0 For #2282, #2181, Move DVR async worker from SrsDvrPlan to global. 4 years ago
winlin 90b5ed2202 For #2282, #2181, Remove reload for dvr_apply. 4.0.160 4 years ago
BoringWednesday 1db155fa2f
SRT: Add member of adaptation_field and fix pos not add after memcpy. (#2066) 4 years ago
winlin cf3129220d Log: Refine the tail help log, show last 30 lines 4 years ago
winlin 7ab3e4a86c Squash: Merge SRS 4.0 4 years ago
winlin 749a98acd6 Merge branch '4.0release' into merge/develop 4 years ago
winlin a018bf8409 Merge branch 'develop' into merge/develop 4 years ago
winlin b6d0c73cda For #1859, Enhancement: Add param and stream to on_connect. 4.0.159 4 years ago
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>
4 years ago
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
4 years ago
winlin f86d6fd073 Squash: Merge SRS 4.0 4 years ago
winlin 4d6daeae23 Merge branch '4.0release' into merge/develop 4 years ago
winlin a598d5ff62 Merge branch 'develop' into merge/develop 4 years ago
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
4 years ago
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
4 years ago
Haibo Chen c8bf98e8e2 Support for multiple SPS/PPS, then pick the first one. (#2544) 4 years ago
Haibo Chen 826f5121c5
Support for multiple SPS/PPS, then pick the first one. (#2544) 4 years ago
winlin 38b0b1dab2 Squash: Fix ingest bug. Refine AUTHORS. 4 years ago
winlin 6e9f1a864c Merge 4 years ago
winlin 23730fa483 Update AUTHORS 4 years ago
winlin 2e8766515e Merge 4 years ago
winlin 573e3236da Merge branch 'develop' into merge/develop 4 years ago
winlin ef2442b666 Update AUTHORS 4 years ago
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
4 years ago
winlin 0859fb5298 Update issue template 4 years ago
winlin cee38ab1e6 Update issue template 4 years ago
winlin be7b71294d Update issue template 4 years ago
winlin 85620a34f5 Squash: Fix rtc to rtmp sync timestamp using sender report. #2470 4 years ago
winlin 7ae9c882b4 Merge 4 years ago
winlin e5f8825584 Merge branch 'develop' into merge/develop 4 years ago
winlin 0123125ec2 RTC: Fix rtc to rtmp sync timestamp using sender report. #2470 4 years ago
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.
4 years ago
winlin 5e876277b6 Update README, move docs to trunk. 4 years ago
winlin 3d58e98d1c Squash: Support github actions for CI 4 years ago
winlin 1c825ce831 Merge 4 years ago
winlin 6cd7a8cc04 Merge branch 'develop' into merge/develop 4 years ago
winlin 5fc455ba3b RTC: Remove TestRtcBasic_Republish for random fail 4 years ago
winlin 140d180d08 Actions: Support push and pullrequest 4 years ago
winlin d08f8fab8c Refine Dockerfile 4 years ago
winlin 445bbc9dda Merge 4 years ago