266 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
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