Commit Graph

1075 Commits (f2a93755c26b56ccb623906168ad16529664558b)

Author SHA1 Message Date
winlin 6e5143449e HTTP API support JSONP by specifies the query string callback=xxx. 10 years ago
winlin 575a698820 fix #380, srs-librtmp send sequence header when sps or pps changed. 10 years ago
winlin 170ad05148 add gfps and nb_packets 10 years ago
winlin 2cf526ffc7 close #454, support obs restart publish. 2.0.184 10 years ago
winlin a0a89a8ca6 use reduce_sequence_header for stream control. 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 10 years ago
winlin c02da33c11 add bytes api benchmark. 10 years ago
winlin 035cd40866 add bytes api benchmark. 10 years ago
winlin 9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 10 years ago
winlin 267846a3fa for #442, support kickoff connected client. 2.0.181 10 years ago
winlin 34fe51a85c refine for 2.0release 10 years ago
winlin 0e3128d3e3 Merge branch '2.0release' into develop 10 years ago
winlin a62d1cdf2a refine the readme 10 years ago
winlin de64f6829d update readme 10 years ago
winlin 3d5fbc7a61 update README, remove the 1.0history. 10 years ago
winlin 4c3d3013a2 Merge branch '2.0release' into develop 10 years ago
winlin cd8be3f194 Update README.md 10 years ago
winlin fb46481fc7 Update README.md 10 years ago
winlin 9e6746fcaa Update README.md 10 years ago
winlin 94569b181f merge from 2.0 10 years ago
winlin c85f92c229 fix #169, support default values for transcode. 2.0.180 10 years ago
winlin 48c040c92b Merge branch '2.0release' into develop 10 years ago
winlin 89183c52c9 update hls and transcode wiki 10 years ago
winlin 31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 10 years ago
winlin 146a44a2ce merge from 2.0 10 years ago
winlin b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 10 years ago
winlin fdb17a1864 merge from 2.0 10 years ago
winlin 366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 10 years ago
winlin 8e293f927f merge 2.0release 10 years ago
winlin 5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 10 years ago
winlin 5f91fbc970 merge from 2.0release 10 years ago
winlin ef5ddd01e4 Update README.md 10 years ago
winlin c8fef99cb6 merge from 2.0release 10 years ago
winlin 438914c481 fix #433, fix the sps parse bug. 2.0.176 10 years ago
winlin 8951752086 Merge branch '2.0release' into develop 10 years ago
Jonathan Barratt 2e437a28b4 Update README.md
Correct path in installation instructions since project repository renamed to srs from simple-rtmp-server
10 years ago
winlin b0ce38dc8f merge from 2.0 10 years ago
winlin 56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 10 years ago
winlin 12eab8a128 merge from srs2. 10 years ago
winlin 6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 10 years ago
winlin 5d75e32e1d Merge branch '2.0release' into develop 10 years ago
winlin a1dd734318 fix #421, drop video for unkown RTMP header. 10 years ago
winlin d10d57716a Merge branch '2.0release' into develop 10 years ago
winlin 26b76c0e4c fix #420, remove ts for hls ram mode. 10 years ago
winlin 9dce971d57 merge from srs2 10 years ago
winlin 223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 10 years ago
winlin 4a80a5a71e for #209, support cleanup when srs stop. 10 years ago
winlin 597993d414 support pure video hls. 10 years ago
winlin 5caafadd45 fix #409: support pure video hls. 2.0.172. 10 years ago
winlin 3ad030fe83 add HLS overload 10 years ago
winlin 27a1fee6b9 Merge branch '2.0release' into develop 10 years ago
winlin 41ead65345 support [srs-dolphin][srs-dolphin], the multiple-process SRS. 10 years ago
winlin b44987fac7 Merge branch '2.0release' into develop 10 years ago
winlin 9ab579c6e8 refine the configure test script. 10 years ago
winlin 7349fed8b1 Merge branch '2.0release' into develop 10 years ago
winlin 8afeb29d8d update readme 10 years ago
winlin cd162c2848 merge from 2.0 10 years ago
winlin 9e9f38133d update readme. 10 years ago
winlin d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 10 years ago
winlin 4df19ba99a for #405, improve the http flv to 3k. 2.0.170 10 years ago
winlin 0e1ac2b923 update readme 10 years ago
winlin 960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 10 years ago
winlin fc995473eb for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 10 years ago
winlin f540ce307b merge from 2.0 10 years ago
winlin 069ee0afc3 fix #404, register handler then start http thread. 2.0.167. 10 years ago
winlin 9e342f41a4 add rtmp cluster. 10 years ago
winlin 58b336451d Merge branch '2.0release' into develop 10 years ago
winlin 94efe3f727 update wiki 10 years ago
winlin 829b3a392b merge from 2.0 10 years ago
winlin d63242b6e8 add http flv sample. 10 years ago
winlin e4c97cde2f update readme 10 years ago
winlin 2d9103db77 update readme 10 years ago
winlin dbb37d2a52 update readme 10 years ago
winlin bbdc8b901b update readme 10 years ago
winlin 16d386df91 update readme 10 years ago
winlin 982b09f9a7 update readme 10 years ago
winlin 6418801487 update readme 10 years ago
winlin fe7d5c70d1 update readme 10 years ago
winlin 25d28c1461 update readme 10 years ago
winlin 504d0b9385 update readme 10 years ago
winlin 6f60fefba4 update readme 10 years ago
winlin 6d13178e92 refine readme the features and compare. 10 years ago
winlin 353e37c5b6 rename summary to features. 10 years ago
winlin 03c6aa37ad Merge branch '2.0release' into develop 10 years ago
winlin c19856be5c refine for 2.0 10 years ago
winlin 2b52960b50 Merge branch '2.0release' into develop 10 years ago
winlin a993462f95 merge from srs1.0 10 years ago
winlin 56f014ecf2 refine the graph of srs arch. 10 years ago
winlin 6b28dec8ec merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166 10 years ago
winlin 5908096fc3 refine the thread, protocol, kbps code. 2.0.166 10 years ago
winlin 478873fdec Merge branch '2.0release' into develop 10 years ago
winlin 0bb90145ba fix #391, copy request for async call. 10 years ago
winlin 7243cdbff6 merge from 2.0release. 10 years ago
winlin 6ca46e84bc fix #397, the USER_HZ maybe not 100. 2.0.165 10 years ago
winlin 948d200ce1 fix #400, parse when got entire http header, by feilong. 2.0.164. 10 years ago
winlin 44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 10 years ago
winlin f6d2fd991b merge from 2.0.162 10 years ago
winlin c617d2aaa5 support push flv stream over HTTP POST to SRS. 10 years ago
winlin f15e9f5b62 Merge branch '2.0release' into develop 10 years ago
winlin 4d18073dab update contact add skype. 10 years ago
winlin 5819614ff0 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin fff838e4c1 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 9189a408c1 Merge branch '2.0release' into develop 10 years ago
winlin 90b80ffc45 migarate from winlinvip to srs org. 10 years ago
winlin 7d5f1c2be8 Merge branch '2.0release' into develop 10 years ago
winlin 2239e9f1fd support ingest hls live stream to RTMP. 10 years ago
winlin 6726a88f47 merge from 2.0release 10 years ago
winlin 22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 10 years ago
winlin 0c939e7114 merge from 2.0.160: 10 years ago
winlin dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 10 years ago
winlin 17c1423f4a Merge branch '2.0release' into develop 10 years ago
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 10 years ago
winlin 7dbc95e085 refine the hls deviation for floor algorithm. 10 years ago
winlin 71e1602458 merge from 2.0.159 10 years ago
winlin 546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 10 years ago
winlin 4f9df4f1a0 merge from 2.0.157, reap ts on the IDR. 10 years ago
winlin 77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 10 years ago
winlin 70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156. 10 years ago
winlin cb148e43ee merge from 2.0.155 10 years ago
winlin 17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 10 years ago
winlin fe5783e7a4 merge 2.0.154 10 years ago
winlin 8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 10 years ago
winlin 2d3d628865 merge from 2.0.153 10 years ago
winlin 717d088376 support server cycle handler. 2.0.153. 10 years ago
winlin e75b7e89d6 merge from 2.0.152 10 years ago
winlin c49bc0628e support on_hls for http hooks. 2.0.152. 10 years ago
winlin ef28865991 merge from 2.0.151 10 years ago
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151. 10 years ago
winlin abbed8f66c merge from 2.0release 10 years ago
winlin 692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 10 years ago
winlin 4d27030c19 Merge branch '2.0release' into develop 10 years ago
winlin 6776065b04 big support from all friends of SRS 10 years ago
winlin 11b93803de revert to SRS2. 10 years ago
winlin ab673e1300 for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 10 years ago
winlin 19ec1dafb7 Merge branch '2.0release' into develop 10 years ago
winlin c32d9ee43e remove the contact from index. 10 years ago
winlin ef39a88f3d Merge branch '2.0release' into develop 10 years ago
winlin 5d7c24de48 update readme 10 years ago
winlin a21243ea12 merge from 2.0 10 years ago
winlin d349a3dbda update stable version check 10 years ago
winlin 519c25a064 fork srs2 and start srs3. 3.0.0 10 years ago
winlin 636bc574af start 2.0release, 80773 lines. 10 years ago
winlin 5e19f5f2b8 add qq and weixin image. 10 years ago
winlin 320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 10 years ago
winlin 27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 10 years ago
winlin 2adc069df0 update readme for why srs 10 years ago
winlin ffef62900f for #328, support adobe hds. 2.0.138. 10 years ago
winlin db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 10 years ago
winlin 5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 10 years ago
winlin 8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 10 years ago
winlin f31412db21 update readme. 10 years ago
winlin b3ef8e9d48 set stream caster to experiment state 10 years ago
winlin f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 10 years ago
winlin 3982ec1d87 refine http request parse. 2.0.132. 10 years ago
winlin 012c29e124 for #133, update the wiki. 10 years ago
winlin fb3fced8d0 for #179, revert dvr http api. 2.0.128. 10 years ago
winlin 4505983944 update readme, add why srs. 10 years ago
winlin e282fa94c0 update readme, add why srs. 10 years ago
winlin 6b0a8092ab update readme, add why srs. 10 years ago
winlin b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 10 years ago
winlin 1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 10 years ago
winlin a3648063d5 fix #179, support dvr http api. 2.0.123. 10 years ago
winlin 691f732204 for #179, update readme. 10 years ago
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 10 years ago
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121. 10 years ago
winlin 9d233db27e fix #133, support push rtsp to srs. 2.0.120. 10 years ago
winlin d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119. 10 years ago
winlin ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. 10 years ago
winlin 78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 10 years ago
winlin 922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 10 years ago
winlin 25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 10 years ago
winlin 9a7696a7c2 Merge branch '1.0release' of github.com:winlinvip/simple-rtmp-server into 1.0release 10 years ago
winlin 103ce78b35 Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop 10 years ago
winlin 4cf263876c update readme 10 years ago
winlin e1e12e5dba release 1.0r2 10 years ago
winlin 61b0ee55ed release 1.0r2 10 years ago
winlin d4f642504f update readme 10 years ago
winlin 16bf0a1826 dev code HuKaiqun for 1.0.27. 10 years ago
winlin f016245e20 dev code ZhouGuoWen for 2.0.115. 10 years ago
winlin 0e783f4548 Update README.md 10 years ago
winlin d07f09aa0b Update README.md 10 years ago
winlin e19ee0cb99 for #311, set pcr_base to dts. 2.0.114. 10 years ago
winlin 828aadf858 for #310, downcast aac SSR to LC. 2.0.113 10 years ago
winlin d5e3ac4e7d for #310, the aac profile must be object plus one. 1.0.26 10 years ago
winlin dba983d124 for #136, update the config for ram hls. 10 years ago
winlin 16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 10 years ago
winlin 8374017329 build libfdk-aac in ffmpeg. 2.0.108 10 years ago
winlin 52b62918d9 for #250, decode the PAT of PSI ts packet. 10 years ago
winlin 7fc3996e45 update readme for hls(h.264+mp3). 10 years ago
winlin 919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 10 years ago
winlin 2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 10 years ago
winlin aaade0f04f for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105 10 years ago
winlin 7888506999 update readme for 1.0.25 10 years ago
winlin 16372365ae for #151, refine pcr=dts-800ms and use dts/pts directly. 2.0.104 10 years ago
winlin 1835957a2b for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24 10 years ago
winlin 8ace73f30d for #151, use absolutely overflow to make jwplayer happy. 2.0.103 10 years ago
winlin 4f5cc9c403 for #151, use absolutely overflow to make jwplayer happy. 1.0.23 10 years ago
winlin 1e26f54b5c update stream arch. 10 years ago
winlin 102736a94d for #250, update readme add streamer arch. 10 years ago
winlin d8c7267cfc update readme. 10 years ago