Commit Graph

921 Commits (ccc4c05da96bca147eb30693a57da848e2943ca0)

Author SHA1 Message Date
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
winlin a647043a06 update readme and wiki url for http ts stream 10 years ago
winlin 0702ad19b6 for #293, http ts stream, update readme. 10 years ago
winlin 463f75f1c9 update readme, add http live stream 10 years ago
winlin 3f0c80599b update reamde 10 years ago
winlin b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 10 years ago
winlin 3b853a6dbd fix #293, support rtmp remux to http flv live stream. 10 years ago
winlin 53d9faf395 for #293, update readme. 10 years ago
winlin 9bf408ad25 for bug #277, update readme remove the experiment for http server and http vod stream. 10 years ago
winlin cbed2bbca4 fix #277, refine http server refer to go http-framework. 2.0.98 10 years ago
winlin 9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 10 years ago
winlin cc22ca4890 hotfix #290, use iformat only for rtmp input. 2.0.95 10 years ago
winlin 4449a8d7b0 fix #290, use iformat only for rtmp input. 1.0.22 10 years ago
winlin 1f9fae43a4 update readme for 1.0rc1 10 years ago
winlin 118efcbbf8 update the file for 1.0rc1. 10 years ago
winlin 8e2b871829 update readme for 1.0rc1 10 years ago
winlin 98fb50464a update readme for 1.0r1, 1.0.21 10 years ago
winlin ad5956eab4 update readme 10 years ago
winlin bb74c8dfc5 update readme for 1.0r1 10 years ago
winlin df3b5c953b update donation link to develop 10 years ago
winlin 1316dab83c update donation link to develop 10 years ago
winlin b1187b8c66 update readme 10 years ago
winlin c80477d58e update readme. 10 years ago
winlin b466756931 merge from feilong for bug #281. 10 years ago
winlin 27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 10 years ago
winlin 32657b0a50 update readme 10 years ago
winlin 2ea1c4fb61 update readme for security 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 10 years ago
winlin 247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 10 years ago
winlin f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 10 years ago
winlin e590537dca fix #207, trim the last 0 of log. 1.0.18 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 10 years ago
winlin ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 10 years ago
winlin 518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 10 years ago
winlin c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 10 years ago
winlin bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 10 years ago
winlin 12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 10 years ago
winlin c0a6c3efa3 merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79 10 years ago
winlin d9aca8ab82 hotfix #267, the forward dest ep should use server. 1.0.15 10 years ago
winlin e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 10 years ago
winlin a1a9d636aa update readme for merged from 1.0release 10 years ago
winlin 513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 10 years ago
winlin a7b6974dcb Merge branch '1.0release' into develop 10 years ago
winlin e77e4cfb8b hotfix 1.0release, add gitlab remote mirror 10 years ago
winlin a576bb20b6 merge from hotfix 1.0release. 10 years ago
winlin 02ec771030 hotfix 1.0release, update the system requirements. 10 years ago
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. 10 years ago
winlin 5a0bfd4fe2 test git, hotfix on release 1.0 branch. 10 years ago
winlin 3218efd242 merge from 1.0 10 years ago
winlin ac11e33ea7 update readme for #264 10 years ago
winlin 9b8f6ff962 update readme, use table for performance. 10 years ago