2340 commits

Author	SHA1	Message	Date
winlin	46a81372e7	fix #398, set recv timeout for http connection.	2015-05-22 13:57:04 +08:00
winlin	6f8c076b30	add comments for srs thread, add never quit thread.	2015-05-22 12:10:06 +08:00
winlin	948d200ce1	fix #400, parse when got entire http header, by feilong. 2.0.164.	2015-05-22 12:00:48 +08:00
winlin	5d7b0edccc	merge from bravo code, fix some warnings.	2015-05-22 11:20:25 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	0f7cafe50b	order the xcode project	2015-05-15 14:34:59 +08:00
winlin	f6d2fd991b	merge from 2.0.162	2015-05-10 10:36:49 +08:00
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	2015-05-10 10:35:35 +08:00
winlin	39f5f80b6c	Merge branch '2.0release' into develop	2015-05-09 23:12:23 +08:00
winlin	77ee2400df	fix the unicode to ascii	2015-05-09 23:12:12 +08:00
winlin	1fd69beea5	Merge branch '2.0release' into develop	2015-05-08 16:45:48 +08:00
winlin	7fc1cda392	add stream status to api.	2015-05-08 16:45:25 +08:00
winlin	7ce9398b41	Merge branch '2.0release' into develop	2015-05-08 07:04:36 +08:00
winlin	ac13817aae	update donation	2015-05-08 07:04:31 +08:00
winlin	2d61a8cfaf	Merge branch '2.0release' into develop	2015-05-07 11:07:42 +08:00
winlin	f6252c7f72	enable hls for push flv.	2015-05-07 11:07:32 +08:00
winlin	644454a4f5	Merge branch '2.0release' into develop	2015-05-05 11:46:28 +08:00
winlin	ffdabf32ed	add push flv conf	2015-05-05 11:44:20 +08:00
winlin	f13c4d3a0f	Merge branch '2.0release' into develop	2015-05-05 07:37:20 +08:00
winlin	e221d002a2	fix the flv caster bug, when nread is 0, disconnect it.	2015-05-05 07:37:12 +08:00
winlin	e516c7f7a5	Merge branch '2.0release' into develop	2015-05-04 21:55:28 +08:00
winlin	ad32048c1c	fix the http flv stream caster.	2015-05-04 21:55:19 +08:00
winlin	cba6675560	refine the http message, set the connection if required.	2015-05-04 19:06:38 +08:00
winlin	ba6c3132e3	refine code, use decoder to parse flv stream	2015-05-04 18:28:41 +08:00
winlin	411f5a1d2a	Merge branch '2.0release' into develop	2015-05-04 18:12:00 +08:00
winlin	ea1e015a4e	fix the http read chunked encoding bug.	2015-05-04 18:11:52 +08:00
winlin	da00b67c76	Merge branch '2.0release' into develop	2015-05-03 23:57:32 +08:00
winlin	a95fd6d140	read the http flv stream.	2015-05-03 23:57:22 +08:00
winlin	022b6aa561	refine the http remux for http flv stream.	2015-05-03 23:34:59 +08:00
winlin	f0c24eeacc	add stream caster for post flv over http.	2015-05-03 10:56:20 +08:00
winlin	91e285b0cd	Merge branch '2.0release' into develop	2015-04-29 18:46:54 +08:00
winlin	4b372d8d16	change primary to the primary branch.	2015-04-29 18:46:47 +08:00
winlin	94681702e1	Merge branch '2.0release' into develop	2015-04-29 18:03:20 +08:00
winlin	e63b8eda51	migarate to srs org.	2015-04-29 18:03:17 +08:00
winlin	42ddb76544	Merge branch '2.0release' into develop	2015-04-29 18:01:24 +08:00
winlin	8603dba697	migarate to srs org.	2015-04-29 18:01:16 +08:00
winlin	17b15deee6	Merge branch '2.0release' into develop	2015-04-29 17:38:29 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	53e92a17f5	Merge branch '2.0release' into develop	2015-04-29 17:06:40 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	5559fb9842	Merge branch '2.0release' into develop	2015-04-29 15:44:53 +08:00
winlin	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