41 commits

Author	SHA1	Message	Date
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	45724bfaec	update conf for transcode.	2015-01-03 14:46:29 +08:00
winlin	07b207b7e3	remove test code for api-server.	2015-01-02 10:30:25 +08:00
winlin	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	2015-01-02 10:21:04 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	79c641e8d6	remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178	2014-07-30 10:00:23 +08:00
winlin	69eb935505	fix bug of flv parser, librtmp amf0 library	2014-05-22 11:39:10 +08:00
winlin	d4b8fee61a	fix bug #73, http callback api support authentication in tcUrl	2014-05-22 10:23:12 +08:00
winlin	7c804277b2	add heatbeat url, add stream for api-server	2014-05-19 15:27:05 +08:00
winlin	07fbd58f39	update api server, add meiyi demo streams.	2014-05-16 10:52:38 +08:00
winlin	add64533e3	add donation user chen.chen	2014-05-12 10:36:37 +08:00
winlin	1c1efd7000	update readme, update api server stream list	2014-05-10 14:01:40 +08:00
winlin	ae372de65e	merge from wukong, fix the bug of build x264 on minimal server	2014-05-06 13:51:38 +08:00
winlin	90e50da305	update api server, add hiwifi	2014-05-05 18:07:06 +08:00
winlin	241d04b391	update api server for android server vhost changed	2014-04-28 14:54:27 +08:00
winlin	e271cb607f	refine plan, add stream start time for atc	2014-04-23 17:53:14 +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	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	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	9ef7a83415	update server, add rtmp pc url	2014-04-17 10:08:04 +08:00
winlin	642fc19f9d	update api server demo	2014-04-16 11:03:58 +08:00
winlin	b1877db405	fix typo of full.conf. fix api server bug	2014-04-14 17:31:59 +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	acdd5a827e	update api server, support servers	2014-04-11 11:29:17 +08:00
winlin	3a26b23fba	change ffmpeg log to ./objs	2014-04-10 17:19:49 +08:00
winlin	ca02cfe1bf	update server.py	2014-04-10 16:33:45 +08:00
winlin	c3c2767363	update api server, add servers	2014-04-10 15:06:18 +08:00
winlin	bb3c88fef7	change copyright from 2013 to 2013-2014.	2014-01-01 10:37:12 +08:00
winlin	4b4f317e09	refine the ui, link the players to the api server static dir	2013-12-25 23:42:23 +08:00
winlin	836bc413f9	fix the bug of publish, server close the connection when timeout.	2013-12-25 14:39:54 +08:00
winlin	6875b6f5f2	support chat room, meeting.	2013-12-23 01:22:10 +08:00
winlin	889ad9238b	support http hooks: on_connect/close/publish/unpublish/play/stop.	2013-12-08 12:45:12 +08:00
winlin	3d4474f620	support multiple http hooks for a event.	2013-12-08 10:53:18 +08:00
winlin	9f3139c5c3	add comments for api server	2013-12-08 09:22:33 +08:00
winlin	a478452f57	support http callback hooks: on_connect	2013-12-07 23:23:19 +08:00
winlin	d3cee00b3b	add cherrypy api server	2013-12-07 20:34:42 +08:00