148 commits

Author	SHA1	Message	Date
winlin	c33ff4fdb8	support reload http_api	2014-04-13 13:08:10 +08:00
winlin	17ac29d160	refine code for reload http api/stream	2014-04-12 22:16:39 +08:00
winlin	821b58af03	support reload atc	2014-04-12 22:00:27 +08:00
winlin	eda1ddc03d	support reload log level/logfile/tank	2014-04-12 21:35:26 +08:00
winlin	f652c28485	support reload pid.	2014-04-12 20:46:32 +08:00
winlin	0a016e58bf	add comments for main	2014-04-12 20:37:16 +08:00
winlin	b38df9cd1a	refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59	2014-04-12 20:35:40 +08:00
winlin	15f651bccd	update demo, support acodec	2014-04-11 14:13:14 +08:00
winlin	3a26b23fba	change ffmpeg log to ./objs	2014-04-10 17:19:49 +08:00
winlin	ccba9ba9ba	move log level parse to app utility	2014-04-10 14:20:02 +08:00
winlin	f2f30dcc52	add utility, change log to trace	2014-04-10 14:12:22 +08:00
winlin	94874e77af	refine reload config	2014-04-10 14:06:23 +08:00
winlin	6c5d8b4851	refine reload config	2014-04-10 14:05:01 +08:00
winlin	bc61b1de18	fix bug of reload ingest	2014-04-10 11:47:38 +08:00
winlin	e0a6fe63cc	fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57	2014-04-10 11:40:06 +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	5e504944dc	add comments for http conn	2014-04-10 10:22:22 +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	70e73bc281	add comments for bug #39	2014-04-08 13:56:45 +08:00
winlin	d124772d6a	add http server/api to srs.conf. add comments for bug #6.	2014-04-08 13:54:16 +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	9107831b0e	add config to read ingesters	2014-04-07 11:57:24 +08:00
winlin	f5c4f492da	add comments for ffmpeg	2014-04-07 11:49:20 +08:00
winlin	c759a7c6b5	refine log of ffmpeg	2014-04-07 11:20:03 +08:00
winlin	4f7cfeed37	change to 0.9.52, refine encoder and ffmpeg	2014-04-07 10:15:44 +08:00
winlin	72c330d47c	refine ffmepg and encoder, extract ffmpeg.	2014-04-07 09:34:36 +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	4a7378b77a	ingest stream when server cycle	2014-04-07 08:41:32 +08:00
winlin	adfbbbfd68	add ingest files	2014-04-07 08:32:28 +08:00
winlin	983fe46ce2	use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding	2014-04-06 20:30:51 +08:00
winlin	c4524484e6	add comments for aac encoder	2014-04-06 18:48:39 +08:00
winlin	7916cab50e	donot check the aac encoder, ensure aac is ok	2014-04-05 15:01:41 +08:00
winlin	30e3323fe4	update readme, add SampleHTTP link	2014-04-05 13:38:05 +08:00
winlin	4e3fe36ae2	refine http server pages. change to 0.9.51	2014-04-05 13:14:59 +08:00
winlin	ced050829e	fix bug of http, change to 0.9.50	2014-04-04 23:25:32 +08:00
winlin	c5d3b11a6e	update http stream. change to 0.9.49	2014-04-04 23:16:31 +08:00
winlin	17ce21348d	implements the http stream module. change to 0.9.49	2014-04-04 23:06:46 +08:00
winlin	ef26e77560	implements the http stream module.	2014-04-04 23:06:27 +08:00