1317 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	2295ebb346	remove the edge message flag, use directly send mode	2014-04-27 14:23:21 +08:00
winlin	5ddc71685b	pre change publish edge to directly send mode	2014-04-27 14:21:19 +08:00
winlin	16319d73fd	implements basic edge(play and publish), with bug	2014-04-27 12:28:45 +08:00
winlin	79c9c6dcb7	implements the proxy for edge publish mode	2014-04-27 11:11:15 +08:00
winlin	ec96072472	add publish edge framework	2014-04-27 09:29:37 +08:00
winlin	270b1270af	fix bug of edge, refine state to user state.	2014-04-26 22:51:01 +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	acba4cfdc6	add edge framework	2014-04-26 18:08:21 +08:00
winlin	b0951d36d3	refine source, rename req to _req	2014-04-26 17:16:18 +08:00
winlin	a2f317a113	add chad.wang to authors for srs-librtmp on windows build project	2014-04-26 14:47:38 +08:00
winlin	a63a3812e3	add srs app edge	2014-04-25 16:35:03 +08:00
winlin	d6948d613f	add author byteman for h264 to flv.	2014-04-25 15:27:50 +08:00
winlin	f3b441ba1f	add alipay donation page. to 0.9.76	2014-04-25 12:56:48 +08:00
winlin	2553bd74b7	udpate readme, add edge to dev plan	2014-04-25 12:54:23 +08:00
winlin	b7048c56fa	udpate readme, add edge to dev plan	2014-04-25 11:59:29 +08:00
winlin	df28d194ec	udpate readme, add edge to dev plan	2014-04-25 11:49:42 +08:00
winlin	312a649f72	update reame	2014-04-24 18:12:56 +08:00
winlin	4a3852bbce	update readme, add flash p2p arch	2014-04-24 18:01:09 +08:00
winlin	bfd1d07827	update readme	2014-04-24 17:46:10 +08:00
winlin	3ed59f190b	refine srs live flashP2P(integrated by chnvideo)	2014-04-24 17:38:57 +08:00
winlin	67e1988b81	support live flashP2P(integrated by chnvideo VDN). 0.9.75	2014-04-24 16:32:19 +08:00
winlin	b276714573	support chnvideo hss streaming	2014-04-24 14:26:24 +08:00
winlin	35f3a93239	support dvr to hss. change to 0.9.74	2014-04-24 12:22:36 +08:00
winlin	e271cb607f	refine plan, add stream start time for atc	2014-04-23 17:53:14 +08:00
winlin	0c0010d529	update dvr, extract flv segment	2014-04-23 16:33:42 +08:00
winlin	7ff8df4d97	refine code, notice api when segment close	2014-04-23 16:25:18 +08:00
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