905 commits

Author	SHA1	Message	Date
winlin	d645411392	refine the kbps comments, add one usage.	2015-05-22 20:31:07 +08:00
winlin	6ca46e84bc	fix #397, the USER_HZ maybe not 100. 2.0.165	2015-05-22 17:16:33 +08:00
winlin	c17a1198cb	fix #399, disconnect when not keep alive.	2015-05-22 16:27:48 +08:00
winlin	46a81372e7	fix #398, set recv timeout for http connection.	2015-05-22 13:57:04 +08:00
winlin	6f8c076b30	add comments for srs thread, add never quit thread.	2015-05-22 12:10:06 +08:00
winlin	948d200ce1	fix #400, parse when got entire http header, by feilong. 2.0.164.	2015-05-22 12:00:48 +08:00
winlin	5d7b0edccc	merge from bravo code, fix some warnings.	2015-05-22 11:20:25 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	2015-05-10 10:35:35 +08:00
winlin	77ee2400df	fix the unicode to ascii	2015-05-09 23:12:12 +08:00
winlin	7fc1cda392	add stream status to api.	2015-05-08 16:45:25 +08:00
winlin	e221d002a2	fix the flv caster bug, when nread is 0, disconnect it.	2015-05-05 07:37:12 +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	ea1e015a4e	fix the http read chunked encoding bug.	2015-05-04 18:11:52 +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	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
tufang14	b6d650cdb4	m3u8 mount bug	2015-04-25 14:59:12 +08:00
winlin	e50996270e	fix the config parse error.	2015-04-23 16:25:49 +08:00
winlin	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	2015-04-23 12:05:24 +08:00
winlin	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	2239e9f1fd	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
winlin	623e37e22a	Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release	2015-04-20 11:28:20 +08:00
winlin	6e5c587e0a	support aac_adtstoasc filter to copy mode.	2015-04-20 11:24:12 +08:00
J	aca02b6d6b	for #384,refine code for empty body request.	2015-04-18 14:51:33 +08:00
J	8adbdc39e3	for #384,refine code for empty body request.	2015-04-18 14:42:16 +08:00
J	a71db53661	for #384,refine code for empty body request.	2015-04-18 14:33:57 +08:00
J	56f75cbbe9	fix #384	2015-04-17 10:12:52 +08:00
winlin	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	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	dcac9c69d5	fix #381, support reap hls/ts by gop or not. 2.0.160.	2015-04-13 10:32:32 +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	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	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