51 commits

Author	SHA1	Message	Date
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00
winlin	0e1861b084	for #367: extract the process from ffmpeg to exec programs.	2015-08-24 21:51:05 +08:00
winlin	66a26bdce8	move json from app to protocol	2015-08-21 16:20:19 +08:00
winlin	f8f6e438cc	extract http static and http stream from http conn.	2015-06-14 14:06:39 +08:00
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	8b3bd5b4b9	add srs memory watcher.	2015-06-07 15:13:41 +08:00
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:04:28 +08:00
winlin	68d835021e	refine code, move the kbps to protocol	2015-05-23 09:58:00 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +08:00
winlin	e2955da78f	refine code, extract the http protocol sdk to module.	2015-05-22 20:47:27 +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	f0c24eeacc	add stream caster for post flv over http.	2015-05-03 10:56:20 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
winlin	eb54ec25c9	fix compile errors.	2015-04-03 11:30:59 +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	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +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
winlin	5c6ef6ded6	fix warning for xcode.	2015-03-14 13:09:34 +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
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
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +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	4325809daf	refine http	2015-03-05 21:45:01 +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	40fbfd8560	for #133, rtsp extract tcp/udp listener.	2015-02-17 16:28:28 +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	4246be92c9	for #250, merge avc to codec. use queue to dequeue.	2015-01-31 21:16:42 +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	755e61e011	update the qt project.	2015-01-29 11:27:56 +08:00
winlin	d22e4e86d8	update projects for rtmp renamed to protocol	2015-01-24 16:59:36 +08:00
winlin	6463d22a14	for #250, add mpegts over udp stream caster class.	2015-01-24 16:27:30 +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	dfe385d0c9	for #293, move the simple buffer to kernel.	2015-01-22 18:13:33 +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	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