Commit Graph

73 Commits (463105c012055b4167f56ccd239595bf309ab0f9)

Author SHA1 Message Date
winlin ef617b5fc6 Demo: Refine H5 demo page
winlin db37a4ac02 SquashSRS3: Add crossdomain.xml for install script.
winlin de1c7522f0 SquashSRS3: Add console
winlin 31945c244d For , Refine code.
winlin 54411e0768 Fix , replace NXJSON(LGPL) with json-parser(BSD). 3.0.23
winlin 00c60db7c3 Merge branch '2.0release' into develop
winlin f7d9ed5ae4 update api
winlin 49308dddfb update 2015 to 2016
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs
winlin 7db7d43aea Merge branch '2.0release' into develop
winlin 18b50d961f support query server by id.
winlin aca9fe805c Merge branch '2.0release' into develop
winlin d916c53702 refine the api server.
winlin 2bae6e09d3 for , snapshot 1 image per 1 seconds, choose best from 5 images.
winlin 1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png
winlin 33a282e576 support snapshot by http hooks for .
winlin 7cdcf41d26 refine the api server
winlin 31d2de3f23 fix , add pageUrl for HTTP callback on_play.
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org.
winlin 115daa3cc1 migarate from winlinvip to srs org
winlin 0000c945ea refine the proxy api server.
winlin fe1886aa08 add proxy for hls
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts.
winlin 64b065e450 for hls callback, add duration of ts.
winlin c49bc0628e support on_hls for http hooks. 2.0.152.
winlin 97442c56b6 enhance hls in floor mode.
winlin 76c1957260 enhance hls, increase piece one by one.
winlin 1246989ea9 for , refine dvr, support callback when reap dvr segment.
winlin dc11418c79 fix : http-callback support on_dvr when reap a dvr file. 2.0.89
winlin 45724bfaec update conf for transcode.
winlin 07b207b7e3 remove test code for api-server.
winlin 9d34820c80 fix : http-callback check http status code ok(200). 2.0.84
winlin 569596c10d update copyright, from 2013 to 2015
winlin 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178
winlin 69eb935505 fix bug of flv parser, librtmp amf0 library
winlin d4b8fee61a fix bug , http callback api support authentication in tcUrl
winlin 7c804277b2 add heatbeat url, add stream for api-server
winlin 07fbd58f39 update api server, add meiyi demo streams.
winlin add64533e3 add donation user chen.chen
winlin 1c1efd7000 update readme, update api server stream list
winlin ae372de65e merge from wukong, fix the bug of build x264 on minimal server
winlin 90e50da305 update api server, add hiwifi
winlin 241d04b391 update api server for android server vhost changed
winlin e271cb607f refine plan, add stream start time for atc
winlin 09901d31da fix bug of android api server, fix the dead loop
winlin 580cbb84a9 add threading.Lock for cherrypy, or performance suffer.
winlin 6f984ff54b fix bug of raspberry-pi build, static off
winlin a158d81085 update raspberry-pi demo api
winlin b5b5202ed2 update cdn api server.