github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,429 Commits
13 Branches
107 Tags
371 MiB
develop
5.0release
6.0release
4.0release
feature/simulcast
feature/gb28181
feature/h265
master
fossa
3.0release
2.0release
min
1.0release
v2.0-r2
v2.0-r1
v2.0-r0
v2.0-b4
v2.0-b3
v2.0-b2
v2.0-b1
v2.0-b0
v2.0-a3
v2.0-a2
v2.0-a1
v2.0-a0
v1.0-r4
v1.0-r3
v1.0-r2
v1.0-r1
v1.0-r0
v0.9.0
v0.8.0
v0.7.0
v0.6.0
v0.5.0
v0.4.0
v0.3.0
v0.2.0
v0.1.0
v2.0-r10
v2.0-r11
v2.0-r3
v2.0-r4
v2.0-r5
v2.0-r6
v2.0-r7
v2.0-r8
v2.0-r9
v3.0-a0
v3.0-a1
v3.0-a2
v3.0-a3
v3.0-a4
v3.0-a5
v3.0-a6
v3.0-a7
v3.0-a8
v3.0-a9
v3.0-b0
v3.0-b1
v3.0-b2
v3.0-b3
v3.0-b4
v3.0-r0
v3.0-r1
v3.0-r2
v3.0-r3
v3.0-r4
v3.0-r5
v3.0-r6
v3.0-r7
v3.0-r8
v4.0-b0
v4.0-b1
v4.0-b10
v4.0-b2
v4.0-b3
v4.0-b4
v4.0-b5
v4.0-b6
v4.0-b7
v4.0-b8
v4.0-b9
v4.0-r0
v4.0-r1
v4.0-r2
v4.0-r3
v4.0-r4
v4.0-r5
v5.0-a0
v5.0-a1
v5.0-a2
v5.0-a3
v5.0-a4
v5.0-a5
v5.0-b0
v5.0-b1
v5.0-b2
v5.0-b3
v5.0-b4
v5.0-b5
v5.0-b6
v5.0-b7
v5.0-r0
v5.0-r1
v5.0-r2
v5.0-r3
v6.0-a0
v6.0-a1
v6.0-d0
v6.0-d1
v6.0-d2
v6.0-d3
v6.0-d4
v6.0-d5
v6.0-d6
v6.0.10
v6.0.36
v6.0.45
v6.0.48
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2a01540433'
${ noResults }
Commit Graph

2599 Commits (2a01540433ebd4f65968cf4d7c4ab644c8563ffa)

Author SHA1 Message Date
winlin 54bb42483b change time jitter to off for hls and forward. 10 years ago
winlin be342178c0 fix ingest flv tool, support non monotonically timestamp. 10 years ago
winlin b3b6df365e fix the stream caster build failed bug. 10 years ago
winlin 50feaacdde refine code for http remux reload. 10 years ago
winlin 677567d9f2 Merge branch '2.0release' into develop 10 years ago
winlin 0aa053433c fix #132: build failed when enable the info or verbose log. 10 years ago
zhengfl 2567a89599 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
zhengfl 2263f2a610 refine code: 
优化 判断重复推流 及 推流流程
 10 years ago
winlin 404bc565a1 refine the pithy print mechenism. 10 years ago
winlin 97b8c99682 Merge branch '2.0release' into develop 10 years ago
winlin bed540bac9 fix #439: http remux support reload 10 years ago
winlin da47f1648b refine file mode to 644 10 years ago
zhengfl f6a2cea716 refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。 10 years ago
winlin 3dadad2dbc Merge branch '2.0release' into develop 10 years ago
winlin 0aed408855 refine code, to 644 and unix encoding. 10 years ago
winlin 210d0a67cb Merge branch '2.0release' into develop 10 years ago
winlin c6c90e2643 refine code, add comments for stat on_disconnect. 10 years ago
zhengfl db9ea4e66e rewrite #438 10 years ago
zhengfl f9257b89e7 fix #438 
问题：edge模式，推流时异常断开。
    解决方法：增加edge模式推流检测。
 10 years ago
zhengfl 120033e0a2 fix #437 
edge模式，重新从源站拉流时，导致forwarders异常
 10 years ago
winlin f39faa78bb refine config default values of srs, prepare to move each default values to functions. 10 years ago
winlin 9c716d4791 Merge branch '2.0release' into develop 10 years ago
winlin 3b8daafc03 use local openssl header files to avoid warnings on osx. 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 312366bba2 add srs_recvi_bytes for intranet bytes stat. 10 years ago
winlin 750399ace4 fix network device compare bug. 10 years ago
winlin 8cd68a1eb3 ignore any intranet bandwidth. 10 years ago
zhengfl 52110990c1 修正编码风格问题 10 years ago
zhengfl b4ff9cfba1 fix bug 
某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。
 10 years ago
