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

1075 Commits (f2a93755c26b56ccb623906168ad16529664558b)

Author SHA1 Message Date
winlin 5819614ff0 migarate from winlinvip to srs org, move the copyright to srs org.
winlin fff838e4c1 migarate from winlinvip to srs org, move the copyright to srs org.
winlin 9189a408c1 Merge branch '2.0release' into develop
winlin 90b80ffc45 migarate from winlinvip to srs org.
winlin 7d5f1c2be8 Merge branch '2.0release' into develop
winlin 2239e9f1fd support ingest hls live stream to RTMP.
winlin 6726a88f47 merge from 2.0release
winlin 22ca46350b fix , support mix_correct algorithm. 2.0.161.
winlin 0c939e7114 merge from 2.0.160:
winlin dcac9c69d5 fix , support reap hls/ts by gop or not. 2.0.160.
winlin 17c1423f4a Merge branch '2.0release' into develop
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts.
winlin 7dbc95e085 refine the hls deviation for floor algorithm.
winlin 71e1602458 merge from 2.0.159
winlin 546be09219 fix , fix hls bug, keep cc continous between ts files. 2.0.159.
winlin 4f9df4f1a0 merge from 2.0.157, reap ts on the IDR.
winlin 77c29da26b for , rewrite annexb mux for ts, refer to apple sample. 2.0.157.
winlin 70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156.
winlin cb148e43ee merge from 2.0.155
winlin 17c0a5c470 fix , support transform vhost of edge 2.0.155.
winlin fe5783e7a4 merge 2.0.154
winlin 8401d9ac06 fix , config hls to disable cleanup of ts. 2.0.154.
winlin 2d3d628865 merge from 2.0.153
winlin 717d088376 support server cycle handler. 2.0.153.
winlin e75b7e89d6 merge from 2.0.152
winlin c49bc0628e support on_hls for http hooks. 2.0.152.
winlin ef28865991 merge from 2.0.151
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151.
winlin abbed8f66c merge from 2.0release
winlin 692b751da8 for , support config the m3u8/ts path for hls. 2.0.149.
winlin 4d27030c19 Merge branch '2.0release' into develop
winlin 6776065b04 big support from all friends of SRS
winlin 11b93803de revert to SRS2.
winlin ab673e1300 for , osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
winlin 19ec1dafb7 Merge branch '2.0release' into develop
winlin c32d9ee43e remove the contact from index.
winlin ef39a88f3d Merge branch '2.0release' into develop
winlin 5d7c24de48 update readme
winlin a21243ea12 merge from 2.0
winlin d349a3dbda update stable version check
winlin 519c25a064 fork srs2 and start srs3. 3.0.0
winlin 636bc574af start 2.0release, 80773 lines.
winlin 5e19f5f2b8 add qq and weixin image.
winlin 320f45c6f4 fix , support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
winlin 27cb62b7aa for , support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
winlin 2adc069df0 update readme for why srs
winlin ffef62900f for , support adobe hds. 2.0.138.
winlin db7ddfd510 fix , , support osx(darwin) for mac pro. 2.0.137.
winlin 5143e3a58d fix , http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136
winlin 8dbabe3708 fix , refine aac LC, support aac HE/HEv2. 2.0.134.
winlin f31412db21 update readme.
winlin b3ef8e9d48 set stream caster to experiment state
winlin f26e719800 fix , fix http-flv stream bug, support multiple streams. 2.0.133.
winlin 3982ec1d87 refine http request parse. 2.0.132.
winlin 012c29e124 for , update the wiki.
winlin fb3fced8d0 for , revert dvr http api. 2.0.128.
winlin 4505983944 update readme, add why srs.
winlin e282fa94c0 update readme, add why srs.
winlin 6b0a8092ab update readme, add why srs.
winlin b903a7b436 for , dvr suport vhost/app/stream level control. 2.0.125.
winlin 1cb8e44b1b fix , fix hls bug, write pts/dts error. 2.0.124.
winlin a3648063d5 fix , support dvr http api. 2.0.123.
winlin 691f732204 for , update readme.
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122.
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121.
winlin 9d233db27e fix , support push rtsp to srs. 2.0.120.
winlin d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.
winlin ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
winlin 78f34ad46f for , support config default acodec/vcodec. 2.0.118.
winlin 922150b2cf for , rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.
winlin 25af6c6847 for , use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
winlin 9a7696a7c2 Merge branch '1.0release' of github.com:winlinvip/simple-rtmp-server into 1.0release
winlin 103ce78b35 Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin 4cf263876c update readme
winlin e1e12e5dba release 1.0r2
winlin 61b0ee55ed release 1.0r2
winlin d4f642504f update readme
winlin 16bf0a1826 dev code HuKaiqun for 1.0.27.
winlin f016245e20 dev code ZhouGuoWen for 2.0.115.
winlin 0e783f4548 Update README.md
winlin d07f09aa0b Update README.md
winlin e19ee0cb99 for , set pcr_base to dts. 2.0.114.
winlin 828aadf858 for , downcast aac SSR to LC. 2.0.113
winlin d5e3ac4e7d for , the aac profile must be object plus one. 1.0.26
winlin dba983d124 for , update the config for ram hls.
winlin 16afe7ddbb fix , support push MPEGTS over UDP to SRS. 2.0.111
winlin 8374017329 build libfdk-aac in ffmpeg. 2.0.108
winlin 52b62918d9 for , decode the PAT of PSI ts packet.
winlin 7fc3996e45 update readme for hls(h.264+mp3).
winlin 919a85b103 for , hls support h.264+mp3, ok for vlc. 2.0.107
winlin 2c42350489 for , http ts stream support h.264+mp3. 2.0.106
winlin aaade0f04f for , refine the pcr start at 0, dts/pts plus delay. 2.0.105
winlin 7888506999 update readme for 1.0.25
winlin 16372365ae for , refine pcr=dts-800ms and use dts/pts directly. 2.0.104
winlin 1835957a2b for , refine pcr=dts-800ms and use dts/pts directly. 1.0.24
winlin 8ace73f30d for , use absolutely overflow to make jwplayer happy. 2.0.103
winlin 4f5cc9c403 for , use absolutely overflow to make jwplayer happy. 1.0.23
winlin 1e26f54b5c update stream arch.
winlin 102736a94d for , update readme add streamer arch.
winlin d8c7267cfc update readme.
winlin a647043a06 update readme and wiki url for http ts stream
winlin 0702ad19b6 for , http ts stream, update readme.
winlin 463f75f1c9 update readme, add http live stream
winlin 3f0c80599b update reamde
winlin b7b268dfbf fix , support http live flv/aac/mp3 stream with fast cache. 2.0.100.
winlin 3b853a6dbd fix , support rtmp remux to http flv live stream.
winlin 53d9faf395 for , update readme.
winlin 9bf408ad25 for bug , update readme remove the experiment for http server and http vod stream.
winlin cbed2bbca4 fix , refine http server refer to go http-framework. 2.0.98
winlin 9bbbaad288 for bug , refine http api refer to go http-framework. 2.0.97
winlin cc22ca4890 hotfix , use iformat only for rtmp input. 2.0.95
winlin 4449a8d7b0 fix , use iformat only for rtmp input. 1.0.22
winlin 1f9fae43a4 update readme for 1.0rc1
winlin 118efcbbf8 update the file for 1.0rc1.
winlin 8e2b871829 update readme for 1.0rc1
winlin 98fb50464a update readme for 1.0r1, 1.0.21
winlin ad5956eab4 update readme
winlin bb74c8dfc5 update readme for 1.0r1
winlin df3b5c953b update donation link to develop
winlin 1316dab83c update donation link to develop
winlin b1187b8c66 update readme
winlin c80477d58e update readme.
winlin b466756931 merge from feilong for bug .
winlin 27e0521ace fix , fix hls bug ignore type-9 send aud. 1.0.20
winlin 32657b0a50 update readme
winlin 2ea1c4fb61 update readme for security
winlin dc11418c79 fix : http-callback support on_dvr when reap a dvr file. 2.0.89
winlin dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88
winlin 247b772449 hotfix to remove the pageUrl for http callback. 1.0.19
winlin f881bc43b5 fix : dvr support custom filepath by variables. 2.0.87
winlin 75f2607685 fix , support security allow/deny publish/play all/ip. 2.0.86
winlin f8ec7c706d merge from 1.0.18, hotfix , trim the last 0 of log. 2.0.85
winlin e590537dca fix , trim the last 0 of log. 1.0.18
winlin 9d34820c80 fix : http-callback check http status code ok(200). 2.0.84
winlin 8df0f724d6 fix , http-callback post in application/json content-type. 2.0.83
winlin ca977ef739 hotfix , http-callback post in application/json content-type. 1.0.17
winlin 518a5a72ab fix , srs-librtmp flv read tag should init size. 2.0.82
winlin c1c01ec802 hotfix , memory leak for http client post. 2.0.81
winlin bb6dfe40c1 fix , memory leak for http client post. 1.0.16
winlin 12f4abd553 fix , aac profile is object id plus one. 2.0.80
winlin c0a6c3efa3 merge from 1.0release, hotfix , the forward dest ep should use server. 2.0.79
winlin d9aca8ab82 hotfix , the forward dest ep should use server. 1.0.15
winlin e27c95b0e8 merge from 1.0release for , the hls pcr is negative when startup. 2.0.78
winlin a1a9d636aa update readme for merged from 1.0release
winlin 513c1ec6d5 fix , the hls pcr is negative when startup. 1.0.14
winlin a7b6974dcb Merge branch '1.0release' into develop
winlin e77e4cfb8b hotfix 1.0release, add gitlab remote mirror
winlin a576bb20b6 merge from hotfix 1.0release.
winlin 02ec771030 hotfix 1.0release, update the system requirements.
winlin 49daee34b4 hotfix 1.0release, remove the multiple process arch, for 2.0 supports huge connections, and 3.0 will use other arch without st.
winlin 5a0bfd4fe2 test git, hotfix on release 1.0 branch.
winlin 3218efd242 merge from 1.0
winlin ac11e33ea7 update readme for
winlin 9b8f6ff962 update readme, use table for performance.
winlin b9147af38a update readme, use table for performance.
winlin 0133913b7c update readme, for latence refined.
winlin bacbec6647 update readme
winlin cbad7a3074 fix , server latency is 0.1s+, the bottleneck is encoder. 2.0.71
winlin 66fd4bbf31 update readme
winlin 450eeb8dd6 update readme
winlin d276ff3367 add latency benchmark table.
winlin 0af1154293 add latency benchmark table.
winlin 10297fab51 fix , support 0.1s+ latency. 2.0.70
winlin 149d5863e9 update reame
winlin 6a49ae4ffb update readme, for 10k performance
winlin ffacf1b774 update 2.0 history for 1.0 released.
winlin 8c1023d816 fix , 10k+ clients, use queue cond wait and fast vector. 2.0.67
winlin 71155fc3d2 update readme for 1.0release
winlin ed93c50218 update readme. 10k clients.
winlin 8aff915538 release SRS 1.0
winlin cdb1984ba4 update readme
winlin cd317859db add mw sleep time and msgs/iovs table.
winlin 9ee138746f for bug , 9k+ clients, use fast cache for msgs queue. 2.0.57
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350.
winlin b1d7fbe668 fix , add mw(merged-write) config. 2.0.53
winlin 72fa33d9fb update performance to 4k, when mr_sleep to 2000ms. 2.0.52
winlin 5589b13d2e for bug , support mr(merged-read) config and reload. 2.0.52.
winlin 4b09531e2f for bug , simplify the merged read config macros.
winlin 310f51e6a1 update readme.
winlin b84e87845e update readme
winlin 511a482fba for bug and , improve about 25% performance. 2.0.50
winlin fd5ef89030 update readme
winlin 19b1d750aa update readme
winlin c083238760 update readme.
winlin a88962daf2 update readme.
winlin f70027cdeb update readme.
winlin bf99069ed1 update readme.
winlin 787ab674e3 fix , conn thread use cond to wait for recv thread error. 2.0.47.
winlin 5905e5c050 merge from 1.0release, traverse the token before response connect. 2.0.45.
winlin 9bda56cb42 update readme for bug
winlin 304208f822 fix , traverse the token before response connect. 1.0.10.
winlin 3584bdb7b6 srs-librtmp support hijack io apis for st-load. 2.0.42.
winlin 212a9aa78c for bug , refine syscall for recv, supports 1.5k clients. 2.0.41.
winlin af83e18d7e update the README for 1.5k publishers. 2.0.41
winlin 47b4b694be add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39.
winlin efb73c5487 fix , refine handshake, replace union with template method. 2.0.38.
winlin ff5cdb1cc1 for bug , add srs_rtmp_dump tool. 2.0.37.
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.
winlin d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8
winlin 32cf44e5bb update PRIMARY, AUTHORS, CONTRIBUTORS rule
winlin 5fde890603 update PRIMARY, AUTHORS, CONTRIBUTORS rule
winlin e492fa5353 fix , support publish aac adts raw stream. 2.0.31.
winlin 5408169b6e update readme
winlin 58136ec178 fix , remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30.
winlin aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29
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 d6072b16c0 support compile srs-librtmp on windows. 2.0.26
winlin 89110d9748 add report bug url. update readme
winlin 1bf32a15e1 refs : update readme, SRS1.0/2.0 supports 500 clients to publish streams.
winlin c1e9aed0ac all wiki translated to English. 1.0.7
winlin fbcb63f775 v2.0, 2014-11-18, all wiki translated to English. 2.0.23.
winlin 520764fba3 update readme, add qq group.
winlin a7faf54567 update readme, add qq group.
winlin 7f987bb2a0 update readme, add qq group.
winlin ba5b3b92b1 update readme, add qq group.
winlin 2599165f90 update 1.0release readme, remove the unstable features.
winlin c3986d9d6d update readme for wiki
winlin 8878367505 update readme for wiki
winlin 64a1d975d7 update readme for wiki
winlin 3f9e11ea83 update readme for wiki
winlin 68a09d5b5c update readme for wiki
winlin 3247121619 update readme for wiki
winlin 81b0f246f5 update readme for wiki
winlin 55d4c71362 update readme for wiki
winlin 273ba9c2e5 update readme for wiki
winlin dca060dcde update readme for wiki
winlin e70e864e5d add h264 stream publish usage.
winlin fed87b3986 update readme, typo
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 bb5e99f562 fix , fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20.
winlin 9b2da59eeb update readme
winlin 55d4ce603e update readme
winlin 1f5c82ecc4 update readme
winlin eba1740ed5 hotfix , deadloop when read/write 0 and ETIME. 1.0.6.
winlin 0bc35e093c for bug , deadloop when read/write 0 and ETIME. 2.0.16.
winlin cc6aca9ad5 fix , writev multiple msgs, support 6k+ 250kbps clients. 2.0.15.
winlin 8acd143a7a fix : refine the timeout recv, pulse to 500ms. 2.0.14.
winlin 46330dd196 fix : remove the confuse code st_usleep(0). 2.0.13.
winlin 4f34ac022f add benchmark for 1.0.5/2.0.12, 2700clients, 85%CPU, 66MB.
winlin 845c1e9329 update readme
winlin f9a7d40364 update readme
winlin 9172dc14dc update the death link for readme.
winlin 2dde5dc89d update readme
winlin 805ff7b1be update readme for srs-librtmp
winlin 6968aef66a update readme for srs-librtmp
winlin 3405f35d06 fix : configure --export-librtmp-project and --export-librtmp-single. 2.0.11.
winlin 926650840e fix , configure --export-librtmp. 2.0.10.
winlin 106bef802f fix , srs-librtmp support write h264 raw packet. 2.0.9.
winlin f2f259d050 use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5.
winlin d88a2cc8dc update readme
winlin 74f7c32e81 update readme, add oschina mirror.
winlin ff76afa81a update readme
winlin 85c2398e78 update readme.
winlin 6a3418cd45 fix , AMF0 support 0x0B the date type codec. 2.0.5.
winlin f4b779060b add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
winlin 59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
winlin fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
winlin d8e55d14cd rename EN/CN home
winlin 8295750821 rename EN/CN home
winlin 1bfc238fec hotfix for bug , drop connect args when not object. 2.0.4.
winlin aa98ca60b9 fix , hotfix for bug , drop connect args when not object. 1.0.3.
winlin 77d14ff752 update readme, rename wiki/xxx to wiki/v1_xxx
winlin a169262099 update readme, rename wiki/xxx to wiki/v1_xxx
winlin e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx
winlin 6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx
winlin b9b345ec37 update readme, ENHome_v1 to v1_ENHome
winlin abe2779a37 update readme.
winlin 616d1cb2b3 update readme.
winlin 57e8356221 fix , support AnnexB in RTMP body for HLS. 2.0.2
winlin bd158ec838 hotfix for bug , donot support AnnexB when decoding RTMP body for HLS. 1.0.1.
winlin 1f0f98ff04 update readme.
winlin 9ab6ff15fe remove supports for OSX. 2.0.1.
winlin d24e2fd0cc remove supports for OSX. 2.0.1.
winlin 4fe5a9bdb3 update readme
winlin a4d1b136d8 update readme
winlin b1b70cdf09 update readme.
winlin e707006a68 revert github srs README to English. 2.0.0.
winlin ba868da7c4 refine readme.
winlin 4ab4ce29bb refine readme.
winlin cba9e51845 refine readme.
winlin 8053f0ba9d refine readme.
winlin 9b90a7444f remove all chinese in readme.
winlin 75f3df5d30 remove qq url.
winlin cb7f3a82c7 remove qq url.
winlin 1bf6c32deb I donot think QQ is neccessary.
winlin 48e187a75d I donot think QQ is neccessary.
winlin b370b176d4 update readme for 1.0beta
winlin e455032dc7 update readme for 1.0beta
winlin 1d939f55ba update readme for 1.0beta.
winlin 570d2a450e update readme for 1.0beta.
winlin fed8c31c5d update readme for 1.0beta. 1.0.0
winlin 9789335d0b fix , always reap ts whatever audio or video packet. 0.9.223.
winlin f33f91c8c2 update readme.
winlin b830b995e6 fix bug , requires epoll. 0.9.222
winlin f3002144fc fix : crash for multiple edge publishing the same stream. 0.9.220.
winlin 20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216.
winlin 83f266b9e2 fix , dvr segment add config dvr_wait_keyframe. 0.9.213.
winlin 728b749384 fix , add openssl includes to utest. 0.9.209.