3318 Commits (0a63448b86bfa2998f14055402896406a33de109)

Author	SHA1	Message	Date
winlin	d8f18aee37	use the right int type for port.	10 years ago
winlin	1c7d5f1852	Merge branch '2.0release' into develop	10 years ago
winlin	353e3260b8	remove duplicated code	10 years ago
winlin	9ead08725d	use kernel utility int2str and float2str	10 years ago
winlin	6efd2dd27e	add load balance round robin for brokers.	10 years ago
winlin	2a4ab8a923	add brokers to config	10 years ago
winlin	f187a7deef	refine the startup logs.	10 years ago
winlin	3ab0ccaa27	Merge branch '2.0release' into develop	10 years ago
winlin	7cdcf41d26	refine the api server	10 years ago
winlin	afd6428366	refine code of server.	10 years ago
winlin	8b6c78b862	Merge branch '2.0release' into develop	10 years ago
winlin	d1de097f5e	fix make clean bug, donot rm when no dir	10 years ago
winlin	396bb43672	Merge branch '2.0release' into develop	10 years ago
winlin	8b1198562a	show cpu info.	10 years ago
winlin	4e88262512	merge from srs2 to check cpus.	10 years ago
winlin	cfe2082353	fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192	10 years ago
winlin	f6e655396c	for #485, support cross build for arm	10 years ago
winlin	d94a88a797	merge from srs2 for pi and cubie.	10 years ago
winlin	16730ea031	refine code for cross build	10 years ago
winlin	6990508e58	for #485, srs for respberrypi and cubieboard. 2.0.191	10 years ago
winlin	f75058413d	Merge branch '2.0release' into develop	10 years ago
winlin	7dcdb18588	support build on pi and cubie	10 years ago
winlin	a8829e0a8b	support build on pi or cubie.	10 years ago
winlin	9a9483e7d5	support without kafka	10 years ago
winlin	abb5c5ad31	add kafka producer	10 years ago
winlin	b5ccc35340	add kafka config	10 years ago
winlin	ab1e62a886	create the metadata request message	10 years ago
winlin	ca3b89aa7d	add kafka array, use c++ template.	10 years ago
winlin	8a6edac4e8	add --x86-64 alias for --x86-x64.	10 years ago
winlin	edead21a25	refine the options	10 years ago
winlin	e415824576	refine the options	10 years ago
winlin	2d5cc7a3e4	add structures for kafka	10 years ago
winlin	83f40697e2	refine the hpp macro defines.	10 years ago
winlin	df6ac8842c	rename rtmp utility to protocol utility	10 years ago
winlin	82ff05c1d4	rename rtmp io to protocol io	10 years ago
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	10 years ago
winlin	1310c0f577	rename srs_protocol_buffer to srs_protocol_stream	10 years ago
winlin	d32632ee8a	rename SrsFastBuffer to SrsFastStream	10 years ago
winlin	4f3d2c8607	rename SrsSimpleBuffer to SrsSimpleStream	10 years ago
winlin	dadfe101b4	rename SrsBitStream to SrsBitBuffer	10 years ago
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	10 years ago
winlin	ca3577e11b	rename temp to stream	10 years ago
winlin	f33d736442	rename kernel stream to buffer	10 years ago
winlin	a4f51564db	rename kernel stream to buffer	10 years ago
winlin	495f575ac3	rename kernel buffer to temp	10 years ago
winlin	ac2b03a3ed	rename srs_kernel_buffer to temp	10 years ago
winlin	faf6d15878	add replace script.	10 years ago
winlin	1de2bb0801	add kafka protocol files.	10 years ago
winlin	b5996567e8	refine the role of srs, to cluster.	10 years ago
winlin	e4e36a0166	merge from srs2, fix openssl build	10 years ago
winlin	d8a64aaab5	fix #484, hotfix the openssl build script 2.0.190	10 years ago
winlin	b471c6e61c	refine code, use json integter rather than number.	10 years ago
winlin	c5cd58761c	move the srs thread to st.	10 years ago
winlin	3042115385	refine json to_str to dumps.	10 years ago
winlin	b59d9ba6a1	support amf0 and json to convert with each other.	10 years ago
winlin	3f7e69b617	json objects support dumps to string.	10 years ago
winlin	b78781707e	update the srs player	10 years ago
winlin	5073a6fa08	merge from srs2	10 years ago
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
winlin	03d951c0fb	fix the audio or video pid generate bug.	10 years ago
winlin	c3c4cb2f2a	Merge branch '2.0release' into develop	10 years ago
winlin	96f8f1f502	fix build bug.	10 years ago
winlin	09750082e5	Merge branch '2.0release' into develop	10 years ago
winlin	0a87b567f6	fix the build failed bug.	10 years ago
winlin	9dce971d57	merge from srs2	10 years ago
winlin	223ae194b1	fix #209, cleanup hls when stop and timeout. 2.0.173.	10 years ago
winlin	4a80a5a71e	for #209, support cleanup when srs stop.	10 years ago
winlin	860d68e6e7	for #374, use fast stop for ingesters to stop many FFMPEG.	10 years ago
winlin	d611bb6b45	for #209, server cycle to enable the hls to cleanup. do dispose	10 years ago
winlin	567d84e997	fix #374: when terminate srs, cleanup to ensure FFMPEG quit.	10 years ago
winlin	db57a519a9	for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly.	10 years ago
winlin	597993d414	support pure video hls.	10 years ago
winlin	5caafadd45	fix #409: support pure video hls. 2.0.172.	10 years ago
winlin	27a1fee6b9	Merge branch '2.0release' into develop	10 years ago
winlin	af4eec90ac	for srs-dolphin, support HTTP and RTMP.	10 years ago
winlin	b44987fac7	Merge branch '2.0release' into develop	10 years ago
winlin	394e070b2e	support dolphin	10 years ago
winlin	e5461d2df9	refine code	10 years ago
winlin	60775485c4	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	10 years ago
winlin	385ee893f5	update readme	10 years ago
zhengfl	4864e796d6	fix #408:Queue丢视频时，不应该丢弃SequenceHeader	10 years ago
winlin	7e04975b8d	fix the test configure script	10 years ago
winlin	1150cde829	fix the verbose build failed.	10 years ago
winlin	ca01bd407b	fix the bug of test configure script.	10 years ago
winlin	fec8422d6b	fix bug of configure.	10 years ago
winlin	eb488e3bde	fix the test configure script bug	10 years ago
winlin	02c4741d64	add usage and make jobs support for configure test script	10 years ago
winlin	c1b9541b5c	support disable all	10 years ago
winlin	9ab579c6e8	refine the configure test script.	10 years ago
winlin	409c1e4823	Merge branch '2.0release' into develop	10 years ago
winlin	2e1ca3c751	fix the build failed bug.	10 years ago
winlin	cd162c2848	merge from 2.0	10 years ago
winlin	d12fc7fcc5	fix #405, improve the HTTP FLV performance to 6k. 2.0.171	10 years ago
winlin	4df19ba99a	for #405, improve the http flv to 3k. 2.0.170	10 years ago
winlin	8a9dbaefb7	use cache for flv tag header.	10 years ago
winlin	960341b9b2	for #405, improve the HTT FLV to 3k. 2.0.169	10 years ago
winlin	b53e9814b3	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	10 years ago
winlin	fc995473eb	for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168	10 years ago
winlin	2661e3c419	Merge branch '2.0release' into develop	10 years ago
winlin	cf9ee04611	fix the utest build failed bug.	10 years ago
winlin	f540ce307b	merge from 2.0	10 years ago
winlin	069ee0afc3	fix #404, register handler then start http thread. 2.0.167.	10 years ago
winlin	a45cf38d44	auto detect the sed command for osx.	10 years ago
winlin	f510a3d6fb	add /api/v1/versions for http server for go-sharp to detect.	10 years ago
winlin	58b336451d	Merge branch '2.0release' into develop	10 years ago
winlin	94efe3f727	update wiki	10 years ago
winlin	5840bc1053	add flv cluster confs.	10 years ago
winlin	7571d70f16	fix the build failed bug.	10 years ago
winlin	2f66c8dd09	Merge branch '2.0release' into develop	10 years ago
winlin	93a1d097dc	update jwplayer to support play HTTP flv.	10 years ago
winlin	829b3a392b	merge from 2.0	10 years ago
winlin	e96150b7db	update readme	10 years ago
winlin	6b28dec8ec	merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166	10 years ago
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	10 years ago
winlin	af172d9593	refine script, use PROTOCOL as RTMP.	10 years ago
winlin	68d835021e	refine code, move the kbps to protocol	10 years ago
winlin	478873fdec	Merge branch '2.0release' into develop	10 years ago
winlin	cfc0877ec9	refine the thread, add all callback.	10 years ago
winlin	e5f449ce36	refine the thread to three category.	10 years ago
winlin	2f0ef87d6d	refine code, rename the sync call to common class.	10 years ago
winlin	0bb90145ba	fix #391, copy request for async call.	10 years ago
winlin	6bfb743aa0	remove the unused app http file	10 years ago
winlin	f0ae66a081	merge the app http to conn.	10 years ago
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	10 years ago
winlin	e2955da78f	refine code, extract the http protocol sdk to module.	10 years ago
winlin	d645411392	refine the kbps comments, add one usage.	10 years ago
winlin	7243cdbff6	merge from 2.0release.	10 years ago
winlin	6ca46e84bc	fix #397, the USER_HZ maybe not 100. 2.0.165	10 years ago
winlin	c17a1198cb	fix #399, disconnect when not keep alive.	10 years ago
winlin	46a81372e7	fix #398, set recv timeout for http connection.	10 years ago
winlin	6f8c076b30	add comments for srs thread, add never quit thread.	10 years ago
winlin	948d200ce1	fix #400, parse when got entire http header, by feilong. 2.0.164.	10 years ago
winlin	5d7b0edccc	merge from bravo code, fix some warnings.	10 years ago
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	10 years ago
winlin	0f7cafe50b	order the xcode project	10 years ago
winlin	f6d2fd991b	merge from 2.0.162	10 years ago
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	10 years ago
winlin	39f5f80b6c	Merge branch '2.0release' into develop	10 years ago
winlin	77ee2400df	fix the unicode to ascii	10 years ago
winlin	1fd69beea5	Merge branch '2.0release' into develop	10 years ago
winlin	7fc1cda392	add stream status to api.	10 years ago
winlin	7ce9398b41	Merge branch '2.0release' into develop	10 years ago
winlin	ac13817aae	update donation	10 years ago
winlin	2d61a8cfaf	Merge branch '2.0release' into develop	10 years ago
winlin	f6252c7f72	enable hls for push flv.	10 years ago
winlin	644454a4f5	Merge branch '2.0release' into develop	10 years ago
winlin	ffdabf32ed	add push flv conf	10 years ago
winlin	f13c4d3a0f	Merge branch '2.0release' into develop	10 years ago
winlin	e221d002a2	fix the flv caster bug, when nread is 0, disconnect it.	10 years ago
winlin	e516c7f7a5	Merge branch '2.0release' into develop	10 years ago
winlin	ad32048c1c	fix the http flv stream caster.	10 years ago
winlin	cba6675560	refine the http message, set the connection if required.	10 years ago
winlin	ba6c3132e3	refine code, use decoder to parse flv stream	10 years ago
winlin	411f5a1d2a	Merge branch '2.0release' into develop	10 years ago
winlin	ea1e015a4e	fix the http read chunked encoding bug.	10 years ago
winlin	da00b67c76	Merge branch '2.0release' into develop	10 years ago
winlin	a95fd6d140	read the http flv stream.	10 years ago
winlin	022b6aa561	refine the http remux for http flv stream.	10 years ago
winlin	f0c24eeacc	add stream caster for post flv over http.	10 years ago
winlin	91e285b0cd	Merge branch '2.0release' into develop	10 years ago
winlin	4b372d8d16	change primary to the primary branch.	10 years ago
winlin	94681702e1	Merge branch '2.0release' into develop	10 years ago
winlin	e63b8eda51	migarate to srs org.	10 years ago
winlin	42ddb76544	Merge branch '2.0release' into develop	10 years ago
winlin	8603dba697	migarate to srs org.	10 years ago
winlin	17b15deee6	Merge branch '2.0release' into develop	10 years ago
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	10 years ago
winlin	53e92a17f5	Merge branch '2.0release' into develop	10 years ago
winlin	115daa3cc1	migarate from winlinvip to srs org	10 years ago
winlin	5559fb9842	Merge branch '2.0release' into develop	10 years ago
winlin	b3bd007f0d	update git commit	10 years ago
winlin	ae6d0a5ab1	Merge branch '2.0release' into develop	10 years ago
tufang14	b6d650cdb4	m3u8 mount bug	10 years ago
winlin	dbcd7d883b	add script check_hls_backup.sh to research hls.	10 years ago
winlin	e50996270e	fix the config parse error.	10 years ago
winlin	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	10 years ago
winlin	7b157b0678	refine hls ingester, quit when error.	10 years ago
winlin	aabe84046c	refine hls ingester, quit when error.	10 years ago
winlin	114f4447bb	Merge branch '2.0release' into develop	10 years ago
winlin	4e5ddb51e7	refine the overflow algorithm, prevent smaller piece.	10 years ago
winlin	1d973e2178	refine the overflow algorithm, prevent smaller piece.	10 years ago
winlin	d19dfa528e	abs overflow also plus the deviation, for pure audio hls.	10 years ago
winlin	c514a4ceeb	use atc for ingest hls aac time.	10 years ago
winlin	3e0ba172a3	Merge branch '2.0release' into develop	10 years ago
winlin	a28eec89b0	support ingest hls with m3u8 in m3u8.	10 years ago
winlin	7d5f1c2be8	Merge branch '2.0release' into develop	10 years ago
winlin	ba6736839b	support hls ingest, fix the bugs.	10 years ago
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	10 years ago
winlin	23b978c0bb	merge from github	10 years ago
winlin	623e37e22a	Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release	10 years ago
winlin	6e5c587e0a	support aac_adtstoasc filter to copy mode.	10 years ago
J	aca02b6d6b	for #384,refine code for empty body request.	10 years ago
J	8adbdc39e3	for #384,refine code for empty body request.	10 years ago
J	a71db53661	for #384,refine code for empty body request.	10 years ago
J	56f75cbbe9	fix #384	10 years ago
winlin	6726a88f47	merge from 2.0release	10 years ago
winlin	22ca46350b	fix #383, support mix_correct algorithm. 2.0.161.	10 years ago
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	10 years ago
winlin	542aab4557	fix the hls notify bug, pass the query to get path.	10 years ago
winlin	70c1d3cc7e	Merge branch '2.0release' into develop	10 years ago
winlin	02a2cb7e1a	for #381, refine the hls notify, report one by one.	10 years ago
winlin	a4216cc582	add todo for ts parse.	10 years ago
winlin	40eab7fc88	for #381, refine the deviation for hls.	10 years ago
winlin	0c939e7114	merge from 2.0.160:	10 years ago
winlin	dcac9c69d5	fix #381, support reap hls/ts by gop or not. 2.0.160.	10 years ago
winlin	9759b78da8	Merge branch '2.0release' into develop	10 years ago
winlin	0000c945ea	refine the proxy api server.	10 years ago
winlin	fe1886aa08	add proxy for hls	10 years ago
winlin	e5b8e0da01	fix async call and hls_nb_notify bug.	10 years ago
winlin	5d37e47783	support config the hls_nb_notify.	10 years ago
winlin	0a7cea063c	refine http read, support c style api	10 years ago
winlin	5c00ce8a96	refine hls on_hls_notify, read a little of ts.	10 years ago
winlin	1f93fb3399	refine hls notify, support timeout.	10 years ago
winlin	d8988da0ea	refine the hls_on_notify, calc the spent time in ms.	10 years ago
winlin	310157ab77	refine the hls_on_notify, calc the spent time in ms.	10 years ago
winlin	e6d6bdfe57	refine the hls_on_notify, only read a chunk.	10 years ago
winlin	17c1423f4a	Merge branch '2.0release' into develop	10 years ago
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	10 years ago
winlin	7dbc95e085	refine the hls deviation for floor algorithm.	10 years ago
winlin	425e69e0cd	Merge branch '2.0release' into develop	10 years ago
winlin	23b310971e	guess again when annexb change to ibmf.	10 years ago
winlin	71e1602458	merge from 2.0.159	10 years ago
winlin	bd77f995bf	ignore the unknown flv tag.	10 years ago
winlin	546be09219	fix #375, fix hls bug, keep cc continous between ts files. 2.0.159.	10 years ago
winlin	29ac4c724b	change default log tank to file.	10 years ago
winlin	cfed8e81c5	merge from 2.0.158	10 years ago
winlin	e56d7add44	fix bug of config to parse the default value. 2.0.158	10 years ago
winlin	aef97db77a	refine the config code.	10 years ago
winlin	931370e9f6	Merge branch '2.0release' into develop	10 years ago
winlin	e7fd309cb0	refine hls info, show the deviation in seconds and pieces.	10 years ago
winlin	e958305d09	Merge branch '2.0release' into develop	10 years ago
winlin	6e2d756e1b	fix the bug of h.264 bit stream demux.	10 years ago
winlin	bd7db5aed6	only ignore the aud message.	10 years ago
winlin	61d5b78ae5	refine the h264 parser, one ts message should parsed to one rtmp/flv message.	10 years ago
winlin	4329366c08	for #304, do not add deviation for absolute overflow.	10 years ago
winlin	4f9df4f1a0	merge from 2.0.157, reap ts on the IDR.	10 years ago
winlin	77c29da26b	for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157.	10 years ago
winlin	70c59da1bf	enhanced avc decode, parse the sps get width+height. 2.0.156.	10 years ago
winlin	7e1749e029	refine the comments.	10 years ago
winlin	e458305f81	add utc time format.	10 years ago
winlin	90cd16aae4	Merge branch '2.0release' into develop	10 years ago
winlin	56cd373015	support hls callback with duration.	10 years ago
winlin	64b065e450	for hls callback, add duration of ts.	10 years ago
winlin	c4466a8c0c	fix crash bug for hls cleanup.	10 years ago
winlin	eb54ec25c9	fix compile errors.	10 years ago
winlin	cb148e43ee	merge from 2.0.155	10 years ago
winlin	17c0a5c470	fix #372, support transform vhost of edge 2.0.155.	10 years ago
winlin	d95e5a3f47	Merge branch '2.0release' into develop	10 years ago
winlin	4d98cbb965	add hls config in api.	10 years ago
winlin	fe5783e7a4	merge 2.0.154	10 years ago
winlin	8401d9ac06	fix #366, config hls to disable cleanup of ts. 2.0.154.	10 years ago
winlin	2d3d628865	merge from 2.0.153	10 years ago
winlin	717d088376	support server cycle handler. 2.0.153.	10 years ago
winlin	e75b7e89d6	merge from 2.0.152	10 years ago
winlin	3b4bd194b6	refine http hooks, donot pass the known variable.	10 years ago
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	10 years ago
winlin	97442c56b6	enhance hls in floor mode.	10 years ago
winlin	76c1957260	enhance hls, increase piece one by one.	10 years ago
winlin	ef28865991	merge from 2.0.151	10 years ago
winlin	b9c21b1e8f	enhanced hls, warning when ts dup or jmp.	10 years ago
winlin	9be7fbba7d	user smaller deviation to avoid dup ts.	10 years ago
winlin	f6e135943f	enhanced hls, support deviation for duration. 2.0.151.	10 years ago
winlin	40f186ba82	Merge branch '2.0release' into develop	10 years ago
winlin	cd682ae4be	update donations. fix hls path bug.	10 years ago
winlin	abbed8f66c	merge from 2.0release	10 years ago
winlin	692b751da8	for #351, support config the m3u8/ts path for hls. 2.0.149.	10 years ago
winlin	922adaf59f	Merge branch '2.0release' into develop	10 years ago
winlin	85afb6ea6f	add donation. fix bug of adts.	10 years ago
winlin	01ee456649	fix the ts parse bug, should never complete message when PES packet length is 0.	10 years ago
winlin	75ca70c619	Merge branch '2.0release' into develop	10 years ago
tufang14	0faaa61be7	seg fault ... seg fault	10 years ago
winlin	a5c5befad1	for parse video ts.	10 years ago
winlin	896983c1dc	refine the aac codec enum name	10 years ago
winlin	1401f2e0ab	ignore when sps/pps consumed all frame.	10 years ago
winlin	12d5431f3b	Merge branch '2.0release' into develop	10 years ago
winlin	b319e9ff9c	ignore when sps/pps consumed all frame.	10 years ago
winlin	c250e3e651	Merg branch '2.0release' into develop	10 years ago
winlin	e818f36316	fix #360, fix build bug for centos7.	10 years ago
winlin	713cedfbb4	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	10 years ago
winlin	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	10 years ago
winlin	d16ae193f6	Merge branch '2.0release' into develop	10 years ago
winlin	fcab17741c	fix #222, the dvr path rule changed.	10 years ago
winlin	df3f24403e	Merge branch '2.0release' into develop	10 years ago
winlin	02addf61f7	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	bfa46e7a98	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	f69fa7273b	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	09ce6651eb	Merge branch '2.0release' into develop	10 years ago
winlin	1cb2992808	refine build for modules, add defines.	10 years ago
winlin	0a7b179e14	Merge branch '2.0release' into develop	10 years ago
winlin	2f2aaf5ee4	for #155, refine code, donot check network devices for osx.	10 years ago
winlin	e7e17cf15d	fix osx bug.	10 years ago
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	10 years ago
winlin	e45c62003a	Merge branch '2.0release' into develop	10 years ago
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	10 years ago
winlin	7065db192c	for #354, remove the double underscore of macro.	10 years ago
winlin	45d9018051	Merge branch '2.0release' into develop	10 years ago
winlin	c6817cc422	for #354, remove the double underscore of macro.	10 years ago
winlin	3ca906d560	Merge branch '2.0release' into develop	10 years ago
winlin	014993ad1e	remove the sudo of log.	10 years ago
winlin	a4709a6439	for #151, add comments for the audio overflow ratio.	10 years ago
winlin	b1142d83fc	Merge branch '2.0release' into develop	10 years ago
winlin	0319e85f99	support config the audio overflow ratio.	10 years ago
winlin	b7138ba9c5	merge from 2.0	10 years ago
tufang14	e319da3329	小瑕疵 ... 小瑕疵	10 years ago
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	10 years ago
winlin	4a50bf1894	Merge branch '2.0release' into develop	10 years ago
winlin	fbd722bf76	refine the fast buffer to more readable.	10 years ago
winlin	d25eb0aaa2	merge from 2.0	10 years ago
winlin	f36e4a443d	refine the fast buffer. 2.0.144	10 years ago
winlin	6a98758435	revert the changes for SRS2.	10 years ago
winlin	df2644c850	merge from 2.0release	10 years ago
winlin	6855ab4c52	Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop	10 years ago
winlin	9bf6c9e9c6	Merge branch '2.0release' into develop	10 years ago
winlin	cf3becbc17	for #155, osx(darwin) enable http api and stat, rusage is ok.	10 years ago
winlin	9f81a8b73e	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	10 years ago
winlin	ab673e1300	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	10 years ago
winlin	a28c051c2c	osx support build nginx and ffmpeg	10 years ago
winlin	f3e5431d0f	check what a fuck os for some fresh.	10 years ago
tufang14	1cc3384a19	seg fault ... seg fault	10 years ago
winlin	79fbeeb8c6	Merge branch '2.0release' into develop	10 years ago
winlin	8a4312f4ec	fix bug, use size_t for string::npos	10 years ago
winlin	9e407d32fe	change verstion to 3.0.0	10 years ago
winlin	2241ba0e34	for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142	10 years ago
winlin	9c43c73d86	Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop	10 years ago
winlin	33e579599c	refine build for osx	10 years ago
wenjie.zhao	65f404fb42	for #340, refine ts prefix code.	10 years ago
wenjie.zhao	5969f72354	for #340, refine ts prefix code.	10 years ago
wenjie.zhao	10da182853	add hls prefix of uri supported	10 years ago
wenjie.zhao	efe3050d7a	fix hls muxer Segmentation fault.	10 years ago
wenjie.zhao	73f13dfc42	fix hls muxer Segmentation fault.	10 years ago
winlin	9a0a8affc5	Merge pull request #337 from tufang14/develop ... 可能数组越界	10 years ago
winlin	685a29af83	Merge branch '2.0release' into develop	10 years ago
winlin	c92d40e00b	for #334, refine code, use kbps instead skt of rtmp connection.	10 years ago
Nimrod A. Abing (on kohima)	a95bd7d30e	Modified on_close webhook. ... Pass the send_bytes and recv_bytes count to the web hook.	10 years ago
Nimrod A. Abing (on kohima)	bc93147426	for #308, disable st examples. for #334, refine the st init and event select.	10 years ago
tufang14	6cf5a6a7a9	可能数组越界 ... 可能数组越界	10 years ago
winlin	67671e43f9	Merge branch '2.0release' into develop	10 years ago
winlin	8ee0826e9a	fix build failed bug.	10 years ago
winlin	0017ee85e0	Merge branch '2.0release' into develop	10 years ago
winlin	59d9af8039	update conf	10 years ago
winlin	a21243ea12	merge from 2.0	10 years ago
winlin	d349a3dbda	update stable version check	10 years ago
winlin	519c25a064	fork srs2 and start srs3. 3.0.0	10 years ago
winlin	636bc574af	start 2.0release, 80773 lines.	10 years ago
winlin	e6058c1560	update donation	10 years ago
winlin	320f45c6f4	fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.	10 years ago
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	10 years ago
winlin	995b130090	for #324, refine code for hstrs, support hijack handler.	10 years ago
winlin	5c6ef6ded6	fix warning for xcode.	10 years ago
winlin	6d15d0ea99	for #324, refine code, add hstrs config.	10 years ago
winlin	74fa3ba16f	fix build failed for linux.	10 years ago
winlin	a15ce1147f	for #155, fix all warnings for mac.	10 years ago
wenjie.zhao	643f18abe4	add hds reload supported.#328	10 years ago
winlin	984145de72	for #328, add todo for hds, check whether disabled, support reload.	10 years ago
winlin	5d12a1ab20	for #328, add hds specification.	10 years ago
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	10 years ago
winlin	da56e4fbb9	for #328, fix hds compile error on mac.	10 years ago
wenjie.zhao	07d8f060eb	refine annotation	10 years ago
wenjie.zhao	570c0d66bd	fix path issue.	10 years ago
wenjie.zhao	e57bda8908	Merge code. ... Conflicts: trunk/configure trunk/src/app/srs_app_source.cpp trunk/src/kernel/srs_kernel_error.hpp	10 years ago
winlin	a739b2c555	fix the bug for fork ffmpeg in mac, the local variable is unvailable.	10 years ago
winlin	3e5821efff	enable http api for x86_x64	10 years ago
winlin	3732554844	remove the xcode state.	10 years ago
winlin	1ad0c847ce	fix http parse bug	10 years ago
winlin	f247ac9daf	fix the http parse bug.	10 years ago
wenjie.zhao	d4198ee8ba	add hds supported.	10 years ago
winlin	5370493140	add ingest to mac.dev conf.	10 years ago
winlin	24616e15b5	remove the code for xcode, not required.	10 years ago
winlin	b3aed2cb59	fix the bug of configure.	10 years ago
winlin	f9767c91b5	fix configure bug, refine code for stream caster.	10 years ago
winlin	6c11207e28	fix http ts bug, the adts use id=1 which indicates the aac encoding.	10 years ago
winlin	5c3c38684b	fix the bug of flv stream, metadata type should be 18	10 years ago
winlin	0ff49fd299	for #155, debug srs on xcode.	10 years ago
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	10 years ago
winlin	20fb5f3e8e	modify the colorful bash for osx.	10 years ago
winlin	b0953c1d3a	add comments of audio profile supported by srs.	10 years ago
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	10 years ago
winlin	2e9f2753c9	for #316, add stream codec info. 2.0.135	10 years ago
winlin	885b9af122	for #310, refine code to support he/hev2, use aac object.	10 years ago
winlin	8dbabe3708	fix #310, refine aac LC, support aac HE/HEv2. 2.0.134.	10 years ago
winlin	d3e2838fc6	for #310, refine the aac profile for adts and aac object for RTMP sequence header.	10 years ago
winlin	04f3f2a8f8	for #316, add codec info to stream.	10 years ago
winlin	8bf60895a9	refine the kbps of server.	10 years ago
winlin	fbbe46d272	refine the config, support directly parse file.	10 years ago
winlin	b8e70f8538	support module	10 years ago
winlin	ee30e6bb1f	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	10 years ago
winlin	05d238f860	support modules.	10 years ago
winlin	688890cd7a	refine configure, generate objs/makefile first.	10 years ago
winlin	a29b8a7a5b	refine configure, move auto headers to script.	10 years ago
winlin	aaf87cf3d9	add srs module rule.	10 years ago
winlin	b360fe279d	remove libaacplus.	10 years ago
winlin	496f689de7	fix bug for libfdk aac.	10 years ago
winlin	f26e719800	fix #322, fix http-flv stream bug, support multiple streams. 2.0.133.	10 years ago
winlin	1277968d4a	refine http client, use initialize to set host and port.	10 years ago
winlin	2bcb4f811c	refine http.	10 years ago
winlin	964e4be9d4	refine http request post. 2.0.132.	10 years ago
winlin	3982ec1d87	refine http request parse. 2.0.132.	10 years ago
winlin	4325809daf	refine http	10 years ago
winlin	6fccfa061d	refine the http request code.	10 years ago
winlin	025b707330	refine the http request reader.	10 years ago
winlin	3e394a5f06	for #320, set socket send buffer to smaller macro. 2.0.131	10 years ago