3467 commits

Author	SHA1	Message	Date
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	b3bd007f0d	update git commit	2015-04-29 15:09:03 +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	dbcd7d883b	add script check_hls_backup.sh to research hls.	2015-04-23 16:58:00 +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	23b978c0bb	merge from github	2015-04-20 11:28:46 +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	0000c945ea	refine the proxy api server.	2015-04-10 16:07:45 +08:00
winlin	fe1886aa08	add proxy for hls	2015-04-10 15:50:12 +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	09ce6651eb	Merge branch '2.0release' into develop	2015-03-23 17:49:52 +08:00
winlin	1cb2992808	refine build for modules, add defines.	2015-03-23 17:49:45 +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	014993ad1e	remove the sudo of log.	2015-03-20 15:10:17 +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
winlin	a28c051c2c	osx support build nginx and ffmpeg	2015-03-17 21:51:19 +08:00
winlin	f3e5431d0f	check what a fuck os for some fresh.	2015-03-17 21:12:30 +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
winlin	9c43c73d86	Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop	2015-03-17 07:45:27 +08:00
winlin	33e579599c	refine build for osx	2015-03-16 22:25:59 +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	0017ee85e0	Merge branch '2.0release' into develop	2015-03-15 19:34:11 +08:00
winlin	59d9af8039	update conf	2015-03-15 19:34:04 +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	636bc574af	start 2.0release, 80773 lines.	2015-03-15 07:48:27 +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	74fa3ba16f	fix build failed for linux.	2015-03-13 17:34:33 +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	5d12a1ab20	for #328, add hds specification.	2015-03-12 11:36:12 +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	3e5821efff	enable http api for x86_x64	2015-03-11 15:04:34 +08:00
winlin	3732554844	remove the xcode state.	2015-03-11 14:56:03 +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	5370493140	add ingest to mac.dev conf.	2015-03-11 13:24:14 +08:00
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +08:00
winlin	b3aed2cb59	fix the bug of configure.	2015-03-10 18:18:47 +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	0ff49fd299	for #155, debug srs on xcode.	2015-03-10 13:13:31 +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	20fb5f3e8e	modify the colorful bash for osx.	2015-03-09 23:20:12 +08:00
winlin	b0953c1d3a	add comments of audio profile supported by srs.	2015-03-08 20:02:43 +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	b8e70f8538	support module	2015-03-07 16:49:21 +08:00
winlin	ee30e6bb1f	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	2015-03-07 16:39:56 +08:00
winlin	05d238f860	support modules.	2015-03-07 16:39:05 +08:00
winlin	688890cd7a	refine configure, generate objs/makefile first.	2015-03-07 16:37:29 +08:00
winlin	a29b8a7a5b	refine configure, move auto headers to script.	2015-03-07 16:33:06 +08:00
winlin	aaf87cf3d9	add srs module rule.	2015-03-07 16:29:18 +08:00
winlin	b360fe279d	remove libaacplus.	2015-03-06 22:35:02 +08:00
winlin	496f689de7	fix bug for libfdk aac.	2015-03-06 22:29:49 +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	f619f174e6	add readme for ide.	2015-03-03 15:28:18 +08:00
winlin	5d0cb7e68f	update conf for rtsp	2015-03-01 21:24:01 +08:00
winlin	012c29e124	for #133, update the wiki.	2015-03-01 21:08: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	0af6e5e829	fix bug for srs-librtmp	2015-02-03 17:37:21 +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	89b37d3469	for #136, refine the conf for hls.	2015-02-02 13:39:23 +08:00
winlin	4d10cc9f59	for #250, add conf.	2015-01-31 23:44:35 +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	6b89ffbc1d	add config section for stream caster.	2015-01-23 15:06:12 +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	d9a012164e	update vs2010 project.	2015-01-22 19:01:21 +08:00
winlin	a647043a06	update readme and wiki url for http ts stream	2015-01-22 18:39:53 +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	7305fa6f03	update vs2010 filter	2015-01-22 08:51:24 +08:00
winlin	f26a2a8f0e	add vs2010 filters.	2015-01-22 08:50:16 +08:00
winlin	db700a0c64	update vs solution	2015-01-20 19:11:14 +08:00
winlin	31efea4f33	rename srs cmake ide to jetbrains clion	2015-01-20 18:35:24 +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
winlin	49330b98b3	Merge pull request #296 from panda1986/develop ... 支持mp3音频编码	2015-01-20 14:27:46 +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	bb1331cc91	update conf.	2015-01-20 13:46:50 +08:00
winlin	b735e29d05	refine conf, add port.	2015-01-20 12:02:25 +08:00
winlin	e5ef4c2e66	update the conf of http static and stream.	2015-01-20 10:53:57 +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	77e43d1813	refine comments of aac publish for #212	2015-01-18 22:11:38 +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	7f60d472e6	remove the change vhost forward.	2015-01-03 14:47:19 +08:00
winlin	45724bfaec	update conf for transcode.	2015-01-03 14:46:29 +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	07b207b7e3	remove test code for api-server.	2015-01-02 10:30:25 +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	8757473a7a	Merge branch '1.0release' into develop	2014-12-26 22:45:22 +08:00
winlin	dec4f6b989	hotfix 1.0release, add remote gitlab	2014-12-26 22:45:09 +08:00
winlin	8ea6da2607	Merge branch '1.0release' into develop	2014-12-26 21:49:22 +08:00
winlin	dfd4eeca45	hotfix 1.0release, git checkout develop when commit	2014-12-26 21:49:04 +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	0c132e9781	update the log position.	2014-11-28 10:58:16 +08:00
winlin	127b96b255	add git2unix and git commit script.	2014-11-28 10:42:47 +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	be53b10ed3	refine log position	2014-11-27 08:04:39 +08:00
winlin	d91a9dfa9d	udpate the srs_bwt.	2014-11-25 11:10:54 +08:00
winlin	cd0ab5fb43	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:50:59 +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	2175102ea2	remove the sync script for mirror, which maybe updated.	2014-10-27 11:41:28 +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	fca500fae6	update package for pi, check the lsb_release.	2014-10-09 14:07:20 +08:00
winlin	024611cc08	update package for pi, check the lsb_release.	2014-10-09 14:06:54 +08:00
winlin	dddec3484e	update to 1.0beta, 1.0.0	2014-10-09 12:55:25 +08:00
winlin	effcd89f66	refine script.	2014-10-09 12:09:01 +08:00
winlin	6468b9e92b	refine script, to disable iptables and selinux. 0.9.225	2014-10-09 12:07:56 +08:00
winlin	5e8f8ad3b9	add add hosts and wiki.	2014-10-09 11:53:59 +08:00
winlin	3fcbb60b1c	add add hosts and wiki.	2014-10-09 11:53:21 +08:00
winlin	bea53dca97	refine the run script for centos7	2014-10-09 11:32:12 +08:00
winlin	a9cceee943	refine the run script for centos7	2014-10-09 11:27:49 +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	3f9a53de0e	refine cmake list, only for clion.	2014-10-08 13:53:04 +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	0d98dc88bf	Merge branch '1.0release'	2014-11-28 11:09:33 +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	bb85a0c856	for bug #229, remove the windows vs2010 build files for srs-librtmp build failed on windows.	2014-11-27 18:31:25 +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	62b861718f	Revert "remove vs2010 files from master" ... This reverts commit f8a2c22f3a.	2014-11-27 17:02:30 +08:00
winlin	f8a2c22f3a	remove vs2010 files from master	2014-11-27 16:16:04 +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	bb54194c26	checkout master	2014-11-27 12:53:21 +08:00
winlin	1ce79980b1	checkout master	2014-11-27 12:52:47 +08:00
winlin	c49981ed6f	refine script	2014-11-27 12:51:33 +08:00
winlin	b825ea62f9	refine comments	2014-11-27 12:50:04 +08:00
winlin	8766ab5de2	add git2unix script	2014-11-27 12:45:34 +08:00
winlin	e76c53dae8	sleep when git commit failed.	2014-11-27 08:03:21 +08:00
winlin	ff73088091	fix bug of git commit	2014-11-27 08:02:17 +08:00
winlin	93ee15a552	udpate github commit to git commit	2014-11-27 08:00:11 +08:00
winlin	55461e866f	sync tags with csdn and oschina	2014-11-27 07:52:12 +08:00
winlin	131f598ab5	use multiple remote to commit and sync with csdn+oschina.	2014-11-27 07:47:39 +08:00
winlin	6a5f405ba0	add github script	2014-11-27 07:02:54 +08:00
winlin	e11fa383ca	udpate the srs_bwt.	2014-11-25 11:09:28 +08:00
winlin	02778dba4c	udpate the srs_bwt.	2014-11-25 11:05:45 +08:00
winlin	a2af051840	udpate the srs_bwt.	2014-11-25 10:59:38 +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	0c39a704c2	update build srs librtmp single	2014-11-16 11:29:50 +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	30d48905b3	refine git sync script, checkout master	2014-11-15 14:34:23 +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	55580ca900	add comments about bug #197	2014-11-12 13:47:04 +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	bf5206d049	Revert "Revert "add test file to show the max open files."" ... This reverts commit ea70f29648.	2014-11-11 17:02:16 +08:00
winlin	ea70f29648	Revert "add test file to show the max open files." ... This reverts commit c8673cd50e.	2014-11-11 16:55:46 +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	c8673cd50e	add test file to show the max open files.	2014-11-11 15:02:58 +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	2adf2550dc	refine the depends to make st script	2014-11-11 13:42:06 +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	8ab6b57612	research st, the timeout and coroutine scheduler.	2014-11-11 12:58:25 +08:00
winlin	be46e428ad	research st, for bug #193, remove the code with bug, exit when fork.	2014-11-11 11:25:52 +08:00
winlin	f4dfee0e9f	research st, add comments for bug #193.	2014-11-11 11:24:19 +08:00
winlin	cd09fcaf55	research st, remove all events except epoll.	2014-11-11 11:15:58 +08:00
winlin	91f6dbe479	research st, add test for setjmp and longjmp.	2014-11-10 16:50:36 +08:00
winlin	4d4e840209	research st, add jmp_flow.	2014-11-10 15:22:30 +08:00
winlin	683b01a6c9	research st, add comments about the thread cycle	2014-11-10 14:54:52 +08:00
winlin	8327a57b7e	never use stack variable for setjmp	2014-11-10 14:02:49 +08:00
winlin	2c01f7e943	research st, expand MD_INIT_CONTEXT macro, the thread start.	2014-11-10 13:52:17 +08:00
winlin	8da8c49f39	research st, add comments	2014-11-10 11:49:14 +08:00
winlin	2b70212649	research st, add stack struct comments.	2014-11-10 11:47:24 +08:00
winlin	6bde1e54dc	research st, add stack alloc commnets.	2014-11-10 11:10:27 +08:00
winlin	e49a868308	research st, rename variable thread to trd, for thread is a keyword.	2014-11-10 11:06:06 +08:00
winlin	ac1a4ec0a3	research st, always alloc on stack.	2014-11-10 10:21:05 +08:00
winlin	ae8b3e3c00	research st, remove the support of MD_STACK_GROWS_UP	2014-11-09 12:05:59 +08:00
winlin	340464ed56	research st, remove __ia64__ cpu support	2014-11-09 12:04:56 +08:00
winlin	a27c3dca2d	research st, add gdb info for setjmp.	2014-11-09 11:56:14 +08:00
winlin	4b24ee9db3	research st, only for linux and arm/mips/i386/x86_64 cpus.	2014-11-09 11:46:32 +08:00
winlin	cc811dfc90	refine script for generate script	2014-11-08 20:14:20 +08:00
winlin	6968aef66a	update readme for srs-librtmp	2014-11-08 20:06:31 +08:00
winlin	a827766cd6	for #191, support exported to project or file.	2014-11-08 18:43:58 +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	eb88ebfb39	use relative objs dir for makefile. for bug #191	2014-11-08 16:07:31 +08:00
winlin	d4d3d46317	implements export srslibrtmp. for bug #191	2014-11-08 15:31:21 +08:00
winlin	5554922820	refine librtmp tools, use srs_trace macro instead printf.	2014-11-08 14:06:40 +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	6407baffd5	for bug #66, output the h264 frame type.	2014-11-07 23:19:31 +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	e4af098d06	refine code for bug #66	2014-11-07 21:16:41 +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	1db69b153e	update the research of arm	2014-11-07 16:47:49 +08:00
winlin	0f41e0d26f	research st: only support linux	2014-11-06 15:45:31 +08:00
winlin	d67454ecc2	research st: only support linux	2014-11-06 15:43:28 +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	8521762cb3	research st: refine sync.	2014-11-06 14:00:27 +08:00
winlin	3377df0bea	research st: refine skt.	2014-11-06 13:55:06 +08:00
winlin	22710db911	research st: refine sched.	2014-11-06 13:52:15 +08:00
winlin	f5f8e8946f	research st: refine event, io and key.	2014-11-06 13:40:24 +08:00
winlin	c38a545780	reserach st: refine key.c	2014-11-06 13:17:54 +08:00
winlin	fd0c85b324	research st: refine io.	2014-11-06 13:11:34 +08:00
winlin	f8f18fffa7	research st: update test for st.	2014-11-06 12:50:27 +08:00
winlin	0f293802c8	research st: refine the md.h	2014-11-05 17:42:57 +08:00
winlin	856ba07bd3	research st: update public and common.	2014-11-05 17:22:36 +08:00
winlin	315707d726	research st: refine public	2014-11-05 17:16:15 +08:00
winlin	bba2d3dd98	research st: replace the TAB with 4spaces	2014-11-05 17:12:56 +08:00
winlin	55bd1dd95e	research st: replace the TAB with 4spaces	2014-11-05 17:10:54 +08:00
winlin	0faa38dc0c	research st: remove the osguess.sh	2014-11-05 17:06:18 +08:00
winlin	2dc6b7d1ea	add io for st research	2014-11-05 17:01:15 +08:00
winlin	9d7e6b9bb2	update mirror utils	2014-10-27 12:56:04 +08:00
winlin	60ab365660	update mirror, use utils functions.	2014-10-27 12:03:56 +08:00
winlin	e104a18763	update sync script on master	2014-10-27 11:40:59 +08:00
winlin	b8db8b0fa4	add oschina mirror	2014-10-27 11:32:34 +08:00
winlin	511c814ffb	refs #182: rename to sync test.	2014-10-26 16:38:00 +08:00
winlin	69fdec411f	refs #182: rename to sync test.	2014-10-26 16:35:12 +08:00
winlin	9aba47cbe3	refs #182: research st, add multiple threadds.	2014-10-26 14:04:31 +08:00
winlin	79ab9f05f3	refs #182: update the st, use cond and mutex.	2014-10-26 13:55:37 +08:00
winlin	388305f44c	update st research.	2014-10-26 13:43:11 +08:00
winlin	fb906f0afc	revert the player for bug #185.	2014-10-25 17:15:33 +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	d9b12b151c	refine the makefile.	2014-10-18 13:16:17 +08:00
winlin	b65df251c3	chmod +x *.sh	2014-10-12 21:50:28 +08:00
winlin	2f388d614f	rename st-1.9 to st	2014-10-12 21:31:50 +08:00
winlin	7692373e02	remove the unused files. add upp project file	2014-10-12 21:29:48 +08:00
winlin	7f4c113e57	add st-1.9 to research	2014-10-12 20:57:59 +08:00
winlin	ffabcec191	update csdn mirror, add 1.0release	2014-10-10 09:51:25 +08:00
winlin	d085a5cabc	update csdn mirror, add 1.0release	2014-10-10 09:50:18 +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
winlin	922bc3e3a8	refine configure, use console for gmc/gcp/gmp/gprof	2014-09-09 16:56:05 +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	cc8dc0fee0	remove the not-supported features, add bug #163, #164.	2014-08-20 09:18:07 +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	fc347a1c44	update configure, remove the bwtc, moved to research now.	2014-08-18 14:15:39 +08:00
winlin	f03fde37ea	refine configre, add --with-stat to configure summary	2014-08-17 22:19:52 +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	554a9763db	fix linux config openssl bug.	2014-08-17 19:43:53 +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	0cd2b13e2e	add rtmfp tsvarea	2014-08-09 07:35:22 +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	37ceadd865	sync the conf file	2014-07-27 19:11:51 +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	abef029610	refine full conf	2014-07-27 15:04:31 +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	24a041266c	refine config	2014-07-20 12:22:24 +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	f3e85a0063	refine the usage of csr.	2014-07-17 11:06:37 +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	8984ba9d56	refine the usage of bwtc.	2014-07-13 19:28:09 +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	cf7a48e3da	refine options.sh in auto	2014-07-13 13:50:58 +08:00
winlin	f24a60819f	add demo config test	2014-07-13 13:48:53 +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	019b25ea30	add MIT license to bandwidth check/test as/js library.	2014-07-13 10:05:30 +08:00
winlin	3a1b3dd142	fix bandwidth bug, config item interval to float.	2014-07-12 22:22:56 +08:00
winlin	d8ed7cc968	refine the js library for bandwidth test.	2014-07-12 21:03:26 +08:00
winlin	0707c24b54	refine the js library for bandwidth test.	2014-07-12 20:56:44 +08:00
winlin	2ff88b9bcd	move js to srs_bwt.	2014-07-12 20:51:57 +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	6a2f0a3dc9	add configure preset --demo	2014-06-29 10:50:58 +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	4d45b3305b	srs demo requires ffmpeg to transcode.	2014-06-29 10:07:57 +08:00
winlin	18534ecdb2	donot start nginx for demo, use cherrypy to delivery HLS.	2014-06-29 10:06:28 +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	594c1d8bf7	fix ssl make install on ubuntu 14, change to make install_sw	2014-06-28 23:16:14 +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	6ae6f6e60d	add freetype2 to pkg-config path.	2014-06-26 17:14:52 +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	e9c96af91a	add wiki and conf for token traverse auth	2014-06-21 12:58:33 +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	6ff193c989	donot need to yum install pkg-config, for centos always installed it	2014-06-20 10:40:06 +08:00
winlin	94e5e7070d	fix bug of freetype2 build for ffmpeg, depends on pkg-config	2014-06-20 10:25:52 +08:00
winlin	094d82bd06	add connections count to api summaries. 0.9.127	2014-06-19 18:49:05 +08:00
winlin	603b3bcdcc	add libfreetype2 for ffmpeg, remove the depends of freetype of build_ffmpeg.	2014-06-19 16:15:49 +08:00
winlin	6ee2ba049b	add srs bytes and kbps to api summaries. 0.9.126	2014-06-19 15:28:05 +08:00
winlin	8fabd5d987	refine cubieboard configure, use ubuntu prepare to install tools	2014-06-19 13:32:19 +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	17cb8c4550	finish the research for python-subprocess	2014-06-11 11:14:43 +08:00
winlin	b7d8be46a1	add research for usage for subprocess	2014-06-11 11:03:22 +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	4d9ed6f7fe	refine the code, add comments to result to self interpret	2014-06-10 11:44:02 +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	3dbe8ba9de	update configure script	2014-06-08 13:18:34 +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	48adeeb1a5	fix the demo player html text	2014-06-06 15:35:47 +08:00
winlin	e227bd3a0e	remove the srs community	2014-05-31 17:47:02 +08:00
winlin	7022f48a86	add rtmfp rfc doc	2014-05-30 15:47:27 +08:00
winlin	52971f3f81	update readme, add rtmfp	2014-05-30 10:28:16 +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	009de72a01	fix research bug, rename srs_freepa to srs_freep	2014-05-28 10:20:11 +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	384687a36d	add server ip to flash client.	2014-05-27 16:17:40 +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	cf7b6f25f6	add srs community	2014-05-23 22:39:13 +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	6bc0ecece7	add dvr, http heartbeat conf sample	2014-05-22 17:13:57 +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	2a8db3ab83	refine the re of ingest flv, re cleanup always sleep	2014-05-21 09:31:38 +08:00
winlin	1d6b096ce9	adjust the deviation.	2014-05-20 18:15:02 +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	07fbd58f39	update api server, add meiyi demo streams.	2014-05-16 10:52:38 +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	1a1527a857	fix bug #64: install_dir=DESTDIR+PREFIX	2014-05-12 12:56:58 +08:00
niesongsong	327f030ef5	Update options.sh ... fix options bug like: --prefix=../bin	2014-05-12 10:56:36 +08:00
winlin	add64533e3	add donation user chen.chen	2014-05-12 10:36:37 +08:00
winlin	1c1efd7000	update readme, update api server stream list	2014-05-10 14:01:40 +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	b2aab8804b	use complex handshake for srs play	2014-05-08 11:48:34 +08:00
winlin	f5f29e486f	update code stat	2014-05-07 13:19:25 +08:00
winlin	5e806d62bb	add code statistic tool	2014-05-07 11:07:10 +08:00
winlin	cb64d20575	refine core macros	2014-05-06 18:22:01 +08:00
winlin	c4167c66bc	Merge pull request #56 from T-bagwell/master ... fix problem: cannot build x264 normal minimal Linux	2014-05-06 14:10:39 +08:00
winlin	999e2876b4	revert to try to merge with pull request	2014-05-06 14:09:51 +08:00
winlin	ae372de65e	merge from wukong, fix the bug of build x264 on minimal server	2014-05-06 13:51:38 +08:00
Steven Liu	7ba7fd487e	fix problem: cannot build x264 normal minimal Linux ... parameters: External library support: --disable-avs disable avisynth support --disable-swscale disable swscale support --disable-lavf disable libavformat support --disable-ffms disable ffmpegsource support --disable-gpac disable gpac support There have no ffmpeg or libav when build x264, so no needed these parameters. Signed-off-by: Steven Liu <lingjiujianke@gmail.com>	2014-05-06 13:41:55 +08:00
winlin	94076b3246	fix bug #50, ubuntu14 build error	2014-05-06 11:04:12 +08:00
winlin	90e50da305	update api server, add hiwifi	2014-05-05 18:07:06 +08:00
winlin	e5290725ab	fix bug of mips	2014-05-04 19:13:21 +08:00
winlin	0c121f1c9b	fix bug of mips	2014-05-04 18:54:57 +08:00
winlin	97f4d81193	fix bug of mips	2014-05-04 18:52:32 +08:00
winlin	a88e95d558	add mips	2014-05-04 18:38:42 +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	45da6b1ef9	refine srs script, use SIGKILL if SIGERM failed.	2014-05-02 14:15:25 +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	e3be7bfa88	disable detail log	2014-04-30 12:22:06 +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	0622004eff	update conf, add todo for edge/forward	2014-04-29 09:10:17 +08:00
winlin	e5720d3906	fix bug of research librtmp tools	2014-04-28 19:05:24 +08:00
winlin	60f319de0c	fix bug of package script, donot default os	2014-04-28 19:01:56 +08:00
winlin	e85a46f88e	fix bug of package script, donot default os	2014-04-28 18:58:51 +08:00
winlin	6e8c0b9674	fix bug of arm package script	2014-04-28 18:55:19 +08:00
winlin	fe80a4a7d2	remove package script for pi and arm, use param instead	2014-04-28 18:52:18 +08:00
winlin	cdcbca6423	update package script	2014-04-28 18:48:31 +08:00
winlin	555d8b9f1d	delete pid file when stop service	2014-04-28 18:07:18 +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	241d04b391	update api server for android server vhost changed	2014-04-28 14:54:27 +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	bfd1d07827	update readme	2014-04-24 17:46:10 +08:00
winlin	3ed59f190b	refine srs live flashP2P(integrated by chnvideo)	2014-04-24 17:38:57 +08:00