6391 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	09901d31da	fix bug of android api server, fix the dead loop	2014-04-23 13:19:08 +08:00
winlin	580cbb84a9	add threading.Lock for cherrypy, or performance suffer.	2014-04-23 12:17:22 +08:00
winlin	435e02db5d	dvr use .tmp and rename to .flv when finished.	2014-04-22 17:50:22 +08:00
winlin	733ca2475d	call http api when dvr got keyframe	2014-04-22 17:32:45 +08:00
winlin	36d8fdfc1a	move the ts buffer to http message	2014-04-22 12:20:58 +08:00
winlin	a73bf8d4aa	optimizm the http server for send ts file	2014-04-22 12:15:13 +08:00
winlin	1af2c9bcc9	update script add librtmp for arm for tools flv/rtmp ingester	2014-04-21 15:46:29 +08:00
winlin	6f984ff54b	fix bug of raspberry-pi build, static off	2014-04-21 15:17:45 +08:00
winlin	a158d81085	update raspberry-pi demo api	2014-04-21 13:47:32 +08:00
winlin	fc17d778ad	update readme	2014-04-21 10:49:04 +08:00
winlin	b5b5202ed2	update cdn api server.	2014-04-21 10:40:30 +08:00
winlin	b85e667991	update api, select the lowest load of peer	2014-04-21 09:11:08 +08:00
winlin	87bdaa21c9	add nodes for api	2014-04-21 00:03:17 +08:00
winlin	dcb9941ed7	add hls api to api-server	2014-04-20 15:00:34 +08:00
winlin	8bf1f4ad87	add api/v1 summaries/rusages/self_proc_stats/system_proc_stats/meminfos. change to 0.9.72	2014-04-20 00:17:11 +08:00
winlin	a5f4f6bd14	add meminfo	2014-04-20 00:15:26 +08:00
winlin	15aea4d9b3	add cpuinfo	2014-04-19 23:18:00 +08:00
winlin	951a93ab86	get self proc and system proc stat	2014-04-19 21:43:13 +08:00
winlin	117fd67950	add cpu stat	2014-04-19 21:23:34 +08:00
winlin	4c5aae7804	fix bug of ingest for android, init the variable to 0	2014-04-19 12:49:15 +08:00
winlin	5c8aad4fe4	fix bug of ingest for android, init the variable to 0	2014-04-19 12:49:05 +08:00
winlin	c530a8e5fc	fix bug of ingest for android, init the variable to 0	2014-04-19 12:47:16 +08:00
winlin	e0e033d847	fix bug for arm cross build	2014-04-19 11:54:14 +08:00
winlin	e42eef422f	add ssl and nossl for ingest flv/rtmp over srs-librtmp	2014-04-19 11:40:46 +08:00
winlin	e5fcf80b94	refine ingest flv over srs-librtmp	2014-04-19 11:24:31 +08:00
winlin	fae1c61c3f	update readme. change to 0.9.71	2014-04-19 11:21:13 +08:00
winlin	b1835ee2fe	add ingest flv to RTMP over srs-librtmp	2014-04-19 11:19:26 +08:00
winlin	f17f5de7d1	ingest rtmp to rtmp by srs-librtmp	2014-04-19 10:30:40 +08:00
winlin	608b28f223	add srs ingest flv/rtmp base on srs-librtmp	2014-04-19 09:47:47 +08:00
winlin	038f907830	update readme.	2014-04-18 22:20:51 +08:00
winlin	d013801c26	add configure options --disable-all	2014-04-18 15:13:52 +08:00
winlin	6b76e9e665	update test configure script	2014-04-18 14:21:36 +08:00
winlin	25630b5211	fix bug of utest build.	2014-04-18 09:16:43 +08:00
winlin	8651f38b59	update test configure script	2014-04-18 09:12:44 +08:00
winlin	6a220c03ec	update readme	2014-04-18 09:06:32 +08:00
winlin	443b9c48f4	update script	2014-04-18 08:57:36 +08:00
winlin	1966ab9446	update reame	2014-04-18 08:53:56 +08:00
winlin	03af43017d	update dvr config comments	2014-04-17 18:32:43 +08:00
winlin	67ddc9f5ae	support dvr(record live to flv file for vod), change to 0.9.70	2014-04-17 18:23:49 +08:00
winlin	ab9a2ddd6c	dvr support segment plan	2014-04-17 18:13:59 +08:00
winlin	2d1c28cff9	update dvr, support segment plan	2014-04-17 17:35:21 +08:00
winlin	6f19a83114	dvr support plan and default session plan	2014-04-17 16:57:04 +08:00
winlin	4b82a4f510	support reload dvr	2014-04-17 16:22:21 +08:00
winlin	9861fc4fe3	refine dvr, add comments	2014-04-17 16:16:17 +08:00
winlin	56ff70cdf8	remove lseek and size of fs stream	2014-04-17 16:10:05 +08:00
winlin	271b969d0b	set audio/video flag to 0 in flv header.	2014-04-17 16:08:56 +08:00
winlin	73459547e1	support dvr. change to 0.9.69	2014-04-17 16:06:49 +08:00
winlin	996d042a33	add comments for file stream	2014-04-17 12:59:35 +08:00
winlin	a63fa20e53	extract flv format from f4v/flv specification	2014-04-17 12:07:44 +08:00
winlin	9ef7a83415	update server, add rtmp pc url	2014-04-17 10:08:04 +08:00