3082 commits

Author	SHA1	Message	Date
winlin	1ed5118246	refine the spaces, no TABS	2017-01-16 15:47:26 +08:00
winlin	750f4413c8	merge srs2 for #536	2017-01-16 12:47:48 +08:00
winlin	142a9733b2	refine encoder code for #536.	2017-01-16 12:42:25 +08:00
winlin	ccb250f3bc	merge srs2. convert ts aac audio private stream 1 to common.	2017-01-11 17:43:29 +08:00
winlin	e6eafd3b97	fix #740, convert ts aac audio private stream 1 to common. 2.0.229	2017-01-11 17:42:34 +08:00
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	db231f6d37	refine hls html5 video template.	2017-01-10 18:43:36 +08:00
winlin	087a596a63	refine hls html5 video template.	2017-01-10 18:43:10 +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	b7dd764920	update gitignore	2017-01-09 15:17:08 +08:00
winlin	10a0c6c10c	update for srs3	2017-01-06 17:55:06 +08:00
winlin	1b1ae00910	fix #727, install valgrind-devel	2017-01-06 17:51:07 +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	d29416a5f0	add conf sample for ingest rtsp	2017-01-06 10:47:05 +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	78aa518ecc	merge srs2	2016-09-27 11:00:13 +08:00
winlin	b19702f669	update srs player	2016-09-27 10:58:04 +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	0596550a72	Merge branch '2.0release' into develop	2016-09-15 13:31:28 +08:00
winlin	99d87f9f9c	fix sys-ssl librtmp build bug.	2016-09-15 13:17:58 +08:00
winlin	4bcd90d747	fix sys-ssl librtmp build bug.	2016-09-15 13:11:42 +08:00
winlin	92fb81003c	link crypto when use sys-ssl	2016-09-15 12:59:34 +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	6b8fe92afa	Merge branch '2.0release' into develop	2016-09-13 15:53:40 +08:00
winlin	588de3e7b4	check lsb_realease for install	2016-09-13 15:53:34 +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	c231f45fe8	Merge branch '2.0release' into develop	2016-09-09 14:57:58 +08:00
winlin	bd652e4607	fix build failed for stdc++	2016-09-09 14:41:02 +08:00
winlin	8a4e241eec	merge from srs2	2016-09-09 14:29:33 +08:00