431 commits

Author	SHA1	Message	Date
winlin	f2efa96015	for #324, always enable hstrs. 3.0.10	2017-01-05 09:08:56 +08:00
winlin	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	2016-12-15 16:22:04 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +08:00
winlin	2a01540433	support change work_dir for oryx.	2016-09-23 14:53:58 +08:00
winlin	516f33888c	refine config	2016-08-09 12:37:48 +08:00
winlin	f87646d489	fix typo of config.	2016-08-08 13:58:42 +08:00
winlin	892591f9a6	merge from @mbeacom	2016-04-22 10:18:13 +08:00
winlin	d81b2cb140	support hls mount to vhost and reload	2016-01-11 13:15:46 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	8974fe298b	connect to kafka and send metadata request.	2015-10-23 14:42:03 +08:00
winlin	29122b6e70	fix #502, transcoder support snapshot.	2015-10-20 14:52:34 +08:00
winlin	2a4ab8a923	add brokers to config	2015-09-24 14:53:22 +08:00
winlin	b5ccc35340	add kafka config	2015-09-22 15:10:43 +08:00
winlin	2b9869ee52	update the wiki for dvr	2015-09-15 17:58:35 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	a7c4b786cf	merge from 2.0	2015-09-14 18:42:31 +08:00
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	2015-09-14 18:36:44 +08:00
winlin	7ae76b579e	refine the conf, use srs3 style	2015-09-11 08:21:06 +08:00
winlin	a62c82bd46	for #319, api raw update global.listen	2015-08-30 23:42:21 +08:00
winlin	364460f2ab	for #319, support raw update global.listen	2015-08-30 23:18:14 +08:00
winlin	f8d8c3ace4	use function to dumps the engine.	2015-08-30 23:08:27 +08:00
winlin	01878e5a9c	for #319, query vhost detail.	2015-08-30 22:23:47 +08:00
winlin	b1b76a4a80	for #319, allow multiple ingest and transcode.	2015-08-30 14:52:12 +08:00
winlin	d1336e0d80	refine conf	2015-08-30 10:52:05 +08:00
winlin	dc11013c01	for #319, render the detail of vhost	2015-08-30 10:17:39 +08:00
winlin	0109a74840	for #319, refine the config structure.	2015-08-30 08:34:52 +08:00
winlin	2b4fa2d73e	for #319, move the edge configs to cluster.	2015-08-30 08:30:04 +08:00
winlin	6bd05f9cfc	for #319, refine the config forward.	2015-08-30 07:59:25 +08:00
winlin	bc24c0407b	for #319, move smi and rsh to play	2015-08-30 07:36:06 +08:00
winlin	f7c893d907	for #319, move gop_cache and queue_length to play	2015-08-30 07:26:55 +08:00
winlin	06ae74dd3f	for #319, move mw_latency to play.	2015-08-30 07:05:57 +08:00
winlin	4eb1874955	for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency.	2015-08-30 06:49:20 +08:00
winlin	9c4340f789	for #319, move atc and atc_auto to play	2015-08-29 23:36:03 +08:00
winlin	d6b0aa3a5b	for #319, move time_jitter and mix_correct to play	2015-08-29 23:18:25 +08:00
winlin	738642073e	for #319, refine config, collect the mr and publish timeout	2015-08-29 22:41:50 +08:00
winlin	7ef3ff90c0	refine the config structure, compatible with SRS1/2	2015-08-29 18:40:18 +08:00
winlin	a79e19599c	for #319, support query the vhost info.	2015-08-29 16:12:30 +08:00
winlin	bdfd0ae09e	for #319, dumps the http static, remux and globals.	2015-08-28 23:51:23 +08:00
winlin	66ffcad635	for #319, always allow raw query.	2015-08-28 13:17:46 +08:00
winlin	f167616379	rename the config_query to query	2015-08-28 13:01:04 +08:00
winlin	2dcf3bc606	for #319, support rpc raw api to query the HTTP RAW API configs.	2015-08-28 12:28:18 +08:00
winlin	d921d59e57	for #319, support HTTP RAW API reload.	2015-08-27 18:11:50 +08:00
winlin	53f4ce3604	for #367, update wiki to v3	2015-08-25 22:41:57 +08:00
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00
winlin	74d4c96423	for #367, design the config for exec.	2015-08-23 21:58:06 +08:00
winlin	cbfe438e73	for #367, design the config for exec.	2015-08-23 21:53:20 +08:00
winlin	7273c33c35	support publish_1stpkt_timeout and publish_normal_timeout	2015-08-19 16:16:05 +08:00
winlin	e7714cd445	add packets interval in ms to set the right send_min_interval	2015-08-19 15:14:26 +08:00
winlin	a0a89a8ca6	use reduce_sequence_header for stream control.	2015-08-14 14:35:41 +08:00
winlin	b79d830e2c	refine the default smi	2015-08-14 11:15:23 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	7dcba040eb	refine config.	2015-08-12 18:02:31 +08:00
winlin	9fb4640a8f	enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182	2015-08-12 13:22:09 +08:00
winlin	c85f92c229	fix #169, support default values for transcode. 2.0.180	2015-07-21 12:07:26 +08:00
winlin	31d2de3f23	fix #435, add pageUrl for HTTP callback on_play.	2015-07-21 10:50:57 +08:00
winlin	af9efe9213	disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.	2015-06-03 10:13:46 +08:00
winlin	d611bb6b45	for #209, server cycle to enable the hls to cleanup. do dispose	2015-05-30 10:48:02 +08:00
winlin	5caafadd45	fix #409: support pure video hls. 2.0.172.	2015-05-29 21:43:17 +08:00
winlin	94efe3f727	update wiki	2015-05-24 09:15:30 +08:00
winlin	5840bc1053	add flv cluster confs.	2015-05-24 08:41:29 +08:00
winlin	f6252c7f72	enable hls for push flv.	2015-05-07 11:07:32 +08:00
winlin	ffdabf32ed	add push flv conf	2015-05-05 11:44:20 +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	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	2015-04-23 12:05:24 +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	02a2cb7e1a	for #381, refine the hls notify, report one by one.	2015-04-14 11:36:58 +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	5d37e47783	support config the hls_nb_notify.	2015-04-10 14:44:18 +08:00
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	2015-04-10 12:01:45 +08:00
winlin	e458305f81	add utc time format.	2015-04-03 16:42:32 +08:00
winlin	64b065e450	for hls callback, add duration of ts.	2015-04-03 13:46:44 +08:00
winlin	17c0a5c470	fix #372, support transform vhost of edge 2.0.155.	2015-04-03 10:56:56 +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	76c1957260	enhance hls, increase piece one by one.	2015-03-31 16:58:20 +08:00
winlin	f6e135943f	enhanced hls, support deviation for duration. 2.0.151.	2015-03-31 15:39:47 +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	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:13:57 +08:00
winlin	fcab17741c	fix #222, the dvr path rule changed.	2015-03-23 22:06:18 +08:00
winlin	0319e85f99	support config the audio overflow ratio.	2015-03-19 17:24:27 +08:00
winlin	2241ba0e34	for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142	2015-03-17 07:57:58 +08:00
wenjie.zhao	65f404fb42	for #340, refine ts prefix code.	2015-03-13 02:01:24 +08:00
wenjie.zhao	5969f72354	for #340, refine ts prefix code.	2015-03-13 01:32:51 +08:00
wenjie.zhao	10da182853	add hls prefix of uri supported	2015-03-13 00:22:55 +08:00
winlin	59d9af8039	update conf	2015-03-15 19:34:04 +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
wenjie.zhao	e57bda8908	Merge code. ... Conflicts: trunk/configure trunk/src/app/srs_app_source.cpp trunk/src/kernel/srs_kernel_error.hpp	2015-03-11 14:18:09 +08:00
winlin	5370493140	add ingest to mac.dev conf.	2015-03-11 13:24:14 +08:00
winlin	0ff49fd299	for #155, debug srs on xcode.	2015-03-10 13:13:31 +08:00
winlin	b0953c1d3a	add comments of audio profile supported by srs.	2015-03-08 20:02:43 +08:00
winlin	b360fe279d	remove libaacplus.	2015-03-06 22:35:02 +08:00
winlin	5d0cb7e68f	update conf for rtsp	2015-03-01 21:24:01 +08:00
winlin	012c29e124	for #133, update the wiki.	2015-03-01 21:08:44 +08:00
winlin	fb3fced8d0	for #179, revert dvr http api. 2.0.128.	2015-03-01 17:57:28 +08:00
winlin	0213cc6466	for #179, refine dvr, support POST create dvr when publish not start. 2.0.126	2015-02-27 20:39:36 +08:00
winlin	b903a7b436	for #179, dvr suport vhost/app/stream level control. 2.0.125.	2015-02-25 09:20:11 +08:00
winlin	a3648063d5	fix #179, support dvr http api. 2.0.123.	2015-02-24 17:29:30 +08:00
winlin	d650118988	fix #179, dvr support api to start or stop. 2.0.123	2015-02-23 19:23:32 +08:00
winlin	1246989ea9	for #179, refine dvr, support callback when reap dvr segment.	2015-02-22 10:45:13 +08:00
winlin	849e59b05d	for #179, support http api to start dvr.	2015-02-21 23:09:21 +08:00
winlin	c67a4fdf97	for #179, enable http api crossdomain for dvr api.	2015-02-21 21:17:59 +08:00
winlin	7077b74d03	for #179, add dvr plan append.	2015-02-21 16:52:37 +08:00
winlin	95b4baee7c	for #179, refine dvr code to more simple.	2015-02-21 16:25:04 +08:00
winlin	a984eeecab	refine dvr, append file when dvr file exists. 2.0.122.	2015-02-19 19:50:10 +08:00
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	2015-02-19 18:56:21 +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	78f34ad46f	for #304, support config default acodec/vcodec. 2.0.118.	2015-02-15 18:11:24 +08:00
winlin	922150b2cf	for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.	2015-02-15 17:43:35 +08:00
winlin	25af6c6847	for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.	2015-02-12 13:34:59 +08:00
winlin	dba983d124	for #136, update the config for ram hls.	2015-02-03 16:29:59 +08:00
winlin	a23191497f	fix #136, support hls without io(in ram). 2.0.112	2015-02-03 16:01:07 +08:00
winlin	89b37d3469	for #136, refine the conf for hls.	2015-02-02 13:39:23 +08:00
winlin	4d10cc9f59	for #250, add conf.	2015-01-31 23:44:35 +08:00
winlin	52891b491a	listen and serve stream caster mpegts over udp.	2015-01-24 14:52:52 +08:00
winlin	6b89ffbc1d	add config section for stream caster.	2015-01-23 15:06:12 +08:00
winlin	e0ee8de2fb	for #299, srs http server support dash, flash request range in range or bytes.	2015-01-23 13:17:50 +08:00
winlin	a647043a06	update readme and wiki url for http ts stream	2015-01-22 18:39:53 +08:00
winlin	7d86c6d9e9	for bug #293, refine for fast cache of http stream.	2015-01-22 13:16:54 +08:00
winlin	25807298ad	alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux	2015-01-22 09:34:33 +08:00
winlin	bb1331cc91	update conf.	2015-01-20 13:46:50 +08:00
winlin	b735e29d05	refine conf, add port.	2015-01-20 12:02:25 +08:00
winlin	e5ef4c2e66	update the conf of http static and stream.	2015-01-20 10:53:57 +08:00
winlin	b7b268dfbf	fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100.	2015-01-19 13:17:46 +08:00
winlin	eff2d81016	for #293, add http flv stream	2015-01-18 18:00:40 +08:00
winlin	2742c0d3c2	for #277, support http vhost mount.	2015-01-18 16:38:26 +08:00
winlin	4513486266	refine http server, support mount dir for vhost.	2015-01-18 13:34:26 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	7f60d472e6	remove the change vhost forward.	2015-01-03 14:47:19 +08:00
winlin	45724bfaec	update conf for transcode.	2015-01-03 14:46:29 +08:00
winlin	f881bc43b5	fix #179: dvr support custom filepath by variables. 2.0.87	2015-01-03 12:54:54 +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	28eedfc177	merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75	2014-12-22 17:12:09 +08:00
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	2014-12-22 17:10:51 +08:00
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	2014-12-20 11:58:39 +08:00
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	2014-12-20 11:45:59 +08:00
winlin	595bf24a51	for bug #257, default to off the realtime(min-latency).	2014-12-13 10:13:49 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	68ade0a267	add log info for rtmp conn. change the mw_latency to 100 for realtime.	2014-12-10 18:06:09 +08:00
winlin	a3de1c71fc	reset the mw_latency to 350.	2014-12-08 09:49:45 +08:00