2997 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	6b28dec8ec	merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:05:06 +08:00
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:04:28 +08:00
winlin	af172d9593	refine script, use PROTOCOL as RTMP.	2015-05-23 09:59:24 +08:00
winlin	68d835021e	refine code, move the kbps to protocol	2015-05-23 09:58:00 +08:00
winlin	478873fdec	Merge branch '2.0release' into develop	2015-05-23 09:49:23 +08:00
winlin	cfc0877ec9	refine the thread, add all callback.	2015-05-23 09:49:15 +08:00
winlin	e5f449ce36	refine the thread to three category.	2015-05-23 09:20:16 +08:00
winlin	2f0ef87d6d	refine code, rename the sync call to common class.	2015-05-23 07:57:45 +08:00
winlin	0bb90145ba	fix #391, copy request for async call.	2015-05-23 07:46:45 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +08:00
winlin	f0ae66a081	merge the app http to conn.	2015-05-22 22:34:03 +08:00
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	2015-05-22 22:24:05 +08:00
winlin	e2955da78f	refine code, extract the http protocol sdk to module.	2015-05-22 20:47:27 +08:00
winlin	d645411392	refine the kbps comments, add one usage.	2015-05-22 20:31:07 +08:00
winlin	7243cdbff6	merge from 2.0release.	2015-05-22 17:20:30 +08:00
winlin	6ca46e84bc	fix #397, the USER_HZ maybe not 100. 2.0.165	2015-05-22 17:16:33 +08:00
winlin	c17a1198cb	fix #399, disconnect when not keep alive.	2015-05-22 16:27:48 +08:00
winlin	46a81372e7	fix #398, set recv timeout for http connection.	2015-05-22 13:57:04 +08:00
winlin	6f8c076b30	add comments for srs thread, add never quit thread.	2015-05-22 12:10:06 +08:00
winlin	948d200ce1	fix #400, parse when got entire http header, by feilong. 2.0.164.	2015-05-22 12:00:48 +08:00
winlin	5d7b0edccc	merge from bravo code, fix some warnings.	2015-05-22 11:20:25 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	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	60e10f2960	Merge branch '2.0release' into develop	2015-05-07 11:48:50 +08:00
winlin	0fd23c85cc	update donation	2015-05-07 11:48:36 +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	99e4bad56f	update donation.	2015-05-06 22:04:47 +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