Commit Graph

412 Commits (a8ee3162d4f97baa5b439ed61bf7fbae3a36ea46)

Author SHA1 Message Date
winlin 00c60db7c3 Merge branch '2.0release' into develop 9 years ago
winlin f7d9ed5ae4 update api 9 years ago
winlin 0cd15068de set default buffer time to 0.5 for srs player. 9 years ago
winlin f8358da316 refine ingester log. 9 years ago
winlin d24aef50ba for #369, support RTMP 302 api at protocol level. 9 years ago
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 9 years ago
winlin 9d22d09646 show signature of server. 9 years ago
winlin f516636448 refine code for hooks and http core. 9 years ago
winlin 49308dddfb update 2015 to 2016 9 years ago
winlin eec2c34b5c refine publisher. 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 7db7d43aea Merge branch '2.0release' into develop 9 years ago
winlin 18b50d961f support query server by id. 9 years ago
winlin aca9fe805c Merge branch '2.0release' into develop 9 years ago
winlin d916c53702 refine the api server. 9 years ago
winlin fe27e76492 support schema 9 years ago
winlin 2bae6e09d3 for #502, snapshot 1 image per 1 seconds, choose best from 5 images. 9 years ago
winlin 1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png 9 years ago
winlin 33a282e576 support snapshot by http hooks for #152. 9 years ago
winlin 3ab0ccaa27 Merge branch '2.0release' into develop 10 years ago
winlin 7cdcf41d26 refine the api server 10 years ago
winlin 4e88262512 merge from srs2 to check cpus. 10 years ago
winlin cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 10 years ago
winlin b78781707e update the srs player 10 years ago
winlin 5073a6fa08 merge from srs2 10 years ago
没——问题 e8680527c3 allow domain *
在使用时,srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
10 years ago
没——问题 c548ab5019 function set_srs_player_url(url, params)
在实际环境中,player.swf 等静态资源 和页面可能部署到不同的域名或路径下。

所以在此处提供设置 srs_player.swf 的url的方法。
10 years ago
winlin b25c45c643 refine srs player, support set the bufferTimeMax. 10 years ago
winlin dd21eee7f0 srs player show current time and url 10 years ago
winlin dfecfb65b1 support fluency and stream empty count 10 years ago
winlin fcd2d3d445 refine code for link generation from rtmp url. 10 years ago
winlin fe87bf1b61 support generate link page for rtmp url 10 years ago
winlin 018af55d65 refine the demo pages, move scripts after body. 10 years ago
winlin 170ad05148 add gfps and nb_packets 10 years ago
winlin e7714cd445 add packets interval in ms to set the right send_min_interval 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 10 years ago
winlin 31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 10 years ago
winlin be342178c0 fix ingest flv tool, support non monotonically timestamp. 10 years ago
winlin 93a1d097dc update jwplayer to support play HTTP flv. 10 years ago
winlin ac13817aae update donation 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
winlin dbcd7d883b add script check_hls_backup.sh to research hls. 10 years ago
winlin 23b978c0bb merge from github 10 years ago
winlin 8fbc6526bb for #383, refine code to support mix correct algorithm. 10 years ago
winlin 0000c945ea refine the proxy api server. 10 years ago
winlin fe1886aa08 add proxy for hls 10 years ago
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 10 years ago
winlin bd77f995bf ignore the unknown flv tag. 10 years ago