Commit Graph

1875 Commits (fb23739113f7a169247a1cfb9aa9c41b247007b8)

Author SHA1 Message Date
winlin 608f3d0fae For #1500, support push stream by GB28181. 4.0.18 5 years ago
winlin d81cde695d Refactor code 5 years ago
winlin e19b927f92 Merge GB28181 5 years ago
winlin 6012ac4eb0 Refine code 5 years ago
winlin a342f460e7 Merge branch '4.0release' into xialixin-dev-28181 5 years ago
winlin 33455867f9 Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181 5 years ago
winlin 74ad7143e7 Change authro to Bepartofyou for RTC codec 5 years ago
winlin 45db63249d Update author to John for RTC 5 years ago
xialixin c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 5 years ago
winlin 03289012fd Refactor code for RTC 5 years ago
xiaozhihong 9dadcdffd6 Merge remote-tracking branch 'upstream/feature/rtc' into sdp 5 years ago
xiaozhihong 49da2099c1 sdp exchange. 5 years ago
winlin 57604a9c65 For #1672, fix dvr close file failed bug. 3.0.140 5 years ago
xfalcon cd1513d6a3
fix fs not close,when dvr error (#1672) 5 years ago
winlin dae7af8444 For #307, rtc support osx 5 years ago
winlin 04c3370458 Merge branch 'develop' into feature/rtc 5 years ago
winlin c2b02f86fa Merge 4.0release 5 years ago
winlin 217b8b94b6 Merge 3.0release 5 years ago
winlin c339542ce0 Support macOS OSX 5 years ago
winlin 90a39ec46d Add api to stat mw iovec 5 years ago
winlin 0d060a1cec For #1659, #307, support aliyun slb UDP health check 5 years ago
bepartofyou 923209b070 Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio 5 years ago
bepartofyou 766da5188b Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio 5 years ago
bepartofyou 4a17259471 err wrap change to new 5 years ago
winlin c00ffa530b Merge branch 'feature/codec' into feature/rtc 5 years ago
winlin 602a478e1b For #1659, #307, add switch to disable rtc 5 years ago
xiaozhihong 734e848741 Update RtcSession peer address when changed. 5 years ago
winlin 2da4e0a43e For #1638, #307, config to discard aac for rtc 5 years ago
winlin e1fe2d1c1d For #1638, #307, add comments for audio codec 5 years ago
七曦 f09dda85fc Exception handle 5 years ago
winlin 2757ec7973 Merge from bepartofyou 5 years ago
winlin 0cd67a997e For #1638, #307, add comments for vhost rtc config 5 years ago
winlin be746da21c Merge branch '3.0release' into 4.0release 5 years ago
winlin 0dd6c31487 Fix #1629, fix kickoff FLV client bug. 3.0.137 5 years ago
七曦 a0a4337214 make webrtc audio work 5 years ago
xiaozhihong 7315b1a26d Fix config read "bframe" discad bug. 5 years ago
xiaozhihong fa700dad64 1. Modify rtc.conf to support Bframe discard.
2. Rename srs_app_rtp.cpp to srs_app_rtc.cpp
5 years ago
winlin 68ad006b73 Remove empty line. 5 years ago
winlin 3f6a2871b0 For #1638, #307, show error information when api failed. 5 years ago
winlin d2036455ac Refactor api, follow https://github.com/rtcdn/rtcdn-draft 5 years ago
winlin 61b8ae8c30 Refactor api, follow https://github.com/rtcdn/rtcdn-draft 5 years ago
winlin de9a004ff7 Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2 5 years ago
xialixin 8b4f84e336 fix push.gb28181.conf, gb28181conn repeat call serve() 5 years ago
xialixin cbe9c1dabc Support gb28181 sip over udp, ps steam over rtp 5 years ago
winlin 8eef439c90 For #1638, #307, use hourglass for timer. 5 years ago
HuyaJohn 94e4f4539d merge feature/rtc, fix conflict 5 years ago
HuyaJohn d1d16d490e Detect B frame in avc stream. Fix compiler error with verbose 5 years ago
winlin 0b6e9257f9 For #1638, #307, remove unused code for rtc 5 years ago
winlin 018577e685 For #1638, #307, fix error new bug for rtc 5 years ago
winlin c210c0b2f5 For #1638, #307, refactor rtc player. 5 years ago
xiaozhihong e2233027b8 fix h264 rtp packet error 5 years ago
winlin fc84f1e545 Refactor source cid with pid 5 years ago
winlin 28c1c57854 For #1638, #307, should set err in return value. 5 years ago
winlin 0ff8a3761b For #1638, #307, should check error by fetch_or_create source 5 years ago
winlin ed2996141c For #1638, #307, refine api and udp for rtc. 5 years ago
winlin 2c4dc0fb3d For #1638, #307, extract rtc server to hybrid manager. 5 years ago
winlin 4318d989a6 For #1638, #307, switch to RTC session context cid for cleanup 5 years ago
winlin 25fec76ea9 For #1638, #307, switch to RTC session context cid for reusing UDP ports 5 years ago
winlin 29b9203428 For #1638, #307, use short-term http connection for rtc to use new cid. 5 years ago
winlin 6118ca382a For #1638, #307, http api success with message, timeout as such 5 years ago
winlin b5dd502103 For #1638, #307, fix build warnings 5 years ago
HuyaJohn e8b2bb5d28 process err, do error check, add some error code 5 years ago
winlin c2a667cc35 For #1638, #307, add comments for api and enum 5 years ago
winlin 2f0b150588 For #1638, #307, accept srs_string_dumps_hex to app utility. 5 years ago
winlin e905fce847 For #1638, #307, add comments in RTMP/RTP message for RTC. 5 years ago
winlin 60c8b37f05 For #1638, #307, merge john, add NACK suport, remove debug code, verbose log 5 years ago
xiaozhihong 2b56f9ee59 add NACK suport, remove debug code, verbose log 5 years ago
winlin 12e99f1897 For #1638, #307, use webrtc adapter.js for demo. 5 years ago
winlin a42cf3ae8d For #1638, #307, refactor rtc config. 5 years ago
winlin 51af2b4779 For #1638, #307, rtc conf support ENV. 5 years ago
xiaozhihong 6c88f58079 remove debug code, fix rtc.html 5 years ago
winlin d21ef106a0 Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc 5 years ago
xiaozhihong 027d34bbd3 add rtp shared packet 5 years ago
xiaozhihong 6decdc7838 adjust code style, fix some bug, add rtc session timeout 5 years ago
winlin 1382337cb4 Merge SRS3 5 years ago
winlin 856ed5a971 For #1635, inotify watch ConfigMap for reload. 3.0.134 5 years ago
winlin bb509d23e2 For #1635, inotify watch ConfigMap for reload. 3.0.133 5 years ago
winlin 88368ed18d For #1635, inotify watch ConfigMap for reload. 3.0.132 5 years ago
winlin 940798a9c7 For #1635, inotify watch ConfigMap for reload. 3.0.131 5 years ago
winlin 5e60c8f9cc For #1635, inotify watch ConfigMap for reload. 3.0.130 5 years ago
winlin 9b663c070a Fix #1635, support auto reaload config by inotify. 3.0.129 5 years ago
winlin b33751e2c1 Merge SRS3 5 years ago
winlin 4b395f6e16 Fix #1630, disable cache for stream changing, and drop dup header. 3.0.128 5 years ago
winlin ed41ca867b For #1594, detect and disable daemon for docker. 3.0.127 5 years ago
winlin c1e07d6a96 For #1634, always check status in thread loop. 3.0.126 5 years ago
winlin 6a765ab849 Merge SRS3 5 years ago
winlin 6c55fd3e4b For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 5 years ago
winlin c61c2a939f For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 5 years ago
HuyaJohn da72caf8b9 h264 packet done, chrome play well 5 years ago
winlin c78595c1fa For #1634, refactor encoder output, support timestamp variables. 5 years ago
winlin 66b194cd63 For #1634, refactor encoder process management. 5 years ago
winlin 927c0c8e39 For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124 5 years ago
xiaozhihong e831f3254a some code 5 years ago
HuyaJohn ff0e03800d h264 rtp debuging 5 years ago
xiaozhihong e2675109fb fix rtp h264 packet bug 5 years ago
HuyaJohn 3ae510b843 rtp dispatch done, but video can not play in chrome 5 years ago
xiaozhihong 2f462775a0 rtp support 5 years ago
HuyaJohn 2e68c375e3 start coding flv->rtp 5 years ago
xiaozhihong c62901a3ac make code easy, wrap udp remux socket 5 years ago
winlin 5586c2a128 For #1612, refactor return value for RTSP initialize. 5 years ago