2658 commits

Author	SHA1	Message	Date
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
没——问题	e8680527c3	allow domain * ... 在使用时，srs_player可能和所在页面部署在不同的域名下。 所以在此处添加跨域许可。	2015-09-17 12:09:29 +08:00
winlin	7b2b11e932	async call worker fast execute tasks.	2015-09-17 11:57:17 +08:00
没——问题	c548ab5019	function set_srs_player_url(url, params) ... 在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。 所以在此处提供设置 srs_player.swf 的url的方法。	2015-09-17 11:44:45 +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	240a1bfadb	rename kafka protocol	2015-09-16 13:56:52 +08:00
winlin	c4e4711b93	add kafka protocol	2015-09-16 13:55:11 +08:00
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	2015-09-15 23:00:00 +08:00
winlin	2b9869ee52	update the wiki for dvr	2015-09-15 17:58:35 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	8f9cfcdcf4	fix #319, http raw api support update global and vhost. 3.0.4	2015-09-15 13:03:18 +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	eb578b4a39	refine the thread, set to disposed when terminate normally	2015-09-14 17:17:38 +08:00
winlin	83a9ff9f5d	for #474, refine the hls publish, donot fetch from source when publish	2015-09-14 15:49:25 +08:00
winlin	44bcb4045f	for #474, decode the sequence header before hls.	2015-09-14 15:32:09 +08:00
winlin	07ef8160a3	clear the queue when edge republish.	2015-09-14 15:25:01 +08:00
winlin	704624c9ec	clear the queue when edge republish.	2015-09-14 15:19:49 +08:00
winlin	8be3c875af	donot release stream when busy	2015-09-14 15:17:59 +08:00
winlin	3da25f3aee	when thread terminated normally, set the tid to NULL.	2015-09-14 15:11:49 +08:00
winlin	a994191ddc	for #474, always release publish for source.	2015-09-14 15:10:34 +08:00
winlin	eb9aa47ab1	merge from 2.0	2015-09-14 13:48:27 +08:00
winlin	0d57ef9373	fix #458, http hooks use source thread cid. 2.0.188	2015-09-14 13:47:25 +08:00
winlin	3b483094bd	merge from 2.0	2015-09-14 12:24:57 +08:00
winlin	6d50aa1aa2	#475, fix http hooks crash for st context switch. 2.0.187	2015-09-14 12:22:19 +08:00
winlin	adb74dc74e	Merge branch '2.0release' into develop	2015-09-14 11:17:19 +08:00
winlin	f0fc093b19	fix the http zero content length bug.	2015-09-14 11:17:04 +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	0d6c24581d	refine json number, use int64 when number is int.	2015-09-12 16:36:29 +08:00
winlin	7ae76b579e	refine the conf, use srs3 style	2015-09-11 08:21:06 +08:00
winlin	a88f321d8b	for #319, merge from 2.0release	2015-09-09 23:41:11 +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	2cfb71616e	for #319, copy all data to request for source.	2015-09-01 18:52:29 +08:00
winlin	2bdd974227	for #319, reorder the ingesters.	2015-09-01 18:41:30 +08:00
winlin	342483bf04	for #319, when reload the listen, restart all ingesters.	2015-09-01 18:39:14 +08:00
winlin	310b5a14cb	for #319, support minimal query api	2015-09-01 13:33:49 +08:00
winlin	06c7ae62ee	for #319, refine the error code for RAW APi.	2015-09-01 12:27:53 +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	d1336e0d80	refine conf	2015-08-30 10:52:05 +08:00
winlin	dc11013c01	for #319, render the detail of vhost	2015-08-30 10:17:39 +08:00
winlin	0109a74840	for #319, refine the config structure.	2015-08-30 08:34:52 +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	1b1a2a1e63	fix #471, api response the width and height. 3.0.2	2015-08-28 18:00:24 +08:00
winlin	04bea781ca	use amf0 encode for json encode.	2015-08-28 15:11:11 +08:00
winlin	e0219bd7aa	refine code, merge json encode to amf0.	2015-08-28 14:39:29 +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	af0a76e51a	fix the build failed bug on centos	2015-08-28 00:03:10 +08:00
winlin	e03d8a0115	fix the build failed bug on centos	2015-08-28 00:01:19 +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	f74dc62046	fix the process restart bug.	2015-08-26 23:20:19 +08:00
winlin	e39e006d63	fix the exec clear bug.	2015-08-26 23:11:42 +08:00
winlin	c081a5370b	Merge branch '2.0release' into develop	2015-08-26 23:03:01 +08:00
winlin	fe4cdceb15	always wait for process to terminated when SIGKILL.	2015-08-26 23:02:54 +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	cdde293785	add todo for reload the source components.	2015-08-25 22:59:17 +08:00
winlin	53f4ce3604	for #367, update wiki to v3	2015-08-25 22:41:57 +08:00
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00
winlin	7de181004f	Merge branch '2.0release' into develop	2015-08-25 11:55:44 +08:00
lovecat	9c2beffe8f	statistic connection bytes before remove client.	2015-08-25 11:46:12 +08:00
winlin	039af7243c	for #367, refine the comments for process.	2015-08-24 22:26:19 +08:00
winlin	6fe88d088c	for #367, process support redirect stdout and stderr.	2015-08-24 22:19:57 +08:00
winlin	0e1861b084	for #367: extract the process from ffmpeg to exec programs.	2015-08-24 21:51:05 +08:00
winlin	3a8c03a471	Merge branch '2.0release' into develop	2015-08-24 16:00:41 +08:00
winlin	a242aa35dc	add pid to srs rtmp dump	2015-08-24 16:00:11 +08:00
winlin	15102a7345	refine commit script	2015-08-24 11:16:39 +08:00
winlin	2a4b448cce	Merge branch '2.0release' into develop	2015-08-24 11:04:48 +08:00
winlin	a7f4104d45	fix bug of commit script	2015-08-24 11:04:39 +08:00