2735 commits

Author	SHA1	Message	Date
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
synote	9b01aad220	fix bug for build failure when configure with --log-info ... wrong use of size in SrsStream::initialize of srs_kernel_stream.cpp	2015-08-28 11:43:55 +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
winlin	d8030faabe	Merge branch '2.0release' into develop	2015-08-24 10:59:39 +08:00
winlin	064031cac1	refine commit script	2015-08-24 10:59:32 +08:00
winlin	8e259eb0c2	refine the commit script	2015-08-24 10:57:12 +08:00
winlin	4118138cf0	update commit script	2015-08-24 10:54:31 +08:00
winlin	b25c45c643	refine srs player, support set the bufferTimeMax.	2015-08-24 07:55:30 +08:00
winlin	74d4c96423	for #367, design the config for exec.	2015-08-23 21:58:06 +08:00
winlin	cbfe438e73	for #367, design the config for exec.	2015-08-23 21:53:20 +08:00
winlin	28791fd14a	release 2.0alpha0, the 2.0a0, 2.0.185	2015-08-23 09:00:21 +08:00
winlin	5721bc371c	Merge branch '2.0release' into develop	2015-08-23 00:01:11 +08:00
winlin	e43d4e46b4	support JSONP DELTE/POST/PUT	2015-08-23 00:01:03 +08:00
winlin	baa70d4ddd	add nb_streams for vhost	2015-08-22 22:51:59 +08:00
winlin	7a2836ae2a	Merge branch '2.0release' into develop	2015-08-22 19:49:39 +08:00
winlin	6e5143449e	HTTP API support JSONP by specifies the query string callback=xxx.	2015-08-22 18:18:18 +08:00
winlin	22485ce5e9	Merge branch '2.0release' into develop	2015-08-22 13:57:45 +08:00
winlin	aeebddb269	for #442, add more information for client for api.	2015-08-22 13:57:34 +08:00
winlin	94641c812b	fix #442, support kickoff client.	2015-08-22 13:36:15 +08:00
winlin	b37797b13a	for #442, add publish connection in stream.publish api	2015-08-22 13:03:10 +08:00
winlin	529803ed04	refine code for api.	2015-08-22 12:38:14 +08:00
winlin	1962449770	Merge branch '2.0release' into develop	2015-08-22 11:09:11 +08:00
winlin	6b6d951298	add api /api/v1/features	2015-08-22 11:08:56 +08:00
winlin	4763f205a2	add kbps for vhost and stream	2015-08-22 09:49:38 +08:00
winlin	0a4d78383c	Merge branch '2.0release' into develop	2015-08-21 17:15:42 +08:00
winlin	20a8818a8e	refine the error response.	2015-08-21 17:15:32 +08:00
winlin	2edcf1d4ff	support query specified vhost	2015-08-21 17:00:52 +08:00
winlin	66a26bdce8	move json from app to protocol	2015-08-21 16:20:19 +08:00
winlin	a7589b9ad3	refine code for api, add clients and parse_rest_id	2015-08-21 16:12:48 +08:00
winlin	ab4620870d	refine the stat api, support query specified stream.	2015-08-21 15:51:20 +08:00
winlin	32a484164a	Merge branch '2.0release' into develop	2015-08-21 15:22:46 +08:00
winlin	c75f05c88b	fix the log cid display error, merge the publish recv thread log to publish connection.	2015-08-21 15:22:40 +08:00
winlin	9528243b81	Merge branch '2.0release' into develop	2015-08-21 13:43:40 +08:00
winlin	3c402cb908	refine the tcp nodelay, effect connected connections.	2015-08-21 13:43:33 +08:00
winlin	71aacebcbc	Merge branch '2.0release' into develop	2015-08-21 12:08:35 +08:00
winlin	c31a546eec	support vhost for http flv.	2015-08-21 12:08:25 +08:00
winlin	0afe4963bc	Merge branch '2.0release' into develop	2015-08-20 18:33:47 +08:00
winlin	dd21eee7f0	srs player show current time and url	2015-08-20 18:33:33 +08:00
winlin	ce8f446494	Merge branch '2.0release' into develop	2015-08-20 18:13:17 +08:00
winlin	dfecfb65b1	support fluency and stream empty count	2015-08-20 18:13:07 +08:00
winlin	fcd2d3d445	refine code for link generation from rtmp url.	2015-08-20 16:18:32 +08:00
winlin	fe87bf1b61	support generate link page for rtmp url	2015-08-20 16:11:17 +08:00
winlin	018af55d65	refine the demo pages, move scripts after body.	2015-08-20 15:19:43 +08:00
winlin	77765b463a	Merge branch '2.0release' into develop	2015-08-20 14:20:58 +08:00
winlin	575a698820	fix #380, srs-librtmp send sequence header when sps or pps changed.	2015-08-20 14:20:49 +08:00
winlin	f10e399991	Merge branch '2.0release' into develop	2015-08-19 19:02:40 +08:00
winlin	ec87dd9cd6	refine code for srs rtmp dump	2015-08-19 19:02: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	170ad05148	add gfps and nb_packets	2015-08-19 15:31:19 +08:00
winlin	a5dd3a8e7b	Merge branch '2.0release' into develop	2015-08-19 15:14:35 +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	de48b477ae	drop the metadata when drop sequence header	2015-08-19 14:23:12 +08:00
winlin	22491b0c99	merge from 2.0	2015-08-19 14:21:12 +08:00
winlin	f691dddc1a	drop metadata when drop sequence header. support PCUC 0x1a	2015-08-19 14:20:31 +08:00
winlin	2cf526ffc7	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00
winlin	0cb7ddfe8c	Merge branch '2.0release' into develop	2015-08-18 14:09:05 +08:00
winlin	ccc4c05da9	fix #229, support vs2010 for srslibrtmp.	2015-08-18 14:08:54 +08:00
winlin	f53b2556bb	Merge branch '2.0release' into develop	2015-08-17 16:34:21 +08:00
winlin	01be68fe58	refine code, donot remove the detail when hls disabled.	2015-08-17 16:34:11 +08:00
winlin	53351cd645	Merge branch '2.0release' into develop	2015-08-14 15:51:15 +08:00
winlin	afd05f71c3	refine code, use size cache for performance issue.	2015-08-14 15:51:02 +08:00
winlin	0b90af7e46	Merge branch '2.0release' into develop	2015-08-14 15:47:36 +08:00
winlin	3b0b2e0b85	fix the bug to support dump packets with count.	2015-08-14 15:47:29 +08:00
winlin	8d3d5dd10b	Merge branch '2.0release' into develop	2015-08-14 14:35:47 +08:00
winlin	a0a89a8ca6	use reduce_sequence_header for stream control.	2015-08-14 14:35:41 +08:00
winlin	9fbff4b8f9	Merge branch '2.0release' into develop	2015-08-14 11:15:29 +08:00
winlin	b79d830e2c	refine the default smi	2015-08-14 11:15:23 +08:00
winlin	807299589e	merge from srs2.	2015-08-14 11:14:33 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	0b84c1d962	Merge branch '2.0release' into develop	2015-08-12 18:02:40 +08:00
winlin	7dcba040eb	refine config.	2015-08-12 18:02:31 +08:00
winlin	653afd0700	merge from 2.0	2015-08-12 13:23:00 +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	1261916eab	refine the mount and dir to /console	2015-08-12 12:49:22 +08:00
winlin	b27bb48447	refine the version	2015-08-12 08:18:45 +08:00
winlin	eab538d2e4	fix the version of srs2	2015-08-11 18:37:50 +08:00
winlin	f28c9b7eb5	merge from 2.0release	2015-08-11 15:49:48 +08:00
winlin	3a6854fc2e	refine code.	2015-08-11 15:36:14 +08:00
lovacat	e8c0ca7af0	fix #442: HTTP API kickoff client.	2015-08-11 15:23:46 +08:00
winlin	d761ebfa55	refine the api, move the requests and errors to rest.	2015-08-11 13:09:21 +08:00
winlin	c5bf397295	fix the http error header.	2015-08-10 16:41:25 +08:00
winlin	fbcc07d85a	fix the typo of AUTIO.	2015-08-05 22:54:29 +08:00
winlin	0e3128d3e3	Merge branch '2.0release' into develop	2015-08-03 15:23:07 +08:00
winlin	65b2ed7ac5	refine code, move the order of functions.	2015-08-03 14:11:21 +08:00
winlin	71f2726b31	fix bug of merge code for reload http_remux for vhost	2015-08-03 13:44:24 +08:00
winlin	ccf6a4de1e	remove the on_reload_vhost_http_remux_updated for vhost added.	2015-08-03 13:35:25 +08:00
winlin	bfe0f97edd	refine params nameing and SrsStream.	2015-07-28 18:08:11 +08:00
winlin	8d86eb6516	refine code naming or comments.	2015-07-28 17:56:50 +08:00
winlin	c2d9c98678	Merge branch '2.0release' into develop	2015-07-23 14:20:57 +08:00
winlin	bc033d5de3	refine code, move default to config function.	2015-07-23 14:20:46 +08:00
zhengfl	39a2d51c66	fix #445, 修正由skip(-4)引起的assert错误	2015-07-22 12:10:19 +08:00
winlin	94569b181f	merge from 2.0	2015-07-21 12:08:05 +08:00
winlin	c85f92c229	fix #169, support default values for transcode. 2.0.180	2015-07-21 12:07:26 +08:00
winlin	48c040c92b	Merge branch '2.0release' into develop	2015-07-21 11:41:13 +08:00
winlin	31d2de3f23	fix #435, add pageUrl for HTTP callback on_play.	2015-07-21 10:50:57 +08:00
winlin	146a44a2ce	merge from 2.0	2015-07-20 09:32:46 +08:00
winlin	b54f9b0f94	refine the hls, ignore packet when no sequence header. 2.0.179	2015-07-20 09:31:46 +08:00
winlin	fdb17a1864	merge from 2.0	2015-07-17 14:06:15 +08:00
winlin	3b65af9bd2	fix the hstrs bug on edge.	2015-07-17 14:05:34 +08:00
winlin	99db2888e7	refine code for hstrs.	2015-07-16 18:42:27 +08:00
winlin	c2ef779523	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-07-16 17:31:31 +08:00
winlin	366d3a3f56	for #441, use 30s timeout for first msg. 2.0.178	2015-07-16 17:30:27 +08:00
zhengfl	a5a9f7c8c5	refine code:优化edge模式回源播放线程启动流程	2015-07-16 11:36:14 +08:00
winlin	5f77724021	refine hls disable the time jitter, support not mix monotonically increase. 2.0.177	2015-07-14 11:46:23 +08:00
winlin	5f91fbc970	merge from 2.0release	2015-07-14 11:32:40 +08:00
winlin	d995726fee	fix the http flv mount bug.	2015-07-14 11:31:17 +08:00
winlin	9743e02541	refine the mix correct algorithm.	2015-07-14 11:28:00 +08:00
winlin	6fe36afcfa	when hls timestamp jump, reset it.	2015-07-14 11:00:58 +08:00
winlin	99574bb77b	ignore when no segments for there must no m3u8	2015-07-14 10:43:21 +08:00
winlin	40c264a316	always reset the max target duration for hls.	2015-07-14 10:31:42 +08:00
winlin	54bb42483b	change time jitter to off for hls and forward.	2015-07-14 10:03:15 +08:00
winlin	be342178c0	fix ingest flv tool, support non monotonically timestamp.	2015-07-13 22:09:01 +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	677567d9f2	Merge branch '2.0release' into develop	2015-07-10 11:50:45 +08:00
winlin	0aa053433c	fix #132: build failed when enable the info or verbose log.	2015-07-10 11:50:35 +08:00
zhengfl	2567a89599	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-07-09 15:49:23 +08:00
zhengfl	2263f2a610	refine code: ... 优化 判断重复推流 及 推流流程	2015-07-09 15:45:55 +08:00
winlin	404bc565a1	refine the pithy print mechenism.	2015-07-09 15:39:02 +08:00
winlin	97b8c99682	Merge branch '2.0release' into develop	2015-07-09 13:52:52 +08:00
winlin	bed540bac9	fix #439: http remux support reload	2015-07-09 13:52:41 +08:00
winlin	da47f1648b	refine file mode to 644	2015-07-09 13:44:05 +08:00
zhengfl	f6a2cea716	refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。	2015-07-09 10:08:17 +08:00
winlin	3dadad2dbc	Merge branch '2.0release' into develop	2015-07-08 17:45:08 +08:00