50 commits

Author	SHA1	Message	Date
winlin	342483bf04	for #319, when reload the listen, restart all ingesters.	2015-09-01 18:39:14 +08:00
winlin	65b2ed7ac5	refine code, move the order of functions.	2015-08-03 14:11:21 +08:00
winlin	f39faa78bb	refine config default values of srs, prepare to move each default values to functions.	2015-07-06 11:11:59 +08:00
winlin	679b4317d8	fix the build failed bug.	2015-06-06 20:34:49 +08:00
winlin	2a1db36750	refine the pithy print of ingesters.	2015-06-06 18:57:41 +08:00
winlin	860d68e6e7	for #374, use fast stop for ingesters to stop many FFMPEG.	2015-05-30 11:25:33 +08:00
winlin	567d84e997	fix #374: when terminate srs, cleanup to ensure FFMPEG quit.	2015-05-30 09:58:17 +08:00
winlin	e5f449ce36	refine the thread to three category.	2015-05-23 09:20:16 +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	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:13:57 +08:00
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	2015-02-19 18:56:21 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	c457364321	for bug #237, add name for thread. 2.0.47	2014-12-03 14:05:15 +08:00
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	2014-09-28 11:08:30 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	573952e2fc	refine macros of HTTP	2014-07-20 13:33:21 +08:00
winlin	a9f7f1ecfe	refine the consts to kernel consts	2014-07-20 13:23:45 +08:00
winlin	baa20b2f31	refine the config consts	2014-07-20 13:16:24 +08:00
winlin	736ec48c71	move some consts to kernel consts	2014-07-20 13:11:53 +08:00
winlin	073d900674	add consts to kernel	2014-07-20 13:04:48 +08:00
winlin	f8423dfa90	fix #119: use iformat and oformat for ffmpeg transcode.	2014-07-19 15:20:16 +08:00
winlin	a5f4323ea8	refine config, add comments	2014-07-18 11:46:29 +08:00
winlin	b4e2d70390	refine config comments, return the engines of transcode.	2014-07-18 11:15:59 +08:00
winlin	f572531eca	refine config, return the vhosts vector.	2014-07-18 10:35:31 +08:00
winlin	96e0e699dd	refine the get port, return a vector<string> contains ports.	2014-07-18 10:21:34 +08:00
winlin	31b568b013	refine core, move specified functions to kernel utility.	2014-06-08 13:03:03 +08:00
winlin	d74921e1ab	fix #89, config to /dev/null to disable ffmpeg log. 0.9.117	2014-05-27 14:10:46 +08:00
winlin	0eb9e0af5b	fix #78 st joinable thread must be stop by other threads, 0.9.113	2014-05-23 17:23:33 +08:00
winlin	fd0efecbc8	refine ingester pithy print	2014-04-29 09:57:59 +08:00
winlin	2bcaeccc51	edge support play and ingest origin stream. change to 0.9.77	2014-04-26 21:41:18 +08:00
winlin	fdd0678bcb	add thread cid to log	2014-04-16 16:58:54 +08:00
winlin	23a1b29935	add dvr option. refine macros of auto headers	2014-04-15 14:01:57 +08:00
winlin	73c310cd2e	refine the macro.	2014-04-14 09:10:36 +08:00
winlin	9ed3421586	rename from get_ingest to get_ingest_by_id of config	2014-04-10 11:24:27 +08:00
winlin	e432fe931f	support reload ingesters(added/removed/updated). change to 0.9.57.	2014-04-10 11:21:47 +08:00
winlin	e6d8bc1e5c	ingest reload: support disable vhost	2014-04-10 10:35:02 +08:00
winlin	dc71eef394	support ingest reload: add new vhost with ingester	2014-04-10 10:09:30 +08:00
winlin	e5646e3bb5	refine ingester, add vhost/id info to ingester	2014-04-10 09:20:23 +08:00
winlin	9372a7065a	refine the ingest log	2014-04-08 18:01:14 +08:00
winlin	ccf0a423be	change sleep time from 3s to 0.6s for ingester.	2014-04-08 15:43:47 +08:00
winlin	509504f27d	change sleep time from 3s to 0.6s	2014-04-08 15:43:18 +08:00
winlin	eba35e2ac0	refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool	2014-04-08 15:28:34 +08:00
winlin	c11e266d5c	update readme	2014-04-07 15:04:31 +08:00
winlin	4f445f2f60	support ingest stream	2014-04-07 14:28:06 +08:00
winlin	e89ab84e4e	implements ingest, change to 0.9.53	2014-04-07 14:20:03 +08:00
winlin	2742679354	implements the ingest framework	2014-04-07 13:32:00 +08:00
winlin	92281548b6	add ingest config	2014-04-07 13:13:57 +08:00
winlin	095364a72b	refine ingest, start/stop ingest in server	2014-04-07 09:27:30 +08:00
winlin	eea2310b07	refine consts	2014-04-07 09:07:12 +08:00
winlin	adfbbbfd68	add ingest files	2014-04-07 08:32:28 +08:00