winlin 8951752086 Merge branch '2.0release' into develop 10 years ago
winlin 8102a22606 add comments for async call. 10 years ago
winlin 6f685e66b1 Merge branch '2.0release' into develop 10 years ago
winlin 3211282b0c refine the http code. 10 years ago
winlin f8f6e438cc extract http static and http stream from http conn. 10 years ago
winlin e743795f3d Merge branch '2.0release' into develop 10 years ago
winlin baa892a762 merge srs_app_st_socket to srs_app_st. 10 years ago
winlin c58b7231e2 Merge branch '2.0release' into develop 10 years ago
winlin 17c276113e refine the hls dispose, when not cycle always dispose it. 10 years ago
winlin ec90ae2082 refine the space of code. 10 years ago
winlin 2f44a29b76 Merge branch '2.0release' into develop 10 years ago
winlin d103557a8b merge the rtmp sdk to stack. 10 years ago
winlin 0d66e92ab5 refine code, support configure to enable --memory-watch 10 years ago
winlin 69b7c57511 Merge branch '2.0release' into develop 10 years ago
winlin 0d6a574216 fix the hls_dispose bug, ignore for 0. 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 8e8c8108fc refine the time jitter code. 10 years ago
winlin 1f1776a0d8 fix the export project bug. wakeup connection when dispose server. 10 years ago
winlin bf9166dbec Merge branch '2.0release' into develop 10 years ago
winlin 969ed7b0ae refine build summary. 10 years ago
winlin 66837ffa6e fix the thread stop bug, must wait when not joinable. 10 years ago
winlin d317528af9 refine the signal manager. 10 years ago
winlin 7996b3b789 add warning for gmp, use gmc to detect memory leak. 10 years ago
winlin f347099fd1 for memory leak detect, move the payload create to message. 10 years ago
winlin 863dddde09 fix typo of code. 10 years ago
winlin 19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 10 years ago
winlin 00d1fdded0 Merge branch '2.0release' into develop 10 years ago
winlin 574cf6a094 use libfdk_aac for srs2. 10 years ago
winlin 00a25ee5c5 cleanup connections when terminate server. 10 years ago
winlin d7e5df2578 cleanup connections when terminate server. 10 years ago
winlin 573495a19f refine the memory watcher. 10 years ago
winlin bb4db61192 add srs memory watcher. 10 years ago
winlin 811ef4bcf6 dispose the gop cache 10 years ago
winlin 600e8e10d0 Merge branch '2.0release' into develop 10 years ago
winlin beb0431746 detect the monotonically increase and warn to use mix_correct 10 years ago
winlin 57f01185f5 Merge branch '2.0release' into develop 10 years ago
winlin 2d9f258eaf refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio. 10 years ago
winlin 17d6016bf6 Merge branch '2.0release' into develop 10 years ago
winlin ec24533955 use smaller value for publish timeout. 10 years ago
winlin a6dd8fb3a1 fix #421, when mix correct on, must check the type of dequeue msg. 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 679b4317d8 fix the build failed bug. 10 years ago
winlin 0fbfad4172 fix gop cache, drop video only when video and not h.264 10 years ago
winlin 2a1db36750 refine the pithy print of ingesters. 10 years ago
winlin d10d57716a Merge branch '2.0release' into develop 10 years ago
winlin e4c27a51b8 fix the hls bug 10 years ago
winlin 4400b12515 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 26b76c0e4c fix #420, remove ts for hls ram mode. 10 years ago
winlin 5dd81d182c Merge branch '2.0release' into develop 10 years ago
winlin af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 10 years ago
winlin 982a937e84 Merge branch '2.0release' into develop 10 years ago
winlin 4e42b9c628 copy the request for hls. 10 years ago
winlin 091b480ac9 Merge branch '2.0release' into develop 10 years ago
winlin 679583dad6 refine comments of ffmpeg. 10 years ago
winlin c1172c9940 Merge branch '2.0release' into develop 10 years ago
winlin 03d951c0fb fix the audio or video pid generate bug. 10 years ago
winlin c3c4cb2f2a Merge branch '2.0release' into develop 10 years ago
winlin 96f8f1f502 fix build bug. 10 years ago
winlin 09750082e5 Merge branch '2.0release' into develop 10 years ago
winlin 0a87b567f6 fix the build failed bug. 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 860d68e6e7 for #374, use fast stop for ingesters to stop many FFMPEG. 10 years ago
winlin d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 10 years ago
winlin 567d84e997 fix #374: when terminate srs, cleanup to ensure FFMPEG quit. 10 years ago
winlin db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 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 27a1fee6b9 Merge branch '2.0release' into develop 10 years ago
winlin af4eec90ac for srs-dolphin, support HTTP and RTMP. 10 years ago
winlin b44987fac7 Merge branch '2.0release' into develop 10 years ago
winlin 394e070b2e support dolphin 10 years ago
winlin e5461d2df9 refine code 10 years ago
winlin 60775485c4 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 385ee893f5 update readme 10 years ago
zhengfl 4864e796d6 fix #408:Queue丢视频时，不应该丢弃SequenceHeader 10 years ago
winlin 7e04975b8d fix the test configure script 10 years ago
winlin 1150cde829 fix the verbose build failed. 10 years ago
winlin ca01bd407b fix the bug of test configure script. 10 years ago
winlin fec8422d6b fix bug of configure. 10 years ago
winlin eb488e3bde fix the test configure script bug 10 years ago
winlin 02c4741d64 add usage and make jobs support for configure test script 10 years ago
winlin c1b9541b5c support disable all 10 years ago
winlin 9ab579c6e8 refine the configure test script. 10 years ago
winlin 409c1e4823 Merge branch '2.0release' into develop 10 years ago
winlin 2e1ca3c751 fix the build failed bug. 10 years ago
winlin cd162c2848 merge from 2.0 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 8a9dbaefb7 use cache for flv tag header. 10 years ago
winlin 960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 10 years ago
winlin b53e9814b3 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin fc995473eb for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 10 years ago
winlin 2661e3c419 Merge branch '2.0release' into develop 10 years ago
winlin cf9ee04611 fix the utest build failed bug. 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 a45cf38d44 auto detect the sed command for osx. 10 years ago
winlin f510a3d6fb add /api/v1/versions for http server for go-sharp to detect. 10 years ago
winlin 58b336451d Merge branch '2.0release' into develop 10 years ago
winlin 94efe3f727 update wiki 10 years ago
winlin 5840bc1053 add flv cluster confs. 10 years ago
winlin 7571d70f16 fix the build failed bug. 10 years ago
winlin 2f66c8dd09 Merge branch '2.0release' into develop 10 years ago
winlin 93a1d097dc update jwplayer to support play HTTP flv. 10 years ago
winlin 829b3a392b merge from 2.0 10 years ago
winlin e96150b7db update readme 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 af172d9593 refine script, use PROTOCOL as RTMP. 10 years ago
winlin 68d835021e refine code, move the kbps to protocol 10 years ago
winlin 478873fdec Merge branch '2.0release' into develop 10 years ago
winlin cfc0877ec9 refine the thread, add all callback. 10 years ago
winlin e5f449ce36 refine the thread to three category. 10 years ago
winlin 2f0ef87d6d refine code, rename the sync call to common class. 10 years ago
winlin 0bb90145ba fix #391, copy request for async call. 10 years ago
winlin 6bfb743aa0 remove the unused app http file 10 years ago
winlin f0ae66a081 merge the app http to conn. 10 years ago
winlin ce1bb6c605 refine code, extrat the ISrsHttpMessage. 10 years ago
winlin e2955da78f refine code, extract the http protocol sdk to module. 10 years ago
winlin d645411392 refine the kbps comments, add one usage. 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 c17a1198cb fix #399, disconnect when not keep alive. 10 years ago
winlin 46a81372e7 fix #398, set recv timeout for http connection. 10 years ago
winlin 6f8c076b30 add comments for srs thread, add never quit thread. 10 years ago
winlin 948d200ce1 fix #400, parse when got entire http header, by feilong. 2.0.164. 10 years ago
winlin 5d7b0edccc merge from bravo code, fix some warnings. 10 years ago
winlin 44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 10 years ago
winlin 0f7cafe50b order the xcode project 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 39f5f80b6c Merge branch '2.0release' into develop 10 years ago
winlin 77ee2400df fix the unicode to ascii 10 years ago
winlin 1fd69beea5 Merge branch '2.0release' into develop 10 years ago
winlin 7fc1cda392 add stream status to api. 10 years ago
winlin 7ce9398b41 Merge branch '2.0release' into develop 10 years ago
winlin ac13817aae update donation 10 years ago
winlin 2d61a8cfaf Merge branch '2.0release' into develop 10 years ago
winlin f6252c7f72 enable hls for push flv. 10 years ago
winlin 644454a4f5 Merge branch '2.0release' into develop 10 years ago
winlin ffdabf32ed add push flv conf 10 years ago
winlin f13c4d3a0f Merge branch '2.0release' into develop 10 years ago
winlin e221d002a2 fix the flv caster bug, when nread is 0, disconnect it. 10 years ago
winlin e516c7f7a5 Merge branch '2.0release' into develop 10 years ago
winlin ad32048c1c fix the http flv stream caster. 10 years ago
winlin cba6675560 refine the http message, set the connection if required. 10 years ago
winlin ba6c3132e3 refine code, use decoder to parse flv stream 10 years ago
winlin 411f5a1d2a Merge branch '2.0release' into develop 10 years ago
winlin ea1e015a4e fix the http read chunked encoding bug. 10 years ago
winlin da00b67c76 Merge branch '2.0release' into develop 10 years ago
winlin a95fd6d140 read the http flv stream. 10 years ago
winlin 022b6aa561 refine the http remux for http flv stream. 10 years ago
winlin f0c24eeacc add stream caster for post flv over http. 10 years ago
winlin 91e285b0cd Merge branch '2.0release' into develop 10 years ago
winlin 4b372d8d16 change primary to the primary branch. 10 years ago
winlin 94681702e1 Merge branch '2.0release' into develop 10 years ago
winlin e63b8eda51 migarate to srs org. 10 years ago
winlin 42ddb76544 Merge branch '2.0release' into develop 10 years ago
winlin 8603dba697 migarate to srs org. 10 years ago
winlin 17b15deee6 Merge branch '2.0release' into develop 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 53e92a17f5 Merge branch '2.0release' into develop 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
winlin 5559fb9842 Merge branch '2.0release' into develop 10 years ago
winlin b3bd007f0d update git commit 10 years ago
winlin ae6d0a5ab1 Merge branch '2.0release' into develop 10 years ago
tufang14 b6d650cdb4 m3u8 mount bug 10 years ago
winlin dbcd7d883b add script check_hls_backup.sh to research hls. 10 years ago
winlin e50996270e fix the config parse error. 10 years ago
winlin 0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url. 10 years ago
winlin 7b157b0678 refine hls ingester, quit when error. 10 years ago
winlin aabe84046c refine hls ingester, quit when error. 10 years ago
winlin 114f4447bb Merge branch '2.0release' into develop 10 years ago
winlin 4e5ddb51e7 refine the overflow algorithm, prevent smaller piece. 10 years ago
winlin 1d973e2178 refine the overflow algorithm, prevent smaller piece. 10 years ago
winlin d19dfa528e abs overflow also plus the deviation, for pure audio hls. 10 years ago
winlin c514a4ceeb use atc for ingest hls aac time. 10 years ago
winlin 3e0ba172a3 Merge branch '2.0release' into develop 10 years ago
winlin a28eec89b0 support ingest hls with m3u8 in m3u8. 10 years ago
winlin 7d5f1c2be8 Merge branch '2.0release' into develop 10 years ago
winlin ba6736839b support hls ingest, fix the bugs. 10 years ago
winlin 2239e9f1fd support ingest hls live stream to RTMP. 10 years ago
winlin 23b978c0bb merge from github 10 years ago
winlin 623e37e22a Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release 10 years ago
winlin 6e5c587e0a support aac_adtstoasc filter to copy mode. 10 years ago
J aca02b6d6b for #384,refine code for empty body request. 10 years ago
J 8adbdc39e3 for #384,refine code for empty body request. 10 years ago
J a71db53661 for #384,refine code for empty body request. 10 years ago
J 56f75cbbe9 fix #384 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 8fbc6526bb for #383, refine code to support mix correct algorithm. 10 years ago
winlin 542aab4557 fix the hls notify bug, pass the query to get path. 10 years ago
winlin 70c1d3cc7e Merge branch '2.0release' into develop 10 years ago
winlin 02a2cb7e1a for #381, refine the hls notify, report one by one. 10 years ago
winlin a4216cc582 add todo for ts parse. 10 years ago
winlin 40eab7fc88 for #381, refine the deviation for hls. 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 9759b78da8 Merge branch '2.0release' into develop 10 years ago
winlin 0000c945ea refine the proxy api server. 10 years ago
winlin fe1886aa08 add proxy for hls 10 years ago
winlin e5b8e0da01 fix async call and hls_nb_notify bug. 10 years ago
winlin 5d37e47783 support config the hls_nb_notify. 10 years ago
winlin 0a7cea063c refine http read, support c style api 10 years ago
winlin 5c00ce8a96 refine hls on_hls_notify, read a little of ts. 10 years ago
winlin 1f93fb3399 refine hls notify, support timeout. 10 years ago
winlin d8988da0ea refine the hls_on_notify, calc the spent time in ms. 10 years ago
winlin 310157ab77 refine the hls_on_notify, calc the spent time in ms. 10 years ago
winlin e6d6bdfe57 refine the hls_on_notify, only read a chunk. 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 425e69e0cd Merge branch '2.0release' into develop 10 years ago