Commit Graph

567 Commits (03389f5e8cae69eff6423c9862222456999f530d)

Author SHA1 Message Date
winlin 609605a50b Fix #820, extract service for modules. 3.0.21 8 years ago
winlin 0a57a46016 Refine LICENSE 8 years ago
winlin f32aab3d92 For #299, refine code. 8 years ago
winlin 14765c2ba5 For #790, play or publish is not neccessary for bandwidth test. 8 years ago
ME_Kun_Han 3562424ee3 fix bug, add param for generating tc url and add play stream to make-bandwidth checking success (#790) 8 years ago
winlin 72c4ae4a8c Refine srs-librtmp API, change print to format 8 years ago
winlin 68a5407b3a Remove using of connect_app2. 8 years ago
winlin c849010fe2 Refine api for srs-librtmp 8 years ago
winlin ca43bfe6d9 Fix build failed, for srs librtmp API changed. 8 years ago
winlin 764cf245e9 For #774, build librtmp exmaples failed for -lpthread 8 years ago
HungMingWu 01d5e4da17 Replace openssl from l-1.0.1f to 1.10e (#774)
DUe to API breakchange, add a wrapper for backward compatibility
8 years ago
winlin 733ba73d54 for #738, write mp4 samples. 8 years ago
winlin 253ac40312 for #738, parse avcc/sps/pps/asc from mp4. 8 years ago
winlin 128a1fd3db for #738, decode mp4 video track boxes. 8 years ago
winlin b6bb3f2446 fix c99 build failed. 8 years ago
winlin 858951da49 for #738, add srs ingest mp4 8 years ago
winlin 34a8eb6113 for #738, add srs ingest mp4 tool 8 years ago
winlin b16ab038ce for #742, refine the u_intxx_t to uintxx_t 8 years ago
winlin 136a7ef488 for #299, refine docs. 8 years ago
winlin c5fcc15989 update the date info 8 years ago
winlin 78aa518ecc merge srs2 8 years ago
winlin b19702f669 update srs player 8 years ago
winlin 0596550a72 Merge branch '2.0release' into develop 9 years ago
winlin 99d87f9f9c fix sys-ssl librtmp build bug. 9 years ago
winlin 4bcd90d747 fix sys-ssl librtmp build bug. 9 years ago
winlin c231f45fe8 Merge branch '2.0release' into develop 9 years ago
winlin bd652e4607 fix build failed for stdc++ 9 years ago
winlin eb915413ad Merge branch '2.0release' into develop 9 years ago
winlin 0015b303a6 librtmp: refine comment for NALU process. 9 years ago
winlin 93eb961b4c Merge branch '2.0release' into develop 9 years ago
winlin 4c6c2c28b8 refine h264 raw publish with fps 9 years ago
winlin 14760003ba merge from 2.0 9 years ago
winlin e00928557e fix the timeout for librtmp 9 years ago
winlin 499fc07db1 refine the hls m3u8 refresh interval. 9 years ago
winlin 5fa500646e update srs player version 9 years ago
winlin ec57e2170d refine hls m3u8 refresh interval and buffer time 9 years ago
winlin c746753c6a update player, add pst(player startup time) 9 years ago
winlin 2e75c9f45f add more buffer 9 years ago
winlin 9312d77c20 default not to preview the stream for publisher. 9 years ago
winlin 6b5c880ff9 refine player to support status change. 9 years ago
winlin 4841435b14 fix default http port bug. 9 years ago
winlin a2d235f015 refresh js cache. 9 years ago
winlin d7a28059ed remove jwplayer and osmf 9 years ago
winlin d9f1ced732 change srs player to 1.28 9 years ago
winlin 77167f3331 refine srs player for hls, extract a HlsNetStream. 9 years ago
winlin 2492562d25 use xpsid X-Playback-Session-Id to more useful. 9 years ago
winlin b2bd63e833 refine srs player to play hls. 9 years ago
winlin 46a31f4884 support play hls 9 years ago
winlin 69ec66ee36 refine js for player. 9 years ago
winlin 0a2e00f8c5 dump logs 9 years ago
winlin 9ab5039b36 extract iplayer for srs-player. 9 years ago
winlin 10ce961a00 update version for bwtc 9 years ago
winlin b3c13f2550 refine the bwtc, to compatible with bms4. 9 years ago
winlin a3038b1274 fix the rtmp url parse bug. 9 years ago
winlin 82aa9d120c for #5114, display metadata. 9 years ago
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 9 years ago
winlin 7cdcf41d26 refine the api server 9 years ago
winlin 4e88262512 merge from srs2 to check cpus. 9 years ago
winlin cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 9 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
winlin 64b065e450 for hls callback, add duration of ts. 10 years ago
winlin c49bc0628e support on_hls for http hooks. 2.0.152. 10 years ago
winlin 97442c56b6 enhance hls in floor mode. 10 years ago
winlin 76c1957260 enhance hls, increase piece one by one. 10 years ago
winlin bbac2348db for #354, remove the double underscore functions and variables. 10 years ago
winlin a15ce1147f for #155, fix all warnings for mac. 10 years ago
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 10 years ago
winlin f247ac9daf fix the http parse bug. 10 years ago
winlin 1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 10 years ago
winlin 1685cdd48e for #250, parse pes packet ok, ts message ok. 10 years ago
winlin 77e43d1813 refine comments of aac publish for #212 10 years ago
winlin a1f887f46f refine code, move onMetaData to consts. 10 years ago
winlin 04aa6f8296 drop script data except the onMetaData packet. 10 years ago
winlin 44f5efda21 refine the print info. 10 years ago
winlin 5aa31568ba fix the rtmp dump, parse the aggregate msg. 10 years ago
winlin 89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 10 years ago
winlin 0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin 45724bfaec update conf for transcode. 10 years ago
winlin 07b207b7e3 remove test code for api-server. 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin d171a26758 disable gop cache when not h.264. fix some warning. 10 years ago
winlin c5dd334645 fix the warning of ts_info 10 years ago
winlin ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 10 years ago
winlin e11fa383ca udpate the srs_bwt. 10 years ago
winlin 02778dba4c udpate the srs_bwt. 10 years ago
winlin a2af051840 udpate the srs_bwt. 10 years ago
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 10 years ago
winlin e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 10 years ago
winlin 3d97048c3a fix bug #217, add reuse conn to play different player. 10 years ago
winlin d80b580c2f refine librtmp, remove the _get_ for some attribute get. 10 years ago
winlin bb7a19636a fix the bandwidth file name bug. 10 years ago
winlin aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 10 years ago
winlin 10bc5399ec refine librtmp api, add prefix utils for utilities. 10 years ago
winlin b3bb2cdf2b refine code, rename the human functions to prefixed with srs_human_ 10 years ago
winlin d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 10 years ago
winlin a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 10 years ago
winlin 2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 10 years ago
winlin 278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 10 years ago
winlin 3292136f70 update research, flv ingester, support atc time flv. 10 years ago
winlin 7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 10 years ago
winlin 0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 10 years ago
winlin 77cf885d8c add comments for #161 10 years ago