Commit Graph

1906 Commits (c34b0c86e1b48d6f3e477bffe1a3117d046f609b)

Author SHA1 Message Date
winlin 01be68fe58 refine code, donot remove the detail when hls disabled. 10 years ago
winlin 53351cd645 Merge branch '2.0release' into develop 10 years ago
winlin afd05f71c3 refine code, use size cache for performance issue. 10 years ago
winlin 0b90af7e46 Merge branch '2.0release' into develop 10 years ago
winlin 3b0b2e0b85 fix the bug to support dump packets with count. 10 years ago
winlin 8d3d5dd10b Merge branch '2.0release' into develop 10 years ago
winlin a0a89a8ca6 use reduce_sequence_header for stream control. 10 years ago
winlin 807299589e merge from srs2. 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 10 years ago
winlin 653afd0700 merge from 2.0 10 years ago
winlin 9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 10 years ago
winlin 1261916eab refine the mount and dir to /console 10 years ago
winlin b27bb48447 refine the version 10 years ago
winlin eab538d2e4 fix the version of srs2 10 years ago
winlin f28c9b7eb5 merge from 2.0release 10 years ago
winlin 3a6854fc2e refine code. 10 years ago
lovacat e8c0ca7af0 fix #442: HTTP API kickoff client. 10 years ago
winlin d761ebfa55 refine the api, move the requests and errors to rest. 10 years ago
winlin c5bf397295 fix the http error header. 10 years ago
winlin fbcc07d85a fix the typo of AUTIO. 10 years ago
winlin 0e3128d3e3 Merge branch '2.0release' into develop 10 years ago
winlin 65b2ed7ac5 refine code, move the order of functions. 10 years ago
winlin 71f2726b31 fix bug of merge code for reload http_remux for vhost 10 years ago
winlin ccf6a4de1e remove the on_reload_vhost_http_remux_updated for vhost added. 10 years ago
winlin bfe0f97edd refine params nameing and SrsStream. 10 years ago
winlin 8d86eb6516 refine code naming or comments. 10 years ago
winlin c2d9c98678 Merge branch '2.0release' into develop 10 years ago
winlin bc033d5de3 refine code, move default to config function. 10 years ago
zhengfl 39a2d51c66 fix #445, 修正由skip(-4)引起的assert错误 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 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 3b65af9bd2 fix the hstrs bug on edge. 10 years ago
winlin 99db2888e7 refine code for hstrs. 10 years ago
winlin c2ef779523 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 10 years ago
zhengfl a5a9f7c8c5 refine code:优化edge模式回源播放线程启动流程 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 d995726fee fix the http flv mount bug. 10 years ago
winlin 9743e02541 refine the mix correct algorithm. 10 years ago
winlin 6fe36afcfa when hls timestamp jump, reset it. 10 years ago
winlin 99574bb77b ignore when no segments for there must no m3u8 10 years ago
winlin 40c264a316 always reset the max target duration for hls. 10 years ago
winlin 54bb42483b change time jitter to off for hls and forward. 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 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 66837ffa6e fix the thread stop bug, must wait when not joinable. 10 years ago
winlin d317528af9 refine the signal manager. 10 years ago