external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
4758 commits 13 branches 107 tags 375 MiB
Commit graph

479 commits

Author SHA1 Message Date
winlin
9312d77c20 default not to preview the stream for publisher. 2016-04-12 11:32:13 +08:00
winlin
6b5c880ff9 refine player to support status change. 2016-03-22 18:35:44 +08:00
winlin
4841435b14 fix default http port bug. 2016-03-19 22:45:39 +08:00
winlin
a2d235f015 refresh js cache. 2016-03-19 22:14:56 +08:00
winlin
d7a28059ed remove jwplayer and osmf 2016-03-19 22:09:36 +08:00
winlin
d9f1ced732 change srs player to 1.28 2016-03-19 22:00:22 +08:00
winlin
77167f3331 refine srs player for hls, extract a HlsNetStream. 2016-03-19 21:54:46 +08:00
winlin
2492562d25 use xpsid X-Playback-Session-Id to more useful. 2016-03-19 19:48:01 +08:00
winlin
b2bd63e833 refine srs player to play hls. 2016-03-19 19:11:31 +08:00
winlin
46a31f4884 support play hls 2016-03-19 16:35:13 +08:00
winlin
69ec66ee36 refine js for player. 2016-03-19 11:08:25 +08:00
winlin
0a2e00f8c5 dump logs 2016-03-19 10:18:11 +08:00
winlin
9ab5039b36 extract iplayer for srs-player. 2016-03-19 10:06:08 +08:00
winlin
10ce961a00 update version for bwtc 2016-03-14 10:23:20 +08:00
winlin
b3c13f2550 refine the bwtc, to compatible with bms4. 2016-03-12 20:53:37 +08:00
winlin
a3038b1274 fix the rtmp url parse bug. 2016-03-10 12:16:51 +08:00
winlin
82aa9d120c for #5114, display metadata. 2016-03-07 16:02:37 +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
0cd15068de set default buffer time to 0.5 for srs player. 2016-01-18 18:02:56 +08:00
winlin
f8358da316 refine ingester log. 2016-01-13 16:20:05 +08:00
winlin
d24aef50ba for #369, support RTMP 302 api at protocol level. 2016-01-08 18:17:37 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
9d22d09646 show signature of server. 2016-01-04 17:28:18 +08:00
winlin
f516636448 refine code for hooks and http core. 2015-12-29 18:33:02 +08:00
winlin
49308dddfb update 2015 to 2016 2015-12-23 11:41:41 +08:00
winlin
eec2c34b5c refine publisher. 2015-12-01 10:42:13 +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
fe27e76492 support schema 2015-10-26 18:34:55 +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
3ab0ccaa27 Merge branch '2.0release' into develop 2015-09-23 18:23:17 +08:00
winlin
7cdcf41d26 refine the api server 2015-09-23 18:23:09 +08:00
winlin
4e88262512 merge from srs2 to check cpus. 2015-09-23 15:11:33 +08:00
winlin
cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 2015-09-23 15:09:59 +08:00
winlin
b78781707e update the srs player 2015-09-17 18:07:02 +08:00
winlin
5073a6fa08 merge from srs2 2015-09-17 18:06:03 +08:00
没——问题
e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
 2015-09-17 12:09:29 +08:00
没——问题
c548ab5019 function set_srs_player_url(url, params) 
在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。

所以在此处提供设置 srs_player.swf 的url的方法。
 2015-09-17 11:44:45 +08:00
winlin
b25c45c643 refine srs player, support set the bufferTimeMax. 2015-08-24 07:55:30 +08:00
winlin
dd21eee7f0 srs player show current time and url 2015-08-20 18:33:33 +08:00
winlin
dfecfb65b1 support fluency and stream empty count 2015-08-20 18:13:07 +08:00
winlin
fcd2d3d445 refine code for link generation from rtmp url. 2015-08-20 16:18:32 +08:00
winlin
fe87bf1b61 support generate link page for rtmp url 2015-08-20 16:11:17 +08:00
winlin
018af55d65 refine the demo pages, move scripts after body. 2015-08-20 15:19:43 +08:00
winlin
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +08:00
winlin
e7714cd445 add packets interval in ms to set the right send_min_interval 2015-08-19 15:14:26 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
be342178c0 fix ingest flv tool, support non monotonically timestamp. 2015-07-13 22:09:01 +08:00
winlin
93a1d097dc update jwplayer to support play HTTP flv. 2015-05-23 19:22:37 +08:00
winlin
ac13817aae update donation 2015-05-08 07:04:31 +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
dbcd7d883b add script check_hls_backup.sh to research hls. 2015-04-23 16:58:00 +08:00
winlin
23b978c0bb merge from github 2015-04-20 11:28:46 +08:00
winlin
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +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
bd77f995bf ignore the unknown flv tag. 2015-04-09 12:35:17 +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
bbac2348db for #354, remove the double underscore functions and variables. 2015-03-21 11:55:28 +08:00
winlin
a15ce1147f for #155, fix all warnings for mac. 2015-03-13 12:53:01 +08:00
winlin
a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 2015-03-11 15:54:31 +08:00
winlin
f247ac9daf fix the http parse bug. 2015-03-11 14:48:51 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
1685cdd48e for #250, parse pes packet ok, ts message ok. 2015-01-29 22:58:02 +08:00
winlin
77e43d1813 refine comments of aac publish for #212 2015-01-18 22:11:38 +08:00
winlin
a1f887f46f refine code, move onMetaData to consts. 2015-01-17 13:29:11 +08:00
winlin
04aa6f8296 drop script data except the onMetaData packet. 2015-01-17 13:23:30 +08:00
winlin
44f5efda21 refine the print info. 2015-01-07 15:46:00 +08:00
winlin
5aa31568ba fix the rtmp dump, parse the aggregate msg. 2015-01-07 15:35:01 +08:00
winlin
89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 2015-01-07 13:37:23 +08:00
winlin
0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 2015-01-07 13:29:30 +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
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
d171a26758 disable gop cache when not h.264. fix some warning. 2014-12-01 21:34:35 +08:00
winlin
c5dd334645 fix the warning of ts_info 2014-12-01 20:54:19 +08:00
winlin
ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 2014-11-28 12:26:36 +08:00
winlin
e11fa383ca udpate the srs_bwt. 2014-11-25 11:09:28 +08:00
winlin
02778dba4c udpate the srs_bwt. 2014-11-25 11:05:45 +08:00
winlin
a2af051840 udpate the srs_bwt. 2014-11-25 10:59:38 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
3d97048c3a fix bug #217, add reuse conn to play different player. 2014-11-22 19:15:40 +08:00
winlin
d80b580c2f refine librtmp, remove the _get_ for some attribute get. 2014-11-21 16:08:29 +08:00