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

1858 commits

Author SHA1 Message Date
winlin
0c48c42f36 Merge branch '3.0release' into 4.0release 2020-02-18 22:15:29 +08:00
winlin
58b40478b6 For #1579, support force gracefully quit. 3.0.120 2020-02-18 22:15:12 +08:00
winlin
eefd74e0e4 Merge branch '3.0release' into develop 2020-02-18 20:25:07 +08:00
winlin
3c597545b1 For #1579, support gracefully quit. 3.0.119 2020-02-18 19:59:47 +08:00
winlin
f4c7b882c5 For #1579, define signals for fast/grace quit and upgrade 2020-02-18 09:53:40 +08:00
夏立新
d6e11706ec Fix disconnect RTSP connection has assertion, resulting in program exit 2020-02-17 18:46:05 +08:00
夏立新
df3ec15cd1 Fix checking the completion of one frame data in RTSP RTP stream 2020-02-17 18:08:16 +08:00
winlin
5be69d290f For #1601, flush async on_dvr/on_hls events before stop. 3.0.118 2020-02-17 11:53:04 +08:00
Alex.CR
9dad53691e
solve latency parameter error (#1600) 
* solve latency parameter error
 2020-02-13 10:54:24 +08:00
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
 2020-02-12 21:03:26 +08:00
winlin
bdc7973596 Merge branch '3.0release' into develop 2020-02-05 14:18:07 +08:00
winlin
fc769550db Fix #665, fix HTTP-FLV reloading bug. 3.0.116 2020-02-05 14:17:30 +08:00
winlin
c6d914bc13 Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115 2020-02-05 13:04:00 +08:00
winlin
c50c51889a For #1592, support ff_log_level and default to warning 2020-02-05 12:32:15 +08:00
winlin
2fa151726b For #1592, rename ff_log_dir. 2020-02-05 12:15:44 +08:00
winlin
823b4fa56f Merge branch '3.0release' into develop 2020-02-04 19:34:09 +08:00
winlin
a99cee2819 For #1186, refactor security check. 3.0.114 2020-02-04 19:33:11 +08:00
winlin
c51c378869 For #1186, refactor security check. 3.0.114 2020-02-04 19:07:54 +08:00
winlin
59439cf8b5 Merge branch '3.0release' into develop 2020-02-04 17:05:19 +08:00
winlin
4f39303f37 Fix #939, response right A/V flag in FLV header. 3.0.113 2020-02-04 17:02:02 +08:00
winlin
68efca4fa9 For #939, always enable fast FLV streaming. 2020-02-04 16:39:01 +08:00
winlin
a2a6ca8258 For #939, always enable fast FLV streaming. 2020-02-04 16:13:48 +08:00
winlin
77114c7df0 Merge SRS3 2020-01-29 20:30:06 +08:00
winlin
23ece94064 Fix #1206, dispose ingester while server quiting. 3.0.111 2020-01-29 20:22:28 +08:00
winlin
a6f88805f3 Remove test code 2020-01-29 14:42:18 +08:00
winlin
6ed6ce58e4 Merge SRS3 2020-01-28 21:37:37 +08:00
winlin
adf7ef4511 Fix #1230, racing condition in source fetch or create. 3.0.110 2020-01-28 21:35:06 +08:00
winlin
b605edb9b3 Merge 3.0 2020-01-27 19:52:41 +08:00
winlin
5d365bade8 Fix #1303, do not dispatch previous meta when not publishing. 3.0.109 2020-01-27 19:46:08 +08:00
winlin
88c9c13707 Update readme for SRT 2020-01-26 14:17:42 +08:00
winlin
2775a391e0 Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108 2020-01-25 20:03:22 +08:00
winlin
74154cdfd9 Fix #703, drop video data util sps/pps. 3.0.107 2020-01-25 18:05:18 +08:00
winlin
bbc7023f85 Merge SRS3 2020-01-25 15:05:52 +08:00
winlin
978d5e993b Fix #1108, reap DVR tmp file when unpublish. 3.0.106 2020-01-25 15:04:34 +08:00
winlin
5d0833fcc3 Add author runner365 2020-01-24 18:41:09 +08:00
winlin
5f174552f3 Merge SRT 2020-01-24 16:10:40 +08:00
winlin
7c9b31815f Refactor code, add stop for hybrid server to do cleanup. 2020-01-23 21:16:34 +08:00
winlin
2363d258de Refactor hybrid server model 2020-01-23 20:42:50 +08:00
winlin
33c6bf1f8f Refactor SRT, using reverse dependency, SRT depends on APP. 2020-01-23 19:40:40 +08:00
winlin
1959d1d920 Extract hybrid server for SRT 2020-01-23 18:21:11 +08:00
winlin
aacf519169 Revert log for forwarder in source 2020-01-23 14:42:06 +08:00
winlin
a7b8695cb0 Refactor code, include without path 2020-01-23 14:33:11 +08:00
winlin
f143757429 Use macro to disable SRT in code 2020-01-23 14:23:09 +08:00
runner365
5c5fd805c5 add srt mpegts to rtmp 2020-01-21 19:20:09 +08:00
winlin
a6fe4e80d3 For #1547, remove the SRS_OSX macro in code 2020-01-20 11:25:39 +08:00
winlin
9dbd049e79 For #1568, extract SrsSourceManager from SrsSource. 2020-01-16 17:56:55 +08:00
winlin
0e750ab3eb For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100 2020-01-16 14:28:05 +08:00
winlin
7240fe3040 For #1509, decrease the fast vector init size from 64KB to 64B. 3.0.99 2020-01-15 21:26:02 +08:00
winlin
857c783efc For #1509, release coroutine when source is idle. 3.0.98 2020-01-15 19:51:33 +08:00
runner365
aeee3011ef add srt server file 2020-01-11 23:05:10 +08:00
winlin
6c1067d56a Merge from 2.0 2020-01-09 10:20:49 +08:00
winlin
dd46a4f700 Fix #1554, support logrotate copytruncate. 2.0.272 2020-01-09 10:03:17 +08:00
winlin
c08b6f1961 Merge 2.0, support logrotate copytruncate. 3.0.96 2020-01-08 18:05:42 +08:00
winlin
731e87876e Fix #1554, support logrotate copytruncate. 2.0.271 2020-01-08 17:57:04 +08:00
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
 2020-01-08 17:54:06 +08:00
winlin
10464a5fbe Always use string instance to avoid crash risk. 3.0.95 2020-01-05 22:17:15 +08:00
winlin
bc6c61e546 Fix #1543, use getpeername to retrieve client ip. 3.0.92 2020-01-05 20:06:25 +08:00
winlin
45aa325722 Improve test coverage for config. 2020-01-01 21:01:14 +08:00
winlin
0fd0114ee6 Improve test coverage for config. 2020-01-01 17:14:59 +08:00
winlin
7136c7c9b8 Improve test coverage for config. 2020-01-01 14:21:24 +08:00
winlin
de87b64f59 Improve test coverage for config. 2020-01-01 14:12:36 +08:00
winlin
a71d93188b Improve test coverage for config. 2020-01-01 13:41:19 +08:00
winlin
d783a12f89 Happy 2020 2019-12-30 10:10:35 +08:00
winlin
8a28a11648 For #299, increase dash segment size for avsync issue. 3.0.89 2019-12-29 18:21:45 +08:00
winlin
d11a7b2e00 For #299, fix some bugs in dash, it works now. 3.0.88 2019-12-27 20:47:33 +08:00
winlin
b9d720c927 For #1105, http server support mp4 range. 2019-12-26 18:33:52 +08:00
winlin
7584c47aaf Fix #1105, dvr mp4 supports playing on Chrome/Safari/Firefox. 3.0.86 2019-12-26 18:05:17 +08:00
winlin
2115d5d22a For #1488, add test and improve coverage for parsing client ip. 2019-12-26 12:07:52 +08:00
winlin
316cab794a For #1488, pass client ip to http callback.3.0.85 2019-12-26 11:42:19 +08:00
winlin
d367730883 For #1488, support parsing original ip from header for proxy 2019-12-26 11:33:26 +08:00
winlin
09b65aff96 For #1488, pass client ip to http callback. 2.0.269 2019-12-26 10:37:16 +08:00
winlin
a11461905b Remove FFMPEG and NGINX, please use srs-docker instead . 3.0.82 2019-12-25 18:29:07 +08:00
winlin
e6e4bd7fb4 Remove useless warning log for reloading. 2019-12-24 19:26:22 +08:00
winlin
7eccc9da26 For #1508, support chunk length and content in multiple parts. 2019-12-24 14:58:35 +08:00
winlin
4382ced3bf For #1508, Refactor srs_is_digital, support all zeros. 2019-12-20 14:49:25 +08:00
winlin
d7078a72d4 For #1520, add TODO list for configing server itself in coworker. 2019-12-19 14:15:21 +08:00
winlin
acfeb8a66f Fix #1520, #1223, bug for origin cluster 3+ servers. 3.0.74 2019-12-19 14:04:26 +08:00
winlin
cef7ec79b3 Detect whether flash enabled for srs-bwt. 2019-12-18 11:50:43 +08:00
winlin
dc1afc142f Fix HTTP CORS bug when sending response for OPTIONS. 3.0.72 2019-12-17 20:52:10 +08:00
winlin
191b07668d Refactor HTTP stream to disconnect client when unpublish 2019-12-17 16:54:06 +08:00
winlin
1e83da7812 Refactor HTTP recv request timeout to 15s. 2019-12-17 16:37:00 +08:00
winlin
2df1dcb05a Fix HTTP-FLV and VOD-FLV conflicting bug. 2019-12-17 16:01:04 +08:00
winlin
d9842b0371 Refactor HttpResponseWriter.write, default to single text mode. 2019-12-17 15:14:59 +08:00
winlin
8cdb7cc727 Add test for vod stream handler 2019-12-17 14:33:47 +08:00
winlin
ca2b68f428 Refactor header of HTTP message by using SrsHttpHeader. 2019-12-16 16:00:02 +08:00
winlin
6f453e7f46 For #547, #1506, default hls_dts_directly to on. 3.0.71 2019-12-12 16:51:34 +08:00
winlin
78da67e8d1 For #1229, fix the security risk in logger. 3.0.69 2019-12-11 11:56:00 +08:00
winlin
ad70589347 For #1229, fix the security risk in HDS. 3.0.69 2019-12-11 11:31:32 +08:00
winlin
1c227f4f8a Refine logger for hls_dts_directly 2019-12-10 15:59:15 +08:00
winlin
b4870a6d6f Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68 2019-12-05 20:47:23 +08:00
winlin
31f341e205 For #1506, refine the AAC samples guess algorithm. 2019-12-05 20:16:23 +08:00
winlin
52c6c7c45d For #1506, ignore video when codec is unknown. 2019-12-05 19:21:43 +08:00
winlin
5a3fd1e68a Release v3.0-a2, 3.0.67 2019-12-01 19:24:17 +08:00
winlin
517974d451 Refine redirect flow for origin cluster 2019-11-30 19:06:41 +08:00
winlin
e5285ecabf Fix #1501, use request ip for origin cluster. 3.0.66 2019-11-30 18:50:24 +08:00
winlin
4cd03a7c06 Refine debug info for edge. 3.0.64 2019-11-30 17:31:27 +08:00
winlin
e045b0a619 We prefer ipv4, only use ipv6 if ipv4 is disabled. 3.0.59 2019-10-07 10:34:55 +08:00
winlin
88df9a2497 Support go-oryx rtmplb with proxy protocol. 3.0.56 2019-10-04 19:03:34 +08:00
winlin
130c545f9a Refine origin cluster log 2019-10-04 06:51:15 +08:00
winlin
1a65927b1b Remvoe HSTRS warning. 2019-10-03 13:18:28 +08:00
winlin
5d17bb8bb0 Remove KAFKA. 3.0.53 2019-10-03 12:45:38 +08:00
winlin
5d8fb01b45 Fix #1352, fix typo of daemon. 2019-05-07 07:46:20 +08:00
winlin
ffe391aa49 Fix HLS no PMT/PAT bug. 2019-05-07 07:40:19 +08:00
winlin
c71b867b4f Refine comments. 2019-05-06 07:43:05 +08:00
winlin
3d57c1c9bc Refine ST service. 2019-05-05 08:45:11 +08:00
winlin
202a584aab Refine ST service. 2019-05-05 08:17:48 +08:00
winlin
a4160308f5 Refine comments. 2019-05-05 07:55:55 +08:00
winlin
b02527dec0 Refine usage. 2019-04-30 09:15:06 +08:00
winlin
2de3045b25 Remove noisy informations. 2019-04-30 08:53:51 +08:00
winlin
6dbe79ad02 Remove noisy informations. 2019-04-30 08:43:12 +08:00
winlin
ad3749a4d5 Remove noisy informations. 2019-04-30 08:38:57 +08:00
winlin
0564cdedec Refine typo in comments. 2019-04-30 08:31:36 +08:00
winlin
6b2c71d385 Refine typo in files. 3.0.51 2019-04-30 08:30:13 +08:00
winlin
45009785fb Refine typo in app. 2019-04-30 08:24:52 +08:00
winlin
aac8a13f42 Refine typo in app. 2019-04-28 09:08:05 +08:00
winlin
e436cc5665 Refine SrsBasicRtmpClient in time unit. 2019-04-22 08:03:12 +08:00
winlin
c6dcc76fea Refine SrsRequest.duration in time unit. 2019-04-19 08:48:44 +08:00
winlin
73e71d26ea Refine SrsGopCache::start_time in time unit. 2019-04-19 08:04:09 +08:00
winlin
1626942d29 Fix SrsHlsMuxer::segment_close bug, reopen segment when close failed. 2019-04-18 09:28:08 +08:00
winlin
d306ee7506 Refine ms in time unit 2019-04-18 08:50:43 +08:00
winlin
5af572ab50 Refine SrsRtmpConn.duration in time unit. 2019-04-18 08:46:42 +08:00
winlin
f6f49c68da Refine SrsRecvThread timeout in time unit 2019-04-18 08:42:43 +08:00
winlin
6b587c5e0f Refine SrsUdpPacketRecvCycleInterval in time unit. 2019-04-18 08:17:37 +08:00
winlin
283c4c7449 Refine SrsPithyPrint.age or SrsIngesterFFMPEG.alive in time unit. 2019-04-18 08:15:55 +08:00
winlin
522cbf1df8 Refine SrsHourGlass in time unit. 2019-04-18 08:11:16 +08:00
winlin
f5a1f9b774 Refine SrsFragment.start_dts in time unit 2019-04-18 08:01:17 +08:00
winlin
288bed6e26 Refine SrsTcpClient.timeout in time unit. 2019-04-18 07:58:37 +08:00
winlin
33c66b64c5 Refine name TMMS to TIMEOUT 2019-04-18 07:47:35 +08:00
winlin
5505eceeac Refine SrsTcpClient.timeout in time unit. 2019-04-18 07:43:51 +08:00
winlin
feb34ed225 Refine SrsStSocket in time unit 2019-04-17 09:21:38 +08:00
winlin
d3dc45f357 Refine set_recv_timeout in time unit 2019-04-17 08:31:53 +08:00
winlin
f4bee37e76 Refine set_send_timeout in time unit 2019-04-17 08:18:37 +08:00
winlin
a1398892d0 Refine const timeouts in time unit 2019-04-17 08:08:31 +08:00
winlin
61afca7160 Refine SrsTcpClient timeout in time unit 2019-04-17 07:56:28 +08:00
winlin
e9770933a6 Refine dash controller publish or unpublish 2019-04-17 07:34:01 +08:00
winlin
6380e8f1c0 Fix HLS segment close bug 2019-04-16 09:32:26 +08:00
winlin
138d1e3cad Refine get_vhost_http_remux_fast_cache in time unit 2019-04-16 08:50:48 +08:00
winlin
010e35bec2 Refine get_hds_fragment and get_hds_window in time unit 2019-04-16 08:24:11 +08:00
winlin
917f6d066d Refine get_hls_window in time unit 2019-04-16 08:20:32 +08:00
winlin
ca705a6f62 Refine get_hls_fragment in time unit 2019-04-16 08:14:12 +08:00
winlin
402e614471 Refine get_send_min_interval in time unit 2019-04-16 07:59:27 +08:00
winlin
c1b64ba24f Refine get_queue_length and set_queue_size in time unit 2019-04-16 07:55:19 +08:00
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) 2019-04-15 08:17:35 +08:00
winlin
465d255940 Refine SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS in time unit 2019-04-15 07:56:16 +08:00
winlin
980c32aee6 Refine on_hls duration in time unit 2019-04-15 07:53:29 +08:00
winlin
5f3d09c8a0 Refine hls muxer duration in time duration. 2019-04-15 07:47:37 +08:00
winlin
41d1e91540 Fix start and end time bug 2019-04-12 10:00:39 +08:00
winlin
bc1189caee Refine SrsFragment.duration in time unit. 2019-04-12 08:04:06 +08:00
winlin
0879bef9b2 Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT 2019-04-11 09:33:26 +08:00
winlin
53357e92fe Refine headers 2019-04-11 09:27:16 +08:00
winlin
92980a0ca2 Refine SRS_CONSTS_RTMP_TMMS in time unit 2019-04-11 09:18:20 +08:00
winlin
5b0e0d0838 Refine SRS_CONSTS_RTMP_PULSE_TMMS in time unit 2019-04-11 08:43:42 +08:00
winlin
695d430dcf Refine SrsMessageQueue.duration in time unit. 2019-04-11 08:35:57 +08:00
winlin
170cca1f58 Refine srs_get_system_startup_time in time unit 2019-04-10 09:11:54 +08:00
winlin
6c12aa0eca Refine srs_update_system_time in time unit 2019-04-10 09:07:03 +08:00
winlin
9b7c0802a9 Refine srs_update_system_time in time unit 2019-04-10 08:32:46 +08:00
winlin
9b1222a79c Refine get_publish_normal_timeout in time unit 2019-04-10 07:58:39 +08:00
winlin
170872135d Refine get_publish_1stpkt_timeout in time unit 2019-04-10 07:53:09 +08:00
winlin
d6828a3e58 Refine get_mw_sleep in time unit 2019-04-09 09:39:16 +08:00
winlin
839a496d50 Refine get_mr_sleep in time unit 2019-04-09 09:20:44 +08:00
winlin
5df8f2f6c1 Refine get_pithy_print in time unit 2019-04-09 08:55:54 +08:00
winlin
60f9561d2d Refine get_heartbeat_interval in time unit 2019-04-09 08:47:18 +08:00
winlin
5937304717 Refine get_dash_timeshift in time unit 2019-04-08 09:20:02 +08:00
winlin
12cf17ef6b Refine get_dash_update_period in time unit 2019-04-08 09:10:06 +08:00
winlin
4302ab7708 Refine get_dash_fragment to time unit 2019-04-08 09:02:39 +08:00
winlin
bb6389143f Refine get_bw_check_interval in time unit 2019-04-08 08:46:22 +08:00
winlin
74c1944e15 Refine config, allow parse multiple times. 2019-04-08 08:31:58 +08:00
winlin
6239dfa489 Apply time unit 2019-04-07 16:25:52 +08:00
winlin
7037f6a197 Cover more ST Coroutine code 2019-04-07 15:22:09 +08:00
winlin
1ce040cc2c Cover more ST Coroutine code 2019-04-07 14:35:11 +08:00
winlin
3d5508e088 Cover more ST Coroutine code 2019-04-07 13:52:16 +08:00
winlin
a9a720e32f Cover ST Coroutine and time unit. 3.0.48 2019-04-07 12:59:37 +08:00
winlin
f2b4bc7110 Fix #1304, Fix ST coroutine pull error. 3.0.47 2019-04-06 16:10:33 +08:00
winlin
a8781aee3e For #1304, Default HSTRS to on. 2.0.264 2019-04-06 15:35:12 +08:00
winlin
633a9a0d35 Merge #1324, Remove dead code 2019-04-05 18:55:33 +08:00
winlin
b9750baa52 For #1339, Support HTTP-FLV params. 2019-04-05 18:44:50 +08:00
winlin
91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 2019-04-05 18:16:05 +08:00
YLX
ab833943e1 fix: support parse flv query params to http callback (#1339) 2019-04-05 15:44:00 +08:00
winlin
073d42ca7d CI: Refine hls ts context writer 2019-02-05 16:26:43 +08:00
winlin
b2d1d84634 Change to 2019 2019-01-01 21:37:28 +08:00
winlin
6234905532 Refactor ISrsKbpsDelta 2019-01-01 17:36:27 +08:00
winlin
c26b475bae Refine kbps, stub wall clock 2018-12-23 20:47:17 +08:00
winlin
4c40370986 Refine kbps more testable 2018-12-23 20:30:12 +08:00
winlin
16fa4c588a Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter 2018-12-23 20:08:04 +08:00
winlin
6e75993e7f Change public virtual to virtual public 2018-12-23 19:54:08 +08:00
winlin
2e9bf2af83 Always enable SRS_StreamCaster 2018-12-22 20:45:25 +08:00
winlin
aa1a5442f9 Always enable SRS_Ingest 2018-12-22 20:30:13 +08:00
winlin
c6844527fb Always enable SRS_SSL 2018-12-22 20:23:39 +08:00
winlin
0bc7fdbb35 Always enable SRS_SSL 2018-12-22 20:03:40 +08:00
winlin
8e294709b0 Always enable SRS_STAT 2018-12-22 19:58:36 +08:00
winlin
330100769f Always enable SRS_TRANSCODE 2018-12-22 19:48:55 +08:00
winlin
ba4ef34d27 Merge 2.0release 2018-11-27 21:24:51 +08:00
RocFang
768fe68ca3 fix st_usleep param from us to ms. (#1236) 
fix st_usleep param from us to ms.
 2018-10-08 07:14:14 +08:00
Mirko Velic
70ad16ff6a Add request stream param to encoder output format parameters. (#1237) 2018-10-08 07:01:49 +08:00
winlin
8e55ef4b60 Refine code 2018-08-26 14:29:45 +08:00
winlin
1e2cca4712 For #1093, Refine HLS encryption wiki 2018-08-25 21:59:56 +08:00
winlin
ee068cf120 For #1109, Support without ssl for HLS key. 2018-08-25 21:15:26 +08:00
winlin
522fba99aa Merge branch 3.0release into harlanc-3.0release 2018-08-25 18:12:39 +08:00
winlin
e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 2018-08-25 18:10:55 +08:00
Harlan
22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
 2018-08-15 07:37:12 +08:00