389 commits

Author	SHA1	Message	Date
winlin	8b7fbac7d4	SRT supports detail config for DynamicConfig. 4.0.4	2020-02-13 12:17:09 +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	f6fa889393	For #1592, default ff_log_level to info	2020-02-05 13:20:37 +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	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	bbc7023f85	Merge SRS3	2020-01-25 15:05:52 +08:00
winlin	235c889e14	Update config	2020-01-24 15:35:14 +08:00
winlin	87ba204a42	Update doc for SRT url.	2020-01-23 18:25:44 +08:00
winlin	d88d422794	Update doc for SRT.	2020-01-23 16:49:05 +08:00
winlin	c7f6eef4ac	Refine config file, link to issue.	2020-01-23 11:51:35 +08:00
runner365	03ef01c635	update configure	2020-01-22 10:59:50 +08:00
runner365	746d188e6f	update srt.conf	2020-01-21 19:23:38 +08:00
runner365	5c5fd805c5	add srt mpegts to rtmp	2020-01-21 19:20:09 +08:00
runner365	7b9e3ecdc4	add ts demux	2020-01-17 19:43:54 +08:00
runner365	b53b75ea1e	srt pull/push server	2020-01-14 21:10:33 +08:00
runner365	aeee3011ef	add srt server file	2020-01-11 23:05:10 +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	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	6f453e7f46	For #547, #1506, default hls_dts_directly to on. 3.0.71	2019-12-12 16:51:34 +08:00
winlin	d908ee73db	Make the hls_dipose more specific	2019-12-10 16:48: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	f6fc31db66	Add config files for go-oryx	2019-10-05 17:02:25 +08:00
winlin	d3b142a0d9	Fix #775, Support SO_REUSEPORT. 3.0.54	2019-10-03 16:10:22 +08:00
winlin	5df8f2f6c1	Refine get_pithy_print in time unit	2019-04-09 08:55:54 +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
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
Harlan	bf12a45274	add configuration instructions for hls encryption	2018-08-12 14:18:05 +08:00
winlin	455a060fa5	Merge 2.0	2018-08-05 10:52:37 +08:00
winlin	ee43fc92ae	For #1110, Refine conf	2018-08-05 10:47:01 +08:00
winlin	29b74c7220	For #1110, Support params in http callback. 3.0.36	2018-08-04 19:51:04 +08:00
winlin	85d3a5001c	For #1110, Support params in http callback. 2.0.251	2018-08-04 19:36:42 +08:00
xialixin	aaf2905a9d	add: hls configuration adds [duration] variable (#1083)	2018-03-25 17:47:37 +08:00
winlin	449c632e49	For #464: Add example for origin cluster	2018-03-03 10:01:01 +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	0e9e1792fe	For #299, write fMP4 for DASH.	2017-06-04 15:10:35 +08:00
winlin	8b7566a007	Refine code	2017-03-26 18:30:33 +08:00
winlin	8ab727f3c5	For #299, write MPD file.	2017-02-26 20:40:33 +08:00
winlin	d786d61685	Merge branch '2.0release' into develop	2017-02-25 11:21:56 +08:00
winlin	0059b1cf7a	For #783, use directly free to replace auto free	2017-02-25 11:18:54 +08:00
winlin	5e419c66f8	For #299, add dash files.	2017-02-11 21:14:28 +08:00
winlin	b0789c54e4	Update HLS wiki to v3	2017-02-11 14:28:40 +08:00
winlin	5fec59ace2	merge from srs2, fix #503	2017-02-09 14:33:56 +08:00