4811 Commits

Author	SHA1	Message	Date
winlin	f92db0f87e	merge srs2 for kbps	2017-01-11 11:46:50 +08:00
winlin	6a8c232c5b	fix #588, kbps interface error. 2.0.228	2017-01-11 11:37:26 +08:00
winlin	c58dbe4d14	fix #588, kbps interface error. 2.0.228	2017-01-11 11:22:16 +08:00
winlin	7fe60b5bbf	fix #735 config transform refer_publish invalid. 3.0.14	2017-01-11 09:45:22 +08:00
winlin	7bbb3bae42	merge srs2	2017-01-11 09:33:26 +08:00
winlin	e3aa34ec5f	fix #736, recovery the hls dispose. 2.0.227	2017-01-11 09:25:48 +08:00
Himer	afa704bca5	Update srs_app_source.cpp ... enabled 为true才进行转发实例创建	2017-01-10 21:16:49 +08:00
winlin	df983cc9ec	fix typo	2017-01-10 18:14:06 +08:00
winlin	a1ae48f4ac	Merge branch '2.0release' into develop	2017-01-10 18:07:52 +08:00
winlin	6fbda2ae3f	for #635, refine hls open/close gop.	2017-01-10 18:07:46 +08:00
winlin	07871a442e	fix typo	2017-01-10 17:18:22 +08:00
winlin	ae1920e91a	Merge branch '2.0release' into develop	2017-01-10 17:17:31 +08:00
winlin	4104f25069	for #635, support IDR and NonIDR(open-gop).	2017-01-10 17:17:23 +08:00
winlin	1dd877c0d6	merge srs2	2017-01-10 11:17:37 +08:00
winlin	c9a71b7fb2	fix #635, hls support NonIDR(open gop). 2.0.226	2017-01-10 11:14:20 +08:00
winlin	d49f195bbf	fix #734, log format error.	2017-01-10 09:36:51 +08:00
winlin	c46e925be5	add utest for avc uev	2017-01-09 18:14:25 +08:00
winlin	517812dbe2	remove test code for #730	2017-01-06 15:19:27 +08:00
winlin	1b175b1107	for #730, support config in/out ack size. 3.0.13	2017-01-06 14:57:54 +08:00
winlin	bbbc40f9c2	Merge branch '2.0release' into develop	2017-01-06 14:32:07 +08:00
winlin	aa2b7afb44	refine code, print protocol level info.	2017-01-06 14:32:01 +08:00
winlin	e434c09dc0	for #730, merge srs2	2017-01-06 14:13:19 +08:00
winlin	c67036d52e	for #730, reset ack follow flash player rules. 2.0.225	2017-01-06 14:04:34 +08:00
winlin	dc1f227aeb	for #730, refine code to decode the acknowledge message	2017-01-06 13:16:25 +08:00
winlin	4709d0214c	for #711, support prefile for transcode. 3.0.12	2017-01-06 10:39:37 +08:00
winlin	f9a159cd21	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:45:41 +08:00
winlin	8bdf50b14d	update feature list	2017-01-05 09:29:12 +08:00
winlin	f2efa96015	for #324, always enable hstrs. 3.0.10	2017-01-05 09:08:56 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	2016-12-15 16:22:04 +08:00
winlin	f6661989af	fix typo for #513, #691	2016-12-15 15:00:08 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	f30b3073a2	refine the cros of api for flv	2016-12-15 14:10:02 +08:00
winlin	3df8f11884	refine thread stop	2016-12-14 18:21:50 +08:00
winlin	8935fe8897	merge srs2.	2016-12-13 18:43:22 +08:00
winlin	aca8a79d95	fix #713, disable the source cleanup. 2.0.223	2016-12-13 18:41:45 +08:00
winlin	9ba4bed648	merge srs2	2016-12-13 17:58:42 +08:00
winlin	cb1d47bfef	fix #713, refine source to avoid critical fetch and create. 2.0.222	2016-12-13 17:57:49 +08:00
winlin	439c67018d	remove unused macros.	2016-12-09 15:58:59 +08:00
winlin	2955b1fd2d	support log rotate signal SIGUSR1. 3.0.8	2016-12-08 18:23:22 +08:00
winlin	9e9cad1826	refine messages	2016-12-08 17:55:11 +08:00
winlin	dd1c769f65	refine main	2016-12-08 17:35:33 +08:00
winlin	83c251fc1c	fix bug	2016-12-08 17:29:13 +08:00
winlin	2d387035cd	refine the global variables.	2016-12-08 17:26:04 +08:00
winlin	b06203e777	dispose kafka	2016-12-08 11:48:50 +08:00
winlin	9a3674c624	refine kafka	2016-12-08 11:44:49 +08:00
winlin	28517849ed	refine typo	2016-12-07 12:09:39 +08:00
winlin	f6c8e02cca	Merge branch '2.0release' into develop	2016-11-24 18:12:31 +08:00
ME_Kun_Han	ec4d1b3b4f	fix bug: run srs at startup failed. (#454)	2016-11-24 18:05:43 +08:00
winlin	6dfb44b7b5	Merge branch '2.0release' into develop	2016-11-15 10:43:42 +08:00
winlin	85a7cb884f	fix bug: fix the way calculating PCR for ts(#678) (#430)	2016-11-15 10:42:02 +08:00
hankun	e0ab8b080d	fix bug: fix the way calculating PCR for ts(#678)	2016-11-09 10:14:12 +08:00
winlin	0a8d40925f	merge from 2.0	2016-11-09 09:44:19 +08:00
winlin	d8599a56ca	fix #654, crash when source cleanup for edge. 2.0.221	2016-11-05 10:48:49 +08:00
ME_Kun_Han	f107f404ea	fix bug for issues #654 (#426)	2016-11-05 10:46:24 +08:00
winlin	2f5f7d4a7b	merge srs2	2016-10-26 09:55:24 +08:00
winlin	8b00e56a84	fix #666, crash when source cleanup for http-flv. 2.0.220	2016-10-26 09:54:49 +08:00
winlin	5796e4bf89	merge from srs2	2016-10-26 09:53:27 +08:00
hankun	4f09bcce9f	fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666)	2016-10-20 10:49:59 +08:00
winlin	112d98ffdb	merge srs2.	2016-10-10 11:56:10 +08:00
winlin	d6fc289c6a	fix #661, close fd after thread stopped. 2.0.219	2016-10-10 11:54:08 +08:00
ME_Kun_Han	7058411cb8	fix the core dump when trying to close srs (#386)	2016-10-10 11:51:49 +08:00
winlin	9cc528cd33	merge srs2	2016-09-23 15:47:17 +08:00
winlin	3659eec9d1	update the cwd	2016-09-23 15:37:51 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	07fe35f11d	support asprocess for oryx. 2.0.218	2016-09-23 15:17:46 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +08:00
winlin	2a01540433	support change work_dir for oryx.	2016-09-23 14:53:58 +08:00
winlin	b5d466f3d2	update utest	2016-09-15 14:47:42 +08:00
winlin	0fb71281a9	add circleci	2016-09-15 14:28:54 +08:00
winlin	cbffe74494	add circleci	2016-09-15 14:15:49 +08:00
winlin	e15e07c4d1	merge srs2	2016-09-15 13:39:25 +08:00
winlin	ff3f8272a9	fix #640, typo for rtmp type. 2.0.217	2016-09-15 13:37:11 +08:00
winlin	77bca7cc05	Merge branch '2.0release' into develop	2016-09-13 18:08:19 +08:00
winlin	53d2eb5e02	fix librtmp get bytes bug.	2016-09-13 18:08:12 +08:00
winlin	504352d17a	merge srs2.	2016-09-12 18:21:44 +08:00
winlin	c2cb666995	fix fast stream error bug. 2.0.216	2016-09-12 18:21:14 +08:00
winlin	8a4e241eec	merge from srs2	2016-09-09 14:29:33 +08:00
winlin	6c4c68ccb6	2.0 beta1(2.0.215) released.	2016-09-09 14:26:16 +08:00
winlin	49b880d4ce	refine comments	2016-09-09 14:18:50 +08:00
winlin	eb915413ad	Merge branch '2.0release' into develop	2016-09-09 14:14:22 +08:00
winlin	0015b303a6	librtmp: refine comment for NALU process.	2016-09-09 14:14:12 +08:00
winlin	09895fcfc2	Merge branch '2.0release' into develop	2016-09-09 11:03:39 +08:00
Star Brilliant	a164c90e28	Flush the stdout buffer after logging to console ... Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n. However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half). By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.	2016-09-08 07:58:52 -05:00
winlin	17df61724d	Merge branch '2.0release' into develop	2016-09-08 19:56:17 +08:00
winlin	7aaa74b9e0	TODO: FIXME: for librtmp, must group NALUs to frame.	2016-09-08 19:56:06 +08:00
winlin	2cf077abe9	Merge branch '2.0release' into develop	2016-09-08 18:55:40 +08:00
winlin	80a98cf836	refine annexb parse	2016-09-08 18:55:35 +08:00
winlin	b24d1de377	Merge branch '2.0release' into develop	2016-09-05 14:56:41 +08:00
winlin	590e951739	fix memory leak of source.	2016-09-05 14:56:31 +08:00
winlin	0e9318e5d8	merge from 2.0	2016-09-05 14:16:24 +08:00
winlin	c7b97aa1c3	fix memory leak at source. 2.0.214	2016-09-05 14:13:37 +08:00
winlin	815f2491a4	merge from 2.0	2016-09-05 09:39:20 +08:00
winlin	6ec60b0a21	fix memory leak at handshake. 2.0.213	2016-09-05 09:38:30 +08:00
winlin	39a46f7b97	Merge branch '2.0release' into develop	2016-09-03 23:11:58 +08:00
winlin	1214af643e	refine comments for arm	2016-09-03 23:11:51 +08:00
winlin	c0498c82ee	merge 2.0	2016-09-03 18:48:19 +08:00
winlin	e775eb3ff2	support all arm for patched st. 2.0.212	2016-09-03 18:47:46 +08:00
winlin	8ad7da1cb6	merge from 2.0	2016-09-02 15:25:20 +08:00
xubin	49853d2b8a	修复forward崩溃	2016-09-02 15:10:43 +08:00
winlin	7d96a33207	Merge branch '2.0release' into develop	2016-09-01 16:51:18 +08:00
winlin	e2865c6ac1	workaround for #511, the fly stfd in close. 2.0.211	2016-09-01 16:51:09 +08:00
winlin	b49cb3d379	Merge branch '2.0release' into develop	2016-08-30 19:30:05 +08:00
winlin	a0890fe06a	comment the pcr	2016-08-30 19:29:59 +08:00
winlin	5d5fa7204d	Merge branch '2.0release' into develop	2016-08-18 12:22:30 +08:00
winlin	d919668b61	don't ignore aud	2016-08-18 12:22:04 +08:00
winlin	bf22acd689	Merge branch '2.0release' into develop	2016-08-18 11:29:22 +08:00
winlin	a4bb03b9d6	ignore other 264 frame except sps,pps,idr,nonidr	2016-08-18 11:27:11 +08:00
winlin	31a1b7bed2	Merge branch '2.0release' into develop	2016-08-10 22:30:05 +08:00
winlin	304ff02aef	default to 30s timeout for librtmp	2016-08-10 22:29:56 +08:00
winlin	d68a459198	Merge branch '2.0release' into develop	2016-08-10 22:13:30 +08:00
winlin	02fb0779be	fix the microsec calc bug for librtmp	2016-08-10 22:13:24 +08:00
winlin	14760003ba	merge from 2.0	2016-08-10 22:05:21 +08:00
winlin	e00928557e	fix the timeout for librtmp	2016-08-10 22:04:01 +08:00
winlin	36eb0981ec	merge from 2.0release	2016-08-08 14:09:10 +08:00
intliang	3fbe9d2442	fixed crash by improper srs_info use.	2016-08-08 14:07:19 +08:00
winlin	abeb4f46a9	merge 2.0	2016-08-06 17:28:43 +08:00
winlin	ec6e77992e	2.0.210	2016-08-06 16:38:18 +08:00
winlin	b463e4a2f4	Merge branch '2.0release' into develop	2016-05-17 10:54:34 +08:00
weiyabo	8df7135dee	for bug #5064, success parse 264 sps	2016-05-17 10:53:56 +08:00
winlin	eed4626c35	use larger limit	2016-03-10 12:28:46 +08:00
winlin	8db25a0bf5	fix the log for mmap.	2016-01-21 16:18:42 +08:00
winlin	214eda745d	open null dev, not close stdout or stderr.	2016-01-20 14:53:25 +08:00
winlin	03469fc37d	refine code for process fork.	2016-01-20 14:09:14 +08:00
winlin	ce8f3b4478	refine the dup2 of stdout and stderr.	2016-01-20 14:05:48 +08:00
winlin	ae8bd4c2aa	should never close the fd 3+, for it myabe used.	2016-01-20 14:01:18 +08:00
winlin	a6dc17a67d	support redirect stdout by >	2016-01-20 14:00:01 +08:00
winlin	f8358da316	refine ingester log.	2016-01-13 16:20:05 +08:00
winlin	dfe5306327	fix process bug.	2016-01-13 16:18:50 +08:00
winlin	61c0c168b9	merge from srs2.	2016-01-13 12:52:19 +08:00
winlin	266397acee	merge from srs2	2016-01-13 12:46:23 +08:00
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	2016-01-13 12:44:51 +08:00
winlin	f971538cf3	refine http, support no host.	2016-01-12 11:53:52 +08:00
winlin	2941328ee8	rtmp edge support 302 redirect.	2016-01-11 15:46:23 +08:00
winlin	e2e6e76f92	for #558 and #559, 2.0.208	2016-01-11 13:21:28 +08:00
winlin	d81b2cb140	support hls mount to vhost and reload	2016-01-11 13:15:46 +08:00
winlin	041040b846	ignore ingester when vhost disabled.	2016-01-11 13:11:14 +08:00
winlin	eac5440559	merge from srs2 #558 #559	2016-01-09 16:06:22 +08:00
winlin	da722b5b5d	Merge pull request #559 from tufang14/2.0release ... srs reusable thread need join	2016-01-09 16:00:58 +08:00
tufang14	56bffb6646	Update srs_app_thread.cpp	2016-01-09 15:54:23 +08:00
flowerwrong	d42a58faf4	Keep blank of line	2016-01-09 15:10:24 +08:00
tufang14	233ff11172	srs reusable thread need join	2016-01-09 14:58:40 +08:00
winlin	d24aef50ba	for #369, support RTMP 302 api at protocol level.	2016-01-08 18:17:37 +08:00
flowerwrong	9ddd0054a1	Add tcUrl to on_publish http hook for issue #548	2016-01-08 15:10:25 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	5338f21439	merge from srs2	2016-01-05 16:58:21 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	dc38ae1687	show first message when not show version.	2016-01-04 17:41:16 +08:00
winlin	9d22d09646	show signature of server.	2016-01-04 17:28:18 +08:00
winlin	973194c663	merge from srs2.	2015-12-31 16:02:01 +08:00
winlin	26211abf2e	refine code.	2015-12-31 15:57:16 +08:00
winlin	f516636448	refine code for hooks and http core.	2015-12-29 18:33:02 +08:00
winlin	79fdc4e766	fix bug for rtmp client use NULL ptr.	2015-12-28 18:13:40 +08:00
winlin	96a4428bdb	refine the http request parse. edge retry timeout.	2015-12-28 18:02:20 +08:00
winlin	190db75835	refine code for nx_json modify the data when loads.	2015-12-28 17:39:24 +08:00
winlin	86a7db0adb	refine edge ingester, use upstream adapter.	2015-12-28 17:15:44 +08:00
winlin	7ae2c6bf50	merge from srs2.	2015-12-26 12:17:51 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	11e11005ac	specifies the try default vhost	2015-12-24 19:14:23 +08:00
winlin	d267b8fa19	fix bug for create connection with ip.	2015-12-24 17:38:49 +08:00
winlin	a7bf4bfda5	refine code, ignore client when no ip.	2015-12-24 17:25:05 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	714c13d88d	merge from srs2	2015-12-22 19:19:28 +08:00
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	2015-12-22 19:18:46 +08:00
winlin	65b81a4e68	merge from srs2	2015-12-22 17:01:06 +08:00
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	2015-12-22 17:00:22 +08:00
winlin	8d378cda2e	for #418, when simple handshake, copy s1 to c2.	2015-12-22 16:48:06 +08:00
winlin	b881166f9a	merge from srs2	2015-12-22 16:18:09 +08:00
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	2015-12-22 16:13:49 +08:00
winlin	5f915aa959	merge from srs2	2015-12-22 15:40:03 +08:00
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	2015-12-22 15:39:12 +08:00
winlin	e124aeb614	Merge branch '2.0release' into develop	2015-12-15 16:25:27 +08:00
winlin	69d191e53f	refine the hls error log.	2015-12-15 16:25:21 +08:00
winlin	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	f6ff116505	refine code, persistence use isolate method.	2015-12-15 14:27:49 +08:00
winlin	b486f6fe6b	refine /api/v1/summaries, with code and server id.	2015-12-15 12:46:47 +08:00
winlin	26d328e7f2	fix bug for api, level should be string.	2015-12-14 18:43:20 +08:00
winlin	ffef3905af	merge from srs2.	2015-12-11 11:35:56 +08:00
winlin	5660e24953	fast stop server.	2015-12-11 11:30:36 +08:00
winlin	2830ee12c1	fix the on_hls.ts_url bug.	2015-12-11 11:29:10 +08:00
winlin	1e4c8f8bf3	fast stop server.	2015-12-11 10:30:13 +08:00
winlin	3ab5892863	refine comments.	2015-12-10 18:02:23 +08:00
winlin	5ac8177ce6	fix bugs	2015-12-08 18:32:37 +08:00
winlin	fabcc91a0e	refine codes.	2015-12-07 18:22:55 +08:00
winlin	b2ae1acaa4	copy http-parser-2.1 into srs http stack.	2015-12-07 11:35:05 +08:00
winlin	fba1122835	private the srs_vhost_resolve	2015-12-07 10:15:08 +08:00
winlin	17bb31cab1	fix the config bug.	2015-12-04 15:22:13 +08:00
winlin	cfe230438a	revert test code	2015-11-30 19:07:52 +08:00
winlin	6191e0af90	s1 compute key.	2015-11-30 19:05:25 +08:00
winlin	18eb8c81b3	merge from srs2	2015-11-16 18:10:06 +08:00
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	2015-11-16 18:06:44 +08:00
YueHonghui	eb4ca9ff5d	fix bug of fd leek in srs_app_server	2015-11-16 15:47:17 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	a89ed68aa3	update readme for #511.	2015-11-06 10:51:32 +08:00
winlin	75be18133d	fix build failed for utest.	2015-11-06 10:26:18 +08:00
winlin	97f5bb8b99	merge from srs2	2015-11-05 14:48:25 +08:00
zhengfl	38b81ce312	允许操作SrsStream中的函数时，长度为0.	2015-11-05 14:37:21 +08:00
zhengfl	1dae8fc987	fix #511, fix the bug of thread stop invalid.	2015-11-05 13:52:59 +08:00
winlin	49d77b3f09	for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198	2015-11-02 13:42:05 +08:00
winlin	4b5eb5ea2d	fix the parse rtmp url bug for ingest.	2015-11-02 13:37:44 +08:00
winlin	ec225b2108	quit child process when fork failed.	2015-11-02 11:46:33 +08:00
winlin	9d7826c681	quit child process when fork failed.	2015-11-02 11:44:22 +08:00
winlin	f57e537686	for #515, merge from srs2, use SrsAutoFreeA.	2015-11-02 11:29:20 +08:00
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	2015-11-02 11:26:37 +08:00
winlin	604486b0a3	for #515, use srs_freepa to free array.	2015-11-02 11:11:49 +08:00
winlin	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	cef1ae5a8e	fix the config bug.	2015-10-28 12:55:16 +08:00
winlin	9ebb77d711	fix the warnings	2015-10-28 11:58:49 +08:00
winlin	e9e202dbf1	merge srs2	2015-10-28 11:51:32 +08:00
winlin	ef00005ab4	for ExoPlayer, remove duration for live.	2015-10-28 11:51:03 +08:00
winlin	8c96472cea	merge srs2	2015-10-28 11:03:15 +08:00
winlin	50a7b9c1ff	for ExoPlayer, add av tag in flv header. 2.0.197	2015-10-28 11:01:20 +08:00
winlin	59f5c5d6a5	Merge branch '2.0release' into develop	2015-10-27 18:21:04 +08:00
winlin	3b0bf1e10b	for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok.	2015-10-27 18:20:57 +08:00
winlin	390f58e186	fix compile failed.	2015-10-27 17:57:58 +08:00
winlin	a416e891b4	fix compile failed.	2015-10-27 17:54:07 +08:00
winlin	1d57e53910	merge from 2.0release	2015-10-27 17:45:14 +08:00
winlin	d1979c760f	for #512, partical hotfix the hls pure audio. 2.0.196	2015-10-27 17:44:10 +08:00
winlin	3683f06e4d	for #512, write audio frame by frame for video+audio hls.	2015-10-27 16:20:02 +08:00
winlin	b8f2ba4f0d	complete kafka	2015-10-23 14:42:05 +08:00
winlin	cbe4252b4d	refine code.	2015-10-23 14:42:04 +08:00
winlin	d2ca51ac50	notify kafka when client close	2015-10-23 14:42:04 +08:00
winlin	71451878c9	refine kafka, simplify code.	2015-10-23 14:42:04 +08:00
winlin	9a47390253	fix #467, support write log to kafka. 3.0.6	2015-10-23 14:42:04 +08:00
winlin	76cd3f8749	kafka convert json to producer message.	2015-10-23 14:42:04 +08:00
winlin	8e344f1c26	add producer api messages.	2015-10-23 14:42:04 +08:00
winlin	7a0aaf5900	kafka refine code	2015-10-23 14:42:04 +08:00
winlin	f9f5b56951	kakfa erase messages when wrote.	2015-10-23 14:42:04 +08:00
winlin	22fa9a0f1f	kafka use temp transport to fetch metadata.	2015-10-23 14:42:04 +08:00
winlin	531b658f8e	retry when metadata empty	2015-10-23 14:42:04 +08:00
winlin	61486a82aa	kafka use topic and partition cache	2015-10-23 14:42:04 +08:00
winlin	7013993c7a	kafka send the accept message.	2015-10-23 14:42:04 +08:00
winlin	de41c1c9d2	kafka refine comments.	2015-10-23 14:42:04 +08:00
winlin	31a77a83ed	convert metadata to partitions	2015-10-23 14:42:04 +08:00
winlin	f0e39cc330	support show the summary of kafka metadata.	2015-10-23 14:42:04 +08:00
winlin	d013374871	rename ISrsCodec size to nb_bytes.	2015-10-23 14:42:03 +08:00
winlin	33a015329d	add function to convert kafka array to vector	2015-10-23 14:42:03 +08:00
winlin	84b3981d47	refs #1670: support decode the metadata response.	2015-10-23 14:42:03 +08:00
winlin	7106934c3a	kafka producer use async interface to request metadata.	2015-10-23 14:42:03 +08:00
winlin	a108fa8d01	kafka recv and decode message.	2015-10-23 14:42:03 +08:00
winlin	493d282255	kafka refine array, to decode and create object.	2015-10-23 14:42:03 +08:00
winlin	c4862878d1	kafka rename message set to raw message set.	2015-10-23 14:42:03 +08:00
winlin	6e5ed11a00	for kafka, support correlation id cache.	2015-10-23 14:42:03 +08:00
winlin	2e67eb8786	refine comments for kafka messages.	2015-10-23 14:42:03 +08:00
winlin	3c64e4b957	kafka encode and send packet.	2015-10-23 14:42:03 +08:00
winlin	9117e1e918	extract ISrsCodec for code and decode object.	2015-10-23 14:42:03 +08:00
winlin	45755fd1e7	refine code for kakfa request/response, string/bytes.	2015-10-23 14:42:03 +08:00
winlin	8a4ec49064	add graph comments for size of request and response.	2015-10-23 14:42:03 +08:00
winlin	8974fe298b	connect to kafka and send metadata request.	2015-10-23 14:42:03 +08:00
winlin	a9fdb630d9	refine code, replace all rtmp connect by simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	a08d8f83d6	refine mpegts code, use simple rtmp client	2015-10-23 14:42:02 +08:00
winlin	ad9b377d96	refine forwarder code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	0f4cb8ee00	refine code, remove the rtmp recv/send macro, use one macro.	2015-10-23 14:42:02 +08:00
winlin	12e013142d	refine code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	bc27481886	refine code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	e4c852945f	refine code, support override vhost	2015-10-23 14:42:02 +08:00
winlin	a9ad7b211b	refine simple rtmp client for post flv stream.	2015-10-23 14:42:02 +08:00
winlin	adb8f243bf	use simple rtmp client for raw connect app	2015-10-23 14:42:02 +08:00
winlin	24b3899972	use SrsTcpClient instead raw socket.	2015-10-23 14:42:02 +08:00
winlin	a9bb6061c3	use tcp client for raw connect.	2015-10-23 14:42:02 +08:00
winlin	20fcfb3eee	fix bug, use system utility	2015-10-23 14:42:02 +08:00
winlin	69cc01b696	use system utilities	2015-10-23 14:42:02 +08:00
winlin	908365a61a	use string for const char*	2015-10-23 14:42:02 +08:00
winlin	d9f991ed2f	use system utility for string finds	2015-10-23 14:42:02 +08:00
winlin	ca73534d7e	refine comments for api key	2015-10-23 14:42:01 +08:00
winlin	29122b6e70	fix #502, transcoder support snapshot.	2015-10-20 14:52:34 +08:00
winlin	9eebb89432	Merge branch '2.0release' into develop	2015-10-20 10:17:54 +08:00
winlin	91e9fc7e5b	fix typo of INVLIAD to INVALID	2015-10-20 10:17:48 +08:00
winlin	57a3b11b86	merge from srs2	2015-10-13 11:48:02 +08:00
winlin	5de65d41f4	Merge pull request #499 from synote/2.0release ... fix bug for build failure when configure with --log-info	2015-10-12 10:07:08 +08:00
winlin	ed80d9d281	merge from srs2	2015-10-04 08:10:57 +08:00
winlin	0c8209cccd	fix #448, fix the bug of response of http hooks. 2.0.195	2015-10-04 08:09:39 +08:00
winlin	6587c5b2f1	merge from srs2	2015-10-01 13:22:51 +08:00
winlin	7811b4f3f7	fix #497, response error when client not found to kickoff. 2.0.194	2015-10-01 13:20:13 +08:00
winlin	8862ec1988	merge from srs2	2015-10-01 13:05:25 +08:00
winlin	a3c229472e	fix #495, decrease the srs-librtmp size. 2.0.193	2015-10-01 13:04:28 +08:00
winlin	070ada1d6e	Merge branch '2.0release' into develop	2015-10-01 12:30:55 +08:00
winlin	65e4bf2e77	fix compile failed bug.	2015-10-01 12:30:38 +08:00
winlin	d8f18aee37	use the right int type for port.	2015-09-24 18:33:07 +08:00
winlin	1c7d5f1852	Merge branch '2.0release' into develop	2015-09-24 17:55:33 +08:00
winlin	353e3260b8	remove duplicated code	2015-09-24 17:55:27 +08:00
winlin	9ead08725d	use kernel utility int2str and float2str	2015-09-24 17:54:58 +08:00
winlin	6efd2dd27e	add load balance round robin for brokers.	2015-09-24 17:20:04 +08:00
winlin	2a4ab8a923	add brokers to config	2015-09-24 14:53:22 +08:00
winlin	f187a7deef	refine the startup logs.	2015-09-24 12:15:12 +08:00
winlin	afd6428366	refine code of server.	2015-09-23 17:21:57 +08:00
winlin	396bb43672	Merge branch '2.0release' into develop	2015-09-23 15:46:58 +08:00
winlin	8b1198562a	show cpu info.	2015-09-23 15:46:51 +08:00
winlin	4e88262512	merge from srs2 to check cpus.	2015-09-23 15:11:33 +08:00
winlin	cfe2082353	fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192	2015-09-23 15:09:59 +08:00
winlin	6990508e58	for #485, srs for respberrypi and cubieboard. 2.0.191	2015-09-23 11:05:56 +08:00
winlin	9a9483e7d5	support without kafka	2015-09-22 17:46:07 +08:00
winlin	abb5c5ad31	add kafka producer	2015-09-22 17:40:05 +08:00
winlin	b5ccc35340	add kafka config	2015-09-22 15:10:43 +08:00
winlin	ab1e62a886	create the metadata request message	2015-09-22 14:33:17 +08:00
winlin	ca3b89aa7d	add kafka array, use c++ template.	2015-09-22 14:09:24 +08:00
winlin	2d5cc7a3e4	add structures for kafka	2015-09-22 12:38:07 +08:00
winlin	83f40697e2	refine the hpp macro defines.	2015-09-22 09:15:51 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	82ff05c1d4	rename rtmp io to protocol io	2015-09-22 09:07:07 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	1310c0f577	rename srs_protocol_buffer to srs_protocol_stream	2015-09-22 09:02:37 +08:00
winlin	d32632ee8a	rename SrsFastBuffer to SrsFastStream	2015-09-22 09:01:47 +08:00
winlin	4f3d2c8607	rename SrsSimpleBuffer to SrsSimpleStream	2015-09-22 08:59:52 +08:00
winlin	dadfe101b4	rename SrsBitStream to SrsBitBuffer	2015-09-22 08:59:21 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	ca3577e11b	rename temp to stream	2015-09-22 08:52:00 +08:00
winlin	f33d736442	rename kernel stream to buffer	2015-09-22 08:50:14 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	495f575ac3	rename kernel buffer to temp	2015-09-22 08:43:56 +08:00
winlin	ac2b03a3ed	rename srs_kernel_buffer to temp	2015-09-22 08:42:54 +08:00
winlin	1de2bb0801	add kafka protocol files.	2015-09-21 17:12:28 +08:00
winlin	b5996567e8	refine the role of srs, to cluster.	2015-09-21 12:09:09 +08:00
winlin	d8a64aaab5	fix #484, hotfix the openssl build script 2.0.190	2015-09-21 12:01:48 +08:00
winlin	b471c6e61c	refine code, use json integter rather than number.	2015-09-19 14:40:32 +08:00
winlin	c5cd58761c	move the srs thread to st.	2015-09-19 13:46:55 +08:00
winlin	3042115385	refine json to_str to dumps.	2015-09-19 13:37:56 +08:00
winlin	b59d9ba6a1	support amf0 and json to convert with each other.	2015-09-19 13:31:57 +08:00
winlin	3f7e69b617	json objects support dumps to string.	2015-09-19 12:27:31 +08:00
winlin	225e742657	add args3	2015-09-17 14:03:25 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	7b2b11e932	async call worker fast execute tasks.	2015-09-17 11:57:17 +08:00
winlin	087f7740b7	fix the build failed bug	2015-09-17 11:41:23 +08:00
winlin	256459e1ec	fix the utest bug	2015-09-17 11:37:35 +08:00
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	2015-09-15 23:00:00 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	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	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	dc11013c01	for #319, render the detail of vhost	2015-08-30 10:17:39 +08:00
winlin	2b4fa2d73e	for #319, move the edge configs to cluster.	2015-08-30 08:30:04 +08:00
winlin	6bd05f9cfc	for #319, refine the config forward.	2015-08-30 07:59:25 +08:00
winlin	bc24c0407b	for #319, move smi and rsh to play	2015-08-30 07:36:06 +08:00
winlin	f7c893d907	for #319, move gop_cache and queue_length to play	2015-08-30 07:26:55 +08:00
winlin	06ae74dd3f	for #319, move mw_latency to play.	2015-08-30 07:05:57 +08:00
winlin	4eb1874955	for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency.	2015-08-30 06:49:20 +08:00
winlin	9c4340f789	for #319, move atc and atc_auto to play	2015-08-29 23:36:03 +08:00
winlin	d6b0aa3a5b	for #319, move time_jitter and mix_correct to play	2015-08-29 23:18:25 +08:00
winlin	738642073e	for #319, refine config, collect the mr and publish timeout	2015-08-29 22:41:50 +08:00
winlin	bc100c2867	refine the log, move default to each functions.	2015-08-29 19:46:56 +08:00
winlin	7ef3ff90c0	refine the config structure, compatible with SRS1/2	2015-08-29 18:40:18 +08:00
winlin	a79e19599c	for #319, support query the vhost info.	2015-08-29 16:12:30 +08:00
winlin	bdfd0ae09e	for #319, dumps the http static, remux and globals.	2015-08-28 23:51:23 +08:00
winlin	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	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	a242aa35dc	add pid to srs rtmp dump	2015-08-24 16:00:11 +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	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	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	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	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
winlin	0aed408855	refine code, to 644 and unix encoding.	2015-07-08 17:44:25 +08:00
winlin	210d0a67cb	Merge branch '2.0release' into develop	2015-07-08 17:42:47 +08:00
winlin	c6c90e2643	refine code, add comments for stat on_disconnect.	2015-07-08 17:42:35 +08:00
zhengfl	db9ea4e66e	rewrite #438	2015-07-08 17:08:29 +08:00
zhengfl	f9257b89e7	fix #438 ... 问题：edge模式，推流时异常断开。 解决方法：增加edge模式推流检测。	2015-07-08 15:43:09 +08:00
zhengfl	120033e0a2	fix #437 ... edge模式，重新从源站拉流时，导致forwarders异常	2015-07-08 11:47:34 +08:00
winlin	f39faa78bb	refine config default values of srs, prepare to move each default values to functions.	2015-07-06 11:11:59 +08:00
winlin	9c716d4791	Merge branch '2.0release' into develop	2015-07-06 10:32:47 +08:00
winlin	c8fef99cb6	merge from 2.0release	2015-07-01 14:51:27 +08:00
winlin	438914c481	fix #433, fix the sps parse bug. 2.0.176	2015-07-01 14:50:45 +08:00
winlin	312366bba2	add srs_recvi_bytes for intranet bytes stat.	2015-06-19 14:38:05 +08:00
winlin	750399ace4	fix network device compare bug.	2015-06-19 13:51:40 +08:00
winlin	8cd68a1eb3	ignore any intranet bandwidth.	2015-06-19 11:59:41 +08:00
zhengfl	52110990c1	修正编码风格问题	2015-06-18 16:21:00 +08:00
zhengfl	b4ff9cfba1	fix bug ... 某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。	2015-06-17 23:09:17 +08:00
winlin	8951752086	Merge branch '2.0release' into develop	2015-06-17 16:47:08 +08:00
winlin	8102a22606	add comments for async call.	2015-06-17 16:42:43 +08:00
winlin	6f685e66b1	Merge branch '2.0release' into develop	2015-06-14 19:42:53 +08:00
winlin	3211282b0c	refine the http code.	2015-06-14 19:42:43 +08:00
winlin	f8f6e438cc	extract http static and http stream from http conn.	2015-06-14 14:06:39 +08:00
winlin	e743795f3d	Merge branch '2.0release' into develop	2015-06-14 08:43:53 +08:00
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	c58b7231e2	Merge branch '2.0release' into develop	2015-06-13 17:23:53 +08:00
winlin	17c276113e	refine the hls dispose, when not cycle always dispose it.	2015-06-13 17:23:38 +08:00
winlin	ec90ae2082	refine the space of code.	2015-06-13 16:42:05 +08:00
winlin	2f44a29b76	Merge branch '2.0release' into develop	2015-06-13 16:05:26 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	0d66e92ab5	refine code, support configure to enable --memory-watch	2015-06-13 15:45:25 +08:00
winlin	69b7c57511	Merge branch '2.0release' into develop	2015-06-12 16:08:58 +08:00
winlin	0d6a574216	fix the hls_dispose bug, ignore for 0.	2015-06-12 16:08:47 +08:00
winlin	b0ce38dc8f	merge from 2.0	2015-06-10 15:38:44 +08:00
winlin	56938efdbd	fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175	2015-06-10 15:38:13 +08:00
winlin	12eab8a128	merge from srs2.	2015-06-10 13:53:57 +08:00
winlin	6941f2c072	fix #424, fix aggregate timestamp bug. 2.0.174	2015-06-10 13:53:13 +08:00
winlin	8e8c8108fc	refine the time jitter code.	2015-06-09 21:04:30 +08:00
winlin	1f1776a0d8	fix the export project bug. wakeup connection when dispose server.	2015-06-09 14:38:05 +08:00
winlin	bf9166dbec	Merge branch '2.0release' into develop	2015-06-09 11:51:49 +08:00
winlin	66837ffa6e	fix the thread stop bug, must wait when not joinable.	2015-06-09 11:47:04 +08:00
winlin	d317528af9	refine the signal manager.	2015-06-09 11:19:28 +08:00
winlin	7996b3b789	add warning for gmp, use gmc to detect memory leak.	2015-06-09 10:52:32 +08:00
winlin	f347099fd1	for memory leak detect, move the payload create to message.	2015-06-09 10:13:25 +08:00
winlin	863dddde09	fix typo of code.	2015-06-08 17:43:28 +08:00
winlin	19e1f610a3	merge from bravo, parse the http reponse in json of bravo system.	2015-06-08 17:28:39 +08:00
winlin	00d1fdded0	Merge branch '2.0release' into develop	2015-06-08 15:02:30 +08:00
winlin	574cf6a094	use libfdk_aac for srs2.	2015-06-08 15:02:19 +08:00
winlin	00a25ee5c5	cleanup connections when terminate server.	2015-06-08 14:08:12 +08:00
winlin	d7e5df2578	cleanup connections when terminate server.	2015-06-08 14:03:16 +08:00
winlin	573495a19f	refine the memory watcher.	2015-06-08 09:47:45 +08:00
winlin	bb4db61192	add srs memory watcher.	2015-06-07 15:12:55 +08:00
winlin	811ef4bcf6	dispose the gop cache	2015-06-07 09:27:47 +08:00
winlin	600e8e10d0	Merge branch '2.0release' into develop	2015-06-06 22:04:37 +08:00
winlin	beb0431746	detect the monotonically increase and warn to use mix_correct	2015-06-06 22:04:24 +08:00
winlin	57f01185f5	Merge branch '2.0release' into develop	2015-06-06 21:54:54 +08:00
winlin	2d9f258eaf	refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio.	2015-06-06 21:54:43 +08:00
winlin	17d6016bf6	Merge branch '2.0release' into develop	2015-06-06 21:42:12 +08:00
winlin	ec24533955	use smaller value for publish timeout.	2015-06-06 21:42:01 +08:00
winlin	a6dd8fb3a1	fix #421, when mix correct on, must check the type of dequeue msg.	2015-06-06 21:31:39 +08:00
winlin	5d75e32e1d	Merge branch '2.0release' into develop	2015-06-06 21:24:06 +08:00
winlin	a1dd734318	fix #421, drop video for unkown RTMP header.	2015-06-06 21:23:57 +08:00
winlin	679b4317d8	fix the build failed bug.	2015-06-06 20:34:49 +08:00
winlin	0fbfad4172	fix gop cache, drop video only when video and not h.264	2015-06-06 20:23:18 +08:00
winlin	2a1db36750	refine the pithy print of ingesters.	2015-06-06 18:57:41 +08:00
winlin	d10d57716a	Merge branch '2.0release' into develop	2015-06-05 21:34:39 +08:00
winlin	e4c27a51b8	fix the hls bug	2015-06-05 21:34:28 +08:00
winlin	4400b12515	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-06-05 20:38:51 +08:00
winlin	26b76c0e4c	fix #420, remove ts for hls ram mode.	2015-06-05 20:38:01 +08:00
winlin	5dd81d182c	Merge branch '2.0release' into develop	2015-06-03 10:13:58 +08:00
winlin	af9efe9213	disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.	2015-06-03 10:13:46 +08:00
winlin	982a937e84	Merge branch '2.0release' into develop	2015-06-02 12:56:17 +08:00
winlin	4e42b9c628	copy the request for hls.	2015-06-02 12:56:04 +08:00
winlin	091b480ac9	Merge branch '2.0release' into develop	2015-06-01 10:14:58 +08:00
winlin	679583dad6	refine comments of ffmpeg.	2015-06-01 10:14:46 +08:00
winlin	c1172c9940	Merge branch '2.0release' into develop	2015-05-30 21:40:51 +08:00
winlin	03d951c0fb	fix the audio or video pid generate bug.	2015-05-30 21:40:39 +08:00
winlin	c3c4cb2f2a	Merge branch '2.0release' into develop	2015-05-30 21:20:21 +08:00
winlin	96f8f1f502	fix build bug.	2015-05-30 21:20:07 +08:00
winlin	09750082e5	Merge branch '2.0release' into develop	2015-05-30 21:14:56 +08:00
winlin	0a87b567f6	fix the build failed bug.	2015-05-30 21:14:10 +08:00
winlin	9dce971d57	merge from srs2	2015-05-30 14:41:47 +08:00
winlin	223ae194b1	fix #209, cleanup hls when stop and timeout. 2.0.173.	2015-05-30 14:41:09 +08:00
winlin	4a80a5a71e	for #209, support cleanup when srs stop.	2015-05-30 13:48:29 +08:00
winlin	860d68e6e7	for #374, use fast stop for ingesters to stop many FFMPEG.	2015-05-30 11:25:33 +08:00
winlin	d611bb6b45	for #209, server cycle to enable the hls to cleanup. do dispose	2015-05-30 10:48:02 +08:00
winlin	567d84e997	fix #374: when terminate srs, cleanup to ensure FFMPEG quit.	2015-05-30 09:58:17 +08:00
winlin	db57a519a9	for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly.	2015-05-30 09:32:03 +08:00
winlin	597993d414	support pure video hls.	2015-05-29 21:53:37 +08:00
winlin	5caafadd45	fix #409: support pure video hls. 2.0.172.	2015-05-29 21:43:17 +08:00
winlin	27a1fee6b9	Merge branch '2.0release' into develop	2015-05-28 21:02:50 +08:00
winlin	af4eec90ac	for srs-dolphin, support HTTP and RTMP.	2015-05-28 21:02:43 +08:00
winlin	b44987fac7	Merge branch '2.0release' into develop	2015-05-28 14:59:19 +08:00
winlin	394e070b2e	support dolphin	2015-05-28 14:59:12 +08:00
winlin	e5461d2df9	refine code	2015-05-28 07:03:38 +08:00
winlin	60775485c4	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-05-27 23:44:07 +08:00
winlin	385ee893f5	update readme	2015-05-27 23:43:44 +08:00
zhengfl	4864e796d6	fix #408:Queue丢视频时，不应该丢弃SequenceHeader	2015-05-27 16:16:15 +08:00
winlin	1150cde829	fix the verbose build failed.	2015-05-27 11:12:52 +08:00
winlin	fec8422d6b	fix bug of configure.	2015-05-27 10:23:40 +08:00
winlin	c1b9541b5c	support disable all	2015-05-27 07:22:44 +08:00
winlin	409c1e4823	Merge branch '2.0release' into develop	2015-05-25 08:17:22 +08:00
winlin	2e1ca3c751	fix the build failed bug.	2015-05-25 08:17:11 +08:00
winlin	cd162c2848	merge from 2.0	2015-05-25 01:04:04 +08:00
winlin	d12fc7fcc5	fix #405, improve the HTTP FLV performance to 6k. 2.0.171	2015-05-25 01:02:06 +08:00
winlin	4df19ba99a	for #405, improve the http flv to 3k. 2.0.170	2015-05-24 23:29:17 +08:00
winlin	8a9dbaefb7	use cache for flv tag header.	2015-05-24 23:16:56 +08:00
winlin	960341b9b2	for #405, improve the HTT FLV to 3k. 2.0.169	2015-05-24 22:43:02 +08:00
winlin	fc995473eb	for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168	2015-05-24 21:17:00 +08:00
winlin	f540ce307b	merge from 2.0	2015-05-24 15:19:50 +08:00
winlin	069ee0afc3	fix #404, register handler then start http thread. 2.0.167.	2015-05-24 15:19:09 +08:00
winlin	f510a3d6fb	add /api/v1/versions for http server for go-sharp to detect.	2015-05-24 13:01:23 +08:00
winlin	58b336451d	Merge branch '2.0release' into develop	2015-05-24 09:15:37 +08:00
winlin	7571d70f16	fix the build failed bug.	2015-05-23 19:32:27 +08:00
winlin	829b3a392b	merge from 2.0	2015-05-23 18:11:33 +08:00
winlin	e96150b7db	update readme	2015-05-23 15:22:20 +08:00
winlin	6b28dec8ec	merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:05:06 +08:00
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:04:28 +08:00
winlin	68d835021e	refine code, move the kbps to protocol	2015-05-23 09:58:00 +08:00
winlin	478873fdec	Merge branch '2.0release' into develop	2015-05-23 09:49:23 +08:00
winlin	cfc0877ec9	refine the thread, add all callback.	2015-05-23 09:49:15 +08:00
winlin	e5f449ce36	refine the thread to three category.	2015-05-23 09:20:16 +08:00
winlin	2f0ef87d6d	refine code, rename the sync call to common class.	2015-05-23 07:57:45 +08:00
winlin	0bb90145ba	fix #391, copy request for async call.	2015-05-23 07:46:45 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +08:00
winlin	f0ae66a081	merge the app http to conn.	2015-05-22 22:34:03 +08:00
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	2015-05-22 22:24:05 +08:00
winlin	e2955da78f	refine code, extract the http protocol sdk to module.	2015-05-22 20:47:27 +08:00
winlin	d645411392	refine the kbps comments, add one usage.	2015-05-22 20:31:07 +08:00
winlin	7243cdbff6	merge from 2.0release.	2015-05-22 17:20:30 +08:00
winlin	6ca46e84bc	fix #397, the USER_HZ maybe not 100. 2.0.165	2015-05-22 17:16:33 +08:00
winlin	c17a1198cb	fix #399, disconnect when not keep alive.	2015-05-22 16:27:48 +08:00
winlin	46a81372e7	fix #398, set recv timeout for http connection.	2015-05-22 13:57:04 +08:00
winlin	6f8c076b30	add comments for srs thread, add never quit thread.	2015-05-22 12:10:06 +08:00
winlin	948d200ce1	fix #400, parse when got entire http header, by feilong. 2.0.164.	2015-05-22 12:00:48 +08:00
winlin	5d7b0edccc	merge from bravo code, fix some warnings.	2015-05-22 11:20:25 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	f6d2fd991b	merge from 2.0.162	2015-05-10 10:36:49 +08:00
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	2015-05-10 10:35:35 +08:00
winlin	39f5f80b6c	Merge branch '2.0release' into develop	2015-05-09 23:12:23 +08:00
winlin	77ee2400df	fix the unicode to ascii	2015-05-09 23:12:12 +08:00
winlin	1fd69beea5	Merge branch '2.0release' into develop	2015-05-08 16:45:48 +08:00
winlin	7fc1cda392	add stream status to api.	2015-05-08 16:45:25 +08:00
winlin	7ce9398b41	Merge branch '2.0release' into develop	2015-05-08 07:04:36 +08:00
winlin	ac13817aae	update donation	2015-05-08 07:04:31 +08:00
winlin	f13c4d3a0f	Merge branch '2.0release' into develop	2015-05-05 07:37:20 +08:00
winlin	e221d002a2	fix the flv caster bug, when nread is 0, disconnect it.	2015-05-05 07:37:12 +08:00
winlin	e516c7f7a5	Merge branch '2.0release' into develop	2015-05-04 21:55:28 +08:00
winlin	ad32048c1c	fix the http flv stream caster.	2015-05-04 21:55:19 +08:00
winlin	cba6675560	refine the http message, set the connection if required.	2015-05-04 19:06:38 +08:00
winlin	ba6c3132e3	refine code, use decoder to parse flv stream	2015-05-04 18:28:41 +08:00
winlin	411f5a1d2a	Merge branch '2.0release' into develop	2015-05-04 18:12:00 +08:00
winlin	ea1e015a4e	fix the http read chunked encoding bug.	2015-05-04 18:11:52 +08:00
winlin	da00b67c76	Merge branch '2.0release' into develop	2015-05-03 23:57:32 +08:00
winlin	a95fd6d140	read the http flv stream.	2015-05-03 23:57:22 +08:00
winlin	022b6aa561	refine the http remux for http flv stream.	2015-05-03 23:34:59 +08:00
winlin	f0c24eeacc	add stream caster for post flv over http.	2015-05-03 10:56:20 +08:00
winlin	91e285b0cd	Merge branch '2.0release' into develop	2015-04-29 18:46:54 +08:00
winlin	4b372d8d16	change primary to the primary branch.	2015-04-29 18:46:47 +08:00
winlin	94681702e1	Merge branch '2.0release' into develop	2015-04-29 18:03:20 +08:00
winlin	e63b8eda51	migarate to srs org.	2015-04-29 18:03:17 +08:00
winlin	42ddb76544	Merge branch '2.0release' into develop	2015-04-29 18:01:24 +08:00
winlin	8603dba697	migarate to srs org.	2015-04-29 18:01:16 +08:00
winlin	17b15deee6	Merge branch '2.0release' into develop	2015-04-29 17:38:29 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	53e92a17f5	Merge branch '2.0release' into develop	2015-04-29 17:06:40 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	5559fb9842	Merge branch '2.0release' into develop	2015-04-29 15:44:53 +08:00
winlin	ae6d0a5ab1	Merge branch '2.0release' into develop	2015-04-29 09:25:08 +08:00
tufang14	b6d650cdb4	m3u8 mount bug	2015-04-25 14:59:12 +08:00
winlin	e50996270e	fix the config parse error.	2015-04-23 16:25:49 +08:00
winlin	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	2015-04-23 12:05:24 +08:00
winlin	7b157b0678	refine hls ingester, quit when error.	2015-04-22 09:04:18 +08:00
winlin	aabe84046c	refine hls ingester, quit when error.	2015-04-22 09:01:38 +08:00
winlin	114f4447bb	Merge branch '2.0release' into develop	2015-04-21 18:18:59 +08:00
winlin	4e5ddb51e7	refine the overflow algorithm, prevent smaller piece.	2015-04-21 16:21:22 +08:00
winlin	1d973e2178	refine the overflow algorithm, prevent smaller piece.	2015-04-21 16:18:37 +08:00
winlin	d19dfa528e	abs overflow also plus the deviation, for pure audio hls.	2015-04-21 14:35:28 +08:00
winlin	c514a4ceeb	use atc for ingest hls aac time.	2015-04-21 12:58:54 +08:00
winlin	3e0ba172a3	Merge branch '2.0release' into develop	2015-04-21 12:53:52 +08:00
winlin	a28eec89b0	support ingest hls with m3u8 in m3u8.	2015-04-21 12:53:45 +08:00
winlin	7d5f1c2be8	Merge branch '2.0release' into develop	2015-04-20 18:31:52 +08:00
winlin	ba6736839b	support hls ingest, fix the bugs.	2015-04-20 18:31:45 +08:00
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
winlin	623e37e22a	Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release	2015-04-20 11:28:20 +08:00
winlin	6e5c587e0a	support aac_adtstoasc filter to copy mode.	2015-04-20 11:24:12 +08:00
J	aca02b6d6b	for #384,refine code for empty body request.	2015-04-18 14:51:33 +08:00
J	8adbdc39e3	for #384,refine code for empty body request.	2015-04-18 14:42:16 +08:00
J	a71db53661	for #384,refine code for empty body request.	2015-04-18 14:33:57 +08:00
J	56f75cbbe9	fix #384	2015-04-17 10:12:52 +08:00
winlin	6726a88f47	merge from 2.0release	2015-04-15 17:12:57 +08:00
winlin	22ca46350b	fix #383, support mix_correct algorithm. 2.0.161.	2015-04-15 17:12:22 +08:00
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	2015-04-15 16:17:52 +08:00
winlin	542aab4557	fix the hls notify bug, pass the query to get path.	2015-04-14 17:53:53 +08:00
winlin	70c1d3cc7e	Merge branch '2.0release' into develop	2015-04-14 11:37:06 +08:00
winlin	02a2cb7e1a	for #381, refine the hls notify, report one by one.	2015-04-14 11:36:58 +08:00
winlin	a4216cc582	add todo for ts parse.	2015-04-13 16:40:31 +08:00
winlin	40eab7fc88	for #381, refine the deviation for hls.	2015-04-13 11:45:08 +08:00
winlin	0c939e7114	merge from 2.0.160:	2015-04-13 10:33:08 +08:00
winlin	dcac9c69d5	fix #381, support reap hls/ts by gop or not. 2.0.160.	2015-04-13 10:32:32 +08:00
winlin	9759b78da8	Merge branch '2.0release' into develop	2015-04-10 21:06:16 +08:00
winlin	e5b8e0da01	fix async call and hls_nb_notify bug.	2015-04-10 15:00:07 +08:00
winlin	5d37e47783	support config the hls_nb_notify.	2015-04-10 14:44:18 +08:00
winlin	0a7cea063c	refine http read, support c style api	2015-04-10 14:25:14 +08:00
winlin	5c00ce8a96	refine hls on_hls_notify, read a little of ts.	2015-04-10 14:17:49 +08:00
winlin	1f93fb3399	refine hls notify, support timeout.	2015-04-10 13:45:21 +08:00
winlin	d8988da0ea	refine the hls_on_notify, calc the spent time in ms.	2015-04-10 12:32:34 +08:00
winlin	310157ab77	refine the hls_on_notify, calc the spent time in ms.	2015-04-10 12:30:22 +08:00
winlin	e6d6bdfe57	refine the hls_on_notify, only read a chunk.	2015-04-10 12:27:30 +08:00
winlin	17c1423f4a	Merge branch '2.0release' into develop	2015-04-10 12:01:52 +08:00
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	2015-04-10 12:01:45 +08:00
winlin	7dbc95e085	refine the hls deviation for floor algorithm.	2015-04-10 10:21:30 +08:00
winlin	425e69e0cd	Merge branch '2.0release' into develop	2015-04-09 18:03:55 +08:00
winlin	23b310971e	guess again when annexb change to ibmf.	2015-04-09 18:03:45 +08:00
winlin	71e1602458	merge from 2.0.159	2015-04-09 12:35:53 +08:00
winlin	bd77f995bf	ignore the unknown flv tag.	2015-04-09 12:35:17 +08:00
winlin	546be09219	fix #375, fix hls bug, keep cc continous between ts files. 2.0.159.	2015-04-08 16:52:43 +08:00
winlin	29ac4c724b	change default log tank to file.	2015-04-07 17:55:45 +08:00
winlin	cfed8e81c5	merge from 2.0.158	2015-04-07 17:44:09 +08:00
winlin	e56d7add44	fix bug of config to parse the default value. 2.0.158	2015-04-07 17:42:41 +08:00
winlin	aef97db77a	refine the config code.	2015-04-07 17:04:04 +08:00
winlin	931370e9f6	Merge branch '2.0release' into develop	2015-04-07 10:30:53 +08:00
winlin	e7fd309cb0	refine hls info, show the deviation in seconds and pieces.	2015-04-07 10:30:45 +08:00
winlin	e958305d09	Merge branch '2.0release' into develop	2015-04-04 18:24:13 +08:00
winlin	6e2d756e1b	fix the bug of h.264 bit stream demux.	2015-04-04 18:24:07 +08:00
winlin	bd7db5aed6	only ignore the aud message.	2015-04-04 16:05:11 +08:00
winlin	61d5b78ae5	refine the h264 parser, one ts message should parsed to one rtmp/flv message.	2015-04-04 15:53:36 +08:00
winlin	4329366c08	for #304, do not add deviation for absolute overflow.	2015-04-04 15:00:24 +08:00
winlin	4f9df4f1a0	merge from 2.0.157, reap ts on the IDR.	2015-04-04 13:31:02 +08:00
winlin	77c29da26b	for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157.	2015-04-04 13:30:13 +08:00
winlin	70c59da1bf	enhanced avc decode, parse the sps get width+height. 2.0.156.	2015-04-03 23:17:50 +08:00
winlin	7e1749e029	refine the comments.	2015-04-03 17:20:41 +08:00
winlin	e458305f81	add utc time format.	2015-04-03 16:42:32 +08:00
winlin	90cd16aae4	Merge branch '2.0release' into develop	2015-04-03 14:36:09 +08:00
winlin	56cd373015	support hls callback with duration.	2015-04-03 14:24:47 +08:00
winlin	64b065e450	for hls callback, add duration of ts.	2015-04-03 13:46:44 +08:00
winlin	c4466a8c0c	fix crash bug for hls cleanup.	2015-04-03 12:43:40 +08:00
winlin	eb54ec25c9	fix compile errors.	2015-04-03 11:30:59 +08:00
winlin	cb148e43ee	merge from 2.0.155	2015-04-03 10:57:34 +08:00
winlin	17c0a5c470	fix #372, support transform vhost of edge 2.0.155.	2015-04-03 10:56:56 +08:00
winlin	d95e5a3f47	Merge branch '2.0release' into develop	2015-04-02 15:07:29 +08:00
winlin	4d98cbb965	add hls config in api.	2015-04-02 15:05:09 +08:00
winlin	fe5783e7a4	merge 2.0.154	2015-04-02 11:52:49 +08:00
winlin	8401d9ac06	fix #366, config hls to disable cleanup of ts. 2.0.154.	2015-04-02 11:52:03 +08:00
winlin	2d3d628865	merge from 2.0.153	2015-03-31 18:09:13 +08:00
winlin	717d088376	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00
winlin	e75b7e89d6	merge from 2.0.152	2015-03-31 17:53:32 +08:00
winlin	3b4bd194b6	refine http hooks, donot pass the known variable.	2015-03-31 17:52:49 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	97442c56b6	enhance hls in floor mode.	2015-03-31 17:03:14 +08:00
winlin	76c1957260	enhance hls, increase piece one by one.	2015-03-31 16:58:20 +08:00
winlin	ef28865991	merge from 2.0.151	2015-03-31 15:54:37 +08:00
winlin	b9c21b1e8f	enhanced hls, warning when ts dup or jmp.	2015-03-31 15:54:05 +08:00
winlin	9be7fbba7d	user smaller deviation to avoid dup ts.	2015-03-31 15:42:21 +08:00
winlin	f6e135943f	enhanced hls, support deviation for duration. 2.0.151.	2015-03-31 15:39:47 +08:00
winlin	40f186ba82	Merge branch '2.0release' into develop	2015-03-30 14:08:26 +08:00
winlin	cd682ae4be	update donations. fix hls path bug.	2015-03-30 14:08:17 +08:00
winlin	abbed8f66c	merge from 2.0release	2015-03-30 12:56:52 +08:00
winlin	692b751da8	for #351, support config the m3u8/ts path for hls. 2.0.149.	2015-03-30 12:44:04 +08:00
winlin	922adaf59f	Merge branch '2.0release' into develop	2015-03-29 22:35:10 +08:00
winlin	85afb6ea6f	add donation. fix bug of adts.	2015-03-29 22:34:53 +08:00
winlin	01ee456649	fix the ts parse bug, should never complete message when PES packet length is 0.	2015-03-27 15:27:10 +08:00
winlin	75ca70c619	Merge branch '2.0release' into develop	2015-03-26 19:58:27 +08:00
tufang14	0faaa61be7	seg fault ... seg fault	2015-03-26 19:57:51 +08:00
winlin	a5c5befad1	for parse video ts.	2015-03-26 19:52:21 +08:00
winlin	896983c1dc	refine the aac codec enum name	2015-03-26 11:31:40 +08:00
winlin	1401f2e0ab	ignore when sps/pps consumed all frame.	2015-03-26 11:07:45 +08:00
winlin	12d5431f3b	Merge branch '2.0release' into develop	2015-03-26 10:31:19 +08:00
winlin	b319e9ff9c	ignore when sps/pps consumed all frame.	2015-03-26 10:31:13 +08:00
winlin	c250e3e651	Merg branch '2.0release' into develop	2015-03-25 20:39:01 +08:00
winlin	e818f36316	fix #360, fix build bug for centos7.	2015-03-25 20:38:51 +08:00
winlin	713cedfbb4	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:14:29 +08:00
winlin	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:13:57 +08:00
winlin	d16ae193f6	Merge branch '2.0release' into develop	2015-03-23 22:06:25 +08:00
winlin	fcab17741c	fix #222, the dvr path rule changed.	2015-03-23 22:06:18 +08:00
winlin	df3f24403e	Merge branch '2.0release' into develop	2015-03-23 21:21:42 +08:00
winlin	02addf61f7	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:21:36 +08:00
winlin	bfa46e7a98	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:19:35 +08:00
winlin	f69fa7273b	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:19:04 +08:00
winlin	0a7b179e14	Merge branch '2.0release' into develop	2015-03-21 15:38:29 +08:00
winlin	2f2aaf5ee4	for #155, refine code, donot check network devices for osx.	2015-03-21 15:38:22 +08:00
winlin	e7e17cf15d	fix osx bug.	2015-03-21 15:24:26 +08:00
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	2015-03-21 15:22:45 +08:00
winlin	e45c62003a	Merge branch '2.0release' into develop	2015-03-21 11:55:35 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
winlin	7065db192c	for #354, remove the double underscore of macro.	2015-03-21 10:42:55 +08:00
winlin	45d9018051	Merge branch '2.0release' into develop	2015-03-21 10:25:09 +08:00
winlin	c6817cc422	for #354, remove the double underscore of macro.	2015-03-21 10:25:03 +08:00
winlin	3ca906d560	Merge branch '2.0release' into develop	2015-03-20 15:10:34 +08:00
winlin	a4709a6439	for #151, add comments for the audio overflow ratio.	2015-03-19 21:08:42 +08:00
winlin	b1142d83fc	Merge branch '2.0release' into develop	2015-03-19 17:24:37 +08:00
winlin	0319e85f99	support config the audio overflow ratio.	2015-03-19 17:24:27 +08:00
winlin	b7138ba9c5	merge from 2.0	2015-03-19 10:17:51 +08:00
tufang14	e319da3329	小瑕疵 ... 小瑕疵	2015-03-19 10:16:58 +08:00
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	2015-03-18 22:30:17 +08:00
winlin	4a50bf1894	Merge branch '2.0release' into develop	2015-03-18 16:50:54 +08:00
winlin	fbd722bf76	refine the fast buffer to more readable.	2015-03-18 16:50:47 +08:00
winlin	d25eb0aaa2	merge from 2.0	2015-03-18 16:35:24 +08:00
winlin	f36e4a443d	refine the fast buffer. 2.0.144	2015-03-18 16:34:27 +08:00
winlin	6a98758435	revert the changes for SRS2.	2015-03-17 23:51:10 +08:00
winlin	df2644c850	merge from 2.0release	2015-03-17 23:48:50 +08:00
winlin	6855ab4c52	Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop	2015-03-17 23:46:09 +08:00
winlin	9bf6c9e9c6	Merge branch '2.0release' into develop	2015-03-17 22:36:04 +08:00
winlin	cf3becbc17	for #155, osx(darwin) enable http api and stat, rusage is ok.	2015-03-17 22:35:47 +08:00
winlin	9f81a8b73e	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	2015-03-17 22:07:38 +08:00
winlin	ab673e1300	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	2015-03-17 22:06:59 +08:00
tufang14	1cc3384a19	seg fault ... seg fault	2015-03-17 17:45:20 +08:00
winlin	79fbeeb8c6	Merge branch '2.0release' into develop	2015-03-17 15:37:03 +08:00
winlin	8a4312f4ec	fix bug, use size_t for string::npos	2015-03-17 15:36:12 +08:00
winlin	9e407d32fe	change verstion to 3.0.0	2015-03-17 07:58:38 +08:00
winlin	2241ba0e34	for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142	2015-03-17 07:57:58 +08:00
wenjie.zhao	65f404fb42	for #340, refine ts prefix code.	2015-03-13 02:01:24 +08:00
wenjie.zhao	5969f72354	for #340, refine ts prefix code.	2015-03-13 01:32:51 +08:00
wenjie.zhao	10da182853	add hls prefix of uri supported	2015-03-13 00:22:55 +08:00
wenjie.zhao	efe3050d7a	fix hls muxer Segmentation fault.	2015-03-12 23:50:21 +08:00
wenjie.zhao	73f13dfc42	fix hls muxer Segmentation fault.	2015-03-12 23:39:44 +08:00
winlin	9a0a8affc5	Merge pull request #337 from tufang14/develop ... 可能数组越界	2015-03-16 16:02:06 +08:00
winlin	685a29af83	Merge branch '2.0release' into develop	2015-03-16 15:45:01 +08:00
winlin	c92d40e00b	for #334, refine code, use kbps instead skt of rtmp connection.	2015-03-16 15:40:43 +08:00
Nimrod A. Abing (on kohima)	a95bd7d30e	Modified on_close webhook. ... Pass the send_bytes and recv_bytes count to the web hook.	2015-03-16 15:39:49 +08:00
Nimrod A. Abing (on kohima)	bc93147426	for #308, disable st examples. for #334, refine the st init and event select.	2015-03-16 15:35:01 +08:00
tufang14	6cf5a6a7a9	可能数组越界 ... 可能数组越界	2015-03-16 15:08:17 +08:00
winlin	67671e43f9	Merge branch '2.0release' into develop	2015-03-16 10:24:25 +08:00
winlin	8ee0826e9a	fix build failed bug.	2015-03-16 10:24:19 +08:00
winlin	a21243ea12	merge from 2.0	2015-03-15 08:16:37 +08:00
winlin	d349a3dbda	update stable version check	2015-03-15 08:15:04 +08:00
winlin	519c25a064	fork srs2 and start srs3. 3.0.0	2015-03-15 08:06:41 +08:00
winlin	e6058c1560	update donation	2015-03-14 20:25:21 +08:00
winlin	320f45c6f4	fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.	2015-03-14 20:07:56 +08:00
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	2015-03-14 19:45:13 +08:00
winlin	995b130090	for #324, refine code for hstrs, support hijack handler.	2015-03-14 14:55:45 +08:00
winlin	5c6ef6ded6	fix warning for xcode.	2015-03-14 13:09:34 +08:00
winlin	6d15d0ea99	for #324, refine code, add hstrs config.	2015-03-14 09:52:47 +08:00
winlin	a15ce1147f	for #155, fix all warnings for mac.	2015-03-13 12:53:01 +08:00
wenjie.zhao	643f18abe4	add hds reload supported.#328	2015-03-12 22:38:11 +08:00
winlin	984145de72	for #328, add todo for hds, check whether disabled, support reload.	2015-03-12 11:52:35 +08:00
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	2015-03-12 11:15:15 +08:00
winlin	da56e4fbb9	for #328, fix hds compile error on mac.	2015-03-12 07:26:30 +08:00
wenjie.zhao	07d8f060eb	refine annotation	2015-03-11 14:36:28 +08:00
wenjie.zhao	570c0d66bd	fix path issue.	2015-03-11 14:34:00 +08:00
wenjie.zhao	e57bda8908	Merge code. ... Conflicts: trunk/configure trunk/src/app/srs_app_source.cpp trunk/src/kernel/srs_kernel_error.hpp	2015-03-11 14:18:09 +08:00
winlin	a739b2c555	fix the bug for fork ffmpeg in mac, the local variable is unvailable.	2015-03-11 15:54:31 +08:00
winlin	1ad0c847ce	fix http parse bug	2015-03-11 14:55:46 +08:00
winlin	f247ac9daf	fix the http parse bug.	2015-03-11 14:48:51 +08:00
wenjie.zhao	d4198ee8ba	add hds supported.	2015-03-11 13:34:58 +08:00
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +08:00
winlin	f9767c91b5	fix configure bug, refine code for stream caster.	2015-03-10 18:07:43 +08:00
winlin	6c11207e28	fix http ts bug, the adts use id=1 which indicates the aac encoding.	2015-03-10 17:58:29 +08:00
winlin	5c3c38684b	fix the bug of flv stream, metadata type should be 18	2015-03-10 17:04:02 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	2015-03-08 19:59:10 +08:00
winlin	2e9f2753c9	for #316, add stream codec info. 2.0.135	2015-03-08 18:33:35 +08:00
winlin	885b9af122	for #310, refine code to support he/hev2, use aac object.	2015-03-08 17:56:49 +08:00
winlin	8dbabe3708	fix #310, refine aac LC, support aac HE/HEv2. 2.0.134.	2015-03-08 17:36:43 +08:00
winlin	d3e2838fc6	for #310, refine the aac profile for adts and aac object for RTMP sequence header.	2015-03-08 17:33:52 +08:00
winlin	04f3f2a8f8	for #316, add codec info to stream.	2015-03-08 15:33:08 +08:00
winlin	8bf60895a9	refine the kbps of server.	2015-03-08 12:55:40 +08:00
winlin	fbbe46d272	refine the config, support directly parse file.	2015-03-07 22:25:43 +08:00
winlin	f26e719800	fix #322, fix http-flv stream bug, support multiple streams. 2.0.133.	2015-03-06 13:37:57 +08:00
winlin	1277968d4a	refine http client, use initialize to set host and port.	2015-03-06 12:07:12 +08:00
winlin	2bcb4f811c	refine http.	2015-03-06 11:56:28 +08:00
winlin	964e4be9d4	refine http request post. 2.0.132.	2015-03-06 11:51:20 +08:00
winlin	3982ec1d87	refine http request parse. 2.0.132.	2015-03-06 11:36:26 +08:00
winlin	4325809daf	refine http	2015-03-05 21:45:01 +08:00
winlin	6fccfa061d	refine the http request code.	2015-03-05 10:36:40 +08:00
winlin	025b707330	refine the http request reader.	2015-03-04 18:20:15 +08:00
winlin	3e394a5f06	for #320, set socket send buffer to smaller macro. 2.0.131	2015-03-04 16:52:43 +08:00
winlin	04dc60ebe1	refine http for srs, rename SrsGoHttp to SrsHttp.	2015-03-04 13:09:35 +08:00
winlin	983ab8fb89	pass all utest for 2.0	2015-03-04 12:24:22 +08:00
winlin	e7fd733dc5	fix the long long warning.	2015-03-04 09:59:40 +08:00
winlin	3d47fbdc5c	fix build failed of utest.	2015-03-04 09:18:15 +08:00
winlin	a47dbf7a92	for #320, refine code.	2015-03-03 17:28:07 +08:00
winlin	34d6a2ece5	for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129	2015-03-03 17:22:44 +08:00
winlin	fb3fced8d0	for #179, revert dvr http api. 2.0.128.	2015-03-01 17:57:28 +08:00
winlin	8ed256b7e9	for #179, wait keyframe for dvr. 2.0.127	2015-02-27 21:11:29 +08:00
winlin	0213cc6466	for #179, refine dvr, support POST create dvr when publish not start. 2.0.126	2015-02-27 20:39:36 +08:00
winlin	b903a7b436	for #179, dvr suport vhost/app/stream level control. 2.0.125.	2015-02-25 09:20:11 +08:00
winlin	1cb8e44b1b	fix #304, fix hls bug, write pts/dts error. 2.0.124.	2015-02-24 18:39:31 +08:00
winlin	a3648063d5	fix #179, support dvr http api. 2.0.123.	2015-02-24 17:29:30 +08:00
winlin	d650118988	fix #179, dvr support api to start or stop. 2.0.123	2015-02-23 19:23:32 +08:00
winlin	1246989ea9	for #179, refine dvr, support callback when reap dvr segment.	2015-02-22 10:45:13 +08:00
winlin	849e59b05d	for #179, support http api to start dvr.	2015-02-21 23:09:21 +08:00
winlin	c67a4fdf97	for #179, enable http api crossdomain for dvr api.	2015-02-21 21:17:59 +08:00
winlin	1445086451	for #179, update the metadata of flv dvr file.	2015-02-21 19:14:05 +08:00
winlin	7077b74d03	for #179, add dvr plan append.	2015-02-21 16:52:37 +08:00
winlin	95b4baee7c	for #179, refine dvr code to more simple.	2015-02-21 16:25:04 +08:00
winlin	3d225e1bc7	refine dvr, donot append the flv header.	2015-02-19 20:08:56 +08:00
winlin	a984eeecab	refine dvr, append file when dvr file exists. 2.0.122.	2015-02-19 19:50:10 +08:00
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	2015-02-19 18:56:21 +08:00
winlin	9d233db27e	fix #133, support push rtsp to srs. 2.0.120.	2015-02-18 22:28:39 +08:00
winlin	a954040d29	for #133, rtsp parse aac from rtp packet.	2015-02-18 13:37:08 +08:00
winlin	0cc693a3b8	for #133, decode the h264 NALU from rtp.	2015-02-18 11:49:42 +08:00
winlin	6a64164985	for #133, show more info about rtp.	2015-02-18 07:27:11 +08:00
winlin	45c0b12958	for #133, finish rtsp sdp, start rtp.	2015-02-17 22:20:47 +08:00
winlin	f14af45413	for #133, alloc and free rtp port.	2015-02-17 21:10:06 +08:00
winlin	d4ceff649f	the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.	2015-02-17 21:03:39 +08:00
winlin	ccc30c70c4	the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.	2015-02-17 21:01:44 +08:00
winlin	40fbfd8560	for #133, rtsp extract tcp/udp listener.	2015-02-17 16:28:28 +08:00
winlin	4807f7850d	for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.	2015-02-17 14:16:02 +08:00
winlin	604f4cc57b	for #133, support the rtsp options request and response.	2015-02-16 22:15:59 +08:00
winlin	c0e50265bd	for #133, create rtsp framework.	2015-02-16 14:05:01 +08:00
winlin	e81e090239	for #133, add rtsp listener and handler.	2015-02-15 21:28:31 +08:00
winlin	78f34ad46f	for #304, support config default acodec/vcodec. 2.0.118.	2015-02-15 18:11:24 +08:00
winlin	922150b2cf	for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.	2015-02-15 17:43:35 +08:00
winlin	3c813847bd	rewrite the ts remux of hls. 2.0.117	2015-02-15 16:37:28 +08:00
winlin	1ed3e283ab	implements the pat/pmt write ts header.	2015-02-14 23:06:01 +08:00
winlin	e88c1e32ee	always increasing target duration, for #304	2015-02-14 16:30:04 +08:00
winlin	25af6c6847	for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.	2015-02-12 13:34:59 +08:00
winlin	381e88d698	add release code. ZhouGuowen for SRS2.0	2015-02-11 08:52:52 +08:00
winlin	b982b27f6f	add dev code for each release. HuKaiqun for SRS1.0	2015-02-11 08:48:22 +08:00
winlin	e19ee0cb99	for #311, set pcr_base to dts. 2.0.114.	2015-02-10 23:15:43 +08:00
winlin	87519aaae8	fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114	2015-02-10 22:37:29 +08:00
winlin	66931a8890	try to fix hls problem, print the video packets.	2015-02-10 19:58:24 +08:00
winlin	b8d4f68a69	try to refine hls, always flush video when reap segment.	2015-02-10 19:32:42 +08:00
winlin	5a3cd235fd	refine hls, try to fix the hls ts corrupt problem.	2015-02-10 19:09:31 +08:00
winlin	d5e3ac4e7d	for #310, the aac profile must be object plus one. 1.0.26	2015-02-10 17:15:50 +08:00
winlin	4820d455d5	for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113	2015-02-10 16:58:13 +08:00
winlin	f8bdd28de6	add comments for hls m3u8, target duration may should not changed.	2015-02-10 15:18:20 +08:00
winlin	693c7a5349	refine hls m3u8, use LR(0x0a, \n) as new line char	2015-02-10 11:38:14 +08:00
winlin	81ea6d34ce	add pdf of hls rfc, corrent the content type.	2015-02-10 10:58:27 +08:00
winlin	30b1759aa9	fix bug for memory hls.	2015-02-07 18:01:12 +08:00
winlin	bdda337f33	fix aac adts bug, the frame length is 2bits.	2015-02-04 14:42:49 +08:00
winlin	dba983d124	for #136, update the config for ram hls.	2015-02-03 16:29:59 +08:00
winlin	a23191497f	fix #136, support hls without io(in ram). 2.0.112	2015-02-03 16:01:07 +08:00
winlin	16afe7ddbb	fix #250, support push MPEGTS over UDP to SRS. 2.0.111	2015-01-31 23:20:00 +08:00
winlin	4246be92c9	for #250, merge avc to codec. use queue to dequeue.	2015-01-31 21:16:42 +08:00
winlin	153a3a6c42	must user pithy print for mpegts print.	2015-01-31 19:49:35 +08:00
winlin	70c8fe13c4	for #250, support h264 video for push mpegts over udp. 2.0.110	2015-01-31 19:46:55 +08:00
winlin	66fccdbbd1	for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.	2015-01-31 12:21:04 +08:00
winlin	bce78fdab6	for #250, add comments for elemetary stream specifed by stream_id.	2015-01-31 11:46:51 +08:00
winlin	a384cc400a	for #250, use udp packet handler.	2015-01-30 00:04:20 +08:00
winlin	35ab0ea627	for #250, use buffer to cache bytes, for system will split the udp packet.	2015-01-29 23:54:04 +08:00
winlin	b38bae2a89	for #250, refine parse pes packet, remove the clear method.	2015-01-29 23:08:26 +08:00
winlin	1685cdd48e	for #250, parse pes packet ok, ts message ok.	2015-01-29 22:58:02 +08:00
winlin	486277089d	for #250, parse the PES ts packet payload.	2015-01-29 13:54:07 +08:00
winlin	755e61e011	update the qt project.	2015-01-29 11:27:56 +08:00
winlin	8374017329	build libfdk-aac in ffmpeg. 2.0.108	2015-01-29 10:45:19 +08:00
winlin	cc87992fe0	for #250, decode the PMT and PAT	2015-01-27 18:35:43 +08:00
winlin	7692e50fc2	for #250, calc and verify the crc32 of PAT.	2015-01-27 17:04:30 +08:00
winlin	52b62918d9	for #250, decode the PAT of PSI ts packet.	2015-01-27 16:25:46 +08:00
winlin	51aecb8fde	for #250, decode the ts packet header and adaptation field.	2015-01-27 14:28:59 +08:00
winlin	bd395904df	for #250, the ts packet and adaptation field.	2015-01-27 11:13:03 +08:00
winlin	aff7a1cb4d	add ts packet definition for #250.	2015-01-26 17:06:06 +08:00
winlin	919a85b103	for #301, hls support h.264+mp3, ok for vlc. 2.0.107	2015-01-25 17:06:49 +08:00
winlin	2c42350489	for #301, http ts stream support h.264+mp3. 2.0.106	2015-01-25 16:42:22 +08:00
winlin	aaade0f04f	for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105	2015-01-25 13:35:53 +08:00
winlin	9cbc753e8e	for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25	2015-01-25 13:30:45 +08:00
winlin	c9d270fbe0	refine code for #250, ts remux	2015-01-25 13:19:22 +08:00
winlin	b0daf1482d	update version to 1.0.24	2015-01-25 13:10:30 +08:00
winlin	1835957a2b	for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24	2015-01-25 13:04:12 +08:00
winlin	ea85ad2e20	for #293, #250, move the ts codec to kernel ts.	2015-01-25 10:54:25 +08:00
winlin	d22e4e86d8	update projects for rtmp renamed to protocol	2015-01-24 16:59:36 +08:00
winlin	711b6ca277	for #250, basic stream caster framework. 2.0.104	2015-01-24 16:31:32 +08:00
winlin	6463d22a14	for #250, add mpegts over udp stream caster class.	2015-01-24 16:27:30 +08:00
winlin	7f02bfa3a4	for #250, the mpegts over udp stream caster framework.	2015-01-24 15:36:11 +08:00
winlin	52891b491a	listen and serve stream caster mpegts over udp.	2015-01-24 14:52:52 +08:00
winlin	f9d1e1111a	merge from feilong, consumer directly sleep when paused.	2015-01-23 17:07:17 +08:00
winlin	8ace73f30d	for #151, use absolutely overflow to make jwplayer happy. 2.0.103	2015-01-23 15:29:14 +08:00
winlin	4f5cc9c403	for #151, use absolutely overflow to make jwplayer happy. 1.0.23	2015-01-23 15:14:29 +08:00
winlin	73cfdea332	for #299, srs http server support dash vod stream over mp4 range. 2.0.103	2015-01-23 13:45:59 +08:00
winlin	e0ee8de2fb	for #299, srs http server support dash, flash request range in range or bytes.	2015-01-23 13:17:50 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00
winlin	2a05783d5c	for #293, support http ts stream. 2.0.101	2015-01-22 18:32:10 +08:00
winlin	dfe385d0c9	for #293, move the simple buffer to kernel.	2015-01-22 18:13:33 +08:00
winlin	77d78eac5c	for #293, add http ts stream framework.	2015-01-22 17:40:06 +08:00
winlin	0f59073400	refine code, rename the pts to dts although both ok for audio.	2015-01-22 17:35:07 +08:00
winlin	913f98b902	for bug #293, http ts stream, move the avc codec from app to kernel.	2015-01-22 17:08:38 +08:00
winlin	dc6299171f	refine http stream code.	2015-01-22 15:05:38 +08:00
winlin	7d86c6d9e9	for bug #293, refine for fast cache of http stream.	2015-01-22 13:16:54 +08:00
winlin	2167a8385c	update version to 3.0.101	2015-01-22 09:36:19 +08:00
winlin	25807298ad	alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux	2015-01-22 09:34:33 +08:00
winlin	664c85cf3d	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	2015-01-20 18:33:48 +08:00
winlin	a3607c9193	use ide dir for ides.	2015-01-20 18:33:04 +08:00
panda1986	797c1b0762	support all acodec. not forced to aac.	2015-01-20 14:06:27 +08:00
panda1986	e7d54c2ca9	Update srs_app_ffmpeg.cpp ... srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断	2015-01-20 13:52:31 +08:00
winlin	5f194bc87c	merge from feilong, the crash for cosumer wait.	2015-01-19 14:05:59 +08:00
winlin	b7b268dfbf	fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100.	2015-01-19 13:17:46 +08:00
winlin	29a8932b49	for bug #293, use http stream cache for android weixin to happy.	2015-01-19 12:56:05 +08:00
winlin	f9f2fcbb9c	for #293, add http stream cache for audio mp3/aac stream.	2015-01-19 12:24:18 +08:00
winlin	e6549b261c	for #293, support http mp3 streaming	2015-01-19 10:18:18 +08:00
winlin	d364a81d8f	for #293, support http mp3 streaming	2015-01-19 10:13:43 +08:00
winlin	99bf397487	for bug #293, add mp3 id3 spec	2015-01-19 09:25:07 +08:00
winlin	b04888a35d	for #293, #277, support http chunked encoding	2015-01-19 01:05:24 +08:00
winlin	15d87537a1	for bug #293, support aac stream.	2015-01-19 00:14:14 +08:00
winlin	3244c083c7	for bug #293, support http aac stream	2015-01-19 00:05:12 +08:00
winlin	7674524c31	for #239, empty the aac encoder	2015-01-18 22:56:01 +08:00
winlin	c0233542bf	for #293, add aac encoder for http aac stream.	2015-01-18 22:51:07 +08:00
winlin	c0a7752718	for #293, add aac mime audio/x-aac	2015-01-18 21:17:41 +08:00
winlin	d546827b1c	for #293, refine the mime of content type.	2015-01-18 21:04:52 +08:00
winlin	3b853a6dbd	fix #293, support rtmp remux to http flv live stream.	2015-01-18 20:07:54 +08:00
winlin	53d9faf395	for #293, update readme.	2015-01-18 19:50:54 +08:00
winlin	eea31ef4f3	for #293, support rtmp remux to http flv live stream.	2015-01-18 19:49:03 +08:00
winlin	faaa9187f2	for #293, mount http flv stream when publish.	2015-01-18 18:50:15 +08:00
winlin	2698e6dbae	for bug #293, http live streaming framework.	2015-01-18 18:39:53 +08:00
winlin	eff2d81016	for #293, add http flv stream	2015-01-18 18:00:40 +08:00
winlin	c4302b9b61	for bug #277, the http server subscribe the reload.	2015-01-18 17:17:07 +08:00
winlin	f1393ee43f	for bug #277, use http not found when no file.	2015-01-18 17:02:05 +08:00
winlin	398b212bfa	for bug #277, refine code, support default http vhost.	2015-01-18 17:01:39 +08:00
winlin	2742c0d3c2	for #277, support http vhost mount.	2015-01-18 16:38:26 +08:00
winlin	4513486266	refine http server, support mount dir for vhost.	2015-01-18 13:34:26 +08:00
winlin	bfff8413b6	refine code for #277, the copy first param is the dest.	2015-01-18 09:16:14 +08:00
winlin	c695a8fcbd	refine code for #277, extract the flv vod stream.	2015-01-18 09:12:53 +08:00
winlin	e71bc0cbc5	for bug #277, refine the http server.	2015-01-17 23:44:21 +08:00
winlin	bbe96a4b31	for bug #277, support flv stream.	2015-01-17 23:19:30 +08:00
winlin	cbed2bbca4	fix #277, refine http server refer to go http-framework. 2.0.98	2015-01-17 23:00:40 +08:00
winlin	9bbbaad288	for bug #277, refine http api refer to go http-framework. 2.0.97	2015-01-17 21:58:23 +08:00
winlin	a1f887f46f	refine code, move onMetaData to consts.	2015-01-17 13:29:11 +08:00
winlin	04aa6f8296	drop script data except the onMetaData packet.	2015-01-17 13:23:30 +08:00
winlin	cc22ca4890	hotfix #290, use iformat only for rtmp input. 2.0.95	2015-01-17 13:06:18 +08:00
winlin	4449a8d7b0	fix #290, use iformat only for rtmp input. 1.0.22	2015-01-17 13:04:52 +08:00
winlin	29be14dd37	merge from feilong, fix memory leak.	2015-01-17 11:16:13 +08:00
winlin	a4b61081cc	merge from feilong, fix memory leak.	2015-01-15 11:26:30 +08:00
winlin	fae006ca7c	merge from feilong, fix memory leak.	2015-01-15 10:41:20 +08:00
winlin	63309a0538	refine for bug #288, drop info frame without error.	2015-01-14 11:55:15 +08:00
winlin	b705ed0b90	for bug #288, refine the codec decode info frame failed. 1.0.21	2015-01-14 11:32:19 +08:00
winlin	964668dc73	merge from feilong, print format error.	2015-01-14 11:20:21 +08:00
winlin	b3225100e7	Merge pull request #282 from tufang14/develop ... add client num in statistic with traverse every client for #227	2015-01-09 09:00:08 +08:00
qiang.li	310e49e7f3	add client num in statistic with traverse every client	2015-01-08 21:58:10 +08:00
winlin	982e9555bd	merge from feilong, fix hls msg memory leak bug.	2015-01-08 17:48:45 +08:00
winlin	b466756931	merge from feilong for bug #281.	2015-01-08 17:44:08 +08:00
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	2015-01-08 17:37:28 +08:00
winlin	6c833902f9	merge http api from tufang. 2.0.92	2015-01-08 16:02:33 +08:00
winlin	ac584a4db2	Merge pull request #279 from tufang14/develop ... add client num for stream in statistic for #227	2015-01-08 15:52:44 +08:00
qiang.li	46d716612c	add client num for stream in statistic	2015-01-07 23:27:24 +08:00
winlin	44f5efda21	refine the print info.	2015-01-07 15:46:00 +08:00
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	2015-01-07 15:37:44 +08:00
winlin	5aa31568ba	fix the rtmp dump, parse the aggregate msg.	2015-01-07 15:35:01 +08:00
winlin	5661fc2676	refine dvr and rtmp dump, write the original data.	2015-01-07 15:01:58 +08:00
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	2015-01-07 14:31:42 +08:00
winlin	89a3cf9efe	refine code, failed when specified complex but no ssl for srslibrtmp	2015-01-07 13:37:23 +08:00
winlin	0e03d019a8	for bug #215, srs rtmp dump support conn args. 2.0.90	2015-01-07 13:29:30 +08:00
qiang.li	08e9f6ef42	add play client num in statistic	2015-01-06 22:20:31 +08:00
winlin	f1efdcd000	refine code, use global virtual id to generate the id of vhost and stream.	2015-01-05 13:08:11 +08:00
winlin	ae63af6a4a	refine code, implements the stat.:	2015-01-05 12:57:48 +08:00
winlin	97bea51499	refine the api, response the error code and data.	2015-01-05 12:49:00 +08:00
winlin	cc796a433a	refine the statistic arch.	2015-01-05 12:40:38 +08:00
winlin	40ed2249e8	refine code to use the one coding style.	2015-01-05 12:20:46 +08:00
winlin	4bb17f0c81	replace the TAB with 4spaces	2015-01-05 12:14:02 +08:00
winlin	344ff24f66	add srs_app_statistic to upp project.	2015-01-05 12:12:21 +08:00
winlin	67adc8dc61	merge with security bug fix.	2015-01-05 12:09:15 +08:00
qiang.li	a4a93613d0	add statistic for stream	2015-01-04 22:47:12 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	dd2c7e0b4d	hotfix to remove the pageUrl for http callback. 2.0.88	2015-01-03 15:08:46 +08:00
winlin	247b772449	hotfix to remove the pageUrl for http callback. 1.0.19	2015-01-03 15:07:12 +08:00
winlin	0b9bbdbe74	Merge branch '1.0release' into develop	2015-01-03 13:30:13 +08:00
winlin	f9a33fbeee	fix the compile failed for utest at 32bits cpus	2015-01-03 13:29:52 +08:00
qiang.li	8d534d3470	get stream info use http api #227	2015-01-03 12:57:13 +08:00
winlin	f881bc43b5	fix #179: dvr support custom filepath by variables. 2.0.87	2015-01-03 12:54:54 +08:00
winlin	f89941254a	refine code of security deny check	2015-01-02 16:06:18 +08:00
winlin	18b15b9099	refine comments of security deny check	2015-01-02 16:04:30 +08:00
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	f8ec7c706d	merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85	2015-01-02 12:57:44 +08:00
winlin	e590537dca	fix #207, trim the last 0 of log. 1.0.18	2015-01-02 12:56:15 +08:00
winlin	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	2015-01-02 10:21:04 +08:00
winlin	8df0f724d6	fix #216, http-callback post in application/json content-type. 2.0.83	2015-01-02 09:22:49 +08:00
winlin	ca977ef739	hotfix #216, http-callback post in application/json content-type. 1.0.17	2015-01-02 09:20:45 +08:00
winlin	518a5a72ab	fix #263, srs-librtmp flv read tag should init size. 2.0.82	2015-01-02 09:05:16 +08:00
winlin	c1c01ec802	hotfix #270, memory leak for http client post. 2.0.81	2015-01-01 11:47:18 +08:00
winlin	bb6dfe40c1	fix #270, memory leak for http client post. 1.0.16	2015-01-01 11:44:28 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	1824e18bd2	fix the comment bug.	2014-12-31 20:20:32 +08:00
winlin	12f4abd553	fix #266, aac profile is object id plus one. 2.0.80	2014-12-29 14:24:22 +08:00
winlin	c0a6c3efa3	merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79	2014-12-29 09:07:50 +08:00
winlin	d9aca8ab82	hotfix #267, the forward dest ep should use server. 1.0.15	2014-12-29 09:05:56 +08:00
winlin	e27c95b0e8	merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78	2014-12-29 08:45:19 +08:00
winlin	513c1ec6d5	fix #268, the hls pcr is negative when startup. 1.0.14	2014-12-29 08:38:29 +08:00
winlin	5e9ff71740	refine the log verbose	2014-12-28 20:17:27 +08:00
winlin	2d229b09be	refine rtmp protocol stack comments	2014-12-28 15:16:34 +08:00
winlin	5a229e89bf	refine the rtmp protocol stack comments, the stream id in little-endian.	2014-12-28 15:11:55 +08:00
winlin	9e35664510	refine the simple handshake comment.	2014-12-28 12:28:33 +08:00
winlin	9a66d22f3b	hotfix 1.0release, 1.0.13	2014-12-26 21:43:00 +08:00
winlin	b8de3bd3b4	convert the core to unix format.	2014-12-25 10:55:12 +08:00
winlin	92146712d8	fix srs-librtmp send raw aac audio channel bug. 2.0.76	2014-12-25 09:52:18 +08:00
winlin	9788570ba5	fix bug for ubuntu14 to build.	2014-12-24 18:32:37 +08:00
winlin	28eedfc177	merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75	2014-12-22 17:12:09 +08:00
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	2014-12-22 17:10:51 +08:00
winlin	b77e1de1d1	fix bug of utest	2014-12-22 15:31:57 +08:00
winlin	81e70e7bdb	for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object.	2014-12-21 11:41:15 +08:00
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	2014-12-20 11:58:39 +08:00
winlin	7737042795	fix #264, remove the test code. 1.0.11	2014-12-20 11:56:16 +08:00
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	2014-12-20 11:45:59 +08:00
winlin	db13c725a6	refine #259, rename the on_dispose to wakeup. 2.0.73	2014-12-19 09:19:47 +08:00
winlin	61a648f1d2	refine for #259, chmod -x files.	2014-12-19 09:07:31 +08:00
winlin	24815e4efe	refine code for bug #239	2014-12-02 15:33:22 +08:00
winlin	304208f822	fix #239, traverse the token before response connect. 1.0.10.	2014-12-02 15:27:36 +08:00
tufang14	3d0d43c5dc	token bug ... 多级origin-edge模式，edge上功能不生效	2014-12-02 14:38:54 +08:00
winlin	9c033c7da6	hotfix 1.0, author bug, use error macro. 1.0.9	2014-11-27 18:48:01 +08:00
winlin	575e50b6e2	hotfix to add comments on 1.0release	2014-11-27 17:47:13 +08:00
winlin	db7af6259a	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:50:25 +08:00
winlin	d672fae255	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8	2014-11-25 10:07:41 +08:00
winlin	44962c9142	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:06:26 +08:00
winlin	c1e9aed0ac	all wiki translated to English. 1.0.7	2014-11-18 13:41:36 +08:00
winlin	eba1740ed5	hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6.	2014-11-13 14:48:21 +08:00
winlin	f2f259d050	use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5.	2014-11-06 14:28:03 +08:00
winlin	3c31e6db05	for bug #186, read the args when discovery it. 1.0.4	2014-10-24 13:22:35 +08:00
winlin	e3e18b9915	for bug #186, read the args when discovery it. 1.0.4	2014-10-24 13:17:11 +08:00
winlin	fe59783d83	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:28:50 +08:00
winlin	aa98ca60b9	fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3.	2014-10-24 10:34:00 +08:00
winlin	77d14ff752	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 10:01:00 +08:00
winlin	6da21364f6	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:55:58 +08:00
winlin	bd158ec838	hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1.	2014-10-19 11:33:56 +08:00
winlin	2be014e4f5	remove the dead code for bug #180	2014-10-09 14:24:52 +08:00
winlin	dddec3484e	update to 1.0beta, 1.0.0	2014-10-09 12:55:25 +08:00
winlin	6468b9e92b	refine script, to disable iptables and selinux. 0.9.225	2014-10-09 12:07:56 +08:00
winlin	2ed794ad52	refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224	2014-10-09 10:41:24 +08:00
winlin	9789335d0b	fix #151, always reap ts whatever audio or video packet. 0.9.223.	2014-10-08 15:15:57 +08:00
winlin	13b092704d	refine code for bug #151, refine the source functions, add comments.	2014-10-08 14:28:09 +08:00
winlin	b830b995e6	fix bug #162, requires epoll. 0.9.222	2014-10-08 13:27:48 +08:00
zhengfl	2317f0e767	refine	2014-10-02 20:25:36 +08:00
zhengfl	bafdd83122	last	2014-10-02 19:51:01 +08:00
zhengfl	1e34d2a5cd	client connection no disconnect	2014-10-02 19:45:04 +08:00
winlin	0d6b91039d	fix #257, refine latency, send when got one+ msgs, 2.0.72	2014-12-16 09:26:22 +08:00
winlin	cbad7a3074	fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71	2014-12-13 12:48:49 +08:00
winlin	5529813fcb	for bug #257, support NULL msg in msgs to send.	2014-12-13 11:22:40 +08:00
winlin	595bf24a51	for bug #257, default to off the realtime(min-latency).	2014-12-13 10:13:49 +08:00
winlin	dac9f9c45c	refine the log level.	2014-12-12 23:07:35 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	68ade0a267	add log info for rtmp conn. change the mw_latency to 100 for realtime.	2014-12-10 18:06:09 +08:00
winlin	6bdd0af728	for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69	2014-12-10 09:18:49 +08:00
winlin	7150a99f41	for bug #251, remove the mic(message iovs cache), no use.	2014-12-10 09:15:38 +08:00
winlin	a3de1c71fc	reset the mw_latency to 350.	2014-12-08 09:49:45 +08:00
winlin	1311b6fe65	fix #251, support 10k clients. 2.0.67	2014-12-07 16:31:47 +08:00
winlin	55d98fceed	for bug #251, add min msgs for queue cond wait.	2014-12-07 16:15:19 +08:00
winlin	438ee30ac1	for bug #251, refine the queue fast vector. 2.0.66	2014-12-07 13:37:56 +08:00
winlin	5a2b8afead	for bug #251, add queue fast vector. 2.0.66	2014-12-07 13:26:45 +08:00
winlin	8f72f79504	for bug #251, add queue fast cache. 2.0.65	2014-12-07 12:08:38 +08:00
winlin	1bbdae6632	refine code.	2014-12-07 11:37:51 +08:00
winlin	bba6063492	for bug #251, the shared ptr message share the header. 2.0.64	2014-12-07 11:25:05 +08:00
winlin	330819fb74	for bug #251, refine the mic algorithm. 2.0.63	2014-12-06 22:50:51 +08:00
winlin	d53fd7f570	for bug #251, support mic(message iovs cache). 2.0.61	2014-12-06 20:10:05 +08:00
winlin	32d537b96b	for bug #251, refine code before mic.	2014-12-06 19:56:06 +08:00
winlin	d827928eeb	for bug #251, merge the performance refines.	2014-12-06 09:55:51 +08:00
winlin	a6599f2250	remove the qt modify file.	2014-12-06 09:52:26 +08:00
winlin	9892b92258	Revert "for bug #251, somhc(session-oriented message-header cache). 2.0.61" ... It hurt performance, should never use it. This reverts commit d073adde58.	2014-12-06 01:19:49 +08:00
winlin	d073adde58	for bug #251, somhc(session-oriented message-header cache). 2.0.61	2014-12-06 00:59:10 +08:00
winlin	de993b6465	for bug #251, refine the directly access ptrs for hls,dvr,forwarder,consumer.	2014-12-05 23:49:53 +08:00
winlin	d3a103184a	refine protocol sdk send msg, the chunk header generate.	2014-12-05 23:23:11 +08:00
winlin	f9b9a60de7	for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60	2014-12-05 23:03:52 +08:00
winlin	528ae1e9b1	refine source and queue dump msgs.	2014-12-05 22:00:57 +08:00
winlin	e80c8603d4	fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59	2014-12-05 20:55:19 +08:00
winlin	92ecdf088b	for bug #251, use macro to define the fast cache and cond wait. 2.0.58	2014-12-05 18:47:17 +08:00
winlin	cd317859db	add mw sleep time and msgs/iovs table.	2014-12-05 17:07:27 +08:00
winlin	9ee138746f	for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57	2014-12-05 16:44:11 +08:00
winlin	dde05c6315	for bug #251, refine the send use cond wait.	2014-12-05 14:38:43 +08:00
winlin	4c1d5c0d1e	refine the log for mw and mr. 2.0.55	2014-12-05 11:31:06 +08:00
winlin	fad6074a25	set send socket buf. mw/mr sleep default to 350.	2014-12-05 11:24:05 +08:00
winlin	4d1c162ebd	fix utest failed bug.	2014-12-04 22:28:33 +08:00
winlin	4c6cf959c1	refine fast buffer, check available bytes to read.	2014-12-04 22:10:05 +08:00
winlin	98647d6e67	limit the user-space buffer size to 128KB, 128MB for 1k publishers.	2014-12-04 22:00:09 +08:00
winlin	76af04c55d	refine the recv buffer for mr.	2014-12-04 21:50:23 +08:00
winlin	09101b8d5e	remove the increase timeout for read, for there is no small timeout.	2014-12-04 21:39:42 +08:00
winlin	279b4ff4c9	refine macros	2014-12-04 21:37:04 +08:00
winlin	b1d7fbe668	fix #241, add mw(merged-write) config. 2.0.53	2014-12-04 21:35:13 +08:00
winlin	72fa33d9fb	update performance to 4k, when mr_sleep to 2000ms. 2.0.52	2014-12-04 18:46:08 +08:00
winlin	f1192a8302	fix bug for bug #241, default to 32k for socket buffer.	2014-12-04 18:35:50 +08:00
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	2014-12-04 18:21:04 +08:00
winlin	57f844b636	for bug #249, simplify the macro, 0 to disable chunk stream cache.	2014-12-04 15:49:24 +08:00
winlin	159ef3823c	for bug#241, simplify the buffer, donot realloc it.	2014-12-04 15:45:25 +08:00
winlin	a23b5b9a4b	for bug#241, simplify the buffer, donot change its size.	2014-12-04 15:43:37 +08:00
winlin	d026861e23	for bug #241, simplify the buffer, donot reset when chunk size change.	2014-12-04 15:35:39 +08:00
winlin	4b09531e2f	for bug #241, simplify the merged read config macros.	2014-12-04 15:33:17 +08:00
winlin	f57801eb46	fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51	2014-12-04 14:58:40 +08:00
winlin	90992b31a3	for bug #194, add the send macro to performance.	2014-12-04 13:54:02 +08:00
winlin	60bc9c2aa0	add performance header to control options for performance. 2.0.50	2014-12-04 13:43:55 +08:00
winlin	29324fab46	fix #248, improve about 15% performance for fast buffer. 2.0.49	2014-12-04 13:05:13 +08:00
winlin	8423974e3b	for bug #248, rename SrsBuffer to SrsFastBuffer.	2014-12-04 11:32:32 +08:00
winlin	0ea8cd9e84	for bug #248, use simple buffer for http.	2014-12-04 11:29:47 +08:00
winlin	2cb8b7dd52	for bug #248, use simple buffer for hls.	2014-12-04 11:27:07 +08:00
winlin	315f981821	refine for bug #241, increase the small bytes for merged read.	2014-12-04 09:10:57 +08:00
winlin	d1d6023c70	for bug #241, limit the buffer for input chunk size.	2014-12-03 23:11:13 +08:00
winlin	5791ed59fd	for bug #241, refine the socket max buffer.	2014-12-03 23:05:42 +08:00
winlin	4785f882d4	for bug #241, refine the max buffer and kbps.	2014-12-03 22:51:19 +08:00
winlin	850946bb13	for bug #241, calc the small and sleep for merged read.	2014-12-03 22:39:25 +08:00
winlin	aee00877df	for bug #241, change buffer size when chunk size changed.	2014-12-03 21:46:47 +08:00
winlin	f35ec2155b	for bug #241, support merged read. 2.0.48	2014-12-03 19:27:27 +08:00
winlin	adf95d239e	refine code, move the ISrsBufferReader to srs_protocol_io	2014-12-03 19:09:59 +08:00
winlin	ea0e837cd6	move the srs_kernel_buffer to srs_protocol_buffer.	2014-12-03 18:56:09 +08:00
winlin	2fdf994350	for bug #241, use heap to alloc the socket buffer.	2014-12-03 14:27:36 +08:00
winlin	6cbf732e1a	for bug #237, thread donot sleep when timeout is 0.	2014-12-03 14:25:02 +08:00
winlin	c457364321	for bug #237, add name for thread. 2.0.47	2014-12-03 14:05:15 +08:00
winlin	787ab674e3	fix #244, conn thread use cond to wait for recv thread error. 2.0.47.	2014-12-03 12:08:29 +08:00
winlin	565f29ed6c	Revert "for bug #241, merge big chunks for publish, no use." ... This reverts commit 6b57597718.	2014-12-02 22:26:20 +08:00
winlin	6b57597718	for bug #241, merge big chunks for publish, no use.	2014-12-02 22:26:04 +08:00
winlin	463e1fbc41	for bug #237, refine the thread loop for publish thread. 2.0.47	2014-12-02 19:28:36 +08:00
winlin	24a6a723ee	for bug #237, never sleep when thread interval is 0.	2014-12-02 19:22:06 +08:00
winlin	6f963b50f3	refine code, publish recv thread sleep 697ms	2014-12-02 18:19:01 +08:00
winlin	e9712cc627	refine recv thread, donot set auto response for publish recv thread. 2.0.46	2014-12-02 17:16:20 +08:00
winlin	5905e5c050	merge from 1.0release, traverse the token before response connect. 2.0.45.	2014-12-02 15:41:54 +08:00
winlin	757cffbabf	for bug #237, when recv thread failed, quit the cycle. 2.0.44	2014-12-02 15:21:08 +08:00
winlin	b28dc7364e	refine the srs-librtmp, add hijack get the object.	2014-12-02 14:02:28 +08:00
winlin	a94dbecdc4	refine macro of srs-librtmp. 2.0.43	2014-12-02 13:41:41 +08:00
winlin	9387d09f5f	refine the macros for windows of srs-librtmp	2014-12-02 13:38:30 +08:00
winlin	15ae4745f4	add macro to disable log.	2014-12-02 13:21:26 +08:00
winlin	07d55010fe	remove the free bytes api of srs-librtmp. use system default is ok.	2014-12-02 13:03:25 +08:00
winlin	f6032ffe6b	always use system log and context. allow hijack the human print macro.	2014-12-02 12:51:07 +08:00
winlin	3584bdb7b6	srs-librtmp support hijack io apis for st-load. 2.0.42.	2014-12-02 12:19:17 +08:00
winlin	29c6014192	refs #1670: fix the bug for bug #237, use us and ms timeout.	2014-12-02 10:40:21 +08:00
winlin	af83e18d7e	update the README for 1.5k publishers. 2.0.41	2014-12-02 07:27:20 +08:00
winlin	472b1742a2	for bug #237, use isolate thread to recv message. 2.0.41	2014-12-01 23:38:51 +08:00
winlin	0e7836868c	for bug #235, refine the queue recv thread.	2014-12-01 22:53:03 +08:00
winlin	0b631ee80d	for bug #235, pass timeout to recv thread.	2014-12-01 22:45:45 +08:00
winlin	31eb9bf1c1	for bug #237, extract a queue recv thread.	2014-12-01 22:39:22 +08:00
winlin	22524f390a	rename the recv thread to queue recv thread for bug #237.	2014-12-01 22:23:05 +08:00
winlin	1847c5fef7	ignore the actual length of share key. 2.0.40	2014-12-01 22:09:09 +08:00
winlin	d171a26758	disable gop cache when not h.264. fix some warning.	2014-12-01 21:34:35 +08:00
winlin	c5dd334645	fix the warning of ts_info	2014-12-01 20:54:19 +08:00
winlin	47b4b694be	add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39.	2014-12-01 10:58:17 +08:00
winlin	3e521d317d	update upp dir to srs.	2014-11-30 16:54:57 +08:00
winlin	b4057916b6	add qt project file. fix cmake file for clion.	2014-11-30 16:06:37 +08:00
winlin	efb73c5487	fix #235, refine handshake, replace union with template method. 2.0.38.	2014-11-29 18:41:14 +08:00
winlin	abb0fce3d8	fix bug for utest of message array, it does not free messages now.	2014-11-29 18:36:40 +08:00
winlin	23f4aa5737	for bug #235, fix bug of utest.	2014-11-29 18:33:43 +08:00
winlin	e167c97786	for bug #235, fix the return code bug.	2014-11-29 18:16:15 +08:00
winlin	818000dd18	for bug #235, use constructor and destructor for block and digest.	2014-11-29 18:10:33 +08:00
winlin	b32d3fb6aa	remove the read and write with SrsStream.	2014-11-29 17:58:40 +08:00
winlin	6d49cddc9d	for bug #235, refine code order of c1s1 and c2s2	2014-11-29 17:05:54 +08:00
winlin	646d6f6673	for bug #235, refine schema0 and schema1, extract dup code.	2014-11-29 17:04:24 +08:00
winlin	4b9875e279	for bug #235, use strategy to implements the schema0 and schema1.	2014-11-29 16:17:07 +08:00
winlin	5d883e2e29	for bug #235, move functions of block and digest to struct.	2014-11-29 13:08:43 +08:00
winlin	ff5cdb1cc1	for bug #215, add srs_rtmp_dump tool. 2.0.37.	2014-11-28 12:26:36 +08:00
winlin	7f121efd7a	merge from allspace srs-librtmp for win vs2010. 2.0.36	2014-11-28 10:33:36 +08:00
winlin	14fca601f9	merge from 1.0 hotfix. 3.0.35	2014-11-27 18:50:54 +08:00
winlin	03f72fb1a6	for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34	2014-11-27 18:39:02 +08:00
winlin	eb4e7aad69	try to build srs-librtmp on vs2010, failed.	2014-11-27 18:20:13 +08:00
winlin	904a06cadf	Merge branch '1.0release'	2014-11-27 17:47:23 +08:00
winlin	4c0c3a9ada	refine merged code for allspace.	2014-11-27 15:29:24 +08:00
winlin	468941833c	change srs version to 2.0.33	2014-11-27 15:23:16 +08:00
winlin	18c308248e	refine code by winlin, for merged from allspace.	2014-11-27 15:22:39 +08:00
winlin	1855c9429c	merge from allspace, to srs-librtmp, for vs2010	2014-11-27 14:46:05 +08:00
winlin	e7ccbce472	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.	2014-11-25 10:41:55 +08:00
winlin	e492fa5353	fix #212, support publish aac adts raw stream. 2.0.31.	2014-11-24 16:28:52 +08:00
winlin	3d97048c3a	fix bug #217, add reuse conn to play different player.	2014-11-22 19:15:40 +08:00
winlin	3e81e6e0f1	refine code for bug #217, use recv thread to set the timeout.	2014-11-22 18:08:45 +08:00
winlin	58136ec178	fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30.	2014-11-22 17:58:02 +08:00
winlin	622218c4dd	for bug #217, use isolate thread to improve 17% performance.	2014-11-22 15:53:05 +08:00
winlin	d3c770d252	refine librtmp, add audio video detail.	2014-11-21 17:09:52 +08:00
winlin	d80b580c2f	refine librtmp, remove the _get_ for some attribute get.	2014-11-21 16:08:29 +08:00
winlin	bb7a19636a	fix the bandwidth file name bug.	2014-11-21 14:30:01 +08:00
winlin	2a9bec3d89	adjust the api, move audio and h264 after rtmp	2014-11-21 14:26:47 +08:00
winlin	aa69f6197a	srs-librtmp add rtmp prefix for rtmp apis. 2.0.29	2014-11-21 14:18:50 +08:00
winlin	180106ce70	refine librtmp, move the utils and human to end section.	2014-11-21 14:11:53 +08:00
winlin	10bc5399ec	refine librtmp api, add prefix utils for utilities.	2014-11-21 14:09:17 +08:00
winlin	b3bb2cdf2b	refine code, rename the human functions to prefixed with srs_human_	2014-11-21 14:03:30 +08:00
winlin	30e7c38a48	refine code, add human readable section	2014-11-21 13:56:09 +08:00
winlin	d9474d7600	refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28.	2014-11-21 13:48:57 +08:00
winlin	a058eeeb20	fix #212, support publish audio raw frames. 2.0.27	2014-11-20 13:36:14 +08:00
winlin	d6072b16c0	support compile srs-librtmp on windows. 2.0.26	2014-11-19 16:16:04 +08:00
winlin	5f48d4f566	refine comments for SrsMessageArray. 2.0.25	2014-11-19 10:44:50 +08:00
winlin	df35f75df1	refine response call, 2.0.24	2014-11-18 17:55:38 +08:00
winlin	749fac414b	refine code, donot response call when transaction id is zero.	2014-11-18 17:30:40 +08:00
winlin	fbcb63f775	v2.0, 2014-11-18, all wiki translated to English. 2.0.23.	2014-11-18 13:40:58 +08:00
winlin	9f60a6738a	add comments for listen	2014-11-17 10:27:05 +08:00
winlin	2c601a0069	fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22.	2014-11-15 16:53:24 +08:00
winlin	b4269c8d67	refine name of srslibrtmp, raw_stream to h264_raw_stream	2014-11-15 16:31:42 +08:00
winlin	278ff845d3	fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21.	2014-11-15 16:30:37 +08:00
winlin	ecfbcd68d8	refine srslibrtmp, rename flv_bool to srs_flv_bool	2014-11-15 16:07:33 +08:00
winlin	3292136f70	update research, flv ingester, support atc time flv.	2014-11-15 15:27:19 +08:00
winlin	bb5e99f562	fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20.	2014-11-15 14:29:25 +08:00
winlin	7ebca6cb5b	refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19	2014-11-15 13:20:58 +08:00
winlin	47ed9e33dd	refine code for bug #194, use send messages for all msg array.	2014-11-14 11:24:49 +08:00
winlin	f11272e3ce	add comments for bug #194, #196	2014-11-13 17:29:56 +08:00
winlin	38a683192a	fix typo	2014-11-13 17:04:13 +08:00
winlin	f2f02b06d5	for bug #194, refine code, to 2.0.17	2014-11-13 16:56:59 +08:00
winlin	8845bb7caf	for bug #194, refine code, remove the old duplicated code.	2014-11-13 16:56:41 +08:00
winlin	62719c2b12	for bug #200, fix the writev for librtmp, add comments.	2014-11-13 14:38:23 +08:00
winlin	0bc35e093c	for bug #200, deadloop when read/write 0 and ETIME. 2.0.16.	2014-11-13 14:30:56 +08:00
winlin	77cf885d8c	add comments for #161	2014-11-13 13:49:50 +08:00
winlin	4af2e78c59	refine code for bug #194, add comments to macros.	2014-11-13 12:45:54 +08:00
winlin	cc6aca9ad5	fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15.	2014-11-13 12:25:56 +08:00
winlin	7cf855f242	for bug #199, refine the header generate	2014-11-12 18:41:24 +08:00
winlin	953159258c	refine code, rename the c0c3 header cache and iov cache.	2014-11-12 18:19:09 +08:00
winlin	ab93506b01	for bug #199, refine the api of send message.	2014-11-12 17:59:32 +08:00
winlin	d257360e96	add comments about bug #196	2014-11-12 13:46:21 +08:00
winlin	8acd143a7a	fix #194: refine the timeout recv, pulse to 500ms. 2.0.14.	2014-11-12 12:59:53 +08:00
winlin	a6f3478a74	for bug #194, remove the poll, it's no-use	2014-11-12 10:26:48 +08:00
winlin	bc1b5f4bbf	for bug #194, disable the srs fd poll.	2014-11-12 10:05:42 +08:00
winlin	4f21e92ae0	fix the message of config for max_connections.	2014-11-11 18:49:27 +08:00
winlin	21f16f3a83	for bug #194, use play fd poll to improve performance, it works.	2014-11-11 18:46:35 +08:00
winlin	164f632b62	for bug #194, add fds poll, just sleep to send without recv.	2014-11-11 18:35:46 +08:00
winlin	133cc62b51	for bug #194, use play fd poll, create the singleton poll	2014-11-11 17:54:02 +08:00
winlin	efc85ed6df	refine config, check the connections more precise	2014-11-11 17:19:56 +08:00
winlin	de5e2d0a40	Revert "Revert "for bug #194, refine the config"" ... This reverts commit b4c1d55311.	2014-11-11 17:12:45 +08:00
winlin	b4c1d55311	Revert "for bug #194, refine the config" ... This reverts commit 2a55ae4317.	2014-11-11 17:05:36 +08:00
winlin	e87eacd499	Revert "add srs pipe for bug #194" ... This reverts commit f9756ea14c.	2014-11-11 17:05:25 +08:00
winlin	73abb1a31d	Revert "for bug #194, add pipe to consumer." ... This reverts commit 1e601a6efc.	2014-11-11 17:04:56 +08:00
winlin	306f75b267	Revert "for bug#194, open pipe for each connection." ... This reverts commit ade81bb244.	2014-11-11 17:04:32 +08:00
winlin	ade81bb244	for bug#194, open pipe for each connection.	2014-11-11 16:41:39 +08:00
winlin	1e601a6efc	for bug #194, add pipe to consumer.	2014-11-11 16:27:35 +08:00
winlin	f9756ea14c	add srs pipe for bug #194	2014-11-11 16:09:44 +08:00
winlin	2a55ae4317	for bug #194, refine the config	2014-11-11 15:38:21 +08:00
winlin	36d12dd8ea	for bug #194, change server main cycle to 1s.	2014-11-11 14:41:48 +08:00
winlin	8cc9a11b81	for bug #194, set the server main cycle to 1s	2014-11-11 14:38:54 +08:00
winlin	46330dd196	fix #195: remove the confuse code st_usleep(0). 2.0.13.	2014-11-11 13:40:09 +08:00
winlin	606fc13a03	rename the confict macro to srs_lib_trace	2014-11-08 18:37:15 +08:00
winlin	3405f35d06	fix #191: configure --export-librtmp-project and --export-librtmp-single. 2.0.11.	2014-11-08 18:33:15 +08:00
winlin	e62c3a4e0e	for bug #66, clear the sps and pps.	2014-11-08 16:59:42 +08:00
winlin	926650840e	fix #191, configure --export-librtmp. 2.0.10.	2014-11-08 16:45:50 +08:00
winlin	cf5c24af4a	refine librtmp, unify all tools format and usage.	2014-11-08 14:00:59 +08:00
winlin	6de83db76e	refine srs-librtmp log macro	2014-11-08 13:41:47 +08:00
winlin	f92303c764	refine all research tools, remove the public header, add log to srs_librtmp.h	2014-11-08 13:35:38 +08:00
winlin	7ba07c6f49	refine librtmp, add example to api.	2014-11-08 13:16:56 +08:00
winlin	106bef802f	fix #66, srs-librtmp support write h264 raw packet. 2.0.9.	2014-11-08 12:36:00 +08:00
winlin	3358570be6	refine for bug#66, implements the usage.	2014-11-08 10:44:00 +08:00
winlin	0075779d38	for bug #66, refine the api to send h264 frames.	2014-11-08 10:28:59 +08:00
winlin	cd5c58ba5f	for bug #66, refine the api and demo.	2014-11-08 09:21:09 +08:00
winlin	1074c8d9b2	for bug #66, use new api to directly sendout h264 raw data.	2014-11-08 09:12:52 +08:00
winlin	496f4246f4	complete the h264 to rtmp, but the sps and pps should send in a rtmp packet. for bug #66	2014-11-07 23:55:00 +08:00
winlin	72ad6894ca	move the annexb decode utility to protocol.	2014-11-07 23:07:31 +08:00
winlin	bd25626f0e	refine code for bug #66	2014-11-07 22:36:25 +08:00
winlin	955859ce82	refine librtmp, add pefix to srs_amf0_number and srs_amf0_bool	2014-11-07 22:15:56 +08:00
winlin	1c237a821a	add api convert h264 to rtmp packet, for bug #66	2014-11-07 22:06:30 +08:00
winlin	b964a6c534	update for bug #66, add the srs-librtmp sample for publish h.264 raw stream.	2014-11-07 21:06:44 +08:00
winlin	5fd308c64e	update code, warning when compile dev branch.	2014-11-06 15:18:10 +08:00
winlin	fa53250202	refine the macro, use int as version type. 2.0.8	2014-11-06 14:23:08 +08:00
winlin	6a3418cd45	fix #185, AMF0 support 0x0B the date type codec. 2.0.5.	2014-10-25 17:12:56 +08:00
winlin	05cce97140	for bug #186, read the args when discovery it. 2.0.6	2014-10-24 13:23:52 +08:00
winlin	7d70864b33	for bug #186, read the args when discovery it. 2.0.6	2014-10-24 13:16:08 +08:00
winlin	59f68a2655	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:35:06 +08:00
winlin	b65dfd718a	add comments for the RTMP packet fields, NULL or never NULL. 2.0.5	2014-10-24 10:58:06 +08:00
winlin	1bfc238fec	hotfix for bug #186, drop connect args when not object. 2.0.4.	2014-10-24 10:35:40 +08:00
winlin	a169262099	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 10:00:23 +08:00
winlin	e46e7fc596	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:58:53 +08:00
winlin	57e8356221	fix #184, support AnnexB in RTMP body for HLS. 2.0.2	2014-10-19 19:42:27 +08:00
winlin	d24e2fd0cc	remove supports for OSX. 2.0.1.	2014-10-18 13:58:23 +08:00
winlin	5f29935623	update master to 2.0, because the 1.0release branch is created. 2.0.0	2014-10-09 17:40:43 +08:00
winlin	967de9d2e7	for bug #159: postpone the http server bug to 2.0+	2014-09-30 16:34:46 +08:00
winlin	67188dcee7	remove the test code of main.	2014-09-30 16:28:59 +08:00
winlin	2048fbf731	refine code, add bug #160 for big chunk size.	2014-09-30 15:07:24 +08:00
winlin	f3002144fc	fix #180: crash for multiple edge publishing the same stream. 0.9.220.	2014-09-30 11:21:46 +08:00
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	2014-09-28 11:08:30 +08:00
winlin	e0b1e044de	add stub code for bug #180, check complex handshake.	2014-09-27 14:18:02 +08:00
winlin	63c9ad272c	fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid. 0.9.217	2014-09-27 13:15:00 +08:00
winlin	624ab86fa2	fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid.	2014-09-27 13:14:46 +08:00
winlin	bcd1b3d2d4	refine code, remove unused code of dvr.	2014-09-27 13:02:16 +08:00
winlin	20ebf68ea5	fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216.	2014-09-26 17:47:43 +08:00
winlin	002facb85b	refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215	2014-09-26 16:34:13 +08:00
winlin	4a323e64c4	add openssl for cmake.	2014-09-26 14:03:29 +08:00
winlin	2d7f5ddcbf	add cmakelists.txt for cmake for clion of jetbrains. 0.9.214	2014-09-26 11:05:45 +08:00
winlin	83f266b9e2	fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213.	2014-09-25 10:59:29 +08:00
winlin	87aac3ddd4	refine log, add features for macro. 0.9.212	2014-09-23 16:53:12 +08:00
winlin	1d454cd5fb	add bug for http-mp4.	2014-09-16 15:56:46 +08:00
winlin	9dd0939327	fix the bug for gmc. 0.9.211	2014-09-10 14:59:20 +08:00
winlin	61728118ab	donot destroy the source and connections of gmc.	2014-09-10 14:58:19 +08:00
winlin	79938f3214	add comments for gmc.	2014-09-10 10:19:48 +08:00
zhengfl	c2ac11201b	amendment srs_verbose info in the get_peer_ip	2014-08-28 04:18:06 +08:00
winlin	901c9590e4	refine log, log important to file. 1.0.210	2014-08-29 15:07:04 +08:00
winlin	728b749384	fix #167, add openssl includes to utest. 0.9.209.	2014-08-28 13:32:13 +08:00
winlin	53011808fb	add sysctl vm.max_map_count for mmap.	2014-08-27 13:47:56 +08:00
winlin	d0c585af86	max connections is 32756, for st use mmap default. 0.9.209	2014-08-27 13:31:39 +08:00
winlin	839101a036	reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro.	2014-08-27 12:28:05 +08:00
winlin	42a43c69cd	fix #150, forward should forward the sequence header when retry. 0.9.208.	2014-08-24 22:34:38 +08:00
winlin	9b6187c3d5	fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.207.	2014-08-22 13:10:11 +08:00
winlin	cb311d998e	fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.206.	2014-08-22 12:47:50 +08:00
winlin	01ae8c4787	refine the handshake random data, fill with value in [0x0f, 0xf0], 0.9.205	2014-08-21 09:48:19 +08:00
winlin	4d5414faec	update log, add dsu(debug_srs_upnode), 0.9.204	2014-08-19 16:32:52 +08:00
winlin	f549f88ed8	for bug #162, add conf and connections limit. 0.9.203	2014-08-19 15:53:13 +08:00
winlin	e656a65b6c	for bug #162, add conf and connections limit.	2014-08-19 15:52:59 +08:00
winlin	ab965655aa	refine forwarder, add tracable debug info. 0.9.202	2014-08-19 11:54:33 +08:00
winlin	e9e0cd757c	fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201.	2014-08-19 10:59:59 +08:00
winlin	c24e68dd70	refine the stat, use one ok. 1.0.200	2014-08-18 14:39:42 +08:00
winlin	6103b1c3ce	refine options, add --with-stat. 0.9.199	2014-08-17 22:11:43 +08:00
winlin	3111870316	for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198.	2014-08-17 20:38:51 +08:00
winlin	5e4dad210a	build openssl for osx, for bug #155.	2014-08-17 19:12:12 +08:00
winlin	cf7504826b	fix reload ingest bug, remove when disabled. 0.9.196	2014-08-16 19:59:14 +08:00
winlin	08bc34e0df	refine wiki, cluster to forward.	2014-08-14 16:33:26 +08:00
winlin	b15ee26a48	fix the ssl dh key size assert error, key size maybe 127, not always 128. 0.9.195	2014-08-13 18:09:35 +08:00
winlin	67ab0fb5e0	add comments for openssl key generator assert.	2014-08-13 10:58:53 +08:00
winlin	aefcaa9683	refine code, add install root message	2014-08-12 11:06:00 +08:00
winlin	b317abbaee	refine openssl, add compute_key, for bug #148	2014-08-08 13:34:50 +08:00
winlin	d4c2aa1e8e	add __openssl_compute_key to calc the shared key	2014-08-08 11:34:17 +08:00
winlin	7adbe7f456	fix utest build failed, sync with src changed.	2014-08-08 10:47:55 +08:00
winlin	ad2c996bd8	refine HMAC sha256 digest algorithm. 0.9.193	2014-08-08 09:57:36 +08:00
winlin	12ad95a5b8	refine HMAC sha256 digest algorithm. 0.9.193	2014-08-08 09:54:33 +08:00
winlin	156a9ed2a3	change to 0.9.192.	2014-08-07 14:43:03 +08:00
winlin	1ebaab2c6e	fix #148, simplify the RTMP handshake key generation. 0.9.191.	2014-08-06 15:45:40 +08:00
winlin	a9d28122f4	refine code, refine the handshake, refine the log of source_id	2014-08-06 13:57:55 +08:00
winlin	5b28355a0b	fix #147, support identify the srs edge. 0.9.190.	2014-08-06 09:57:30 +08:00
winlin	3532b61e3d	open all utest macro	2014-08-05 09:16:45 +08:00
winlin	798f9139a4	add reload utest.	2014-08-05 09:16:25 +08:00
winlin	33bc8755ab	refine code, add comments for ossrs.net monitor.	2014-08-04 10:50:28 +08:00
winlin	67403bdbf1	fix #79, fix the reload remove edge assert bug. 0.9.189.	2014-08-03 21:50:48 +08:00
winlin	ade2376da0	fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188.	2014-08-03 21:22:40 +08:00
winlin	6dd065bcc3	fix #85, fix the segment-dvr sequence header missing. 0.9.187.	2014-08-03 20:27:57 +08:00
winlin	5a95d594e7	fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186.	2014-08-03 13:06:37 +08:00
winlin	d5ba529d32	fix #143, fix retrieve sys stat bug for all linux. 0.9.185.	2014-08-03 10:42:01 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	84450e1588	fix #138, fix http hooks bug, regression bug. 0.9.184.	2014-08-02 19:24:49 +08:00
winlin	721acc350a	fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183.	2014-08-02 09:54:21 +08:00
winlin	d5f03200a7	revert tcp stat. need more refine. 0.9.182	2014-08-01 23:08:52 +08:00
winlin	f7fdbe6848	update get connections thread to sleep 10ms per 1000 connectios. 0.9.181	2014-08-01 22:52:40 +08:00
winlin	15d4993cc3	slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180	2014-08-01 22:43:12 +08:00
winlin	6539ce69f4	fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.	2014-07-31 10:39:39 +08:00
winlin	f0ffdcc0ae	fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.	2014-07-31 10:37:34 +08:00
winlin	79c641e8d6	remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178	2014-07-30 10:00:23 +08:00
winlin	792a6f944f	refine utility of cpu, add comment for cpu percent	2014-07-28 13:51:54 +08:00
winlin	c16d3585a5	refine utility of cpu, add comment for cpu percent	2014-07-28 13:41:27 +08:00
winlin	e37f312f27	refine the code for ios build. add authors StevenLiu. 0.9.177	2014-07-27 21:56:44 +08:00
winlin	b198d17ab9	Merge pull request #135 from T-bagwell/master ... Support porting srs on MacOS OSX system Platform	2014-07-27 21:07:37 +08:00
Steven Liu	b50ecd6dbe	Support porting srs on MacOS OSX system Platform ... Add the OSX platform cross complie options into srs	2014-07-27 19:32:12 +08:00
winlin	9c11001391	refine log for stats network and disk	2014-07-27 19:03:56 +08:00
winlin	6f700f3f40	rename network_device_index to network	2014-07-27 18:40:32 +08:00
winlin	f4ea48adcb	rename network_device_index to network	2014-07-27 18:39:20 +08:00
winlin	b8ae5c63fc	add disk io test command	2014-07-27 18:05:54 +08:00
winlin	42464cbe1f	add disk io test command	2014-07-27 17:59:19 +08:00
winlin	4f4b15f500	refine the disk iops stat, get cpu info.	2014-07-27 17:46:31 +08:00
winlin	ef7a02e643	refine the disk io busy, can >1	2014-07-27 17:23:07 +08:00
winlin	df8414af63	api connections add udp, add disk iops. 0.9.176	2014-07-27 17:16:04 +08:00
winlin	b334021836	add config item for the stat disk device name	2014-07-27 16:52:00 +08:00
winlin	7c1dd97513	refine system stat, use fgets and sscanf.	2014-07-27 16:34:08 +08:00
winlin	a7a009212b	refine the cpu stat, use fgets and sscanf.	2014-07-27 16:21:11 +08:00
winlin	f53bfcea54	add udp stat to nb_conn_sys as nb_conn_sys_udp	2014-07-27 15:43:43 +08:00
winlin	e5e0c4a68d	refine the utest, add stats	2014-07-27 15:00:52 +08:00
winlin	e76036f40b	refine config heartbeat, add new stats. 0.9.175	2014-07-27 14:43:55 +08:00
winlin	02f7c85710	add total system in and out KBps disk stat. 0.9.174	2014-07-27 14:04:22 +08:00
winlin	d2f125b6d6	refine the cpu usage calc, add total_delta.	2014-07-27 12:47:31 +08:00
winlin	d0bc0884d1	refine rtmp client, add comments for the dumps_packets()	2014-07-27 11:57:08 +08:00
winlin	a645b403c8	add comments for utility, the USER_HZ for /proc/stat	2014-07-27 11:44:48 +08:00
winlin	6d9d9ee3c5	updte forwarder comments	2014-07-26 20:17:03 +08:00
winlin	6ee9ea341a	refine code, rename SrsSocket to SrsStSocket	2014-07-26 20:08:37 +08:00
winlin	b19d2e8e2d	refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp	2014-07-26 20:07:12 +08:00
winlin	13abb0d768	complete config utest. 0.9.173	2014-07-26 19:57:32 +08:00
winlin	a35d403651	add utest for config check	2014-07-26 17:14:14 +08:00
winlin	fbddfbc8a3	fix #134, not fix for the shrink to clear the queue.	2014-07-26 16:35:12 +08:00
winlin	b10d95205a	fix #134, not fix for the shrink to clear the queue.	2014-07-26 16:32:28 +08:00
winlin	30ebba0673	add config check utest	2014-07-26 15:54:40 +08:00
winlin	ebf9e560b1	refine the max connections, compare the system ulimit max open files, error when exeed limit	2014-07-26 15:34:45 +08:00
winlin	5f7ff37e64	fix the utest mock config bug	2014-07-26 15:03:07 +08:00
winlin	9f2da4e095	refine log, can be used when _srs_config is NULL.	2014-07-26 14:58:33 +08:00
winlin	7241fa8744	fix #126, srs_publiser add warnings. refine config utest.	2014-07-26 14:43:37 +08:00
winlin	b17c736f3f	fix #124, gop cache support disable video in publishing. 0.9.171.	2014-07-26 12:22:39 +08:00
winlin	50cd1d2360	refine the config	2014-07-25 11:05:54 +08:00
winlin	7865b0e935	refine config, check chunk size.	2014-07-25 11:04:13 +08:00
winlin	630bdf0c80	refine config, check the value of http api/stream.	2014-07-25 10:54:36 +08:00
winlin	7207c2f435	refine config, check all config item name.	2014-07-25 10:44:04 +08:00
winlin	1c27f3b913	refine config, warning when feature disabled.	2014-07-25 09:38:48 +08:00
winlin	f562a98602	add configure options --log-verbose/info/trace to compile log macros. 0.9.169	2014-07-23 14:37:54 +08:00
winlin	fd8c4989f5	add todo fixme for log verbose and info	2014-07-23 11:24:32 +08:00
winlin	91d2296836	fix #121, srs_info detail log compile failed. 0.9.168.	2014-07-23 11:21:35 +08:00
winlin	2e58fac5eb	fix #122: edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167	2014-07-23 10:53:25 +08:00
winlin	b56e7ef7ab	complete main utest for config	2014-07-22 11:14:51 +08:00
winlin	2c9e16a9e7	add utest for config vhosts, transcode/dvr/hls	2014-07-22 11:01:20 +08:00
winlin	d612597a8f	refine log of edge push/pull	2014-07-21 15:30:44 +08:00
winlin	77236920b6	add config utest, for default vhost	2014-07-21 12:13:01 +08:00
winlin	f1b1dc0c64	add utest for config full.conf, fix the chunk-size bug	2014-07-21 10:50:08 +08:00
winlin	21f49a9875	add basic utest for config service	2014-07-20 17:44:20 +08:00
winlin	6e8c4df4b1	refine error codes.	2014-07-20 17:32:34 +08:00
winlin	0db2e6b8e9	fix the empty config error	2014-07-20 17:08:47 +08:00
winlin	75bfe2af78	refine the LF,CR	2014-07-20 16:19:26 +08:00
winlin	8cd9be4fce	add comments for LF,CR	2014-07-20 16:18:26 +08:00
winlin	c65a6b5d63	fix the conf_line bug of parse config directive.	2014-07-20 16:16:29 +08:00
winlin	86ad39f001	finish basic utest for config	2014-07-20 15:53:19 +08:00
winlin	9b6c22644d	add basic utest for config directive	2014-07-20 15:27:05 +08:00
winlin	6f743a2fe8	pass all utest	2014-07-20 13:48:24 +08:00
winlin	e47c0ae202	refine all consts	2014-07-20 13:46:36 +08:00
winlin	8497b22d4a	complete the consts refine	2014-07-20 13:45:54 +08:00
winlin	1afa6ed607	refine consts.	2014-07-20 13:42:29 +08:00
winlin	2667815123	refine consts, move http consts to kernel consts	2014-07-20 13:39:42 +08:00
winlin	c46b3bd193	refie http consts.	2014-07-20 13:37:30 +08:00
winlin	573952e2fc	refine macros of HTTP	2014-07-20 13:33:21 +08:00
winlin	198a7f1e9d	refine the rtmp consts name	2014-07-20 13:25:25 +08:00
winlin	a9f7f1ecfe	refine the consts to kernel consts	2014-07-20 13:23:45 +08:00
winlin	baa20b2f31	refine the config consts	2014-07-20 13:16:24 +08:00
winlin	736ec48c71	move some consts to kernel consts	2014-07-20 13:11:53 +08:00
winlin	073d900674	add consts to kernel	2014-07-20 13:04:48 +08:00
winlin	f8423dfa90	fix #119: use iformat and oformat for ffmpeg transcode.	2014-07-19 15:20:16 +08:00
winlin	9bf7b722db	fix #119: use iformat and oformat for ffmpeg transcode.	2014-07-19 10:54:38 +08:00
winlin	2f0a72d7d1	refine config, add comments	2014-07-18 12:12:25 +08:00
winlin	a5f4323ea8	refine config, add comments	2014-07-18 11:46:29 +08:00
winlin	b4e2d70390	refine config comments, return the engines of transcode.	2014-07-18 11:15:59 +08:00
winlin	2293700728	refine config, remove the const string&	2014-07-18 10:56:06 +08:00
winlin	1accd8c790	refine config, add comments.	2014-07-18 10:50:02 +08:00
winlin	f572531eca	refine config, return the vhosts vector.	2014-07-18 10:35:31 +08:00
winlin	96e0e699dd	refine the get port, return a vector<string> contains ports.	2014-07-18 10:21:34 +08:00
winlin	1243d962b8	update comments of utility	2014-07-17 17:10:32 +08:00
winlin	b37aeff8d5	refine config, check name	2014-07-17 12:07:01 +08:00
winlin	25180c51b4	refine the config comments.	2014-07-17 11:53:51 +08:00
winlin	1e8981eb08	extracta parse_buffer for config	2014-07-17 11:34:49 +08:00
winlin	784d7499cf	refine config, add error line log	2014-07-17 11:28:20 +08:00
winlin	9f7d488fa4	refine config, add comments.	2014-07-17 11:05:09 +08:00
winlin	f6b084b679	remove the reload create function.	2014-07-16 11:59:44 +08:00
winlin	f4ffe0aaee	refine config, move file buffer to internal namespace	2014-07-16 11:49:34 +08:00
winlin	654c3c6d71	refine server, add comments	2014-07-16 11:23:49 +08:00
winlin	88dc1523d8	refine code, add comments for bandwidth; remove the bwtc configure script test item.	2014-07-16 10:19:50 +08:00
winlin	7945a42770	refine code, add the video tag comments.	2014-07-16 10:05:41 +08:00
winlin	26bfbaeb82	refine code.	2014-07-16 09:39:36 +08:00
winlin	465ff88b1f	refine hls avc/aac codec, move metadata to it.	2014-07-16 09:37:27 +08:00
winlin	e50968f404	refine the hls codec, add comments.	2014-07-15 10:59:21 +08:00
winlin	a4d3283cdd	refine hls codec sample info. 0.9.161	2014-07-15 10:44:06 +08:00
winlin	f020690ed7	add comments for the FLV/RTMP enums	2014-07-15 10:08:15 +08:00
winlin	9860e390a3	refine code, for cubieboard to build ok.	2014-07-14 17:45:27 +08:00
winlin	d609fbc7ce	1.0.mainline6, core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines.	2014-07-13 20:39:31 +08:00
winlin	5c4398f4a9	refine bandwidth check/test, flash publish test is ok.	2014-07-13 20:25:36 +08:00
winlin	fd1e8aa882	remove src/main/srs_main_bandcheck.cpp, and --with-bwtc(use librtmp instead). 0.9.159	2014-07-13 19:42:06 +08:00
winlin	9135aa117c	use librtmp to implemnts the bandwidth linux tool. 0.9.158	2014-07-13 19:16:18 +08:00
winlin	cc62d254f0	add librtmp bandwidth check/test client.	2014-07-13 16:10:06 +08:00
winlin	5b714ba970	fix utest bug, when ssl disable, ignore complex handshake utest.	2014-07-13 13:47:46 +08:00
winlin	ccd99381e6	fix bug, when disable all, some code of HLS must be exported.	2014-07-13 13:42:08 +08:00
winlin	e53655ee83	refine the build script	2014-07-13 13:31:24 +08:00
winlin	0322dbbfb2	big refine code, add author to bandwidth test/check.	2014-07-13 12:09:26 +08:00
winlin	b33a61a8da	finish refine bandwidth check/test server-side.	2014-07-13 12:06:24 +08:00
winlin	0fb51413f4	refine bandwidth test, use function ptr.	2014-07-13 11:17:03 +08:00
winlin	539b595604	refine the bandwidth server-side, use kbps limit and sample. 0.9.157	2014-07-13 10:59:26 +08:00
winlin	e220596675	refine bandwidth server-side, use sample and kbps limit	2014-07-13 10:47:27 +08:00
winlin	79e7e2d6cc	refine bandwidth server-side, use bandwidth sample and kbps limit service	2014-07-13 10:33:18 +08:00
winlin	3a1b3dd142	fix bandwidth bug, config item interval to float.	2014-07-12 22:22:56 +08:00
winlin	c319cc6a40	refine bandwidth test client, provides js and as library	2014-07-12 20:48:03 +08:00
winlin	b1dd0218be	refactor bandwidth test, refactor the interface of bandwidth server object.	2014-07-12 15:55:39 +08:00
winlin	e2d273f493	do performance test, support 1.8k, improve 22%	2014-07-12 10:26:09 +08:00
winlin	047fb74889	refine rtmp client/server, add comments.	2014-07-12 09:01:34 +08:00
winlin	88c94193a3	rename rtmp_stack to stack. remove the global templte function to member function.	2014-07-12 08:47:47 +08:00
winlin	f7922e3823	refine protocol send. add utest for server auto response message	2014-07-12 07:41:52 +08:00
winlin	9556790a5e	finish utest of protocol stack. 0.9.156	2014-07-11 18:08:34 +08:00
winlin	8e27df4cf7	refine the protocol, add comments, add utest for empty packet	2014-07-11 14:57:20 +08:00
winlin	c4aec5705b	fix chunk header parse bug, add utest for basic/message header	2014-07-10 18:56:13 +08:00
winlin	c957fadcb1	refine recv message header, add comments, remove the fresh_packet variable which duplicated with first_chunk	2014-07-10 15:52:50 +08:00
winlin	d86e07b745	finish basic protocol utest, fix the bug of fmt11 length error.	2014-07-10 14:46:58 +08:00
winlin	54fda96f37	add utest for bug #98	2014-07-09 14:14:47 +08:00
winlin	2c3cb73ad6	update utest	2014-07-09 12:51:21 +08:00
winlin	7027a125f0	refine protocol, add comments. add utest for protocol bytes and timeout.	2014-07-09 12:04:40 +08:00
winlin	1e73ae4d47	refine RTMP protocol stack, rename buffer to in_buffer, change field pp/stream to local variables. 0.9.154	2014-07-06 20:59:23 +08:00
winlin	59dff7d268	add comments for RTMP protocol stack	2014-07-06 20:43:05 +08:00
winlin	2516e3c596	complete the comments of RTMP protocol.	2014-07-06 20:34:11 +08:00
winlin	c457eea692	add comments for all RTMP packets.	2014-07-06 20:26:05 +08:00
winlin	8c493e9896	fix #49, open the sample access by default.	2014-07-06 20:17:47 +08:00
winlin	2554836940	add comments for RTMP packets.	2014-07-06 20:17:02 +08:00
winlin	51f924c553	refine RTMP protocol stack, refine the packet encode/decode, remove class_name	2014-07-06 19:06:25 +08:00
winlin	b551056330	add comments of io interfaces.	2014-07-06 18:44:44 +08:00
winlin	09afaa250a	add comments of message array, add utest.	2014-07-06 18:37:48 +08:00
winlin	6a4b177475	refine shared ptr message, rename initialize to create	2014-07-06 18:23:14 +08:00
winlin	891bc3fe65	refine utility of protocol, add comments	2014-07-06 17:43:08 +08:00
winlin	96e0273e99	refine hls, extract the flv/aac sample rates	2014-07-06 17:32:48 +08:00
winlin	e5e2729967	refine amf0 and handshake code, add comments to utest.	2014-07-06 17:25:25 +08:00
winlin	574cd15efb	refine amf0, rename internal classes	2014-07-06 17:12:26 +08:00
winlin	c31c607ad3	refine amf0, move declarations from cpp to hpp, use namespace _srs_internal	2014-07-06 17:04:59 +08:00
winlin	d22e7cab0a	add comments to amf0	2014-07-06 16:51:07 +08:00
winlin	dc7b952043	change HLS audio delay to 100ms. 0.9.153	2014-07-06 14:28:05 +08:00
winlin	f895523ac6	fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152	2014-07-06 13:53:30 +08:00
winlin	21a75924ad	fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152	2014-07-06 13:48:03 +08:00
winlin	aefff75d08	fix #103, support all aac sample rate, add detail codec logs.	2014-07-06 09:59:41 +08:00
winlin	f53abfa1d1	update comments for aac he or he-v2	2014-07-05 23:56:05 +08:00
winlin	b2303c5704	refine code, use macro for hls resample audio	2014-07-05 23:45:43 +08:00
winlin	921b7d239f	refine code, use macro for hls resample audio	2014-07-05 23:43:28 +08:00
winlin	63214d0f2b	fix #81: support all aac sample rate, for instance, 48000. to 0.9.150	2014-07-05 23:29:45 +08:00
winlin	7805f7b12a	add prefix Protocol to AMF0 and Handshake utest	2014-07-05 21:30:11 +08:00
winlin	5a41b1b538	finish kernel utest. to 0.9.149	2014-07-05 21:22:20 +08:00
winlin	ad920915a2	merge handshake to protocol	2014-07-05 17:56:18 +08:00
winlin	b13fd5112b	merge buffer to kernel utest	2014-07-05 17:50:36 +08:00
winlin	1e395e7c10	add assert to flv.	2014-07-05 17:30:13 +08:00
winlin	95e73d0be1	remove the config log http api. 0.9.148	2014-07-05 13:02:50 +08:00
winlin	d219a7b67e	complete the normal kernel flv utest. 0.9.147	2014-07-05 11:10:42 +08:00
winlin	010eb09a30	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	2014-07-05 09:32:13 +08:00
winlin	8271bd657b	refine flv codec, rename fast encoder to flv vod stream decoder	2014-07-05 07:40:55 +08:00
winlin	032118581a	refine http/dvr/hls to use file reader/writer. 0.9.146	2014-07-05 07:33:18 +08:00
wenjiegit	d7454134c9	Update srs_app_hls.cpp ... for hls, srs should not allow player to cache m3u8 list. add #EXT-X-ALLOW-CACHE:NO to m3u8 file.	2014-07-04 09:53:50 +08:00
winlin	ba2e7bbf76	support create stream twice. 0.9.145	2014-06-30 22:13:42 +08:00
winlin	fb70602f93	fix #111, always use 31bits timestamp. 0.9.143.	2014-06-30 21:23:13 +08:00
winlin	0bd7d268e8	add mock for file reader/writer	2014-06-29 21:25:16 +08:00
winlin	a888e52df1	donot mix the read and write for librtmp	2014-06-29 17:17:50 +08:00
winlin	1eee4d25cf	refine the librtmp, open writer then reader.	2014-06-29 17:12:10 +08:00
winlin	1a7735182f	refine the file stream, to file reader and writer. 0.9.142	2014-06-29 17:05:26 +08:00
winlin	ed3f9f0a40	add core utest	2014-06-29 16:04:28 +08:00
winlin	f5f54e6008	add utest for kernel codec	2014-06-29 15:43:32 +08:00
winlin	492665e166	refine tcp client connect, extract to utility srs_socket_connect. 0.9.141	2014-06-29 14:39:56 +08:00
winlin	051c9e6268	refine the protocol utility, add utest, 0.9.140	2014-06-29 11:45:31 +08:00
winlin	55989b4bc8	remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139	2014-06-29 10:43:53 +08:00
winlin	cb2967c967	refine forward, use utility to generate the tcUrl	2014-06-29 10:32:52 +08:00
winlin	ee07210105	fix demo script, start nginx. fix warning of utest on ubuntu14	2014-06-29 10:03:29 +08:00
winlin	e6f524281c	support build on ubuntu14, 0.9.138	2014-06-29 09:11:28 +08:00
winlin	aad42d7941	fix ubuntu14 build warnings	2014-06-29 00:09:55 +08:00
winlin	bfeb24c52b	update call response, add comments.	2014-06-28 21:34:21 +08:00
winlin	fea8755719	response the call message with null. 0.9.137	2014-06-28 16:43:57 +08:00
winlin	53ad510766	add comments for the connection remove	2014-06-28 11:16:45 +08:00
winlin	a3f9aa7e1e	fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136	2014-06-28 10:57:58 +08:00
winlin	efed34301c	add virtual destructor to SrsRefer	2014-06-27 13:40:17 +08:00
winlin	b357504b1d	fix #109: fix the system jump time, adjust system startup time. 0.9.135	2014-06-27 13:35:28 +08:00
winlin	0cd0761508	fix time jitter zero algorithm bug, reset when timestamp overflow.	2014-06-26 10:13:43 +08:00
winlin	1970e18ed6	fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133	2014-06-25 17:14:11 +08:00
winlin	f173345e15	support report summaries in heartbeat. 0.9.132	2014-06-23 15:44:49 +08:00
winlin	db253bc76b	fix fms token traverse bug, always update the token by the latest valid client.	2014-06-23 11:18:55 +08:00
winlin	1ae3e6c64c	performance refine, support 3k+ connections(270kbps). 0.9.130	2014-06-22 20:01:25 +08:00
winlin	41857edaee	support edge token traverse, fix #104. 0.9.129	2014-06-21 12:39:04 +08:00
winlin	10953c9743	support token auth in connect args. 0.9.128	2014-06-21 11:41:00 +08:00
winlin	094d82bd06	add connections count to api summaries. 0.9.127	2014-06-19 18:49:05 +08:00
winlin	6ee2ba049b	add srs bytes and kbps to api summaries. 0.9.126	2014-06-19 15:28:05 +08:00
winlin	46611ac062	refine configure, add cubieboard. use IProtocolStatistic in kbps.	2014-06-19 11:22:24 +08:00
winlin	46c1367fe8	refine the protocol io reader writer arch.	2014-06-19 10:34:10 +08:00
winlin	b0e4dc8085	refine network bytes of summaries, remove the lo data.	2014-06-18 16:21:33 +08:00
winlin	d0b08d0d51	add network bytes to api summaries. 0.9.125	2014-06-18 16:13:02 +08:00
winlin	f893711499	fix #98: workaround for librtmp ping(fmt=1,cid=2 fresh stream).	2014-06-14 20:44:38 +08:00
winlin	3f9c23d834	fix #101: for ubuntu14 build error.	2014-06-14 16:24:15 +08:00
winlin	cbc1486688	refine message, add license	2014-06-14 14:19:19 +08:00
winlin	55b99c90c7	refine detect tool, support atc stream.	2014-06-11 14:16:44 +08:00
winlin	cccc483ab3	add bytes statistic for librtmp	2014-06-10 17:39:12 +08:00
winlin	a639eb0596	fix bug of buffer assert, erase can accept any value	2014-06-10 16:06:18 +08:00
winlin	d48d739fa7	fix bug of detect rtmp, add error code	2014-06-10 11:57:46 +08:00
winlin	8817823462	add rtmp detecter	2014-06-10 11:34:35 +08:00
winlin	ef6efb821c	add rtmp detecter	2014-06-10 10:40:31 +08:00
winlin	0327c85f85	refine kernel codec, remove unused stream	2014-06-09 10:33:35 +08:00
winlin	6286759eaa	refine codec, extract avc aac codec to app.	2014-06-08 22:36:17 +08:00
winlin	31b568b013	refine core, move specified functions to kernel utility.	2014-06-08 13:03:03 +08:00
winlin	7c7920698d	refine utest, move the mock io to handshake where actually use it.	2014-06-08 12:29:05 +08:00
winlin	94cf0c1069	refine kernel buffer. complete the utest for buffer.	2014-06-07 22:23:17 +08:00
winlin	8992e217a9	refine srs buffer, min interfaces	2014-06-07 21:09:46 +08:00
winlin	e6c03c6d6d	complete the amf0 strict array utest	2014-06-07 20:40:02 +08:00
winlin	5a06909d75	update amf0 strict array test, fix bug of count zero init	2014-06-07 20:01:11 +08:00
winlin	373f92551d	refine librtmp, remove the ssl functoins, refine the type2string memory alloc to static	2014-06-07 13:44:46 +08:00
winlin	7166b666c8	refine http log.	2014-05-30 09:20:51 +08:00
winlin	5273509554	refine log, to 0.9.123	2014-05-29 14:16:34 +08:00
winlin	7ec202ee41	support flv inject and flv http streaming with start=bytes. 0.9.122	2014-05-29 12:09:26 +08:00
winlin	d56f445076	remove research flv codec, to librtmp	2014-05-28 19:02:18 +08:00
winlin	22968c85df	supprt inject flv	2014-05-28 19:01:47 +08:00
winlin	4970664e37	move codec to kernel.	2014-05-28 17:37:15 +08:00
winlin	608083d42f	add flv injecter, add flv codec to librtmp.	2014-05-28 15:37:06 +08:00
winlin	6de81fdb1c	refine fast id tracer	2014-05-27 19:34:18 +08:00
winlin	978e985519	fix #87: add source id for full trackable log. 0.9.120	2014-05-27 19:18:31 +08:00
winlin	8d99ef27cf	fix #84: unpublish source when edge stop, clear gop cache	2014-05-27 17:59:59 +08:00
winlin	7920348e5f	extract get_local_ip and get_peer_ip to app utility	2014-05-27 16:45:02 +08:00
winlin	e39eed6519	add SrsPid and SrsId to client response, add pid to log	2014-05-27 16:11:25 +08:00
winlin	5ff1ce7cba	for bug #87, response the server SrsId to flash.	2014-05-27 15:34:55 +08:00
winlin	d74921e1ab	fix #89, config to /dev/null to disable ffmpeg log. 0.9.117	2014-05-27 14:10:46 +08:00
winlin	14f0a2e046	for bug #88, add timeout for connect.	2014-05-26 18:21:35 +08:00
winlin	93c9c55fb9	remove the complex handshake of librtmp. refine makefile of librtmp tools	2014-05-26 15:54:39 +08:00
winlin	69248cedaa	http streaming support flv start index. 0.9.115	2014-05-26 14:58:08 +08:00
winlin	b13bd70c86	http streaming support flv start index.	2014-05-26 13:57:08 +08:00
winlin	7b69b8b5c4	fix #79: allow edge vhost to add or remove. 0.9.114	2014-05-25 10:08:17 +08:00
winlin	344a49918a	fix #79: allow edge vhost to add or remove.	2014-05-25 10:07:57 +08:00
winlin	0eb9e0af5b	fix #78 st joinable thread must be stop by other threads, 0.9.113	2014-05-23 17:23:33 +08:00
winlin	6fba0db9b5	refine http stream server	2014-05-23 14:26:11 +08:00
winlin	9eedf1ac40	the st_thread_exit is ok, not the memory leak cause.	2014-05-23 14:11:50 +08:00
winlin	5f7bacf678	fix st thread exit bug, never implict invoke the st_thread_exit, which may cause memory leak. 0.9.112	2014-05-23 13:56:40 +08:00
winlin	25e279b7c8	support amf0 StrictArray(0x0a). 0.9.111.	2014-05-22 16:30:24 +08:00
winlin	7f48590239	support amf0 StrictArray(0x0a). 0.9.111.	2014-05-22 16:29:42 +08:00
winlin	bd24fe7d75	support flv parser, add amf0 to librtmp. 0.9.110	2014-05-22 15:08:25 +08:00
winlin	69eb935505	fix bug of flv parser, librtmp amf0 library	2014-05-22 11:39:10 +08:00
winlin	d4b8fee61a	fix bug #73, http callback api support authentication in tcUrl	2014-05-22 10:23:12 +08:00
winlin	f37faf7236	update librtmp, add amf0 parse functions	2014-05-21 18:30:58 +08:00
winlin	efc9f53512	fix rtmp handshake utest bug	2014-05-21 12:50:48 +08:00
winlin	f0b54678ad	fix http hooks dvr bug, check dvr macro	2014-05-21 12:02:50 +08:00
winlin	2265173c4d	donot install tools when ffmpeg is not open, 0.9.108	2014-05-20 18:11:33 +08:00
winlin	ef0f7f4da8	support http heartbeat, 0.9.107	2014-05-19 17:39:01 +08:00
winlin	cb95b5909c	add http heartbeat framework	2014-05-19 15:45:04 +08:00
winlin	7c804277b2	add heatbeat url, add stream for api-server	2014-05-19 15:27:05 +08:00
winlin	0186247fee	support http api json, to PUT/POST. 0.9.105	2014-05-18 17:57:20 +08:00
winlin	3064e5ec61	fix bug of nx_json parse, to 0.9.104	2014-05-18 16:48:24 +08:00
winlin	d6355efe22	support http api json, to PUT/POST, to 0.9.103	2014-05-18 16:15:35 +08:00
winlin	b60e8418c6	add json base on nxjson(nx-json/nx_json) decoder for http api. 0.9.102	2014-05-18 14:34:45 +08:00
winlin	2c059d3a80	fix bug #72, also need stream_id for send_and_free_message. 0.9.101	2014-05-17 17:53:27 +08:00
winlin	952abbee03	use server ip or name for forward tcurl.	2014-05-17 15:55:58 +08:00
winlin	c59576146b	rename struct to class. 0.9.100	2014-05-17 14:59:33 +08:00
winlin	2f89c8b2e8	move some utilities from kernel to app. 0.9.99	2014-05-17 14:53:04 +08:00
winlin	4b8d3fe05f	refine log, add overflow log	2014-05-16 13:31:59 +08:00
winlin	47089f0e82	add nxjson	2014-05-16 13:26:04 +08:00
winlin	154f084f1b	add comments for json	2014-05-16 11:56:43 +08:00
winlin	cf712b06bb	fix bug #67: fix pithy print bug, stage must has a age. 0.9.98	2014-05-14 14:35:29 +08:00
winlin	cbbf53f8f9	fix bug #67: fix pithy print bug, stage must has a age	2014-05-14 14:34:28 +08:00
winlin	b175821b62	refine kbps, provides 30s,1m,5m,60m kbps. 0.9.97	2014-05-14 13:56:12 +08:00
winlin	830f0b5eb6	refine metadata info	2014-05-14 11:46:17 +08:00
winlin	3ebda13802	refine the ptr array free, 0.9.96	2014-05-14 09:58:42 +08:00
winlin	dc66c525fd	refine autofree, only free object, never free arrays	2014-05-14 09:41:41 +08:00
winlin	300f264e92	set metadata time equals to sequence header time.	2014-05-13 15:30:20 +08:00
winlin	91eabda7b8	add comments for source, return for sequence header.	2014-05-13 15:15:25 +08:00
winlin	9ba786d1aa	fix bug of mem leak, free the left msgs if send error	2014-05-13 14:32:50 +08:00
winlin	befde6acf7	fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95	2014-05-13 14:24:39 +08:00
winlin	0a1c0afe8d	fix bug of NULL ptr for edge kbps object	2014-05-13 11:34:44 +08:00
winlin	7004510cc7	fix ffmpeg log fd leak, always close log_fd. 0.9.94	2014-05-13 11:16:53 +08:00
winlin	74e6e28993	refine the kbps calc module. 0.9.93	2014-05-12 18:06:13 +08:00
winlin	9006194cd7	refine framework to calc the kbps	2014-05-12 17:27:50 +08:00
winlin	3f33dffdb3	refine the quit and destroy, quit when normal, destroy only for gmc	2014-05-12 13:14:36 +08:00
winlin	900406cc70	refine api, now to now_ms	2014-05-08 16:13:33 +08:00
winlin	a1fed15789	add uptime, startup time, load to api	2014-05-08 15:45:51 +08:00
winlin	8388da6325	add miss files. fix bug #60: support aggregate message	2014-05-08 14:33:25 +08:00
winlin	f6dd1371bf	fix bug #36: never directly use *(int32_t*) to convert, for arm may not support	2014-05-08 12:12:01 +08:00
winlin	fa9870db96	fix bug #59: edge for FMS, always use schema1(digest-key) for FMS, or connect failed.	2014-05-08 11:51:49 +08:00
winlin	cb64d20575	refine core macros	2014-05-06 18:22:01 +08:00
winlin	94076b3246	fix bug #50, ubuntu14 build error	2014-05-06 11:04:12 +08:00
winlin	1e9561150a	add mips	2014-05-04 18:38:08 +08:00
winlin	f8e8c81e50	refine log, simplify it. to 0.9.90	2014-05-04 16:29:57 +08:00
winlin	7b530bf8d8	update signature	2014-05-04 11:28:17 +08:00
winlin	106270c8aa	refine log messages.	2014-05-04 11:11:51 +08:00
winlin	a4410a4fa9	update pithy-print to 10s. refine log	2014-05-04 10:45:13 +08:00
winlin	243a2eabf5	explicit exit st-thread, for gmc to analysis mem	2014-05-04 10:01:57 +08:00
winlin	96a5c7b1ab	fix mem leak of encoder, edge and source. add destroy for gmc to detect mem leak. to 0.9.89	2014-05-03 22:59:21 +08:00
winlin	e492180b78	fix mem leak detect bug, destroy server when quit	2014-05-02 14:08:48 +08:00
winlin	7465f2d20b	fix mem leak in decode message, free the packet and msg	2014-05-02 12:49:11 +08:00
winlin	b53f83acf1	rename __srs_rtmp_expect_message to srs_rtmp_expect_message	2014-05-02 12:45:42 +08:00
winlin	5b98a27256	fix mem leak in recv message error, always free msg	2014-05-02 12:44:38 +08:00
winlin	52d1fa8df5	fix mem leak for send packet, always free in send msg.	2014-05-02 12:34:21 +08:00
winlin	d74f01e2d1	fix signal bug, break for gmc. fix SrsMessage leak, use common message to free payload. to 0.9.88	2014-05-02 12:29:56 +08:00
winlin	daca90db95	disable verbose log for av	2014-04-30 17:37:00 +08:00
winlin	0945c2b441	fix RTMP protocol extended timestamp bug, always trust and use the extended-timestamp for the first chunk of msg	2014-04-30 17:16:28 +08:00
winlin	37476df704	refine log for recv message	2014-04-30 15:42:19 +08:00
winlin	7cbe18902f	fix bug of librtmp after RTMP protocol stack refined, never use cid=2 to send data.	2014-04-30 13:20:53 +08:00
winlin	fc501b050b	add atc_auto to disable or enable auto detect atc	2014-04-30 12:08:11 +08:00
winlin	30bb3ff704	add dvr_plan hss to full.conf	2014-04-30 11:56:19 +08:00
winlin	aebff659b6	remove wait interval for signal	2014-04-30 11:29:03 +08:00
winlin	d0dff2d332	fix bug #34: convert signal to io. 0.9.85	2014-04-30 11:26:32 +08:00
winlin	a14220d4fb	fix bug of auto bravo atc	2014-04-30 10:31:05 +08:00
winlin	6ee49ee029	bravo auto atc per stream. 0.9.84	2014-04-30 10:17:04 +08:00
winlin	f02ac02a50	auto open atc for bravo_atc set	2014-04-29 18:27:00 +08:00
winlin	0f498acd7b	add comments and variable for c3 extended-timestamp. to 0.9.82	2014-04-29 18:16:29 +08:00
winlin	80ddddf823	refine RTMP protocol completed, to 0.9.81	2014-04-29 14:44:07 +08:00
winlin	be4c182d11	refine RTMP protocol stack.	2014-04-29 14:18:10 +08:00
winlin	ebf6203c3b	refine rtmp protocol stack, refer to go.rtmp	2014-04-29 13:39:16 +08:00
winlin	2e5337a26e	refactor: remove the unused super.	2014-04-29 10:06:52 +08:00
winlin	fd0efecbc8	refine ingester pithy print	2014-04-29 09:57:59 +08:00
winlin	cb2959ae7d	fix bug #53, never use msg when sent it	2014-04-29 09:32:30 +08:00
winlin	23b04e2a57	completed the edge reload, to 0.9.79	2014-04-28 17:57:59 +08:00
winlin	c681098949	fix bug of edge, one fd for one thread	2014-04-28 17:20:35 +08:00
winlin	a363e3d293	support basic edge(play/publish) RTMP server. 0.9.78	2014-04-27 15:10:25 +08:00
winlin	bc7648724d	use directly send publish edge mode.	2014-04-27 14:57:28 +08:00
winlin	2295ebb346	remove the edge message flag, use directly send mode	2014-04-27 14:23:21 +08:00
winlin	5ddc71685b	pre change publish edge to directly send mode	2014-04-27 14:21:19 +08:00
winlin	16319d73fd	implements basic edge(play and publish), with bug	2014-04-27 12:28:45 +08:00
winlin	79c9c6dcb7	implements the proxy for edge publish mode	2014-04-27 11:11:15 +08:00
winlin	ec96072472	add publish edge framework	2014-04-27 09:29:37 +08:00
winlin	270b1270af	fix bug of edge, refine state to user state.	2014-04-26 22:51:01 +08:00
winlin	2bcaeccc51	edge support play and ingest origin stream. change to 0.9.77	2014-04-26 21:41:18 +08:00
winlin	acba4cfdc6	add edge framework	2014-04-26 18:08:21 +08:00
winlin	b0951d36d3	refine source, rename req to _req	2014-04-26 17:16:18 +08:00
winlin	a2f317a113	add chad.wang to authors for srs-librtmp on windows build project	2014-04-26 14:47:38 +08:00
winlin	a63a3812e3	add srs app edge	2014-04-25 16:35:03 +08:00
winlin	d6948d613f	add author byteman for h264 to flv.	2014-04-25 15:27:50 +08:00
winlin	f3b441ba1f	add alipay donation page. to 0.9.76	2014-04-25 12:56:48 +08:00
winlin	3ed59f190b	refine srs live flashP2P(integrated by chnvideo)	2014-04-24 17:38:57 +08:00
winlin	67e1988b81	support live flashP2P(integrated by chnvideo VDN). 0.9.75	2014-04-24 16:32:19 +08:00
winlin	b276714573	support chnvideo hss streaming	2014-04-24 14:26:24 +08:00
winlin	35f3a93239	support dvr to hss. change to 0.9.74	2014-04-24 12:22:36 +08:00
winlin	e271cb607f	refine plan, add stream start time for atc	2014-04-23 17:53:14 +08:00
winlin	0c0010d529	update dvr, extract flv segment	2014-04-23 16:33:42 +08:00
winlin	7ff8df4d97	refine code, notice api when segment close	2014-04-23 16:25:18 +08:00
winlin	435e02db5d	dvr use .tmp and rename to .flv when finished.	2014-04-22 17:50:22 +08:00
winlin	733ca2475d	call http api when dvr got keyframe	2014-04-22 17:32:45 +08:00
winlin	36d8fdfc1a	move the ts buffer to http message	2014-04-22 12:20:58 +08:00
winlin	a73bf8d4aa	optimizm the http server for send ts file	2014-04-22 12:15:13 +08:00
winlin	8bf1f4ad87	add api/v1 summaries/rusages/self_proc_stats/system_proc_stats/meminfos. change to 0.9.72	2014-04-20 00:17:11 +08:00
winlin	a5f4f6bd14	add meminfo	2014-04-20 00:15:26 +08:00
winlin	15aea4d9b3	add cpuinfo	2014-04-19 23:18:00 +08:00
winlin	951a93ab86	get self proc and system proc stat	2014-04-19 21:43:13 +08:00
winlin	117fd67950	add cpu stat	2014-04-19 21:23:34 +08:00
winlin	c530a8e5fc	fix bug of ingest for android, init the variable to 0	2014-04-19 12:47:16 +08:00
winlin	fae1c61c3f	update readme. change to 0.9.71	2014-04-19 11:21:13 +08:00
winlin	608b28f223	add srs ingest flv/rtmp base on srs-librtmp	2014-04-19 09:47:47 +08:00
winlin	25630b5211	fix bug of utest build.	2014-04-18 09:16:43 +08:00
winlin	67ddc9f5ae	support dvr(record live to flv file for vod), change to 0.9.70	2014-04-17 18:23:49 +08:00
winlin	ab9a2ddd6c	dvr support segment plan	2014-04-17 18:13:59 +08:00
winlin	2d1c28cff9	update dvr, support segment plan	2014-04-17 17:35:21 +08:00
winlin	6f19a83114	dvr support plan and default session plan	2014-04-17 16:57:04 +08:00
winlin	4b82a4f510	support reload dvr	2014-04-17 16:22:21 +08:00
winlin	9861fc4fe3	refine dvr, add comments	2014-04-17 16:16:17 +08:00
winlin	56ff70cdf8	remove lseek and size of fs stream	2014-04-17 16:10:05 +08:00
winlin	271b969d0b	set audio/video flag to 0 in flv header.	2014-04-17 16:08:56 +08:00
winlin	73459547e1	support dvr. change to 0.9.69	2014-04-17 16:06:49 +08:00
winlin	996d042a33	add comments for file stream	2014-04-17 12:59:35 +08:00
winlin	f5ff9c7241	update dvr comments	2014-04-16 17:54:41 +08:00
winlin	fdd0678bcb	add thread cid to log	2014-04-16 16:58:54 +08:00
winlin	ae3f7d9cb8	change meeting hls to an	2014-04-16 16:18:02 +08:00
winlin	5af1da17ed	change to 0.9.68	2014-04-16 15:59:32 +08:00
winlin	0c91fa6bed	fix dvr mem leak, free msg when not use it.	2014-04-16 15:58:06 +08:00
winlin	88094af97a	refine log, add user original configure	2014-04-16 15:04:38 +08:00
winlin	78e7a31ddb	refine option, add --use-sys-ssl, change to 0.9.67	2014-04-16 14:27:34 +08:00
winlin	47927ab460	refine options, change to 0.9.66	2014-04-16 13:24:00 +08:00
winlin	005502a07e	update comments for HLS on_hls_start	2014-04-16 11:11:53 +08:00
winlin	fd0002e499	add dvr framework	2014-04-16 09:28:02 +08:00
winlin	96115ac4f7	fix bug of config params. x86/x64/pi never use static	2014-04-15 16:07:25 +08:00
winlin	90dee0924d	fix bug of build script	2014-04-15 14:24:03 +08:00
winlin	23a1b29935	add dvr option. refine macros of auto headers	2014-04-15 14:01:57 +08:00
winlin	1ae9178605	add favicon.ico, change to 0.9.65	2014-04-15 11:19:15 +08:00
winlin	b86c83b0e0	refine the info for log to file.	2014-04-14 12:14:01 +08:00
winlin	ce64dafc3c	use stream time for live duration. change to 0.9.64	2014-04-14 10:55:46 +08:00
winlin	2c6b6c6846	fix bug #47: use stream time to stop for duration of rtmpdump	2014-04-14 10:51:31 +08:00
winlin	73c310cd2e	refine the macro.	2014-04-14 09:10:36 +08:00
winlin	bc756d6ad9	fix simple handshake bug #46, copy c1 to s2. change to 0.9.63	2014-04-13 21:55:01 +08:00
winlin	9a036958d7	fix bug #45, support duration for live. change to 0.9.62	2014-04-13 21:37:26 +08:00
winlin	04a526b340	change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE	2014-04-13 17:14:33 +08:00
winlin	a0472f256d	support test config file. change to 0.9.61	2014-04-13 16:55:42 +08:00
winlin	f980340e89	refine config option	2014-04-13 13:57:39 +08:00
winlin	aa784377fd	refine reload, ignore if parse config file failed.	2014-04-13 13:50:58 +08:00
winlin	cfee761899	support full reload. change to 0.9.60	2014-04-13 13:35:03 +08:00
winlin	bb87272c39	refine reload, rename some vhost specified to add vhost prefix	2014-04-13 13:31:59 +08:00
winlin	dc3c3cff8e	support reload http_stream	2014-04-13 13:27:51 +08:00
winlin	c33ff4fdb8	support reload http_api	2014-04-13 13:08:10 +08:00
winlin	17ac29d160	refine code for reload http api/stream	2014-04-12 22:16:39 +08:00
winlin	821b58af03	support reload atc	2014-04-12 22:00:27 +08:00
winlin	eda1ddc03d	support reload log level/logfile/tank	2014-04-12 21:35:26 +08:00
winlin	f652c28485	support reload pid.	2014-04-12 20:46:32 +08:00
winlin	0a016e58bf	add comments for main	2014-04-12 20:37:16 +08:00
winlin	b38df9cd1a	refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59	2014-04-12 20:35:40 +08:00
winlin	15f651bccd	update demo, support acodec	2014-04-11 14:13:14 +08:00
winlin	ff90278048	add speex1.2 to transcode flash encoder stream. change to 0.9.58	2014-04-11 10:40:21 +08:00
winlin	3a26b23fba	change ffmpeg log to ./objs	2014-04-10 17:19:49 +08:00
winlin	8295169e0e	refine code, unify the coding style	2014-04-10 14:22:09 +08:00
winlin	ccba9ba9ba	move log level parse to app utility	2014-04-10 14:20:02 +08:00
winlin	f2f30dcc52	add utility, change log to trace	2014-04-10 14:12:22 +08:00
winlin	94874e77af	refine reload config	2014-04-10 14:06:23 +08:00
winlin	6c5d8b4851	refine reload config	2014-04-10 14:05:01 +08:00
winlin	bc61b1de18	fix bug of reload ingest	2014-04-10 11:47:38 +08:00
winlin	e0a6fe63cc	fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57	2014-04-10 11:40:06 +08:00
winlin	9ed3421586	rename from get_ingest to get_ingest_by_id of config	2014-04-10 11:24:27 +08:00
winlin	e432fe931f	support reload ingesters(added/removed/updated). change to 0.9.57.	2014-04-10 11:21:47 +08:00
winlin	e6d8bc1e5c	ingest reload: support disable vhost	2014-04-10 10:35:02 +08:00
winlin	5e504944dc	add comments for http conn	2014-04-10 10:22:22 +08:00
winlin	dc71eef394	support ingest reload: add new vhost with ingester	2014-04-10 10:09:30 +08:00
winlin	e5646e3bb5	refine ingester, add vhost/id info to ingester	2014-04-10 09:20:23 +08:00
winlin	9372a7065a	refine the ingest log	2014-04-08 18:01:14 +08:00
winlin	ccf0a423be	change sleep time from 3s to 0.6s for ingester.	2014-04-08 15:43:47 +08:00
winlin	509504f27d	change sleep time from 3s to 0.6s	2014-04-08 15:43:18 +08:00
winlin	5aded78272	change to 0.9.56, for macro changed	2014-04-08 15:32:13 +08:00
winlin	eba35e2ac0	refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool	2014-04-08 15:28:34 +08:00
winlin	70e73bc281	add comments for bug #39	2014-04-08 13:56:45 +08:00
winlin	d124772d6a	add http server/api to srs.conf. add comments for bug #6.	2014-04-08 13:54:16 +08:00
winlin	98809862f7	change to 0.9.55, for 1.0 mainline	2014-04-07 16:05:18 +08:00
winlin	12ba02238d	update readme, add ingest	2014-04-07 15:56:19 +08:00
winlin	c11e266d5c	update readme	2014-04-07 15:04:31 +08:00
winlin	4f445f2f60	support ingest stream	2014-04-07 14:28:06 +08:00
winlin	45d8f4346f	implements ingest, change to 0.9.53	2014-04-07 14:20:26 +08:00
winlin	e89ab84e4e	implements ingest, change to 0.9.53	2014-04-07 14:20:03 +08:00
winlin	2742679354	implements the ingest framework	2014-04-07 13:32:00 +08:00
winlin	92281548b6	add ingest config	2014-04-07 13:13:57 +08:00
winlin	9107831b0e	add config to read ingesters	2014-04-07 11:57:24 +08:00
winlin	f5c4f492da	add comments for ffmpeg	2014-04-07 11:49:20 +08:00
winlin	c759a7c6b5	refine log of ffmpeg	2014-04-07 11:20:03 +08:00
winlin	4f7cfeed37	change to 0.9.52, refine encoder and ffmpeg	2014-04-07 10:15:44 +08:00
winlin	72c330d47c	refine ffmepg and encoder, extract ffmpeg.	2014-04-07 09:34:36 +08:00
winlin	095364a72b	refine ingest, start/stop ingest in server	2014-04-07 09:27:30 +08:00
winlin	eea2310b07	refine consts	2014-04-07 09:07:12 +08:00
winlin	4a7378b77a	ingest stream when server cycle	2014-04-07 08:41:32 +08:00
winlin	adfbbbfd68	add ingest files	2014-04-07 08:32:28 +08:00
winlin	983fe46ce2	use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding	2014-04-06 20:30:51 +08:00
winlin	c4524484e6	add comments for aac encoder	2014-04-06 18:48:39 +08:00
winlin	7916cab50e	donot check the aac encoder, ensure aac is ok	2014-04-05 15:01:41 +08:00
winlin	30e3323fe4	update readme, add SampleHTTP link	2014-04-05 13:38:05 +08:00
winlin	4e3fe36ae2	refine http server pages. change to 0.9.51	2014-04-05 13:14:59 +08:00
winlin	1c02f4551c	always use 64bits for lseek	2014-04-04 23:28:31 +08:00
winlin	ced050829e	fix bug of http, change to 0.9.50	2014-04-04 23:25:32 +08:00
winlin	c5d3b11a6e	update http stream. change to 0.9.49	2014-04-04 23:16:31 +08:00
winlin	17ce21348d	implements the http stream module. change to 0.9.49	2014-04-04 23:06:46 +08:00
winlin	ef26e77560	implements the http stream module.	2014-04-04 23:06:27 +08:00
winlin	00eda0d7b2	implements the http stream module.	2014-04-04 23:04:38 +08:00
winlin	83f35d10b1	add http delivery framework	2014-04-04 18:55:21 +08:00
winlin	8d7877ebd1	refine config, group by sections.	2014-04-04 17:01:34 +08:00
winlin	b7093246e4	fix forward conf file bug, change pid file. change to 0.9.48	2014-04-04 15:35:17 +08:00
winlin	28b0c3a27f	refine log and thread function name. change to 0.9.47.	2014-04-04 12:18:26 +08:00
winlin	6d32ad1828	refine log and thread function name	2014-04-04 12:18:05 +08:00
winlin	f089eafd9f	fix bug #38, remove app slash of jwplayer, change to 0.9.46	2014-04-04 10:12:34 +08:00
winlin	3f13726544	add log level in conf. change to 0.9.45	2014-04-03 18:32:51 +08:00
winlin	4984631cd6	refine the http crossdomain, send it only required	2014-04-03 16:39:55 +08:00
winlin	133a6f0dbf	add crossdomain support for http error	2014-04-03 15:55:48 +08:00
winlin	b71eb0d49a	support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44	2014-04-03 15:53:56 +08:00
winlin	f2216691f9	remove the duplicated http status line when error	2014-04-03 15:20:24 +08:00
winlin	818c1f1520	support http error code, check url	2014-04-03 15:17:02 +08:00
winlin	0ae23d7556	rename version to versions	2014-04-03 14:17:00 +08:00
winlin	4a40075f68	add contributors to api/v1/authors	2014-04-03 13:48:52 +08:00
winlin	5c019c7938	implements api/v1/version, change to 0.9.43	2014-04-03 12:08:22 +08:00
winlin	9c3ba680d8	fix http hooks json encode bug, remove the JFIELD_CONT for the last field	2014-04-03 11:52:06 +08:00
winlin	a14267d2b4	refine the http url handler match. refine json encode	2014-04-03 11:49:14 +08:00
winlin	bfa07465f0	implements basic http response framework	2014-04-02 19:10:22 +08:00
winlin	341b5151d9	create http handler framework	2014-04-02 18:07:34 +08:00
winlin	eae9b94153	add api framework code	2014-04-02 12:55:10 +08:00
winlin	0ba0c14fb8	refine code, donot listen if not enabled http	2014-04-02 12:12:27 +08:00
winlin	ec6d696565	refine http framework, use http message	2014-04-02 12:03:49 +08:00
winlin	e70609cea3	refine code, extract http hooks.	2014-04-01 18:40:24 +08:00
winlin	5bbb76a59d	remove the namespace srs, use http prefix	2014-04-01 17:30:55 +08:00
winlin	1922d62ff7	add --with-http-api option	2014-04-01 16:06:32 +08:00
winlin	52263457bf	fix bug of no http-server feature	2014-04-01 15:42:27 +08:00
winlin	6ca9b774c1	support http methods, support js crossdomain request	2014-04-01 14:28:19 +08:00
winlin	51c1615173	change to 0.9.42, add http parse framework	2014-04-01 12:36:56 +08:00
winlin	b0d77c4697	move wiki images to srs.release	2014-03-31 11:35:22 +08:00
winlin	c7a4dd8863	move wiki images to srs.release	2014-03-31 11:35:00 +08:00
winlin	27029679e9	donot ensure transaction-id===1 for connect req/res, change to 0.9.41	2014-03-31 10:22:00 +08:00
winlin	64a8dfb09a	refine rtmp send protocol, use the same cache for header	2014-03-31 10:04:44 +08:00
winlin	4dfbbcdff4	force st to use epoll, change to 0.9.39	2014-03-30 23:42:29 +08:00
winlin	3932cf1334	update build, always patch st, for we need to build in raspberrypi directly	2014-03-29 14:25:47 +08:00
winlin	41f5217360	refine http code, define CRLF consts for http	2014-03-27 17:13:26 +08:00
winlin	6913efe127	implements the http api/stream framework	2014-03-27 13:25:08 +08:00
winlin	ab3c6c92a0	rename srs-client to srs-rtmp-conn	2014-03-27 12:27:47 +08:00
winlin	aa89f9f51e	change to 0.9.37, for http api/stream	2014-03-27 12:14:04 +08:00
winlin	4c8d6d2eb1	fix bug of hls and rename demo player stream to live/demo. change to 0.9.36	2014-03-26 18:13:33 +08:00
winlin	0858bd8b6f	Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35	2014-03-26 16:25:02 +08:00
winlin	ebf1139582	fix the forward loop detect bug. change to 0.9.34	2014-03-26 12:34:35 +08:00
winlin	e02293d94d	fix bug of handshake with nginx-rtmp for forward, change to 0.9.33	2014-03-26 11:39:10 +08:00
winlin	1386e7a8ab	fix bug of handshake with nginx, simple hs	2014-03-26 11:12:34 +08:00
winlin	e56c52ceba	change to 0.9.32	2014-03-26 10:05:34 +08:00
winlin	7b3bc8f741	fix bug of bwtc	2014-03-26 10:05:07 +08:00
winlin	644dfa1a6d	fix bug of librtmp	2014-03-26 09:03:57 +08:00
winlin	a9d11df3a3	update arm tool chain	2014-03-25 14:36:30 +08:00
winlin	a6d9da5e43	fix bug of script, support both abs and relative path	2014-03-25 11:04:36 +08:00
winlin	c3e750e90f	add version to log	2014-03-24 18:07:32 +08:00
winlin	ade3630fa6	add package and install script	2014-03-23 22:52:08 +08:00
winlin	34efa15118	change to 0.9.30, first release for srs1	2014-03-23 21:15:52 +08:00
winlin	cb1499fcb6	change log strategy, write log to file. change to 0.9.29	2014-03-23 14:53:31 +08:00
winlin	ed20bd7078	default write log to file.	2014-03-23 14:51:35 +08:00
winlin	76290a5a12	fix bug of get daemon	2014-03-23 14:47:09 +08:00
winlin	7930add7f9	add log tank config, default to console.	2014-03-23 14:40:55 +08:00
winlin	b290a00de7	refine log	2014-03-23 13:53:07 +08:00
winlin	f1477dc4fe	support daemon, default start in daemon. change to 0.9.28	2014-03-23 12:42:42 +08:00
winlin	3ec3c1f532	support daemon	2014-03-23 12:42:05 +08:00
winlin	2c1354b9b9	fix bug of log message	2014-03-23 12:23:23 +08:00
winlin	56679b3c82	add srs_log_file to write log to file. change to 0.9.27	2014-03-23 12:22:01 +08:00
winlin	d94b9f44b3	add srs_log_file to write log to file. change to 0.9.27	2014-03-23 12:21:36 +08:00
winlin	d63cbb3c46	add reload support. add make install and uninstall, change to 0.9.26	2014-03-22 22:07:49 +08:00
winlin	3c920b933c	add ./etc/init.d/srs, refine configure to support make clean then make.	2014-03-22 20:53:29 +08:00
winlin	fdad7c25f0	fix isse #35: the gettimeofday jitter, log warn message	2014-03-21 17:56:27 +08:00
winlin	4f284b20f0	drop ts segment when duration is too small	2014-03-21 17:35:27 +08:00
winlin	5758551508	support hls republish	2014-03-21 17:10:24 +08:00
winlin	f25c6558a5	write pid to ./objs/srs.pid.	2014-03-21 15:45:34 +08:00
winlin	0686b8fa5a	update readme, add product wiki link	2014-03-21 14:02:14 +08:00
winlin	a0c0c94cf0	refine conf, add comments for other listen type	2014-03-21 14:00:26 +08:00
winlin	2cebaff9d8	refine hls, ts temp file use ext .tmp	2014-03-21 13:10:47 +08:00
winlin	e0fb1029c9	support pure audio hls. change to 0.9.24	2014-03-20 18:55:45 +08:00
winlin	b708f588fc	refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable.	2014-03-20 18:19:08 +08:00
winlin	238349b0c0	update configure, change to 0.9.23	2014-03-20 14:08:53 +08:00
winlin	a2c5075002	update comments for handshake.	2014-03-19 23:40:49 +08:00
winlin	a470330383	finish utest for handshake.	2014-03-19 23:34:50 +08:00
winlin	6b84a5e14c	change to 0.9.22	2014-03-19 22:51:04 +08:00
winlin	b7d40b5aba	support vn/an to disable video/audio, for radio streaming	2014-03-19 22:45:58 +08:00
winlin	747bbd988e	change to 0.9.21, refine complex handshake, client/server support complex handshake.	2014-03-19 17:15:52 +08:00
winlin	da93b6fe99	add complex handshake utest	2014-03-19 17:14:42 +08:00
winlin	491ea4b630	support client complex handshake with server	2014-03-19 16:30:43 +08:00
winlin	841f0f8899	change to 0.9.19, verify the s1/s2/c2, refine the handshake.	2014-03-19 14:58:29 +08:00
winlin	152d3539d8	add s1 validation for client/server	2014-03-19 13:10:25 +08:00
winlin	d89d16ca1e	print the system info when startup main	2014-03-19 10:51:33 +08:00
winlin	2eeb289c2f	assert system is little-endian	2014-03-19 10:38:02 +08:00
winlin	b58ab508f9	add rtmp handshake utest, for arm to finger out the bug	2014-03-19 00:47:10 +08:00
winlin	1c055e7424	add log for ssl disabled.	2014-03-18 17:44:43 +08:00
winlin	1ffbdbc098	refine log, donot show error when client gracefully close it	2014-03-18 16:17:52 +08:00
winlin	c85dde7f3f	substitute all TAB with 4spaces.	2014-03-18 11:32:58 +08:00
winlin	e5770b10b1	refine the colorful log for srs. remove the log when client close.	2014-03-18 11:28:22 +08:00
wenjie.zhao	109ce07c1b	color text of error msg supported. ... strerror msg supported.	2014-03-15 04:55:30 +08:00
wenjie.zhao	e0e3504e1d	color text of error msg supported. ... strerror msg supported.	2014-03-15 04:53:46 +08:00
winlin	3721e72e99	arm: change to 0.9.18	2014-03-16 20:59:56 +08:00
winlin	5a4373d483	Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp.	2014-03-16 20:58:04 +08:00
winlin	a9da5903f6	arm support ssl/hls, change to 0.9.17	2014-03-16 20:16:42 +08:00
winlin	7744053d28	add arm research files, change to 0.9.16	2014-03-16 18:05:07 +08:00
winlin	a90cb9dd84	fix ubuntu build warning, the config unused setter	2014-03-15 19:50:40 +08:00
winlin	010b5c0d7a	fix ubuntu build warning, the config unused setter	2014-03-15 19:48:11 +08:00
winlin	3066a03fb7	rename SRS_HTTP to SRS_HTTP_CALLBACK	2014-03-10 23:13:09 +08:00
winlin	387be8fa3b	change to 0.9.15, finish amf0 utest	2014-03-09 20:37:20 +08:00
winlin	9521fbfaaa	change version to 0.9.14, finish amf0 basic utest	2014-03-08 23:10:54 +08:00
winlin	95c2e7fd63	amf0 utest: finish basic utest for amf0	2014-03-08 23:09:24 +08:00
winlin	044138c39e	refine summary for amf0 hpp	2014-03-08 23:02:27 +08:00
winlin	9fd48d84c1	refine amf0 object size to total_size, elem count to count	2014-03-08 22:59:30 +08:00
winlin	59db1dd260	utest for amf0 object, refine the count of elem	2014-03-08 22:51:13 +08:00
winlin	8ed9ae6242	amf0 utest: remove the object read/write function, directly use object to read or write.	2014-03-08 22:25:56 +08:00
winlin	a3ae871360	refine code, array to ecma_array.	2014-03-08 22:07:40 +08:00
winlin	3129c738cb	amf0 utest: refine interface of amf0, only export required objects	2014-03-08 21:56:14 +08:00
winlin	b55efef2ee	amf0 utest: finish amf0 any read/write utest	2014-03-08 21:12:13 +08:00
winlin	609114a5fe	amf0 utest: remove the old amf0 read any, discovery object ant use object to read itself.	2014-03-08 21:06:20 +08:00
winlin	3691c106fa	amf0 utest: add usage for amf0	2014-03-08 17:18:44 +08:00
winlin	34f94a1be3	amf0 utest: add object and ecma array create function.	2014-03-08 17:04:21 +08:00
winlin	f4aa2f30c1	amf0 utest: change version to 0.9.13	2014-03-08 16:57:13 +08:00
winlin	4306db099d	amf0 utest: elem read/write refined	2014-03-08 16:56:35 +08:00
winlin	bfe771bbba	amf0 utest: null,undefined,object-eof to any	2014-03-08 14:38:19 +08:00
winlin	e40be6e89d	amf0 utest: boolean to any	2014-03-08 14:13:31 +08:00
winlin	4a0023ae63	amf0 utest: finish utest for string to any	2014-03-08 14:05:45 +08:00
winlin	cae8228b09	amf0 utest: remove class SrsAmf0String, use SrsAmf0Any instead	2014-03-08 13:57:08 +08:00
winlin	57ce04ae12	amf0 utest: remove struct use class instead, move class together	2014-03-08 13:41:15 +08:00
winlin	404207db4f	amf0 utest: refine amf0 size and finish utest.	2014-03-08 13:35:22 +08:00
winlin	db7a113441	amf0 utest: refine amf0 size and finish utest.	2014-03-08 13:35:04 +08:00
winlin	3083759273	amf0 utest, refine amf0 size and object/array read/write	2014-03-08 13:11:26 +08:00
winlin	48343e4f3a	refien build script, regenereate all options. change to 0.9.12	2014-03-08 11:25:02 +08:00
winlin	6e0bebdacf	full support gperf gmc/gmp/gcp	2014-03-07 15:40:55 +08:00
winlin	bef7e20ed9	fix rtmp protocol bug, use 31bits timestamp	2014-03-07 13:35:03 +08:00
winlin	c89aea8af7	fix rtmp protocol bug, use 31bits timestamp	2014-03-07 13:34:23 +08:00
winlin	741d6f97f6	support gperf memory check(gmc).	2014-03-07 12:24:47 +08:00
winlin	dcd568a0d7	add gperf to heap check, use reload signal to terminate program normally	2014-03-06 18:12:19 +08:00
winlin	9d08b42c82	change version to 0.9.11	2014-03-05 10:41:23 +08:00
winlin	a488ef8317	fix bug#25: fmle republish bug, srs return special error code and wait for client to republish.	2014-03-05 10:21:31 +08:00
winlin	1ccddf4cfc	add gest framework for utest, build success.	2014-03-04 18:46:00 +08:00
winlin	fe5811304b	add utest script to generate the utest Makefile	2014-03-04 14:01:43 +08:00
winlin	722e79003b	merge from xiangcheng.liu, memory leak in amf0	2014-03-03 09:49:59 +08:00
winlin	d622da3b44	update readme, finish modularity and wiki, change to 0.9.10	2014-03-02 21:57:36 +08:00
winlin	880f4f5dc2	final the modularity, rename the app module.	2014-03-02 21:49:09 +08:00
winlin	c1086f8a9d	srs-librtmp: finish the simple publish and play sample.	2014-03-02 18:33:32 +08:00
winlin	efa09102cf	srs-librtmp: implements the read packet.	2014-03-02 17:47:53 +08:00
winlin	c338eb3666	srs-librtmp: implements the publish and play.	2014-03-02 14:51:19 +08:00
winlin	fce26d6690	srs-librtmp: implements play stream.	2014-03-02 14:07:48 +08:00
winlin	6b213b73eb	refine code, rename SrsRtmp to SrsRtmpServer.	2014-03-02 14:07:10 +08:00
winlin	8aedc51a2f	refine code, rename SrsRtmp to SrsRtmpServer.	2014-03-02 13:54:40 +08:00
winlin	4f91cae377	srs-librtmp: add complex handshake.	2014-03-02 13:07:32 +08:00
winlin	76f37baafe	srs-librtmp: implements the simple socket stream.	2014-03-02 13:06:21 +08:00
winlin	86267f854c	srs-librtmp: implements handshake.	2014-03-02 12:35:15 +08:00
winlin	f24f27deb9	srs-librtmp: add make ssl/nossl support for sample	2014-03-02 11:31:31 +08:00
winlin	b7a62ba131	use goto to free resource	2014-03-02 09:48:30 +08:00
winlin	feaf0c5e89	librtmp: create socket	2014-03-02 09:28:44 +08:00
winlin	f8335e2c1f	extract simple socket to lib	2014-03-02 09:22:09 +08:00
winlin	40a5edb37f	update readme.	2014-03-02 00:15:09 +08:00
winlin	db22af07a0	change to 0.9.9	2014-03-02 00:06:24 +08:00
winlin	fc9e3fd890	srs-librtmp define interfaces	2014-03-02 00:05:59 +08:00
winlin	44375b9e6b	add srs publish/play demo use srs-librtmp	2014-03-01 23:31:52 +08:00
winlin	713b05541b	add librtmp demo srs_publish	2014-03-01 23:24:53 +08:00
winlin	aa5d28ed85	add library	2014-03-01 19:15:36 +08:00
winlin	d5a02a55ee	unify code style	2014-03-01 18:27:55 +08:00
winlin	7d570fb4f3	use fast log	2014-03-01 18:06:20 +08:00
winlin	382fd127e4	rename config and pithy-print to app module.	2014-03-01 16:02:59 +08:00
winlin	b407021d45	move config to app, for its application level features	2014-03-01 15:59:55 +08:00
winlin	517d346a52	change macro for all rtmp protocol files.	2014-03-01 14:09:22 +08:00
winlin	4c498b67da	rename pro to rtmp protocol.	2014-03-01 14:05:58 +08:00
winlin	8d5806154b	add todo, to rename to the right name SrsRtmpServer	2014-03-01 14:03:41 +08:00
winlin	2074b50d87	move handshake and rtmp to protocol module	2014-03-01 14:03:02 +08:00
winlin	0296c8eff4	change to 0.9.6	2014-03-01 13:39:52 +08:00
winlin	4e3f7843fe	rename protocol dir to pro. move rtmp stack to protocol module	2014-03-01 13:39:27 +08:00
winlin	4a8bc3b277	change version to 0.9.5	2014-03-01 12:46:05 +08:00
winlin	7dfc902b87	extract protocol io interface to prepare to extract the protocol from underlayer socket.	2014-03-01 12:43:04 +08:00
winlin	a73dec4c41	refine code, rename ISrsReader to ISrsBufferReader	2014-03-01 11:27:06 +08:00
winlin	85cd1e1a41	extract protocol module, move amf0 to protocol module	2014-03-01 11:24:40 +08:00
winlin	7e14e7fa57	move pithy print to kernel	2014-03-01 11:11:02 +08:00
winlin	fddd60b962	change to 0.9.4, extract kernel module	2014-03-01 11:06:01 +08:00
winlin	c0dbee0854	move buffer to kernel. extract ISrsReader for buffer	2014-03-01 11:04:03 +08:00
winlin	8fea433450	move stream to kernel module	2014-03-01 10:58:13 +08:00
winlin	cb99de4462	move config to kernel module	2014-03-01 10:55:43 +08:00
winlin	5e14aa9c13	fix the macro bug	2014-03-01 10:53:28 +08:00
winlin	b0d20f57e1	move reload to kernel module	2014-03-01 10:51:45 +08:00
winlin	39d3425691	extract log context, move log to kernel module.	2014-03-01 10:42:55 +08:00
winlin	dea66a322d	extract kernel module, depends on core and provides kernel service(no stream)	2014-03-01 10:30:16 +08:00
winlin	bcbea86202	extract auto_free to core module	2014-03-01 10:19:11 +08:00
winlin	4e91a3d5aa	extract core and app module.	2014-03-01 10:14:25 +08:00
winlin	62fbe9e760	refine modules, extract core module	2014-03-01 10:05:14 +08:00
winlin	c2ccb83912	rename core to app	2014-03-01 09:56:48 +08:00
winlin	91d57ae7f9	refine build script, add comments for app.sh. change version to 0.9.3	2014-03-01 09:35:41 +08:00
winlin	4aeed8df1d	fix bug of SrsFMLEStartPacket command name, set_recv_timeout(SRS_PAUSED_RECV_TIMEOUT_US)	2014-02-24 09:12:57 +08:00
winlin	797d548766	fix bug of comment, change version to 0.9.2	2014-02-19 15:31:29 +08:00
winlin	980b53dfbe	change version to 0.9.1	2014-02-19 15:15:32 +08:00
winlin	745797365e	change version to 0.9.1	2014-02-19 15:14:46 +08:00
winlin	39f15ba3da	refine the comments, fix bug of parse message	2014-02-19 14:54:04 +08:00
winlin	73b298cab5	fix bug of connect app response data	2014-02-19 09:38:49 +08:00
winlin	11c5b2cf14	refine code, use RTMP_FMT_TYPE0 instead	2014-02-16 10:23:23 +08:00
winlin	7a91826732	refine code, use RTMP_FMT_TYPE0 instead	2014-02-16 10:22:52 +08:00
winlin	8697adacd9	fix compile warning on 64bit centos	2014-02-11 13:54:05 +08:00
liuxc0116	490033f601	forget delete memset ... at last modify,forget delete memset(payload, 0, size);	2014-01-27 11:34:50 +08:00
liuxc0116	81e085dd1b	memory will leaks ... the payload pointor assigned two memory,will lead to memory leaks	2014-01-23 18:05:55 +08:00
winlin	1d3621dc23	fix warning on 32bits centos6.	2014-01-19 10:49:40 +08:00
winlin	574536d9ed	merge wenjie. fix jw/flower player pause bug, which send closeStream actually.	2014-01-11 19:55:55 +08:00
winlin	63388e8ac3	merge from wenjie, fix the flower player play bug, play(reset=amf0-number)	2014-01-02 19:09:25 +08:00
wenjiegit	f387b2b569	update master	2014-01-02 18:03:49 +08:00
wenjiegit	e981cde90c	update master	2014-01-02 17:38:44 +08:00
wenjiegit	f8a7db51f2	fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]	2014-01-02 14:16:26 +08:00
wenjiegit	bfef0eebfe	fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]	2014-01-02 14:00:00 +08:00
wenjiegit	e959bb6c5c	fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]	2014-01-02 13:26:25 +08:00
winlin	993c5daec7	chunk size default to 60000, high performance. set chunk size when forward	2014-01-01 21:39:06 +08:00
winlin	4d631d749f	fix ts_info centos5 build bug	2014-01-01 21:07:01 +08:00
winlin	4955425be9	fix the listen backlog bug, change from 10 to 512	2014-01-01 20:14:46 +08:00
winlin	3dbb2132d3	change server timeout longer, recv timeout from 5s to 30s	2014-01-01 19:58:33 +08:00
winlin	99b9fa0c25	fix the forwarder dead when st_thread interrupt at st_usleep, check thread->can_loop().	2014-01-01 16:27:45 +08:00
winlin	dba7329682	refine readme.	2014-01-01 11:28:43 +08:00
winlin	0b7c7240e6	refine the authors and license	2014-01-01 11:21:52 +08:00
winlin	bb3c88fef7	change copyright from 2013 to 2013-2014.	2014-01-01 10:37:12 +08:00
winlin	20d1732ced	merge from wenjie, the bandwidth test feature.	2013-12-27 17:03:12 +08:00
wenjiegit	3af83fb02a	add linux version of band check app; add web version of band check app	2013-12-26 07:24:19 +08:00
wenjiegit	237fb13e1b	add linux version of band check app; add web version of band check app	2013-12-26 06:06:16 +08:00
wenjiegit	c7cd726f1b	merge upstream	2013-12-24 10:59:38 +08:00
wenjiegit	00fb37a831	merge upstream	2013-12-24 10:49:17 +08:00
wenjiegit	3753e8c5f1	merge upstream	2013-12-24 10:38:38 +08:00
winlin	593d16446e	add bandwidth workflow	2013-12-22 17:45:08 +08:00
winlin	908f0d87e9	add bandwidth workflow	2013-12-22 17:41:28 +08:00
winlin	084ad79534	refine the bandwidth test	2013-12-22 17:38:51 +08:00
winlin	9455181790	merge from wenjie, support banwidth test.	2013-12-22 17:28:29 +08:00
winlin	bad6f0d3a8	revert the copyrigh, only when commit feature, add the copyright field	2013-12-22 12:40:46 +08:00
winlin	dfb3e117f8	add contributor to core.hpp	2013-12-22 12:35:41 +08:00
winlin	725ff8e5a5	merge from wenjie: support set chunk size at vhost level	2013-12-22 12:23:20 +08:00
winlin	4b74435e89	fix bug of resolve vhost, must strip then get from config.	2013-12-22 00:33:38 +08:00
winlin	632255f08f	update the signature, when connect to server, parse the response.	2013-12-21 21:13:55 +08:00
wenjiegit	9a70ce7865	add bandcheck code and modified srs code for merge	2013-12-21 16:19:16 +08:00
winlin	9080c2e559	ensure the HLS(ts) is continous when republish stream.	2013-12-15 20:36:59 +08:00
winlin	e262147e81	fix the hls reload bug, feed it the sequence header.	2013-12-15 20:29:18 +08:00
winlin	27255a3e7a	refine protocol, use int64_t timestamp for ts and jitter.	2013-12-15 19:59:32 +08:00
winlin	ce4928cef6	support set the live queue length(in seconds), drop when full.	2013-12-15 19:38:39 +08:00
winlin	5836ffd2d4	refine the forwarder, use srs message queue	2013-12-15 19:24:29 +08:00
winlin	c47f07c69a	refine the consumer, use srs message queue to shrink message when overflow.	2013-12-15 19:11:57 +08:00
winlin	b4093bfbe4	support set live queue length	2013-12-15 18:25:55 +08:00
winlin	270041b225	fix the forwarder reconnect bug, feed it the sequence header.	2013-12-15 17:09:25 +08:00
winlin	d911c85a12	add todo for the reload	2013-12-15 13:27:08 +08:00
winlin	b3ef28f831	fix bug of get hls enabled config	2013-12-15 13:23:03 +08:00
winlin	fb67f91167	support reload the hls/forwarder/transcoder	2013-12-15 13:07:39 +08:00
winlin	b90b64954e	support reload the forwarder	2013-12-15 12:34:22 +08:00
winlin	7622878979	support reload the gop_cache	2013-12-15 12:08:01 +08:00
winlin	2f397d0460	support reload the gop_cache	2013-12-15 12:04:28 +08:00
winlin	e2bb38c483	support reload the removed vhost	2013-12-14 22:54:10 +08:00
winlin	f016914ac1	rename SrsReloadHandler to ISrsReloadHandler	2013-12-14 21:34:54 +08:00
winlin	010b7a7595	refine config.	2013-12-14 21:19:47 +08:00
winlin	5b29d0ec42	refine the config	2013-12-14 16:44:27 +08:00
winlin	3dd7156f0d	refine the config buffer.	2013-12-14 15:56:20 +08:00
winlin	ac5ccbc77e	refine the thread model for the retry threads	2013-12-14 14:06:32 +08:00
wenjiegit	c87e55a2cc	merged master	2013-12-13 02:41:31 +08:00
wenjiegit	25caf5db36	for merge	2013-12-13 02:07:50 +08:00
wenjie	6e9f375606	+server support band check +every vhost can have it's own chunk size	2013-12-12 20:56:19 +08:00
winlin	6329284b39	add todo for the bug of forwarder	2013-12-12 16:18:32 +08:00
winlin	7baa53a8d6	add todo for memory increase when forwarder server failed.	2013-12-12 12:42:53 +08:00
winlin	ff9c434eb9	add todo for memory increase when forwarder server failed.	2013-12-12 10:41:27 +08:00
winlin	66048cebbb	add todo for source	2013-12-10 14:49:35 +08:00
winlin	8887754b17	change version to 0.9 dev	2013-12-08 14:28:04 +08:00
winlin	3fd3ac5a11	support http hooks: on_connect/close/publish/unpublish/play/stop.	2013-12-08 12:48:03 +08:00
winlin	889ad9238b	support http hooks: on_connect/close/publish/unpublish/play/stop.	2013-12-08 12:45:12 +08:00
winlin	2887cda176	support multiple http hooks for a event.	2013-12-08 10:46:33 +08:00
winlin	30099dfa09	support multiple http hooks for a event.	2013-12-08 10:46:15 +08:00
winlin	a478452f57	support http callback hooks: on_connect	2013-12-07 23:23:19 +08:00
winlin	65fde21e6c	add http client	2013-12-07 22:06:53 +08:00
winlin	bb22c3b5cd	add http library, support in build script	2013-12-07 20:51:27 +08:00
winlin	3600be9796	add http callback in config	2013-12-07 20:38:14 +08:00
winlin	4b9eabdf01	udpate files.	2013-12-07 19:28:11 +08:00
winlin	263213d8b6	update version, add build date	2013-12-07 19:27:31 +08:00
winlin	3b09f9bea9	support audio transcode only, speex/mp3 to aac	2013-12-06 14:35:03 +08:00
winlin	2d592d177d	refine the signals of ffmpeg.	2013-12-06 14:12:01 +08:00
winlin	71895a4da6	fix the ffmpeg kill bug, wait until ffmpeg quit.	2013-12-06 14:07:37 +08:00
winlin	cab88dfe70	hls support multiple publish/unpublish. disable hls when not support	2013-12-06 14:02:10 +08:00
winlin	679e851f07	support max_connections, drop if exceed.	2013-12-06 11:00:37 +08:00
winlin	86b1f3349a	fix bug of forward, erase msgs when error	2013-12-06 10:23:28 +08:00
winlin	89c0170850	fix bug of forward, earse the forwarded msgs.	2013-12-06 10:16:24 +08:00
winlin	8c5661b9ff	fix bug of hls muxer, support close/open/flush even muxer is closed.	2013-12-06 09:44:23 +08:00
winlin	6207a2f19e	fix the rewind bug, support republish by restart the ffmpeg encoder.	2013-12-05 23:54:30 +08:00
winlin	b9440df745	add encoder/hls pithy print	2013-12-05 23:34:26 +08:00
winlin	464d78b762	add todo for ffmpeg	2013-12-03 00:26:40 +08:00
winlin	113731dd6b	reap the transcode process	2013-12-02 23:51:51 +08:00
winlin	b5bba29768	refine hls, extract ts cache for ts cache audio and flush once	2013-12-02 22:09:10 +08:00
winlin	1c2f5052dd	refine the hls muxer module	2013-12-02 15:55:10 +08:00
winlin	b4eb38c86b	refine hls code, reorder classes.	2013-12-02 14:24:09 +08:00
winlin	d6897205c7	add todo for protocol	2013-12-02 12:56:52 +08:00
winlin	a2e6e6718e	fix the m3u8 crash bug, simplify it	2013-12-02 11:46:39 +08:00
winlin	2b0bef18ed	add todo for forward	2013-12-01 20:03:07 +08:00
winlin	09f9811a97	fix the hls crash bug	2013-12-01 19:54:52 +08:00
winlin	6f0bba9856	add todo: cycle all process, reap the exited	2013-12-01 18:53:24 +08:00
winlin	2695e4d0c6	fix bug of core	2013-12-01 17:42:09 +08:00
winlin	6af0794bab	support dead-loop detect for forwarder and transcoder.	2013-12-01 17:32:06 +08:00
winlin	35676920be	convert to unix format	2013-12-01 13:05:43 +08:00
winlin	18028ad4cb	update readme	2013-12-01 13:04:09 +08:00
winlin	9a0d8855d8	support ffmpeg filter	2013-12-01 10:54:41 +08:00
winlin	f85b70966c	rename global username and email	2013-11-30 23:26:40 +08:00
winlin	951cd08f1f	refine the params	2013-11-30 23:21:14 +08:00
winlin	407801b8a6	add ffempty	2013-11-30 23:20:46 +08:00
winlin	b88596b6dc	update readme	2013-11-30 23:15:25 +08:00
winlin	601a69aa70	update readme	2013-11-30 23:15:13 +08:00
winlin	525af4599f	support live stream transcoding by ffmpeg.	2013-11-30 23:04:47 +08:00
winlin	06278176dd	add research empty ffmpeg	2013-11-30 21:53:28 +08:00
winlin	80a81b1661	parse ffmpeg params	2013-11-30 21:02:21 +08:00
winlin	ce15f4bce3	update encoder framework	2013-11-30 19:14:19 +08:00
winlin	8d91561ca0	add ffmpeg transcoding framework	2013-11-30 18:31:07 +08:00
winlin	a086e2bbfa	add transcoding params to config	2013-11-30 16:23:01 +08:00
winlin	57064237d0	rename author to contributor	2013-11-30 14:35:59 +08:00
winlin	790294f437	add authors	2013-11-29 23:08:50 +08:00
winlin	28572b009a	remove the clock msg from log	2013-11-29 22:39:50 +08:00
winlin	5d69236bff	convert to unix format	2013-11-29 22:21:31 +08:00
winlin	db405b7e0e	support forward stream to origin/edge	2013-11-29 22:20:51 +08:00
winlin	f656087d74	add forward framework	2013-11-29 16:52:24 +08:00
winlin	2fa7610f9c	add rtmp client	2013-11-29 15:07:05 +08:00
winlin	844718c99b	refine the forwarder	2013-11-28 23:43:52 +08:00
winlin	1f8bb0e935	add forward st thread	2013-11-28 23:18:05 +08:00
winlin	f09d457644	add forward framework	2013-11-28 22:59:00 +08:00
winlin	3515af9dff	add tools	2013-11-28 22:32:50 +08:00
winlin	de95bf74b1	refine source, extract gop cache, add srs forwarder.	2013-11-28 22:28:34 +08:00
winlin	ecebedfed2	refine code	2013-11-28 15:12:08 +08:00
winlin	af5e7f002f	fix the memory leak error	2013-11-28 14:53:46 +08:00
winlin	005f821441	fix bug of hls conf detect	2013-11-28 09:14:56 +08:00
winlin	3877ab0ff2	fix bug of hls conf detect	2013-11-28 09:14:31 +08:00
winlin	1653e444dd	add comments for auto ptr message	2013-11-27 23:02:37 +08:00
winlin	90af450d63	add todo for response client detail error	2013-11-27 22:54:43 +08:00
winlin	62a2384a35	check publish streaming available	2013-11-27 22:53:08 +08:00
winlin	ec5cb39b96	add options --with/without -hls/ssl	2013-11-27 22:41:58 +08:00
winlin	f8855cfcbb	fix the aac jump bug on iphone, correct the audio pts, use audio buffer and flush audio	2013-11-27 17:30:16 +08:00
winlin	c78baedf4e	fix bug of 0.5 release.	2013-11-26 18:20:04 +08:00
winlin	94623c0cee	fix bug of shared ptr, must copy the payload for it free it.	2013-11-26 18:11:45 +08:00
winlin	758dff0e97	fix bug of hls, close the muxer when segment finished	2013-11-26 17:56:55 +08:00
winlin	00ec634d56	support hls_fragment and hls_window	2013-11-26 17:48:35 +08:00
winlin	04cfe20279	support HLS, refine the dir use app	2013-11-26 17:21:49 +08:00
winlin	57ea56970d	add nginx and used as http server	2013-11-26 16:45:50 +08:00
winlin	0c72c56f74	support HLS(m3u8)	2013-11-26 16:06:58 +08:00
winlin	749b7bdb2a	refine hls, support time jitter detect and correct	2013-11-26 11:48:18 +08:00
winlin	326713fbed	refine code, extract the rtmp jitter for hls	2013-11-26 11:15:44 +08:00
winlin	501b182dc9	refine code, write audio immediatly	2013-11-26 10:56:29 +08:00
winlin	dbdfb29de1	refine code, remove the base dts, donot drop start BP frames	2013-11-26 10:48:37 +08:00
winlin	b4235582dc	refine code, remove the base dts, donot drop start BP frames	2013-11-26 10:47:05 +08:00
winlin	9e5b3afcbe	update readme	2013-11-26 00:03:07 +08:00
winlin	7ed20cc670	support write ts file	2013-11-25 23:54:01 +08:00
winlin	164392f6aa	fix bug of ts_info	2013-11-25 10:59:21 +08:00
winlin	d5b84b5e20	refine ts code	2013-11-25 00:46:08 +08:00
winlin	38e66be490	fix ts audio bug, aac adts header and PES_packet_length fixed	2013-11-25 00:02:01 +08:00
winlin	4fca914694	support write ts file	2013-11-24 23:13:14 +08:00
winlin	ca6720aab2	add time to write ts file	2013-11-24 18:55:39 +08:00
winlin	385394315d	add ts mux framework	2013-11-24 17:53:36 +08:00
winlin	4af3982721	add ts muxer to write hls/ts file	2013-11-24 17:15:37 +08:00
winlin	ce021b25c7	update the config file format	2013-11-24 16:49:00 +08:00
winlin	19f16ba7a8	remove the analysis doc for ts	2013-11-24 16:00:45 +08:00
winlin	ecc8688455	ensure sequence header is ok when parse avc/aac data	2013-11-24 15:11:18 +08:00
winlin	c243ad3282	avc/aac demux the flv samples	2013-11-24 15:08:43 +08:00
winlin	fcfd51ee20	decoded audio and video. add avc file format doc	2013-11-24 14:28:58 +08:00
winlin	ba234e8741	add avc format doc. decode the flv codec info	2013-11-24 12:39:47 +08:00
winlin	b87318dec0	extract method to process publish message	2013-11-23 20:33:10 +08:00
winlin	195a857f22	nginx never keep the metadata.	2013-11-23 20:23:00 +08:00
winlin	4f3cdd51c1	change metadata. add hls class.	2013-11-23 20:16:47 +08:00
winlin	200a6a6975	add hls config	2013-11-23 19:15:11 +08:00
winlin	e3e0db9bb1	fix the format to unix without x	2013-11-23 18:20:02 +08:00
winlin	2c4c91d821	convert format to unix	2013-11-23 11:36:07 +08:00
winlin	cdd548004c	rename ts_info.cpp to ts_info.cc	2013-11-23 11:29:30 +08:00
winlin	974af0605b	fix protocol decode PCUC packet bug, requires 4bytes	2013-11-20 20:41:46 +08:00
winlin	bc8828a7de	update the random generater	2013-11-20 14:52:47 +08:00
winlin	4bba9ddcbb	add ts_info doc	2013-11-20 11:51:07 +08:00
winlin	d1e20dc866	fix the global static instance error, use function to get server	2013-11-20 10:08:52 +08:00
winlin	a47a53f271	update the ts_info parse the PMT and PES header	2013-11-18 23:49:18 +08:00
winlin	ff565c4d9b	fix bug of amf0 decode	2013-11-16 12:54:48 +08:00
winlin	bf1113dad7	add log for update video/audio sequence header	2013-11-14 17:13:20 +08:00
winlin	687d190da1	reset the audio sample size and video frame size when unpublish	2013-11-13 13:29:03 +08:00
winlin	0645f5e927	calc the delta for time jitter for video	2013-11-12 18:41:22 +08:00
winlin	8f528ae5b2	v0.4 released. 12500 lines.	2013-11-10 12:05:13 +08:00
winlin	b855caa045	refine handshake, pithy print clock	2013-11-10 12:00:01 +08:00
winlin	3669419e4c	support config and reload the pithy print.	2013-11-10 11:52:19 +08:00
winlin	6c3b5943e9	add reload config comments for config.	2013-11-09 22:53:59 +08:00
winlin	68ccd7eb64	support reload config(listen and chunk_size) by SIGHUP(1).	2013-11-09 22:41:44 +08:00
winlin	ed3525056c	support config the chunk_size.	2013-11-09 20:56:35 +08:00
winlin	c78af697a1	support pause for live stream.	2013-11-09 11:49:38 +08:00
winlin	c77695ce55	add comments for extended-timestamp, always send the extended-timestamp even chunk type=0x03	2013-11-08 15:35:24 +08:00
winlin	883b054f9d	update readme.	2013-11-04 23:08:34 +08:00
winlin	6e62efb9e6	update readme.	2013-11-04 23:08:07 +08:00
winlin	751323fac8	release v0.3, 11773 lines	2013-11-04 22:55:19 +08:00
winlin	58d9677ddd	support vhosts specified config.	2013-11-04 22:42:03 +08:00
winlin	9f94f891ad	delete the cache when unpublish, when publish the encoder will update it	2013-11-03 19:57:54 +08:00
winlin	a5339c2a27	refine socket buffer, append bytes to vector directly	2013-11-02 19:52:33 +08:00
winlin	c0b6982e0d	support listen multiple ports.	2013-11-02 19:32:52 +08:00
winlin	2aa15a1134	support nginx-style config file	2013-11-02 17:55:59 +08:00
winlin	a1a3a2eef9	add macro to disable the srs_trace	2013-10-30 11:37:11 +08:00
winlin	b4427877f7	support pithy print log message specified by stage.	2013-10-29 22:16:18 +08:00
winlin	293399dcf5	fix bug of time jitter correcter	2013-10-29 18:46:46 +08:00
winlin	3aa6be8645	fix the timestamp bug. correct the audio diff by audiosamplerate	2013-10-29 10:17:33 +08:00
winlin	3accc969ab	update the signature of server	2013-10-29 07:46:55 +08:00
winlin	3c8e1f8ff7	fix bug of extended-timestamp, support librtmp/ffmpeg publish	2013-10-28 22:09:11 +08:00
winlin	0ed8807727	support cache last gop for video	2013-10-27 11:25:42 +08:00
winlin	359c7da19b	support flash publish	2013-10-25 18:44:56 +08:00
winlin	6d385f15a7	refine code, add todo command	2013-10-25 17:35:37 +08:00
winlin	24a54a40e8	refine code, add prefix srs	2013-10-25 17:22:52 +08:00
winlin	53a668e34d	support h264/avc codec by rtmp complex handshake(SrsComplexHandshake)	2013-10-25 17:16:23 +08:00
winlin	f0f4837a97	define the structs for c0c1 complex handshake	2013-10-25 07:42:18 +08:00
winlin	e6ca039dd6	add rtmp complex handshake classes	2013-10-25 07:15:33 +08:00
winlin	598aaa5c98	detect the video/audio codec, only cache the h264/aac sequence header	2013-10-24 22:29:12 +08:00
winlin	2987a24877	add TODO for complex handshake	2013-10-23 22:25:35 +08:00
winlin	2ee913bd70	update comment TODO for sequence header and fast-startup caching last gop	2013-10-23 22:20:08 +08:00
winlin	9da31de1c1	support decode user control message. response ping automatically	2013-10-23 22:17:57 +08:00
winlin	0a92faf2e3	update timestamp comments	2013-10-23 21:44:24 +08:00
winlin	b40d0467a8	time jitter detect and correct, very simple algorithm	2013-10-23 21:37:22 +08:00
winlin	e31e3d601d	time jitter detect and correct, very simple algorithm	2013-10-23 21:31:22 +08:00
winlin	2a346c2398	support send acknowledgement when recv message.	2013-10-23 20:59:08 +08:00
winlin	5d1d0ff8bb	update help	2013-10-23 12:20:03 +08:00
winlin	a0a0da5f23	release v0.1, support FMLE/FFMPEG publish, vp6 codec live streaming	2013-10-23 11:57:47 +08:00
winlin	54b9c5d389	support FMLE/FFMPEG publish vp6 codec, h264/aac not support yet	2013-10-23 00:17:44 +08:00
winlin	444a45facd	fix bug to accept FFMPEG streaming	2013-10-23 00:01:59 +08:00
winlin	150489af51	support ffmpeg publish	2013-10-22 23:37:44 +08:00
winlin	584a427c2e	dispatch video/audio/data to consumers	2013-10-22 20:08:55 +08:00
winlin	0a0d33335a	rename base message to ISrsMessage	2013-10-22 19:51:46 +08:00
winlin	52a454c41b	rename base message to ISrsMessage	2013-10-22 19:48:50 +08:00
winlin	d8a99dde52	rename SrsSharedMessage to SrsSharedPtrMessage	2013-10-22 19:45:02 +08:00
winlin	cdd843a641	rename SrsMessage to SrsCommonMessage	2013-10-22 19:44:12 +08:00
winlin	c64ed83378	add shared ptr to video/audio/data	2013-10-22 19:38:14 +08:00
winlin	5af377e41d	add shared ptr message	2013-10-22 18:30:36 +08:00
winlin	940d2f02eb	basic media cache framework	2013-10-22 18:20:54 +08:00
winlin	a24d0ecf0c	support decode onMetaData.	2013-10-22 17:26:05 +08:00
winlin	ed371d6e7e	support FMLE publish streaming	2013-10-22 16:44:10 +08:00
winlin	33c586181d	support fmle publish. fix bug of rtmp chunk stream.	2013-10-22 15:48:33 +08:00
winlin	e598616e14	fix objectEncoding bug, default to AMF0, change to AMF3 if required.	2013-10-22 12:27:22 +08:00
winlin	99aa8bc087	support FMLE releaseStream, FCPublish	2013-10-22 12:12:10 +08:00
winlin	58a54176f7	support onStatus, RtmpSampleAccess, DataStart	2013-10-22 11:31:52 +08:00
winlin	adc382ad48	support set chunk size, PCUC 4bytes packets	2013-10-22 08:00:13 +08:00
winlin	af5961432d	support createStream and play, identity the play client	2013-10-21 22:42:36 +08:00
winlin	5475d0e435	support ack size.	2013-10-20 22:22:55 +08:00
winlin	2e590e18f4	fix bug of send rtmp message	2013-10-20 21:58:03 +08:00
winlin	1beee1e970	support ecma array. connect app response.	2013-10-20 17:55:44 +08:00
winlin	8283ed465a	support encode amf0 packet, connect app response packet	2013-10-20 17:13:01 +08:00
winlin	57dd58d557	send set peer bandwidth packet.	2013-10-20 15:59:26 +08:00
winlin	2abfcee10f	support set ack window size.	2013-10-20 15:28:55 +08:00
winlin	1047e06bf3	encode packet and send out	2013-10-20 14:28:37 +08:00
winlin	a2d2fa1a25	log the req.	2013-10-20 08:55:42 +08:00
winlin	bd64ae8257	refine the protocol and amf0, extract the template method as global static method	2013-10-20 08:45:29 +08:00
winlin	2c53134bbb	connect vhost/app packet decoded.	2013-10-19 21:39:19 +08:00
winlin	df400ef1c5	connect vhost/app packet decoded.	2013-10-19 21:32:41 +08:00
winlin	2886672347	amf0 object decode framework	2013-10-19 20:06:07 +08:00
winlin	810bb6ba38	decode amf0 string	2013-10-19 18:46:12 +08:00
winlin	a638ebd1c6	decode the amf0 command message: connect.	2013-10-19 18:27:52 +08:00
winlin	63bf9e112d	decode the amf0 command message: connect.	2013-10-19 18:20:39 +08:00
winlin	25468e4ff8	refine buffer read socket logic.	2013-10-19 16:52:22 +08:00
winlin	496c5ecfde	add amf0 decode framework.	2013-10-19 16:47:40 +08:00
winlin	f5672998fd	expect rtmp packet which decoded from message payload	2013-10-19 16:16:06 +08:00
winlin	bf5378434f	decode chunk stream to RTMP message	2013-10-19 13:52:07 +08:00
winlin	2625ecc151	decode message header	2013-10-19 12:12:52 +08:00
winlin	f730ccbf9f	decode basic header	2013-10-19 11:18:15 +08:00
winlin	393e32ee0f	add rtmp specification	2013-10-19 09:17:56 +08:00
winlin	bd66702299	add rtmp specification	2013-10-19 09:16:25 +08:00
winlin	9541ac1e35	add log macro use __PRETTY_FUNCTION__ for c++	2013-10-19 09:10:17 +08:00
winlin	49a7cb9afb	refine comments.	2013-10-19 09:01:56 +08:00
winlin	56e78bdf6f	add comments. refine naming	2013-10-19 09:00:17 +08:00
winlin	a323483bea	add protocol stack	2013-10-19 08:42:21 +08:00
winlin	fbe6e061c0	simple handshake(specified by rtmp protocol v1.0) success	2013-10-18 22:04:39 +08:00
winlin	3976a17841	add auto free. recv c0c1	2013-10-18 21:57:52 +08:00
winlin	0609eeb7c8	add socket rtmp and buffer. rename logs	2013-10-18 21:41:05 +08:00
winlin	d4b6178f0f	get peer ip and add rtmp class	2013-10-18 20:15:05 +08:00
winlin	96e1de255c	close fd when delete connection object	2013-10-18 17:10:24 +08:00
winlin	973bea1e14	extract the rtmp connection	2013-10-18 16:57:21 +08:00
winlin	d8a64603c0	support listen and accept framework	2013-10-18 16:23:06 +08:00
winlin	5b02f9c78b	init st, add error code	2013-10-18 10:39:37 +08:00
winlin	eb3b824e6c	rename upp project	2013-10-18 09:19:19 +08:00
winlin	a4c5f94b15	add copyright info	2013-10-17 22:27:47 +08:00
winlin	78c69016ba	add srs_core.cpp	2013-10-17 22:14:11 +08:00
winlin	67d96fcab4	add log	2013-10-17 22:09:10 +08:00
winlin	7268dd15a1	add build framework	2013-10-17 20:58:04 +08:00