external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 06:54:22 +00:00
Code Issues Releases Wiki Activity
5823 commits 14 branches 107 tags 376 MiB
Commit graph

472 commits

Author SHA1 Message Date
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
7315b1a26d Fix config read "bframe" discad bug. 2020-03-21 21:40:26 +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
a42cf3ae8d For #1638, #307, refactor rtc config. 2020-03-14 18:05:58 +08:00
winlin
51af2b4779 For #1638, #307, rtc conf support ENV. 2020-03-14 17:15:46 +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
winlin
f917cc1e0c
For SRT, perfer mix_correct to true as default. 2020-03-01 10:09:44 +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
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
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
c51c378869 For #1186, refactor security check. 3.0.114 2020-02-04 19:07:54 +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
runner365
5c5fd805c5 add srt mpegts to rtmp 2020-01-21 19:20:09 +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
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
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
e6e4bd7fb4 Remove useless warning log for reloading. 2019-12-24 19:26:22 +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
6f453e7f46 For #547, #1506, default hls_dts_directly to on. 3.0.71 2019-12-12 16:51:34 +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
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
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
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
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
633a9a0d35 Merge #1324, Remove dead code 2019-04-05 18:55:33 +08:00
winlin
b2d1d84634 Change to 2019 2019-01-01 21:37:28 +08:00
winlin
aa1a5442f9 Always enable SRS_Ingest 2018-12-22 20:30:13 +08:00
winlin
330100769f Always enable SRS_TRANSCODE 2018-12-22 19:48:55 +08:00
winlin
1e2cca4712 For #1093, Refine HLS encryption wiki 2018-08-25 21:59:56 +08:00
Harlan
e9cb8210fc fix default value error 2018-05-15 11:20:52 +08:00
Harlan
52596a0b04 add HLS encryption feature 2018-03-25 12:05:52 +08:00
winlin
c70421e656 Fix #464, support origin cluster 2018-02-16 16:39:07 +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
823dc2df21 Refine help 2018-01-01 22:44:48 +08:00
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.
 2018-01-01 22:43:58 +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
0e9e1792fe For #299, write fMP4 for DASH. 2017-06-04 15:10:35 +08:00
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.
 2017-05-06 14:05:22 +08:00