242 commits

Author	SHA1	Message	Date
winlin	66a26bdce8	move json from app to protocol	2015-08-21 16:20:19 +08:00
winlin	2cf526ffc7	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00
winlin	3b8daafc03	use local openssl header files to avoid warnings on osx.	2015-07-06 10:32:28 +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	fec8422d6b	fix bug of configure.	2015-05-27 10:23:40 +08:00
winlin	cf9ee04611	fix the utest build failed bug.	2015-05-24 18:56:52 +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	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	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	717d088376	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	1cb2992808	refine build for modules, add defines.	2015-03-23 17:49:45 +08:00
winlin	6d15d0ea99	for #324, refine code, add hstrs config.	2015-03-14 09:52:47 +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	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	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	fbbe46d272	refine the config, support directly parse file.	2015-03-07 22:25:43 +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	4325809daf	refine http	2015-03-05 21:45:01 +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	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	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	99bf397487	for bug #293, add mp3 id3 spec	2015-01-19 09:25:07 +08:00
winlin	c0233542bf	for #293, add aac encoder for http aac stream.	2015-01-18 22:51:07 +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	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	60bc9c2aa0	add performance header to control options for performance. 2.0.50	2014-12-04 13:43:55 +08:00
winlin	ea0e837cd6	move the srs_kernel_buffer to srs_protocol_buffer.	2014-12-03 18:56:09 +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	18c308248e	refine code by winlin, for merged from allspace.	2014-11-27 15:22:39 +08:00