R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,821 Commits 16 Branches 113 Tags 351 MiB
1509fde2da
Commit Graph

457 Commits

Author SHA1 Message Date
winlin
39853160d1 Refactor default config 2020-04-14 11:49:59 +08:00
winlin
feaf98eb69 For #307, remove dedicate GSO cache 2020-04-14 10:58:53 +08:00
winlin
8a71ce62db For #307, allow dedicated cache for GSO. 2020-04-14 09:20:21 +08:00
winlin
4400896395 Refactor code for merge_nalus and gso 2020-04-13 16:50:24 +08:00
winlin
78aad11eeb For #307, enable REUSEPORT to increase UDP buffer 2020-04-12 08:55:43 +08:00
kyxlx550
0d593da998 trunk/conf/full.conf 
add sip query catalog interval config
 2020-04-11 19:55:42 +08:00
winlin
d6a5651a30 For #307, support reload rtc_server section 2020-04-10 18:14:33 +08:00
winlin
cf48a5594d Refactor code for #1691 2020-04-09 08:37:28 +08:00
winlin
49f88a3326
Merge pull request #1691 from xialixin/dev-28181 
Dev 28181
 2020-04-09 08:28:53 +08:00
xiaozhihong
85fcbad778 [1].Add 'stun_strict_check' in conf file 
[2].Try to pickup at least H.264 payload type
 2020-04-08 23:24:59 +08:00
xiaozhihong
ca7060c005 Add SrsRtpHeader. 2020-04-08 14:45:26 +08:00
winlin
e6e8605304 For #307, support config RTC session timeout 2020-04-08 13:30:28 +08:00
winlin
6c5b51618c For #307, support config to send plaintext RTP. 2020-04-07 16:05:31 +08:00
winlin
35a037cf05 Add api for tcmalloc 2020-04-07 14:24:14 +08:00
winlin
7cfd2879b0 For #307, config sendmmsg max 2020-04-06 00:24:14 +08:00
xialixin
8ac39cb22f del print_sip_message config 2020-04-05 13:45:52 +08:00
xialixin
92d351ef35 fix 'output' format define; support 'host' auto get; time config use SRS internal format; support auto create stream channel on/off 2020-04-04 16:07:23 +08:00
winlin
573449f1b0 For #307, refine RTC latency from 600ms to 200ms. 4.0.20 2020-04-04 15:36:35 +08:00
winlin
c70a0eb07c Config to use RSA or ECDSA 2020-04-03 15:03:09 +08:00
winlin
e19b927f92 Merge GB28181 2020-03-31 22:45:20 +08:00
winlin
6012ac4eb0 Refine code 2020-03-31 22:30:57 +08:00
winlin
33455867f9 Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181 2020-03-31 20:08:24 +08:00
xialixin
c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 2020-03-31 00:39:10 +08:00
winlin
2da4e0a43e For #1638, #307, config to discard aac for rtc 2020-03-22 08:28:51 +08:00
xiaozhihong
fa700dad64 1. Modify rtc.conf to support Bframe discard. 
2. Rename srs_app_rtp.cpp to srs_app_rtc.cpp
 2020-03-21 21:26:30 +08:00
