2860 Commits (00c60db7c317404642c1eb035038132caa57eb00)

Author	SHA1	Message	Date
winlin	225e742657	add args3	10 years ago
winlin	1fd83d9314	refine the order.	10 years ago
没——问题	e8680527c3	allow domain * ... 在使用时，srs_player可能和所在页面部署在不同的域名下。 所以在此处添加跨域许可。	10 years ago
winlin	7b2b11e932	async call worker fast execute tasks.	10 years ago
没——问题	c548ab5019	function set_srs_player_url(url, params) ... 在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。 所以在此处提供设置 srs_player.swf 的url的方法。	10 years ago
winlin	087f7740b7	fix the build failed bug	10 years ago
winlin	256459e1ec	fix the utest bug	10 years ago
winlin	240a1bfadb	rename kafka protocol	10 years ago
winlin	c4e4711b93	add kafka protocol	10 years ago
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	10 years ago
winlin	2b9869ee52	update the wiki for dvr	10 years ago
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	10 years ago
winlin	8f9cfcdcf4	fix #319, http raw api support update global and vhost. 3.0.4	10 years ago
winlin	e8a00de4a3	for #319, support enable or disable vhost.	10 years ago
winlin	631e76cd32	for #319, support update and delete the disabled vhost	10 years ago
winlin	a7c4b786cf	merge from 2.0	10 years ago
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	10 years ago
winlin	eb578b4a39	refine the thread, set to disposed when terminate normally	10 years ago
winlin	83a9ff9f5d	for #474, refine the hls publish, donot fetch from source when publish	10 years ago
winlin	44bcb4045f	for #474, decode the sequence header before hls.	10 years ago
winlin	07ef8160a3	clear the queue when edge republish.	10 years ago
winlin	704624c9ec	clear the queue when edge republish.	10 years ago
winlin	8be3c875af	donot release stream when busy	10 years ago
winlin	3da25f3aee	when thread terminated normally, set the tid to NULL.	10 years ago
winlin	a994191ddc	for #474, always release publish for source.	10 years ago
winlin	eb9aa47ab1	merge from 2.0	10 years ago
winlin	0d57ef9373	fix #458, http hooks use source thread cid. 2.0.188	10 years ago
winlin	3b483094bd	merge from 2.0	10 years ago
winlin	6d50aa1aa2	#475, fix http hooks crash for st context switch. 2.0.187	10 years ago
winlin	adb74dc74e	Merge branch '2.0release' into develop	10 years ago
winlin	f0fc093b19	fix the http zero content length bug.	10 years ago
winlin	01308ecc98	for #319, support initialize the parser to whether use jsonp	10 years ago
winlin	491ec11833	for #319, raw api support add new vhost	10 years ago
winlin	0d6c24581d	refine json number, use int64 when number is int.	10 years ago
winlin	7ae76b579e	refine the conf, use srs3 style	10 years ago
winlin	a88f321d8b	for #319, merge from 2.0release	10 years ago
winlin	abd7ee227c	support reload utc_time. 2.0.186	10 years ago
winlin	c4feb8f6ed	for #319, raw api support update all globals.	10 years ago
winlin	6aafd072db	for #319, raw api support update srs log tank, level and file.	10 years ago
winlin	8107e5f9a6	for #319, raw api support set the ff_log_dir	10 years ago
winlin	c8466c36bd	for #319, raw api support update the global RTMP chunk_size.	10 years ago
winlin	2cfb71616e	for #319, copy all data to request for source.	10 years ago
winlin	2bdd974227	for #319, reorder the ingesters.	10 years ago
winlin	342483bf04	for #319, when reload the listen, restart all ingesters.	10 years ago
winlin	310b5a14cb	for #319, support minimal query api	10 years ago
winlin	06c7ae62ee	for #319, refine the error code for RAW APi.	10 years ago
winlin	11c409688b	for #319, http raw api support query. 3.0.3	10 years ago
winlin	8a2709dd2c	for #319, do not apply when config not changed.	10 years ago
winlin	a62c82bd46	for #319, api raw update global.listen	10 years ago
winlin	364460f2ab	for #319, support raw update global.listen	10 years ago
winlin	f8d8c3ace4	use function to dumps the engine.	10 years ago
winlin	01878e5a9c	for #319, query vhost detail.	10 years ago
winlin	b1b76a4a80	for #319, allow multiple ingest and transcode.	10 years ago
winlin	873aa7bf9f	for #319, refine the query global, only show true options.	10 years ago
winlin	d1336e0d80	refine conf	10 years ago
winlin	dc11013c01	for #319, render the detail of vhost	10 years ago
winlin	0109a74840	for #319, refine the config structure.	10 years ago
winlin	2b4fa2d73e	for #319, move the edge configs to cluster.	10 years ago
winlin	6bd05f9cfc	for #319, refine the config forward.	10 years ago
winlin	bc24c0407b	for #319, move smi and rsh to play	10 years ago
winlin	f7c893d907	for #319, move gop_cache and queue_length to play	10 years ago
winlin	06ae74dd3f	for #319, move mw_latency to play.	10 years ago
winlin	4eb1874955	for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency.	10 years ago
winlin	9c4340f789	for #319, move atc and atc_auto to play	10 years ago
winlin	d6b0aa3a5b	for #319, move time_jitter and mix_correct to play	10 years ago
winlin	738642073e	for #319, refine config, collect the mr and publish timeout	10 years ago
winlin	bc100c2867	refine the log, move default to each functions.	10 years ago
winlin	7ef3ff90c0	refine the config structure, compatible with SRS1/2	10 years ago
winlin	a79e19599c	for #319, support query the vhost info.	10 years ago
winlin	bdfd0ae09e	for #319, dumps the http static, remux and globals.	10 years ago
winlin	1b1a2a1e63	fix #471, api response the width and height. 3.0.2	10 years ago
winlin	04bea781ca	use amf0 encode for json encode.	10 years ago
winlin	e0219bd7aa	refine code, merge json encode to amf0.	10 years ago
winlin	66ffcad635	for #319, always allow raw query.	10 years ago
winlin	f167616379	rename the config_query to query	10 years ago
winlin	75ca759e5d	fix the reload http api bug.	10 years ago
winlin	2dcf3bc606	for #319, support rpc raw api to query the HTTP RAW API configs.	10 years ago
synote	9b01aad220	fix bug for build failure when configure with --log-info ... wrong use of size in SrsStream::initialize of srs_kernel_stream.cpp	10 years ago
winlin	af0a76e51a	fix the build failed bug on centos	10 years ago
winlin	e03d8a0115	fix the build failed bug on centos	10 years ago
winlin	555a3fbf5f	for #319, support render HTTP RAW API in console.	10 years ago
winlin	8e635d9749	for #319, support HTTP RAW API config_query global data.	10 years ago
winlin	d921d59e57	for #319, support HTTP RAW API reload.	10 years ago
winlin	f74dc62046	fix the process restart bug.	10 years ago
winlin	e39e006d63	fix the exec clear bug.	10 years ago
winlin	c081a5370b	Merge branch '2.0release' into develop	10 years ago
winlin	fe4cdceb15	always wait for process to terminated when SIGKILL.	10 years ago
winlin	1e0481a2d0	for #319, support signal to persistence config	10 years ago
winlin	980e3921e4	for #319, add signal to write config to file.	10 years ago
winlin	cdde293785	add todo for reload the source components.	10 years ago
winlin	53f4ce3604	for #367, update wiki to v3	10 years ago
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	10 years ago
winlin	7de181004f	Merge branch '2.0release' into develop	10 years ago
lovecat	9c2beffe8f	statistic connection bytes before remove client.	10 years ago
winlin	039af7243c	for #367, refine the comments for process.	10 years ago
winlin	6fe88d088c	for #367, process support redirect stdout and stderr.	10 years ago
winlin	0e1861b084	for #367: extract the process from ffmpeg to exec programs.	10 years ago
winlin	3a8c03a471	Merge branch '2.0release' into develop	10 years ago
winlin	a242aa35dc	add pid to srs rtmp dump	10 years ago
winlin	15102a7345	refine commit script	10 years ago
winlin	2a4b448cce	Merge branch '2.0release' into develop	10 years ago
winlin	a7f4104d45	fix bug of commit script	10 years ago
winlin	d8030faabe	Merge branch '2.0release' into develop	10 years ago
winlin	064031cac1	refine commit script	10 years ago
winlin	8e259eb0c2	refine the commit script	10 years ago
winlin	4118138cf0	update commit script	10 years ago
winlin	b25c45c643	refine srs player, support set the bufferTimeMax.	10 years ago
winlin	74d4c96423	for #367, design the config for exec.	10 years ago
winlin	cbfe438e73	for #367, design the config for exec.	10 years ago
winlin	28791fd14a	release 2.0alpha0, the 2.0a0, 2.0.185	10 years ago
winlin	5721bc371c	Merge branch '2.0release' into develop	10 years ago
winlin	e43d4e46b4	support JSONP DELTE/POST/PUT	10 years ago
winlin	baa70d4ddd	add nb_streams for vhost	10 years ago
winlin	7a2836ae2a	Merge branch '2.0release' into develop	10 years ago
winlin	6e5143449e	HTTP API support JSONP by specifies the query string callback=xxx.	10 years ago
winlin	22485ce5e9	Merge branch '2.0release' into develop	10 years ago
winlin	aeebddb269	for #442, add more information for client for api.	10 years ago
winlin	94641c812b	fix #442, support kickoff client.	10 years ago
winlin	b37797b13a	for #442, add publish connection in stream.publish api	10 years ago
winlin	529803ed04	refine code for api.	10 years ago
winlin	1962449770	Merge branch '2.0release' into develop	10 years ago
winlin	6b6d951298	add api /api/v1/features	10 years ago
winlin	4763f205a2	add kbps for vhost and stream	10 years ago
winlin	0a4d78383c	Merge branch '2.0release' into develop	10 years ago
winlin	20a8818a8e	refine the error response.	10 years ago
winlin	2edcf1d4ff	support query specified vhost	10 years ago
winlin	66a26bdce8	move json from app to protocol	10 years ago
winlin	a7589b9ad3	refine code for api, add clients and parse_rest_id	10 years ago
winlin	ab4620870d	refine the stat api, support query specified stream.	10 years ago
winlin	32a484164a	Merge branch '2.0release' into develop	10 years ago
winlin	c75f05c88b	fix the log cid display error, merge the publish recv thread log to publish connection.	10 years ago
winlin	9528243b81	Merge branch '2.0release' into develop	10 years ago
winlin	3c402cb908	refine the tcp nodelay, effect connected connections.	10 years ago
winlin	71aacebcbc	Merge branch '2.0release' into develop	10 years ago
winlin	c31a546eec	support vhost for http flv.	10 years ago
winlin	0afe4963bc	Merge branch '2.0release' into develop	10 years ago
winlin	dd21eee7f0	srs player show current time and url	10 years ago
winlin	ce8f446494	Merge branch '2.0release' into develop	10 years ago
winlin	dfecfb65b1	support fluency and stream empty count	10 years ago
winlin	fcd2d3d445	refine code for link generation from rtmp url.	10 years ago
winlin	fe87bf1b61	support generate link page for rtmp url	10 years ago
winlin	018af55d65	refine the demo pages, move scripts after body.	10 years ago
winlin	77765b463a	Merge branch '2.0release' into develop	10 years ago
winlin	575a698820	fix #380, srs-librtmp send sequence header when sps or pps changed.	10 years ago
winlin	f10e399991	Merge branch '2.0release' into develop	10 years ago
winlin	ec87dd9cd6	refine code for srs rtmp dump	10 years ago
winlin	785a5907a8	set the default get_publish_normal_timeout to 5s	10 years ago
winlin	0bbfc5526a	set the default get_publish_normal_timeout to 5s	10 years ago
winlin	7273c33c35	support publish_1stpkt_timeout and publish_normal_timeout	10 years ago
winlin	170ad05148	add gfps and nb_packets	10 years ago
winlin	a5dd3a8e7b	Merge branch '2.0release' into develop	10 years ago
winlin	e7714cd445	add packets interval in ms to set the right send_min_interval	10 years ago
winlin	de48b477ae	drop the metadata when drop sequence header	10 years ago
winlin	22491b0c99	merge from 2.0	10 years ago
winlin	f691dddc1a	drop metadata when drop sequence header. support PCUC 0x1a	10 years ago
winlin	2cf526ffc7	close #454, support obs restart publish. 2.0.184	10 years ago
winlin	0cb7ddfe8c	Merge branch '2.0release' into develop	10 years ago
winlin	ccc4c05da9	fix #229, support vs2010 for srslibrtmp.	10 years ago
winlin	f53b2556bb	Merge branch '2.0release' into develop	10 years ago
winlin	01be68fe58	refine code, donot remove the detail when hls disabled.	10 years ago
winlin	53351cd645	Merge branch '2.0release' into develop	10 years ago
winlin	afd05f71c3	refine code, use size cache for performance issue.	10 years ago
winlin	0b90af7e46	Merge branch '2.0release' into develop	10 years ago
winlin	3b0b2e0b85	fix the bug to support dump packets with count.	10 years ago
winlin	8d3d5dd10b	Merge branch '2.0release' into develop	10 years ago
winlin	a0a89a8ca6	use reduce_sequence_header for stream control.	10 years ago
winlin	9fbff4b8f9	Merge branch '2.0release' into develop	10 years ago
winlin	b79d830e2c	refine the default smi	10 years ago
winlin	807299589e	merge from srs2.	10 years ago
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	10 years ago
winlin	0b84c1d962	Merge branch '2.0release' into develop	10 years ago
winlin	7dcba040eb	refine config.	10 years ago
winlin	653afd0700	merge from 2.0	10 years ago
winlin	9fb4640a8f	enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182	10 years ago
winlin	1261916eab	refine the mount and dir to /console	10 years ago
winlin	b27bb48447	refine the version	10 years ago
winlin	eab538d2e4	fix the version of srs2	10 years ago
winlin	f28c9b7eb5	merge from 2.0release	10 years ago
winlin	3a6854fc2e	refine code.	10 years ago
lovacat	e8c0ca7af0	fix #442: HTTP API kickoff client.	10 years ago
winlin	d761ebfa55	refine the api, move the requests and errors to rest.	10 years ago
winlin	c5bf397295	fix the http error header.	10 years ago
winlin	fbcc07d85a	fix the typo of AUTIO.	10 years ago
winlin	0e3128d3e3	Merge branch '2.0release' into develop	10 years ago
winlin	65b2ed7ac5	refine code, move the order of functions.	10 years ago
winlin	71f2726b31	fix bug of merge code for reload http_remux for vhost	10 years ago
winlin	ccf6a4de1e	remove the on_reload_vhost_http_remux_updated for vhost added.	10 years ago
winlin	bfe0f97edd	refine params nameing and SrsStream.	10 years ago
winlin	8d86eb6516	refine code naming or comments.	10 years ago
winlin	c2d9c98678	Merge branch '2.0release' into develop	10 years ago
winlin	bc033d5de3	refine code, move default to config function.	10 years ago
zhengfl	39a2d51c66	fix #445, 修正由skip(-4)引起的assert错误	10 years ago
winlin	94569b181f	merge from 2.0	10 years ago
winlin	c85f92c229	fix #169, support default values for transcode. 2.0.180	10 years ago
winlin	48c040c92b	Merge branch '2.0release' into develop	10 years ago
winlin	31d2de3f23	fix #435, add pageUrl for HTTP callback on_play.	10 years ago
winlin	146a44a2ce	merge from 2.0	10 years ago
winlin	b54f9b0f94	refine the hls, ignore packet when no sequence header. 2.0.179	10 years ago
winlin	fdb17a1864	merge from 2.0	10 years ago
winlin	3b65af9bd2	fix the hstrs bug on edge.	10 years ago
winlin	99db2888e7	refine code for hstrs.	10 years ago
winlin	c2ef779523	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	10 years ago
winlin	366d3a3f56	for #441, use 30s timeout for first msg. 2.0.178	10 years ago
zhengfl	a5a9f7c8c5	refine code:优化edge模式回源播放线程启动流程	10 years ago
winlin	5f77724021	refine hls disable the time jitter, support not mix monotonically increase. 2.0.177	10 years ago
winlin	5f91fbc970	merge from 2.0release	10 years ago
winlin	d995726fee	fix the http flv mount bug.	10 years ago
winlin	9743e02541	refine the mix correct algorithm.	10 years ago
winlin	6fe36afcfa	when hls timestamp jump, reset it.	10 years ago
winlin	99574bb77b	ignore when no segments for there must no m3u8	10 years ago
winlin	40c264a316	always reset the max target duration for hls.	10 years ago
winlin	54bb42483b	change time jitter to off for hls and forward.	10 years ago
winlin	be342178c0	fix ingest flv tool, support non monotonically timestamp.	10 years ago
winlin	b3b6df365e	fix the stream caster build failed bug.	10 years ago
winlin	50feaacdde	refine code for http remux reload.	10 years ago
winlin	677567d9f2	Merge branch '2.0release' into develop	10 years ago
winlin	0aa053433c	fix #132: build failed when enable the info or verbose log.	10 years ago
zhengfl	2567a89599	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	10 years ago
zhengfl	2263f2a610	refine code: ... 优化 判断重复推流 及 推流流程	10 years ago
winlin	404bc565a1	refine the pithy print mechenism.	10 years ago
winlin	97b8c99682	Merge branch '2.0release' into develop	10 years ago
winlin	bed540bac9	fix #439: http remux support reload	10 years ago
winlin	da47f1648b	refine file mode to 644	10 years ago
zhengfl	f6a2cea716	refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。	10 years ago
winlin	3dadad2dbc	Merge branch '2.0release' into develop	10 years ago
winlin	0aed408855	refine code, to 644 and unix encoding.	10 years ago
winlin	210d0a67cb	Merge branch '2.0release' into develop	10 years ago
winlin	c6c90e2643	refine code, add comments for stat on_disconnect.	10 years ago
zhengfl	db9ea4e66e	rewrite #438	10 years ago
zhengfl	f9257b89e7	fix #438 ... 问题：edge模式，推流时异常断开。 解决方法：增加edge模式推流检测。	10 years ago
zhengfl	120033e0a2	fix #437 ... edge模式，重新从源站拉流时，导致forwarders异常	10 years ago
winlin	f39faa78bb	refine config default values of srs, prepare to move each default values to functions.	10 years ago
winlin	9c716d4791	Merge branch '2.0release' into develop	10 years ago
winlin	3b8daafc03	use local openssl header files to avoid warnings on osx.	10 years ago
winlin	c8fef99cb6	merge from 2.0release	10 years ago
winlin	438914c481	fix #433, fix the sps parse bug. 2.0.176	10 years ago
winlin	312366bba2	add srs_recvi_bytes for intranet bytes stat.	10 years ago
winlin	750399ace4	fix network device compare bug.	10 years ago
winlin	8cd68a1eb3	ignore any intranet bandwidth.	10 years ago
zhengfl	52110990c1	修正编码风格问题	10 years ago
zhengfl	b4ff9cfba1	fix bug ... 某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。	10 years ago
winlin	8951752086	Merge branch '2.0release' into develop	10 years ago
winlin	8102a22606	add comments for async call.	10 years ago
winlin	6f685e66b1	Merge branch '2.0release' into develop	10 years ago
winlin	3211282b0c	refine the http code.	10 years ago
winlin	f8f6e438cc	extract http static and http stream from http conn.	10 years ago
winlin	e743795f3d	Merge branch '2.0release' into develop	10 years ago
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	10 years ago
winlin	c58b7231e2	Merge branch '2.0release' into develop	10 years ago
winlin	17c276113e	refine the hls dispose, when not cycle always dispose it.	10 years ago
winlin	ec90ae2082	refine the space of code.	10 years ago
winlin	2f44a29b76	Merge branch '2.0release' into develop	10 years ago
winlin	d103557a8b	merge the rtmp sdk to stack.	10 years ago
winlin	0d66e92ab5	refine code, support configure to enable --memory-watch	10 years ago
winlin	69b7c57511	Merge branch '2.0release' into develop	10 years ago
winlin	0d6a574216	fix the hls_dispose bug, ignore for 0.	10 years ago
winlin	b0ce38dc8f	merge from 2.0	10 years ago
winlin	56938efdbd	fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175	10 years ago
winlin	12eab8a128	merge from srs2.	10 years ago
winlin	6941f2c072	fix #424, fix aggregate timestamp bug. 2.0.174	10 years ago
winlin	8e8c8108fc	refine the time jitter code.	10 years ago
winlin	1f1776a0d8	fix the export project bug. wakeup connection when dispose server.	10 years ago
winlin	bf9166dbec	Merge branch '2.0release' into develop	10 years ago
winlin	969ed7b0ae	refine build summary.	10 years ago
winlin	66837ffa6e	fix the thread stop bug, must wait when not joinable.	10 years ago
winlin	d317528af9	refine the signal manager.	10 years ago
winlin	7996b3b789	add warning for gmp, use gmc to detect memory leak.	10 years ago
winlin	f347099fd1	for memory leak detect, move the payload create to message.	10 years ago
winlin	863dddde09	fix typo of code.	10 years ago
winlin	19e1f610a3	merge from bravo, parse the http reponse in json of bravo system.	10 years ago
winlin	00d1fdded0	Merge branch '2.0release' into develop	10 years ago
winlin	574cf6a094	use libfdk_aac for srs2.	10 years ago
winlin	00a25ee5c5	cleanup connections when terminate server.	10 years ago
winlin	d7e5df2578	cleanup connections when terminate server.	10 years ago
winlin	573495a19f	refine the memory watcher.	10 years ago
winlin	bb4db61192	add srs memory watcher.	10 years ago
winlin	811ef4bcf6	dispose the gop cache	10 years ago
winlin	600e8e10d0	Merge branch '2.0release' into develop	10 years ago
winlin	beb0431746	detect the monotonically increase and warn to use mix_correct	10 years ago
winlin	57f01185f5	Merge branch '2.0release' into develop	10 years ago
winlin	2d9f258eaf	refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio.	10 years ago
winlin	17d6016bf6	Merge branch '2.0release' into develop	10 years ago
winlin	ec24533955	use smaller value for publish timeout.	10 years ago
winlin	a6dd8fb3a1	fix #421, when mix correct on, must check the type of dequeue msg.	10 years ago
winlin	5d75e32e1d	Merge branch '2.0release' into develop	10 years ago
winlin	a1dd734318	fix #421, drop video for unkown RTMP header.	10 years ago
winlin	679b4317d8	fix the build failed bug.	10 years ago
winlin	0fbfad4172	fix gop cache, drop video only when video and not h.264	10 years ago
winlin	2a1db36750	refine the pithy print of ingesters.	10 years ago
winlin	d10d57716a	Merge branch '2.0release' into develop	10 years ago
winlin	e4c27a51b8	fix the hls bug	10 years ago
winlin	4400b12515	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	10 years ago
winlin	26b76c0e4c	fix #420, remove ts for hls ram mode.	10 years ago
winlin	5dd81d182c	Merge branch '2.0release' into develop	10 years ago
winlin	af9efe9213	disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.	10 years ago
winlin	982a937e84	Merge branch '2.0release' into develop	10 years ago
winlin	4e42b9c628	copy the request for hls.	10 years ago
winlin	091b480ac9	Merge branch '2.0release' into develop	10 years ago
winlin	679583dad6	refine comments of ffmpeg.	10 years ago
winlin	c1172c9940	Merge branch '2.0release' into develop	10 years ago