github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,261 Commits
14 Branches
107 Tags
345 MiB
Commit Graph

503 Commits (2c4dc0fb3d73da359c1afc33cef5666813037c93)

Author SHA1 Message Date
winlin eec2c34b5c refine publisher.
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 fe27e76492 support schema
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 3ab0ccaa27 Merge branch '2.0release' into develop
winlin 7cdcf41d26 refine the api server
winlin 4e88262512 merge from srs2 to check cpus.
winlin cfe2082353 fix , error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192
winlin b78781707e update the srs player
winlin 5073a6fa08 merge from srs2
没——问题 e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

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

所以在此处提供设置 srs_player.swf 的url的方法。
winlin b25c45c643 refine srs player, support set the bufferTimeMax.
winlin dd21eee7f0 srs player show current time and url
winlin dfecfb65b1 support fluency and stream empty count
winlin fcd2d3d445 refine code for link generation from rtmp url.
winlin fe87bf1b61 support generate link page for rtmp url
winlin 018af55d65 refine the demo pages, move scripts after body.
winlin 170ad05148 add gfps and nb_packets
winlin e7714cd445 add packets interval in ms to set the right send_min_interval
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183
winlin 31d2de3f23 fix , add pageUrl for HTTP callback on_play.
winlin be342178c0 fix ingest flv tool, support non monotonically timestamp.
winlin 93a1d097dc update jwplayer to support play HTTP flv.
winlin ac13817aae update donation
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org.
winlin 115daa3cc1 migarate from winlinvip to srs org
winlin dbcd7d883b add script check_hls_backup.sh to research hls.
winlin 23b978c0bb merge from github
winlin 8fbc6526bb for , refine code to support mix correct algorithm.
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 bd77f995bf ignore the unknown flv tag.
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 bbac2348db for , remove the double underscore functions and variables.
winlin a15ce1147f for , fix all warnings for mac.
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable.
winlin f247ac9daf fix the http parse bug.
winlin 1246989ea9 for , refine dvr, support callback when reap dvr segment.
winlin 1685cdd48e for , parse pes packet ok, ts message ok.
winlin 77e43d1813 refine comments of aac publish for
winlin a1f887f46f refine code, move onMetaData to consts.
winlin 04aa6f8296 drop script data except the onMetaData packet.
winlin 44f5efda21 refine the print info.
winlin 5aa31568ba fix the rtmp dump, parse the aggregate msg.
winlin 89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp
winlin 0e03d019a8 for bug , srs rtmp dump support conn args. 2.0.90
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 10297fab51 fix , support 0.1s+ latency. 2.0.70
winlin d171a26758 disable gop cache when not h.264. fix some warning.
winlin c5dd334645 fix the warning of ts_info
winlin ff5cdb1cc1 for bug , add srs_rtmp_dump tool. 2.0.37.
winlin e11fa383ca udpate the srs_bwt.
winlin 02778dba4c udpate the srs_bwt.
winlin a2af051840 udpate the srs_bwt.
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.
winlin e492fa5353 fix , support publish aac adts raw stream. 2.0.31.
winlin 3d97048c3a fix bug , add reuse conn to play different player.
winlin d80b580c2f refine librtmp, remove the _get_ for some attribute get.
winlin bb7a19636a fix the bandwidth file name bug.
winlin aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29
winlin 10bc5399ec refine librtmp api, add prefix utils for utilities.
winlin b3bb2cdf2b refine code, rename the human functions to prefixed with srs_human_
winlin d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28.
winlin a058eeeb20 fix , support publish audio raw frames. 2.0.27
winlin 2c601a0069 fix , srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22.
winlin 278ff845d3 fix , srs-librtmp drop any video before sps/pps(sequence header). 2.0.21.
winlin 3292136f70 update research, flv ingester, support atc time flv.
winlin 7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19
winlin 0bc35e093c for bug , deadloop when read/write 0 and ETIME. 2.0.16.
winlin 77cf885d8c add comments for
winlin bf5206d049 Revert "Revert "add test file to show the max open files."" 
This reverts commit ea70f29648.
winlin ea70f29648 Revert "add test file to show the max open files." 
This reverts commit c8673cd50e.
winlin c8673cd50e add test file to show the max open files.
winlin 8ab6b57612 research st, the timeout and coroutine scheduler.
winlin be46e428ad research st, for bug , remove the code with bug, exit when fork.
winlin f4dfee0e9f research st, add comments for bug .
winlin cd09fcaf55 research st, remove all events except epoll.
winlin 91f6dbe479 research st, add test for setjmp and longjmp.
winlin 4d4e840209 research st, add jmp_flow.
winlin 683b01a6c9 research st, add comments about the thread cycle
winlin 8327a57b7e never use stack variable for setjmp
winlin 2c01f7e943 research st, expand MD_INIT_CONTEXT macro, the thread start.
winlin 8da8c49f39 research st, add comments
winlin 2b70212649 research st, add stack struct comments.
winlin 6bde1e54dc research st, add stack alloc commnets.
winlin e49a868308 research st, rename variable thread to trd, for thread is a keyword.
winlin ac1a4ec0a3 research st, always alloc on stack.
winlin ae8b3e3c00 research st, remove the support of MD_STACK_GROWS_UP
winlin 340464ed56 research st, remove __ia64__ cpu support
winlin a27c3dca2d research st, add gdb info for setjmp.
winlin 4b24ee9db3 research st, only for linux and arm/mips/i386/x86_64 cpus.
winlin 606fc13a03 rename the confict macro to srs_lib_trace
winlin 5554922820 refine librtmp tools, use srs_trace macro instead printf.
winlin cf5c24af4a refine librtmp, unify all tools format and usage.
winlin 6de83db76e refine srs-librtmp log macro
winlin f92303c764 refine all research tools, remove the public header, add log to srs_librtmp.h
winlin 3358570be6 refine for bug#66, implements the usage.
winlin 0075779d38 for bug , refine the api to send h264 frames.
winlin cd5c58ba5f for bug , refine the api and demo.
winlin 1074c8d9b2 for bug , use new api to directly sendout h264 raw data.
winlin 6407baffd5 for bug , output the h264 frame type.
winlin 72ad6894ca move the annexb decode utility to protocol.
winlin bd25626f0e refine code for bug
winlin 1c237a821a add api convert h264 to rtmp packet, for bug
winlin e4af098d06 refine code for bug
winlin b964a6c534 update for bug , add the srs-librtmp sample for publish h.264 raw stream.
winlin 1db69b153e update the research of arm
winlin 0f41e0d26f research st: only support linux
winlin d67454ecc2 research st: only support linux
winlin 5fd308c64e update code, warning when compile dev branch.
winlin fa53250202 refine the macro, use int as version type. 2.0.8
winlin 8521762cb3 research st: refine sync.
winlin 3377df0bea research st: refine skt.
winlin 22710db911 research st: refine sched.
winlin f5f8e8946f research st: refine event, io and key.
winlin c38a545780 reserach st: refine key.c
winlin fd0c85b324 research st: refine io.
winlin f8f18fffa7 research st: update test for st.
winlin 0f293802c8 research st: refine the md.h
winlin 856ba07bd3 research st: update public and common.
winlin 315707d726 research st: refine public
winlin bba2d3dd98 research st: replace the TAB with 4spaces
winlin 55bd1dd95e research st: replace the TAB with 4spaces
winlin 0faa38dc0c research st: remove the osguess.sh
winlin 2dc6b7d1ea add io for st research
winlin 511c814ffb refs : rename to sync test.
winlin 69fdec411f refs : rename to sync test.
winlin 9aba47cbe3 refs : research st, add multiple threadds.
winlin 79ab9f05f3 refs : update the st, use cond and mutex.
winlin 388305f44c update st research.
winlin fb906f0afc revert the player for bug .
winlin 6a3418cd45 fix , AMF0 support 0x0B the date type codec. 2.0.5.
winlin 59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
winlin e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx