503 commits

Author	SHA1	Message	Date
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
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	7fd221ef63	Always enable DVR	2017-02-11 17:27:40 +08:00
winlin	8e5d4dc73d	always enable http and hls	2017-02-11 13:29:53 +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	733ba73d54	for #738, write mp4 samples.	2017-02-05 09:15:46 +08:00
winlin	a1fcf66f32	for #742, always enable http utilities.	2017-01-23 17:43:59 +08:00
winlin	7fe60b5bbf	fix #735 config transform refer_publish invalid. 3.0.14	2017-01-11 09:45:22 +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	8bdf50b14d	update feature list	2017-01-05 09:29:12 +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	eed4626c35	use larger limit	2016-03-10 12:28:46 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	5338f21439	merge from srs2	2016-01-05 16:58:21 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	dc38ae1687	show first message when not show version.	2016-01-04 17:41:16 +08:00
winlin	9d22d09646	show signature of server.	2016-01-04 17:28:18 +08:00
winlin	973194c663	merge from srs2.	2015-12-31 16:02:01 +08:00
winlin	26211abf2e	refine code.	2015-12-31 15:57:16 +08:00
winlin	f516636448	refine code for hooks and http core.	2015-12-29 18:33:02 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	f6ff116505	refine code, persistence use isolate method.	2015-12-15 14:27:49 +08:00
winlin	3ab5892863	refine comments.	2015-12-10 18:02:23 +08:00
winlin	17bb31cab1	fix the config bug.	2015-12-04 15:22:13 +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	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	cef1ae5a8e	fix the config bug.	2015-10-28 12:55:16 +08:00
winlin	f0e39cc330	support show the summary of kafka metadata.	2015-10-23 14:42:04 +08:00
winlin	8974fe298b	connect to kafka and send metadata request.	2015-10-23 14:42:03 +08:00
winlin	6efd2dd27e	add load balance round robin for brokers.	2015-09-24 17:20:04 +08:00
winlin	2a4ab8a923	add brokers to config	2015-09-24 14:53:22 +08:00
winlin	abb5c5ad31	add kafka producer	2015-09-22 17:40:05 +08:00
winlin	b5ccc35340	add kafka config	2015-09-22 15:10:43 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	b471c6e61c	refine code, use json integter rather than number.	2015-09-19 14:40:32 +08:00
winlin	b59d9ba6a1	support amf0 and json to convert with each other.	2015-09-19 13:31:57 +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	256459e1ec	fix the utest bug	2015-09-17 11:37:35 +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	01308ecc98	for #319, support initialize the parser to whether use jsonp	2015-09-12 22:22:33 +08:00
winlin	491ec11833	for #319, raw api support add new vhost	2015-09-12 21:55:53 +08:00
winlin	abd7ee227c	support reload utc_time. 2.0.186	2015-09-09 23:37:07 +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	a62c82bd46	for #319, api raw update global.listen	2015-08-30 23:42:21 +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	01878e5a9c	for #319, query vhost detail.	2015-08-30 22:23:47 +08:00
winlin	b1b76a4a80	for #319, allow multiple ingest and transcode.	2015-08-30 14:52:12 +08:00
winlin	873aa7bf9f	for #319, refine the query global, only show true options.	2015-08-30 12:16:26 +08:00
winlin	dc11013c01	for #319, render the detail of vhost	2015-08-30 10:17:39 +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	bc24c0407b	for #319, move smi and rsh to play	2015-08-30 07:36:06 +08:00
winlin	f7c893d907	for #319, move gop_cache and queue_length to play	2015-08-30 07:26:55 +08:00
winlin	06ae74dd3f	for #319, move mw_latency to play.	2015-08-30 07:05:57 +08:00
winlin	4eb1874955	for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency.	2015-08-30 06:49:20 +08:00
winlin	9c4340f789	for #319, move atc and atc_auto to play	2015-08-29 23:36:03 +08:00
winlin	d6b0aa3a5b	for #319, move time_jitter and mix_correct to play	2015-08-29 23:18:25 +08:00
winlin	738642073e	for #319, refine config, collect the mr and publish timeout	2015-08-29 22:41:50 +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	a79e19599c	for #319, support query the vhost info.	2015-08-29 16:12:30 +08:00
winlin	bdfd0ae09e	for #319, dumps the http static, remux and globals.	2015-08-28 23:51:23 +08:00
winlin	66ffcad635	for #319, always allow raw query.	2015-08-28 13:17:46 +08:00
winlin	f167616379	rename the config_query to query	2015-08-28 13:01:04 +08:00
winlin	75ca759e5d	fix the reload http api bug.	2015-08-28 12:38:09 +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	555a3fbf5f	for #319, support render HTTP RAW API in console.	2015-08-27 23:55:59 +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	3c402cb908	refine the tcp nodelay, effect connected connections.	2015-08-21 13:43:33 +08:00
winlin	785a5907a8	set the default get_publish_normal_timeout to 5s	2015-08-19 16:27:22 +08:00
winlin	0bbfc5526a	set the default get_publish_normal_timeout to 5s	2015-08-19 16:22:52 +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	ccf6a4de1e	remove the on_reload_vhost_http_remux_updated for vhost added.	2015-08-03 13:35:25 +08:00
winlin	bc033d5de3	refine code, move default to config function.	2015-07-23 14:20:46 +08:00
winlin	c85f92c229	fix #169, support default values for transcode. 2.0.180	2015-07-21 12:07:26 +08:00
winlin	b3b6df365e	fix the stream caster build failed bug.	2015-07-10 13:50:35 +08:00
winlin	50feaacdde	refine code for http remux reload.	2015-07-10 13:45:21 +08:00
winlin	bed540bac9	fix #439: http remux support reload	2015-07-09 13:52:41 +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	af9efe9213	disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.	2015-06-03 10:13:46 +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	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	7fc1cda392	add stream status to api.	2015-05-08 16:45:25 +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	e50996270e	fix the config parse error.	2015-04-23 16:25:49 +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	29ac4c724b	change default log tank to file.	2015-04-07 17:55: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	aef97db77a	refine the config code.	2015-04-07 17:04:04 +08:00
winlin	e458305f81	add utc time format.	2015-04-03 16:42:32 +08:00
winlin	c4466a8c0c	fix crash bug for hls cleanup.	2015-04-03 12:43:40 +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	c6817cc422	for #354, remove the double underscore of macro.	2015-03-21 10:25:03 +08:00
winlin	0319e85f99	support config the audio overflow ratio.	2015-03-19 17:24:27 +08:00
winlin	2241ba0e34	for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142	2015-03-17 07:57:58 +08:00
wenjie.zhao	65f404fb42	for #340, refine ts prefix code.	2015-03-13 02:01:24 +08:00
wenjie.zhao	5969f72354	for #340, refine ts prefix code.	2015-03-13 01:32:51 +08:00
wenjie.zhao	10da182853	add hls prefix of uri supported	2015-03-13 00:22:55 +08:00
winlin	5c6ef6ded6	fix warning for xcode.	2015-03-14 13:09:34 +08:00
winlin	6d15d0ea99	for #324, refine code, add hstrs config.	2015-03-14 09:52:47 +08:00
wenjie.zhao	643f18abe4	add hds reload supported.#328	2015-03-12 22:38:11 +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	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	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	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
winlin	52891b491a	listen and serve stream caster mpegts over udp.	2015-01-24 14:52:52 +08:00