winlin
de9a004ff7 Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2 2020-03-20 21:39:04 +08:00
xialixin
cbe9c1dabc Support gb28181 sip over udp, ps steam over rtp 2020-03-20 00:01:48 +08:00
winlin
d21ef106a0 Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc 2020-03-13 21:18:09 +08:00
winlin
1382337cb4 Merge SRS3 2020-03-12 22:42:33 +08:00
winlin
9b663c070a Fix #1635, support auto reaload config by inotify. 3.0.129 2020-03-12 18:14:23 +08:00
winlin
b33751e2c1 Merge SRS3 2020-03-12 12:18:15 +08:00
winlin
ed41ca867b For #1594, detect and disable daemon for docker. 3.0.127 2020-03-12 10:11:41 +08:00
runner365
a2839aacdf add h264 sei filter 2020-03-07 16:15:36 +08:00
HuyaJohn
b730458d51 add candidates ip list, add rtc_upload.html to test 2020-03-06 23:28:15 -08:00
runner365
7f4cc6221c 1,solve audio timestamp bugs;2,solve video dts increase bugs 2020-02-29 16:47:20 +08:00
winlin
90afd06c85 For #1615, support default app(live) for vmix SRT. 4.0.9 2020-02-25 13:22:44 +08:00
winlin
ef2b123325 Merge branch '3.0release' into 4.0release 2020-02-21 23:52:04 +08:00
winlin
20b9d6ab02 For #1598, support SLB health checking by TCP. 3.0.123 2020-02-21 23:51:40 +08:00
xiaozhihong
bc22ebe949 add rtc http request and response, exchange sdp. 2020-02-21 23:50:22 +08:00
winlin
388ad61cdc Merge branch '3.0release' into 4.0release 2020-02-18 23:38:52 +08:00
winlin
dc0f804452 For #1579, support start/final wait for gracefully quit. 3.0.121 2020-02-18 23:37:11 +08:00
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
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
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
c51c378869 For #1186, refactor security check. 3.0.114 2020-02-04 19:07:54 +08:00
runner365
aeee3011ef add srt server file 2020-01-11 23:05:10 +08:00
winlin
10464a5fbe Always use string instance to avoid crash risk. 3.0.95 2020-01-05 22:17:15 +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
b4870a6d6f Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68 2019-12-05 20:47:23 +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
aac8a13f42 Refine typo in app. 2019-04-28 09:08:05 +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
winlin
bc1189caee Refine SrsFragment.duration in time unit. 2019-04-12 08:04:06 +08:00
winlin
53357e92fe Refine headers 2019-04-11 09:27:16 +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
b2d1d84634 Change to 2019 2019-01-01 21:37:28 +08:00
Harlan
52596a0b04 add HLS encryption feature 2018-03-25 12:05:52 +08:00
winlin
92f2bcd878 For #464, support config origin cluster 2018-02-16 10:31:19 +08:00
winlin
d0fbf44d18 For #464, support config for origin cluster. 2018-02-14 21:52:40 +08:00
winlin
ca1395a807 Change date from 2017 to 2018 2018-01-07 10:58:53 +08:00
winlin
6eae93258a For #913, APP support complex error. 2018-01-01 19:39:57 +08:00
winlin
fd91df9411 For #913, reload use complex error 2017-09-22 16:14:30 +08:00
winlin
9f5224c34a For #913, use complex error for http 2017-07-29 21:39:57 +08:00
winlin
661eb8b37c For #913, use complex error for reload utc time 2017-07-29 20:02:38 +08:00
winlin
b5c14938d9 For #913, config and log support complex error. 2017-06-11 14:03:19 +08:00
winlin
860aac3e50 For #913, config reload and persistence 2017-06-11 09:54:09 +08:00
winlin
7d618fed43 For #820, fix utest failed. 2017-03-26 14:25:08 +08:00
winlin
0a57a46016 Refine LICENSE 2017-03-25 21:29:29 +08:00
winlin
f32aab3d92 For #299, refine code. 2017-03-25 17:21:39 +08:00
winlin
8ab727f3c5 For #299, write MPD file. 2017-02-26 20:40:33 +08:00
winlin
5e419c66f8 For #299, add dash files. 2017-02-11 21:14:28 +08:00
winlin
0a054cd6bd for #738, remove the dvr plan append for it's no use 2017-02-06 20:22:07 +08:00
winlin
1b175b1107 for #730, support config in/out ack size. 3.0.13 2017-01-06 14:57:54 +08:00
winlin
4709d0214c for #711, support prefile for transcode. 3.0.12 2017-01-06 10:39:37 +08:00
winlin
f2efa96015 for #324, always enable hstrs. 3.0.10 2017-01-05 09:08:56 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
b231550c32 fix #717, #691, http api/static/stream support cors. 3.0.9 2016-12-15 16:22:04 +08:00
winlin
664844b5f5 merge from srs2. for #513. 2016-12-15 14:54:09 +08:00
winlin
2d387035cd refine the global variables. 2016-12-08 17:26:04 +08:00
winlin
0e308b0fa1 merge srs2, support oryx 2016-09-23 15:33:43 +08:00
winlin
b748fac23a support asprocess for oryx. 2.0.218 2016-09-23 15:00:50 +08:00
winlin
2a01540433 support change work_dir for oryx. 2016-09-23 14:53:58 +08:00
winlin
b5d466f3d2 update utest 2016-09-15 14:47:42 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
9d22d09646 show signature of server. 2016-01-04 17:28:18 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
f6ff116505 refine code, persistence use isolate method. 2015-12-15 14:27:49 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
8974fe298b connect to kafka and send metadata request. 2015-10-23 14:42:03 +08:00
winlin
2a4ab8a923 add brokers to config 2015-09-24 14:53:22 +08:00
winlin
b5ccc35340 add kafka config 2015-09-22 15:10:43 +08:00
winlin
b471c6e61c refine code, use json integter rather than number. 2015-09-19 14:40:32 +08:00
winlin
3f7e69b617 json objects support dumps to string. 2015-09-19 12:27:31 +08:00
winlin
225e742657 add args3 2015-09-17 14:03:25 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
winlin
087f7740b7 fix the build failed bug 2015-09-17 11:41:23 +08:00
winlin
8a90e76637 fix #459, support dvr raw api. 3.0.4 2015-09-15 23:00:00 +08:00
winlin
2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 2015-09-15 15:58:57 +08:00
winlin
e8a00de4a3 for #319, support enable or disable vhost. 2015-09-15 12:51:14 +08:00
winlin
631e76cd32 for #319, support update and delete the disabled vhost 2015-09-15 12:15:18 +08:00
winlin
a7c4b786cf merge from 2.0 2015-09-14 18:42:31 +08:00
winlin
511627abab fix #474, config to donot parse width/height from sps. 2.0.189 2015-09-14 18:36:44 +08:00
winlin
491ec11833 for #319, raw api support add new vhost 2015-09-12 21:55:53 +08:00
winlin
c4feb8f6ed for #319, raw api support update all globals. 2015-09-09 23:32:02 +08:00
winlin
6aafd072db for #319, raw api support update srs log tank, level and file. 2015-09-09 22:44:34 +08:00
winlin
8107e5f9a6 for #319, raw api support set the ff_log_dir 2015-09-09 21:46:29 +08:00
winlin
c8466c36bd for #319, raw api support update the global RTMP chunk_size. 2015-09-01 21:27:04 +08:00
winlin
310b5a14cb for #319, support minimal query api 2015-09-01 13:33:49 +08:00
winlin
11c409688b for #319, http raw api support query. 3.0.3 2015-08-31 23:34:03 +08:00
winlin
8a2709dd2c for #319, do not apply when config not changed. 2015-08-31 12:06:22 +08:00
winlin
364460f2ab for #319, support raw update global.listen 2015-08-30 23:18:14 +08:00
winlin
f8d8c3ace4 use function to dumps the engine. 2015-08-30 23:08:27 +08:00
winlin
2b4fa2d73e for #319, move the edge configs to cluster. 2015-08-30 08:30:04 +08:00
winlin
6bd05f9cfc for #319, refine the config forward. 2015-08-30 07:59:25 +08:00
winlin
bc100c2867 refine the log, move default to each functions. 2015-08-29 19:46:56 +08:00
winlin
7ef3ff90c0 refine the config structure, compatible with SRS1/2 2015-08-29 18:40:18 +08:00
winlin
bdfd0ae09e for #319, dumps the http static, remux and globals. 2015-08-28 23:51:23 +08:00
winlin
f167616379 rename the config_query to query 2015-08-28 13:01:04 +08:00
winlin
2dcf3bc606 for #319, support rpc raw api to query the HTTP RAW API configs. 2015-08-28 12:28:18 +08:00
winlin
8e635d9749 for #319, support HTTP RAW API config_query global data. 2015-08-27 22:46:56 +08:00
winlin
d921d59e57 for #319, support HTTP RAW API reload. 2015-08-27 18:11:50 +08:00
winlin
1e0481a2d0 for #319, support signal to persistence config 2015-08-26 21:49:05 +08:00
winlin
980e3921e4 for #319, add signal to write config to file. 2015-08-26 21:11:28 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 2015-08-19 16:16:05 +08:00
winlin
e7714cd445 add packets interval in ms to set the right send_min_interval 2015-08-19 15:14:26 +08:00
winlin
a0a89a8ca6 use reduce_sequence_header for stream control. 2015-08-14 14:35:41 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 2015-08-12 13:22:09 +08:00
winlin
65b2ed7ac5 refine code, move the order of functions. 2015-08-03 14:11:21 +08:00
winlin
b3b6df365e fix the stream caster build failed bug. 2015-07-10 13:50:35 +08:00
winlin
f39faa78bb refine config default values of srs, prepare to move each default values to functions. 2015-07-06 11:11:59 +08:00
winlin
574cf6a094 use libfdk_aac for srs2. 2015-06-08 15:02:19 +08:00
winlin
d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 2015-05-30 10:48:02 +08:00
winlin
af4eec90ac for srs-dolphin, support HTTP and RTMP. 2015-05-28 21:02:43 +08:00
winlin
394e070b2e support dolphin 2015-05-28 14:59:12 +08:00
winlin
f0c24eeacc add stream caster for post flv over http. 2015-05-03 10:56:20 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 2015-04-15 17:12:22 +08:00
winlin
dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 2015-04-13 10:32:32 +08:00
winlin
e5b8e0da01 fix async call and hls_nb_notify bug. 2015-04-10 15:00:07 +08:00
winlin
5d37e47783 support config the hls_nb_notify. 2015-04-10 14:44:18 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
e56d7add44 fix bug of config to parse the default value. 2.0.158 2015-04-07 17:42:41 +08:00
winlin
e458305f81 add utc time format. 2015-04-03 16:42:32 +08:00
winlin
17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 2015-04-03 10:56:56 +08:00
winlin
8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 2015-04-02 11:52:03 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
f6e135943f enhanced hls, support deviation for duration. 2.0.151. 2015-03-31 15:39:47 +08:00
winlin
692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 2015-03-30 12:44:04 +08:00
winlin
b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 2015-03-23 23:13:57 +08:00
winlin
fcab17741c fix #222, the dvr path rule changed. 2015-03-23 22:06:18 +08:00
winlin
0319e85f99 support config the audio overflow ratio. 2015-03-19 17:24:27 +08:00
wenjie.zhao
10da182853 add hls prefix of uri supported 2015-03-13 00:22:55 +08:00
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
wenjie.zhao
e57bda8908 Merge code. 
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
 2015-03-11 14:18:09 +08:00
