74 commits

Author	SHA1	Message	Date
winlin	3cd22b6e6e	Use SPDX-License-Identifier: MIT. 4.0.124	2021-05-31 12:59:21 +08:00
winlin	ef617b5fc6	Demo: Refine H5 demo page	2021-05-19 20:54:22 +08:00
winlin	db37a4ac02	SquashSRS3: Add crossdomain.xml for install script.	2021-04-26 13:57:14 +08:00
winlin	de1c7522f0	SquashSRS3: Add console	2021-04-24 19:07:37 +08:00
winlin	31945c244d	For #1110, Refine code.	2018-08-05 11:09:48 +08:00
winlin	54411e0768	Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23	2017-05-30 07:40:18 +08:00
winlin	00c60db7c3	Merge branch '2.0release' into develop	2016-01-31 22:47:48 +08:00
winlin	f7d9ed5ae4	update api	2016-01-31 21:49:53 +08:00
winlin	49308dddfb	update 2015 to 2016	2015-12-23 11:41:41 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	7db7d43aea	Merge branch '2.0release' into develop	2015-11-09 15:25:55 +08:00
winlin	18b50d961f	support query server by id.	2015-11-09 15:19:50 +08:00
winlin	aca9fe805c	Merge branch '2.0release' into develop	2015-11-09 14:51:47 +08:00
winlin	d916c53702	refine the api server.	2015-11-09 14:51:41 +08:00
winlin	2bae6e09d3	for #502, snapshot 1 image per 1 seconds, choose best from 5 images.	2015-10-20 14:10:14 +08:00
winlin	1aa4502d5f	for snapshot, choose the best to link to the [stream]-best.png	2015-10-20 13:38:03 +08:00
winlin	33a282e576	support snapshot by http hooks for #152.	2015-10-20 12:30:57 +08:00
winlin	7cdcf41d26	refine the api server	2015-09-23 18:23:09 +08:00
winlin	31d2de3f23	fix #435, add pageUrl for HTTP callback on_play.	2015-07-21 10:50:57 +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	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	0000c945ea	refine the proxy api server.	2015-04-10 16:07:45 +08:00
winlin	fe1886aa08	add proxy for hls	2015-04-10 15:50:12 +08:00
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	2015-04-10 12:01:45 +08:00
winlin	64b065e450	for hls callback, add duration of ts.	2015-04-03 13:46:44 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	97442c56b6	enhance hls in floor mode.	2015-03-31 17:03:14 +08:00
winlin	76c1957260	enhance hls, increase piece one by one.	2015-03-31 16:58:20 +08:00
winlin	1246989ea9	for #179, refine dvr, support callback when reap dvr segment.	2015-02-22 10:45:13 +08:00
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