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

1027 Commits (908365a61a0862d4ee4dfd13c2af5e0dbb8b6eb8)

Author SHA1 Message Date
winlin 2cf526ffc7 close , support obs restart publish. 2.0.184
winlin 8d3d5dd10b Merge branch '2.0release' into develop
winlin a0a89a8ca6 use reduce_sequence_header for stream control.
winlin 807299589e merge from srs2.
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183
winlin a64340c2b5 Merge branch '2.0release' into develop
winlin c02da33c11 add bytes api benchmark.
winlin 035cd40866 add bytes api benchmark.
winlin 653afd0700 merge from 2.0
winlin 9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182
winlin 267846a3fa for , support kickoff connected client. 2.0.181
winlin 6a39bf4731 refine for srs3
winlin 34fe51a85c refine for 2.0release
winlin 0e3128d3e3 Merge branch '2.0release' into develop
winlin a62d1cdf2a refine the readme
winlin de64f6829d update readme
winlin 3d5fbc7a61 update README, remove the 1.0history.
winlin 4c3d3013a2 Merge branch '2.0release' into develop
winlin cd8be3f194 Update README.md
winlin fb46481fc7 Update README.md
winlin 9e6746fcaa Update README.md
winlin 94569b181f merge from 2.0
winlin c85f92c229 fix , support default values for transcode. 2.0.180
winlin 48c040c92b Merge branch '2.0release' into develop
winlin 89183c52c9 update hls and transcode wiki
winlin 31d2de3f23 fix , add pageUrl for HTTP callback on_play.
winlin 146a44a2ce merge from 2.0
winlin b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179
winlin fdb17a1864 merge from 2.0
winlin 366d3a3f56 for , use 30s timeout for first msg. 2.0.178
winlin 8e293f927f merge 2.0release
winlin 5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177
winlin 5f91fbc970 merge from 2.0release
winlin ef5ddd01e4 Update README.md
winlin c8fef99cb6 merge from 2.0release
winlin 438914c481 fix , fix the sps parse bug. 2.0.176
winlin 8951752086 Merge branch '2.0release' into develop
Jonathan Barratt 2e437a28b4 Update README.md 
Correct path in installation instructions since project repository renamed to srs from simple-rtmp-server
winlin b0ce38dc8f merge from 2.0
winlin 56938efdbd fix , refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175
winlin 12eab8a128 merge from srs2.
winlin 6941f2c072 fix , fix aggregate timestamp bug. 2.0.174
winlin 5d75e32e1d Merge branch '2.0release' into develop
winlin a1dd734318 fix , drop video for unkown RTMP header.
winlin d10d57716a Merge branch '2.0release' into develop
winlin 26b76c0e4c fix , remove ts for hls ram mode.
winlin 9dce971d57 merge from srs2
winlin 223ae194b1 fix , cleanup hls when stop and timeout. 2.0.173.
winlin 4a80a5a71e for , support cleanup when srs stop.
winlin 597993d414 support pure video hls.
winlin 5caafadd45 fix : support pure video hls. 2.0.172.
winlin 3ad030fe83 add HLS overload
winlin 27a1fee6b9 Merge branch '2.0release' into develop
winlin 41ead65345 support [srs-dolphin][srs-dolphin], the multiple-process SRS.
winlin b44987fac7 Merge branch '2.0release' into develop
winlin 9ab579c6e8 refine the configure test script.
winlin 7349fed8b1 Merge branch '2.0release' into develop
winlin 8afeb29d8d update readme
winlin cd162c2848 merge from 2.0
winlin 9e9f38133d update readme.
winlin d12fc7fcc5 fix , improve the HTTP FLV performance to 6k. 2.0.171
winlin 4df19ba99a for , improve the http flv to 3k. 2.0.170
winlin 0e1ac2b923 update readme
winlin 960341b9b2 for , improve the HTT FLV to 3k. 2.0.169
winlin fc995473eb for , improve the HTTP FLV delivery 1k to 2.3k. 2.0.168
winlin f540ce307b merge from 2.0
winlin 069ee0afc3 fix , register handler then start http thread. 2.0.167.
winlin 9e342f41a4 add rtmp cluster.
winlin 58b336451d Merge branch '2.0release' into develop
winlin 94efe3f727 update wiki
winlin 829b3a392b merge from 2.0
winlin d63242b6e8 add http flv sample.
winlin e4c97cde2f update readme
winlin 2d9103db77 update readme
winlin dbb37d2a52 update readme
winlin bbdc8b901b update readme
winlin 16d386df91 update readme
winlin 982b09f9a7 update readme
winlin 6418801487 update readme
winlin fe7d5c70d1 update readme
winlin 25d28c1461 update readme
winlin 504d0b9385 update readme
winlin 6f60fefba4 update readme
winlin 6d13178e92 refine readme the features and compare.
winlin 353e37c5b6 rename summary to features.
winlin 03c6aa37ad Merge branch '2.0release' into develop
winlin c19856be5c refine for 2.0
winlin 2b52960b50 Merge branch '2.0release' into develop
winlin a993462f95 merge from srs1.0
winlin 56f014ecf2 refine the graph of srs arch.
winlin 6b28dec8ec merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166
winlin 5908096fc3 refine the thread, protocol, kbps code. 2.0.166
winlin 478873fdec Merge branch '2.0release' into develop
winlin 0bb90145ba fix , copy request for async call.
winlin 7243cdbff6 merge from 2.0release.
winlin 6ca46e84bc fix , the USER_HZ maybe not 100. 2.0.165
winlin 948d200ce1 fix , parse when got entire http header, by feilong. 2.0.164.
winlin 44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.
winlin f6d2fd991b merge from 2.0.162
winlin c617d2aaa5 support push flv stream over HTTP POST to SRS.
winlin f15e9f5b62 Merge branch '2.0release' into develop
winlin 4d18073dab update contact add skype.
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.