wenjie.zhao
d4198ee8ba add hds supported. 2015-03-11 13:34:58 +08:00
winlin
f9767c91b5 fix configure bug, refine code for stream caster. 2015-03-10 18:07:43 +08:00
winlin
fbbe46d272 refine the config, support directly parse file. 2015-03-07 22:25:43 +08:00
winlin
fb3fced8d0 for #179, revert dvr http api. 2.0.128. 2015-03-01 17:57:28 +08:00
winlin
0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 2015-02-27 20:39:36 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
849e59b05d for #179, support http api to start dvr. 2015-02-21 23:09:21 +08:00
winlin
c67a4fdf97 for #179, enable http api crossdomain for dvr api. 2015-02-21 21:17:59 +08:00
winlin
7077b74d03 for #179, add dvr plan append. 2015-02-21 16:52:37 +08:00
winlin
95b4baee7c for #179, refine dvr code to more simple. 2015-02-21 16:25:04 +08:00
winlin
1102c7a58f refine pithy print to more easyer to use 2.0.121. 2015-02-19 18:56:21 +08:00
winlin
40fbfd8560 for #133, rtsp extract tcp/udp listener. 2015-02-17 16:28:28 +08:00
winlin
e81e090239 for #133, add rtsp listener and handler. 2015-02-15 21:28:31 +08:00
winlin
78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 2015-02-15 18:11:24 +08:00
winlin
922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 2015-02-15 17:43:35 +08:00
winlin
25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 2015-02-12 13:34:59 +08:00
winlin
a23191497f fix #136, support hls without io(in ram). 2.0.112 2015-02-03 16:01:07 +08:00