Commit Graph

2257 Commits (2dc311fbd9d7d50e867d4357d68be3c910c0c37b)

Author SHA1 Message Date
winlin a8cc3a3430 For #307, fix some memory leaking 5 years ago
winlin e22d1dffc1 Merge remote-tracking branch 'john/rtc' into feature/rtc 5 years ago
winlin 6c5b51618c For #307, support config to send plaintext RTP. 5 years ago
winlin 00810e6d1d Refine api for tcmalloc 5 years ago
winlin 35a037cf05 Add api for tcmalloc 5 years ago
winlin 574ae58adc For #307, support mock server eip by API 5 years ago
winlin 59b9fa9610 For #307, always 1 if os does not support sendmmsg 5 years ago
winlin 7cfd2879b0 For #307, config sendmmsg max 5 years ago
winlin 40c95b04ca Merge remote-tracking branch 'winlin/feature/perf_stat' into feature/rtc 5 years ago
winlin 133e3ce075 For #307, use sendmmsg in rtc server 5 years ago
xialixin d2b8b937d6 fix generate ssrc, rtmp muxer cycle sleep, ps steam parase etc.. 5 years ago
xialixin c70ed1cd74 add sip session status check 5 years ago
xialixin 8ac39cb22f del print_sip_message config 5 years ago
winlin 55a4052d90 For #307, support sendmmsg to improve RTC performance 5 years ago
xialixin 92d351ef35 fix 'output' format define; support 'host' auto get; time config use SRS internal format; support auto create stream channel on/off 5 years ago
xialixin 5e4fdfd1d4 fix after RTMP is closed, empty PPS and SPS. sip client sockaddr set 5 years ago
xialixin ac8acc0b22 fix 28281 to 28181, sip heart message, timeout channel peer ip and port reset 5 years ago
winlin 573449f1b0 For #307, refine RTC latency from 600ms to 200ms. 4.0.20 5 years ago
xiaozhihong 22fe799649 Add annotation about rtp packet. Remove no need verbose log. 5 years ago
winlin 0ff3ce7464 Merge remote-tracking branch 'john/rtc' into feature/rtc 5 years ago
winlin 9e7e80f5f5 Add TODO comment for Cert 5 years ago
winlin 8c42ad622b Config to use RSA or ECDSA 5 years ago
winlin c70a0eb07c Config to use RSA or ECDSA 5 years ago
winlin 862c211acd Support openssl 1.0 and 1.1, RSA and ECDSA 5 years ago
xiaozhihong 3cf03393c0 format a=candidate line 5 years ago
xiaozhihong d6adb5cd8d process USE-CANDIDATE/ICE-CONTROLLING/ICE-CONTROLLED atrribute in STUN 5 years ago
winlin 8de89f3f37 Add TODO for SRTP-GCM for RTC 5 years ago
winlin 51bae42560 For RTC, verify peer and accept all certificate. 5 years ago
xiaozhihong bfd8971db8 fix compile warning. 5 years ago
xiaozhihong 4f671b1de2 Merge remote-tracking branch 'upstream/feature/rtc' into rtc 5 years ago
xiaozhihong 14421a7f0b add annotation about some sdp line 5 years ago
xiaozhihong f4067bcb4d fix nack bug 5 years ago
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
winlin dcb0553cc8 For #1612, fix crash bug for RTSP. 4.0.12 5 years ago
winlin 12a74326e8
Merge pull request #1612 from xialixin/develop
Fix disconnect RTSP connection has assertion, resulting in program exit
5 years ago
runner365 a2839aacdf add h264 sei filter 5 years ago
HuyaJohn b730458d51 add candidates ip list, add rtc_upload.html to test 5 years ago
xiaozhihong 9d5495c0c2 "stun and dtls done" 5 years ago
xiaozhihong 30d8b2209f parse sdp 5 years ago
winlin f917cc1e0c
For SRT, perfer mix_correct to true as default. 5 years ago
runner365 7f4cc6221c 1,solve audio timestamp bugs;2,solve video dts increase bugs 5 years ago
xiaozhihong 62563bdd81 rtc framework 5 years ago
winlin ea305790df For #1579, refactor log for gracefully quit. 5 years ago
winlin 90afd06c85 For #1615, support default app(live) for vmix SRT. 4.0.9 5 years ago
xiaozhihong 51abb0844e rtp session manager, stun codding 5 years ago
winlin ef2b123325 Merge branch '3.0release' into 4.0release 5 years ago
winlin 20b9d6ab02 For #1598, support SLB health checking by TCP. 3.0.123 5 years ago
xiaozhihong bc22ebe949 add rtc http request and response, exchange sdp. 5 years ago
winlin 388ad61cdc Merge branch '3.0release' into 4.0release 5 years ago
winlin dc0f804452 For #1579, support start/final wait for gracefully quit. 3.0.121 5 years ago
winlin 0c48c42f36 Merge branch '3.0release' into 4.0release 5 years ago
winlin 58b40478b6 For #1579, support force gracefully quit. 3.0.120 5 years ago
winlin eefd74e0e4 Merge branch '3.0release' into develop 5 years ago
winlin 3c597545b1 For #1579, support gracefully quit. 3.0.119 5 years ago
winlin f4c7b882c5 For #1579, define signals for fast/grace quit and upgrade 5 years ago
夏立新 d6e11706ec Fix disconnect RTSP connection has assertion, resulting in program exit 5 years ago
夏立新 df3ec15cd1 Fix checking the completion of one frame data in RTSP RTP stream 5 years ago
winlin 5be69d290f For #1601, flush async on_dvr/on_hls events before stop. 3.0.118 5 years ago
Alex.CR 9dad53691e
solve latency parameter error (#1600)
* solve latency parameter error
5 years ago
Alex.CR 5f7d23f123
add srt parameter configure (#1599)
* if there isn't srt connect, it needn't epoll wait

* solve repush srt bugs

* change two thread to one thread

* mpegts discard header is not 0x47

* add srt_epoll_clear_usocks

* add srt parameter configure
5 years ago
winlin bdc7973596 Merge branch '3.0release' into develop 5 years ago
winlin fc769550db Fix #665, fix HTTP-FLV reloading bug. 3.0.116 5 years ago
winlin c6d914bc13 Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115 5 years ago
winlin c50c51889a For #1592, support ff_log_level and default to warning 5 years ago
winlin 2fa151726b For #1592, rename ff_log_dir. 5 years ago
winlin 823b4fa56f Merge branch '3.0release' into develop 5 years ago
winlin a99cee2819 For #1186, refactor security check. 3.0.114 5 years ago
winlin c51c378869 For #1186, refactor security check. 3.0.114 5 years ago
winlin 59439cf8b5 Merge branch '3.0release' into develop 5 years ago
winlin 4f39303f37 Fix #939, response right A/V flag in FLV header. 3.0.113 5 years ago
winlin 68efca4fa9 For #939, always enable fast FLV streaming. 5 years ago
winlin a2a6ca8258 For #939, always enable fast FLV streaming. 5 years ago
winlin 77114c7df0 Merge SRS3 5 years ago
winlin 23ece94064 Fix #1206, dispose ingester while server quiting. 3.0.111 5 years ago
winlin a6f88805f3 Remove test code 5 years ago
winlin 6ed6ce58e4 Merge SRS3 5 years ago
winlin adf7ef4511 Fix #1230, racing condition in source fetch or create. 3.0.110 5 years ago
winlin b605edb9b3 Merge 3.0 5 years ago
winlin 5d365bade8 Fix #1303, do not dispatch previous meta when not publishing. 3.0.109 5 years ago
winlin 88c9c13707 Update readme for SRT 5 years ago
winlin 2775a391e0 Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108 5 years ago
winlin 74154cdfd9 Fix #703, drop video data util sps/pps. 3.0.107 5 years ago
winlin bbc7023f85 Merge SRS3 5 years ago
winlin 978d5e993b Fix #1108, reap DVR tmp file when unpublish. 3.0.106 5 years ago
winlin 5d0833fcc3 Add author runner365 5 years ago
winlin 5f174552f3 Merge SRT 5 years ago
winlin 7c9b31815f Refactor code, add stop for hybrid server to do cleanup. 5 years ago
winlin 2363d258de Refactor hybrid server model 5 years ago
winlin 33c6bf1f8f Refactor SRT, using reverse dependency, SRT depends on APP. 5 years ago
winlin 1959d1d920 Extract hybrid server for SRT 5 years ago
winlin aacf519169 Revert log for forwarder in source 5 years ago
winlin a7b8695cb0 Refactor code, include without path 5 years ago
winlin f143757429 Use macro to disable SRT in code 5 years ago
runner365 5c5fd805c5 add srt mpegts to rtmp 5 years ago
winlin a6fe4e80d3 For #1547, remove the SRS_OSX macro in code 5 years ago
winlin 9dbd049e79 For #1568, extract SrsSourceManager from SrsSource. 5 years ago
winlin 0e750ab3eb For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100 5 years ago
winlin 7240fe3040 For #1509, decrease the fast vector init size from 64KB to 64B. 3.0.99 5 years ago
winlin 857c783efc For #1509, release coroutine when source is idle. 3.0.98 5 years ago
runner365 aeee3011ef add srt server file 5 years ago
winlin 6c1067d56a Merge from 2.0 5 years ago
winlin dd46a4f700 Fix #1554, support logrotate copytruncate. 2.0.272 5 years ago
winlin c08b6f1961 Merge 2.0, support logrotate copytruncate. 3.0.96 5 years ago
winlin 731e87876e Fix #1554, support logrotate copytruncate. 2.0.271 5 years ago
Michael.Ma 459488bcf8 fix logrotate empty file hole issue (#1561)
* fix logrotate empty file hole issue
refer to https://github.com/ossrs/srs/issues/1554
5 years ago
winlin 10464a5fbe Always use string instance to avoid crash risk. 3.0.95 5 years ago
winlin bc6c61e546 Fix #1543, use getpeername to retrieve client ip. 3.0.92 5 years ago
winlin 45aa325722 Improve test coverage for config. 5 years ago
winlin 0fd0114ee6 Improve test coverage for config. 5 years ago
winlin 7136c7c9b8 Improve test coverage for config. 5 years ago
winlin de87b64f59 Improve test coverage for config. 5 years ago
winlin a71d93188b Improve test coverage for config. 5 years ago
winlin d783a12f89 Happy 2020 5 years ago
winlin 8a28a11648 For #299, increase dash segment size for avsync issue. 3.0.89 5 years ago
winlin d11a7b2e00 For #299, fix some bugs in dash, it works now. 3.0.88 5 years ago
winlin b9d720c927 For #1105, http server support mp4 range. 5 years ago
winlin 7584c47aaf Fix #1105, dvr mp4 supports playing on Chrome/Safari/Firefox. 3.0.86 5 years ago
winlin 2115d5d22a For #1488, add test and improve coverage for parsing client ip. 5 years ago
winlin 316cab794a For #1488, pass client ip to http callback.3.0.85 5 years ago
winlin d367730883 For #1488, support parsing original ip from header for proxy 5 years ago
winlin 09b65aff96 For #1488, pass client ip to http callback. 2.0.269 5 years ago
winlin a11461905b Remove FFMPEG and NGINX, please use srs-docker instead . 3.0.82 5 years ago
winlin e6e4bd7fb4 Remove useless warning log for reloading. 5 years ago
winlin 7eccc9da26 For #1508, support chunk length and content in multiple parts. 5 years ago
winlin 4382ced3bf For #1508, Refactor srs_is_digital, support all zeros. 5 years ago
winlin d7078a72d4 For #1520, add TODO list for configing server itself in coworker. 5 years ago
winlin acfeb8a66f Fix #1520, #1223, bug for origin cluster 3+ servers. 3.0.74 5 years ago
winlin cef7ec79b3 Detect whether flash enabled for srs-bwt. 5 years ago
winlin dc1afc142f Fix HTTP CORS bug when sending response for OPTIONS. 3.0.72 5 years ago
winlin 191b07668d Refactor HTTP stream to disconnect client when unpublish 5 years ago
winlin 1e83da7812 Refactor HTTP recv request timeout to 15s. 5 years ago
winlin 2df1dcb05a Fix HTTP-FLV and VOD-FLV conflicting bug. 5 years ago
winlin d9842b0371 Refactor HttpResponseWriter.write, default to single text mode. 5 years ago
winlin 8cdb7cc727 Add test for vod stream handler 5 years ago
winlin ca2b68f428 Refactor header of HTTP message by using SrsHttpHeader. 5 years ago
winlin 6f453e7f46 For #547, #1506, default hls_dts_directly to on. 3.0.71 5 years ago
winlin 78da67e8d1 For #1229, fix the security risk in logger. 3.0.69 5 years ago
winlin ad70589347 For #1229, fix the security risk in HDS. 3.0.69 5 years ago
winlin 1c227f4f8a Refine logger for hls_dts_directly 5 years ago
winlin b4870a6d6f Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68 5 years ago
winlin 31f341e205 For #1506, refine the AAC samples guess algorithm. 5 years ago
winlin 52c6c7c45d For #1506, ignore video when codec is unknown. 5 years ago
winlin 5a3fd1e68a Release v3.0-a2, 3.0.67 5 years ago
winlin 517974d451 Refine redirect flow for origin cluster 5 years ago
winlin e5285ecabf Fix #1501, use request ip for origin cluster. 3.0.66 5 years ago
winlin 4cd03a7c06 Refine debug info for edge. 3.0.64 5 years ago
winlin e045b0a619 We prefer ipv4, only use ipv6 if ipv4 is disabled. 3.0.59 6 years ago
winlin 88df9a2497 Support go-oryx rtmplb with proxy protocol. 3.0.56 6 years ago
winlin 130c545f9a Refine origin cluster log 6 years ago
winlin 1a65927b1b Remvoe HSTRS warning. 6 years ago
winlin 5d17bb8bb0 Remove KAFKA. 3.0.53 6 years ago
winlin 5d8fb01b45 Fix #1352, fix typo of daemon. 6 years ago
winlin ffe391aa49 Fix HLS no PMT/PAT bug. 6 years ago
winlin c71b867b4f Refine comments. 6 years ago
winlin 3d57c1c9bc Refine ST service. 6 years ago
winlin 202a584aab Refine ST service. 6 years ago
winlin a4160308f5 Refine comments. 6 years ago
winlin b02527dec0 Refine usage. 6 years ago
winlin 2de3045b25 Remove noisy informations. 6 years ago
winlin 6dbe79ad02 Remove noisy informations. 6 years ago
winlin ad3749a4d5 Remove noisy informations. 6 years ago
winlin 0564cdedec Refine typo in comments. 6 years ago
winlin 6b2c71d385 Refine typo in files. 3.0.51 6 years ago
winlin 45009785fb Refine typo in app. 6 years ago
winlin aac8a13f42 Refine typo in app. 6 years ago
winlin e436cc5665 Refine SrsBasicRtmpClient in time unit. 6 years ago
winlin c6dcc76fea Refine SrsRequest.duration in time unit. 6 years ago
winlin 73e71d26ea Refine SrsGopCache::start_time in time unit. 6 years ago
winlin 1626942d29 Fix SrsHlsMuxer::segment_close bug, reopen segment when close failed. 6 years ago
winlin d306ee7506 Refine ms in time unit 6 years ago
winlin 5af572ab50 Refine SrsRtmpConn.duration in time unit. 6 years ago
winlin f6f49c68da Refine SrsRecvThread timeout in time unit 6 years ago
winlin 6b587c5e0f Refine SrsUdpPacketRecvCycleInterval in time unit. 6 years ago
winlin 283c4c7449 Refine SrsPithyPrint.age or SrsIngesterFFMPEG.alive in time unit. 6 years ago
winlin 522cbf1df8 Refine SrsHourGlass in time unit. 6 years ago
winlin f5a1f9b774 Refine SrsFragment.start_dts in time unit 6 years ago
winlin 288bed6e26 Refine SrsTcpClient.timeout in time unit. 6 years ago
winlin 33c66b64c5 Refine name TMMS to TIMEOUT 6 years ago
winlin 5505eceeac Refine SrsTcpClient.timeout in time unit. 6 years ago
winlin feb34ed225 Refine SrsStSocket in time unit 6 years ago
winlin d3dc45f357 Refine set_recv_timeout in time unit 6 years ago
winlin f4bee37e76 Refine set_send_timeout in time unit 6 years ago
winlin a1398892d0 Refine const timeouts in time unit 6 years ago
winlin 61afca7160 Refine SrsTcpClient timeout in time unit 6 years ago
winlin e9770933a6 Refine dash controller publish or unpublish 6 years ago
winlin 6380e8f1c0 Fix HLS segment close bug 6 years ago
winlin 138d1e3cad Refine get_vhost_http_remux_fast_cache in time unit 6 years ago
winlin 010e35bec2 Refine get_hds_fragment and get_hds_window in time unit 6 years ago
winlin 917f6d066d Refine get_hls_window in time unit 6 years ago
winlin ca705a6f62 Refine get_hls_fragment in time unit 6 years ago
winlin 402e614471 Refine get_send_min_interval in time unit 6 years ago
winlin c1b64ba24f Refine get_queue_length and set_queue_size in time unit 6 years ago
ME_Kun_Han af49e218ce for #1349, use correct value for SRS_CONF_DEFAULT_HLS_ON_ERROR_IGNORE and SRS_CONF_DEFAULT_HLS_ON_ERROR (#1351) 6 years ago
winlin 465d255940 Refine SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS in time unit 6 years ago
winlin 980c32aee6 Refine on_hls duration in time unit 6 years ago
winlin 5f3d09c8a0 Refine hls muxer duration in time duration. 6 years ago
winlin 41d1e91540 Fix start and end time bug 6 years ago
winlin bc1189caee Refine SrsFragment.duration in time unit. 6 years ago
winlin 0879bef9b2 Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT 6 years ago
winlin 53357e92fe Refine headers 6 years ago
winlin 92980a0ca2 Refine SRS_CONSTS_RTMP_TMMS in time unit 6 years ago
winlin 5b0e0d0838 Refine SRS_CONSTS_RTMP_PULSE_TMMS in time unit 6 years ago
winlin 695d430dcf Refine SrsMessageQueue.duration in time unit. 6 years ago
winlin 170cca1f58 Refine srs_get_system_startup_time in time unit 6 years ago
winlin 6c12aa0eca Refine srs_update_system_time in time unit 6 years ago
winlin 9b7c0802a9 Refine srs_update_system_time in time unit 6 years ago
winlin 9b1222a79c Refine get_publish_normal_timeout in time unit 6 years ago
winlin 170872135d Refine get_publish_1stpkt_timeout in time unit 6 years ago
winlin d6828a3e58 Refine get_mw_sleep in time unit 6 years ago
winlin 839a496d50 Refine get_mr_sleep in time unit 6 years ago
winlin 5df8f2f6c1 Refine get_pithy_print in time unit 6 years ago
winlin 60f9561d2d Refine get_heartbeat_interval in time unit 6 years ago
winlin 5937304717 Refine get_dash_timeshift in time unit 6 years ago
winlin 12cf17ef6b Refine get_dash_update_period in time unit 6 years ago
winlin 4302ab7708 Refine get_dash_fragment to time unit 6 years ago
winlin bb6389143f Refine get_bw_check_interval in time unit 6 years ago
winlin 74c1944e15 Refine config, allow parse multiple times. 6 years ago
winlin 6239dfa489 Apply time unit 6 years ago
winlin 7037f6a197 Cover more ST Coroutine code 6 years ago
winlin 1ce040cc2c Cover more ST Coroutine code 6 years ago
winlin 3d5508e088 Cover more ST Coroutine code 6 years ago
winlin a9a720e32f Cover ST Coroutine and time unit. 3.0.48 6 years ago
winlin f2b4bc7110 Fix #1304, Fix ST coroutine pull error. 3.0.47 6 years ago
winlin a8781aee3e For #1304, Default HSTRS to on. 2.0.264 6 years ago
winlin 633a9a0d35 Merge #1324, Remove dead code 6 years ago
winlin b9750baa52 For #1339, Support HTTP-FLV params. 6 years ago
winlin 91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 6 years ago
YLX ab833943e1 fix: support parse flv query params to http callback (#1339) 6 years ago
winlin 073d42ca7d CI: Refine hls ts context writer 6 years ago
winlin b2d1d84634 Change to 2019 6 years ago
winlin 6234905532 Refactor ISrsKbpsDelta 6 years ago
winlin c26b475bae Refine kbps, stub wall clock 6 years ago
winlin 4c40370986 Refine kbps more testable 6 years ago
winlin 16fa4c588a Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter 6 years ago
winlin 6e75993e7f Change public virtual to virtual public 6 years ago
winlin 2e9bf2af83 Always enable SRS_StreamCaster 6 years ago
winlin aa1a5442f9 Always enable SRS_Ingest 6 years ago
winlin c6844527fb Always enable SRS_SSL 6 years ago
winlin 0bc7fdbb35 Always enable SRS_SSL 6 years ago
winlin 8e294709b0 Always enable SRS_STAT 6 years ago
winlin 330100769f Always enable SRS_TRANSCODE 6 years ago
winlin ba4ef34d27 Merge 2.0release 6 years ago
RocFang 768fe68ca3 fix st_usleep param from us to ms. (#1236)
fix st_usleep param from us to ms.
7 years ago
Mirko Velic 70ad16ff6a Add request stream param to encoder output format parameters. (#1237) 7 years ago
winlin 8e55ef4b60 Refine code 7 years ago
winlin 1e2cca4712 For #1093, Refine HLS encryption wiki 7 years ago
winlin ee068cf120 For #1109, Support without ssl for HLS key. 7 years ago
winlin 522fba99aa Merge branch 3.0release into harlanc-3.0release 7 years ago
winlin e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 7 years ago
Harlan 22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
7 years ago
Harlan ac6b37de4b rewrite ff_data_to_hex 7 years ago
winlin 1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 7 years ago
winlin 1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 7 years ago
winlin 928c6ab091 For #1181, Add utest 7 years ago
winlin 01d8bba455 For #1181, Refine code to write utest 7 years ago
winlin 6cea551c64 For #1110, Refine params in http callback. 2.0.253 7 years ago
winlin d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 7 years ago
winlin 03ac48f8fa Merge 2.0, for FLV latency 7 years ago
winlin c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 7 years ago
winlin 580c94c8c0 Refine code 7 years ago
winlin 29b74c7220 For #1110, Support params in http callback. 3.0.36 7 years ago
winlin 85d3a5001c For #1110, Support params in http callback. 2.0.251 7 years ago
winlin 68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 7 years ago
winlin 09dbda5b18 For #1031, SRS forwarder support douyu.com. 7 years ago
winlin a66d450ec1 For #1031, SRS edge support douyu.com. 3.0.34 7 years ago
winlin 586899a010 For #1031, SRS edge support douyu.com. 2.0.250 7 years ago
winlin d27db215df For #1176, should not close fd when success. 7 years ago
winlin e4742ddac7 Merge 2.0release 7 years ago
Hui Zhang (huzhang2) 01ed485cf3 fix #1172 #1173 #1174 #1175
security scan report issue
7 years ago
Harlan e9cb8210fc fix default value error 7 years ago
Harlan 43ebd5958d fix bug that only one stream can be encrypted.. 7 years ago
winlin dba44c7c3f Merge branch 'develop' into 3.0release 7 years ago
xialixin aaf2905a9d add: hls configuration adds [duration] variable (#1083) 7 years ago
Harlan 52596a0b04 add HLS encryption feature 7 years ago
winlin 0d78b908a7 Fix client tools resolve dns failed bug 7 years ago
winlin bd797ad385 Fix utest build failed for ::atoi 7 years ago
winlin 459272b94c Merge #1077 from 2.0release 7 years ago
RocFang fd016ed91a use hls->initialize to set req of hls (#1077) 7 years ago
winlin c70421e656 Fix #464, support origin cluster 7 years ago
winlin 2f09ec4353 For #464, refine result of origin cluster api 7 years ago
winlin 92f2bcd878 For #464, support config origin cluster 7 years ago
winlin 55c96192e2 For #464, refine code 7 years ago
winlin ec362b2774 For #464, query origin info and ip addresses 7 years ago
winlin 469250f850 For #464, support origin cluster api 7 years ago
winlin d0fbf44d18 For #464, support config for origin cluster. 7 years ago
winlin a2cefe4dbd For #1059, show more information from stream 7 years ago
winlin 681138d2af Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27 7 years ago
winlin 1721e4ea4b Fix #1059, support vhost in stream parameters. 2.0.246 7 years ago
winlin 93d3e1464a For #1045, revert macro for TCP keepalive detection, use system macro 7 years ago
winlin 366309ce2d For #1045, revert macro for TCP keepalive detection, use system macro 7 years ago
winlin 049e7c82c0 Merge #1044, for #1045, set TCP SO_KEEPALIVE 7 years ago
winlin 911cd448f1 Merge #1045, for #1044, TCP connection alive detection. 2.0.245 7 years ago
juntaoliu a6871052af set tcp keepalive for tcp socket (#1045) 7 years ago
winlin ca1395a807 Change date from 2017 to 2018 7 years ago
winlin 922a8f3a5c For #988, refine code. 7 years ago
winlin 823dc2df21 Refine help 7 years ago
Thomas Dreibholz feaae341b9 IPv6 support (for 3.0 release) (#988)
* IPv6 support, part 1.

* IPv6 support, part 2.

* Some more IPv6 work.

* Made functions for address:port paŕsing IPv6-capable.

* Fixed type (compile warning).

* Fixed formatting.

* Reverted option change.

* Replaced abort() by proper error handling.

* Also retrieving local IPv6 addresses now.
7 years ago
winlin db08f1586c For #913, APP support complex error. 7 years ago
winlin e2c1f58674 For #913, APP support complex error. 7 years ago
winlin 6eae93258a For #913, APP support complex error. 7 years ago
winlin 204ef041da For #913, Kernel MP4 FLV HTTP support complex error. 7 years ago
winlin 9802dc326e For #913, source support complex error 8 years ago
winlin abcaba33ee For #913: TS/HLS/MPEGTS support complex error 8 years ago
winlin 20a42599f3 For #913, http callback use complex error 8 years ago
winlin fd91df9411 For #913, reload use complex error 8 years ago
winlin 9f5224c34a For #913, use complex error for http 8 years ago
winlin 661eb8b37c For #913, use complex error for reload utc time 8 years ago
winlin 5c9a12e72a For #913, use complex error for listener 8 years ago
winlin 71dd3f3137 For #913, use complex error for server handler. 8 years ago
winlin 9db2a04c3b For #913, coroutine support complex error. 8 years ago
winlin b5c14938d9 For #913, config and log support complex error. 8 years ago
winlin 860aac3e50 For #913, config reload and persistence 8 years ago
winlin 7cac35a289 For #913, source cycle error 8 years ago
winlin a20e2c3ef6 For #913, refine server utility 8 years ago
winlin ca9f0bdb1e For #913, refine server initialize st 8 years ago
winlin 4e4091231e Refine object create in server. 8 years ago
winlin 93710c7489 For #913, refine the error mechanism 8 years ago
winlin bb200b5d2d For #913, add complex error. 8 years ago
winlin 69374c8d6d For #299, use format for v/a sequence header. 8 years ago
winlin 9ca36970aa Fix #908, use empty coroutine to avoid NULL pointer. 8 years ago
winlin 0e9e1792fe For #299, write fMP4 for DASH. 8 years ago
winlin 1bf99e8f3e For #907, Wrap ST, only use in service ST. 8 years ago
winlin 54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 8 years ago
winlin 6993ac226f For #906, #902, use coroutine for reusable2 thread 8 years ago
winlin ea9a5f26d9 For #906, #902, use coroutine for reusable thread 8 years ago
winlin 2ed2513f08 For #906, #902, use coroutine for one cycle thread 8 years ago
winlin b21f92f97a For #906, #902, remove the thread start and stop event 8 years ago
winlin 3ffb0980f5 For #906, #902, use connection manager to remove connection 8 years ago
winlin 44f542f77f For #906, #902, replace the endless thread with coroutine 8 years ago
winlin fc380fe48d For #906, #902, refine thread object. 8 years ago
xialixin 92c8c0505d Fix the timebase bug, change from us to ms. (#876)
* fix SRS_CONSTS_RTMP_PULSE_TMMS (int64_t)(500*1000LL)

* fix SrsBufferCache::cycle st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)

* fix st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)
8 years ago
HungMingWu 815d50f00a Remove warning: C++11 requires a space between string literal and macro (#874)
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
8 years ago
winlin a58874178b Fix merge build failed. 8 years ago
winlin f97260be1d Merge SRS2 8 years ago
winlin a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 8 years ago
walkermi 79e4f9f3a0 fixed compile error when add --log-info (#860)
* Update srs_app_server.cpp

fixed compile error when add --log-info

* Update srs_app_mpegts_udp.cpp

fixed compile error when add --log-info
8 years ago
winlin ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 8 years ago
HungMingWu 98d4b6ae11 Refine srs_kernel_codec audio & video config code (#854) 8 years ago
winlin c97f2233a2 Merge SRS2 for #851 8 years ago
winlin ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 8 years ago
winlin bcd24126c5 Update comments for HLS 8 years ago
winlin a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 8 years ago
winlin 18d9f6c8f1 Fix build failed. 8 years ago
winlin 1054b0a90f Merge SRS2 8 years ago
winlin 33a0abdeff Fix #844, support Haivision encoder. 2.0.238 8 years ago
winlin d6e28bde69 Merge from SRS2. 8 years ago
HungMingWu 14acc59a19 Refine kernel/mp4 code (#823) 8 years ago
haofz 52b6823a90 fix #826, fix memory leak in streamCasterFlv (#836) 8 years ago
winlin 33375db401 Merge from SRS2, for #834 8 years ago
winlin b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 8 years ago
winlin 7d618fed43 For #820, fix utest failed. 8 years ago