external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity
3320 commits 13 branches 107 tags 375 MiB
Commit graph

2525 commits

Author SHA1 Message Date
winlin
71f2726b31 fix bug of merge code for reload http_remux for vhost 2015-08-03 13:44:24 +08:00
winlin
ccf6a4de1e remove the on_reload_vhost_http_remux_updated for vhost added. 2015-08-03 13:35:25 +08:00
winlin
bfe0f97edd refine params nameing and SrsStream. 2015-07-28 18:08:11 +08:00
winlin
8d86eb6516 refine code naming or comments. 2015-07-28 17:56:50 +08:00
winlin
c2d9c98678 Merge branch '2.0release' into develop 2015-07-23 14:20:57 +08:00
winlin
bc033d5de3 refine code, move default to config function. 2015-07-23 14:20:46 +08:00
zhengfl
39a2d51c66 fix #445, 修正由skip(-4)引起的assert错误 2015-07-22 12:10:19 +08:00
winlin
94569b181f merge from 2.0 2015-07-21 12:08:05 +08:00
winlin
c85f92c229 fix #169, support default values for transcode. 2.0.180 2015-07-21 12:07:26 +08:00
winlin
48c040c92b Merge branch '2.0release' into develop 2015-07-21 11:41:13 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
146a44a2ce merge from 2.0 2015-07-20 09:32:46 +08:00
winlin
b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 2015-07-20 09:31:46 +08:00
winlin
fdb17a1864 merge from 2.0 2015-07-17 14:06:15 +08:00
winlin
3b65af9bd2 fix the hstrs bug on edge. 2015-07-17 14:05:34 +08:00
winlin
99db2888e7 refine code for hstrs. 2015-07-16 18:42:27 +08:00
winlin
c2ef779523 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-07-16 17:31:31 +08:00
winlin
366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 2015-07-16 17:30:27 +08:00
zhengfl
a5a9f7c8c5 refine code:优化edge模式回源播放线程启动流程 2015-07-16 11:36:14 +08:00
winlin
5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 2015-07-14 11:46:23 +08:00
winlin
5f91fbc970 merge from 2.0release 2015-07-14 11:32:40 +08:00
winlin
d995726fee fix the http flv mount bug. 2015-07-14 11:31:17 +08:00
winlin
9743e02541 refine the mix correct algorithm. 2015-07-14 11:28:00 +08:00
winlin
6fe36afcfa when hls timestamp jump, reset it. 2015-07-14 11:00:58 +08:00
winlin
99574bb77b ignore when no segments for there must no m3u8 2015-07-14 10:43:21 +08:00
winlin
40c264a316 always reset the max target duration for hls. 2015-07-14 10:31:42 +08:00
winlin
54bb42483b change time jitter to off for hls and forward. 2015-07-14 10:03:15 +08:00
winlin
be342178c0 fix ingest flv tool, support non monotonically timestamp. 2015-07-13 22:09:01 +08:00
winlin
b3b6df365e fix the stream caster build failed bug. 2015-07-10 13:50:35 +08:00
winlin
50feaacdde refine code for http remux reload. 2015-07-10 13:45:21 +08:00
winlin
677567d9f2 Merge branch '2.0release' into develop 2015-07-10 11:50:45 +08:00
winlin
0aa053433c fix #132: build failed when enable the info or verbose log. 2015-07-10 11:50:35 +08:00
zhengfl
2567a89599 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-07-09 15:49:23 +08:00
zhengfl
2263f2a610 refine code: 
优化 判断重复推流 及 推流流程
 2015-07-09 15:45:55 +08:00
winlin
404bc565a1 refine the pithy print mechenism. 2015-07-09 15:39:02 +08:00
winlin
97b8c99682 Merge branch '2.0release' into develop 2015-07-09 13:52:52 +08:00
winlin
bed540bac9 fix #439: http remux support reload 2015-07-09 13:52:41 +08:00
winlin
da47f1648b refine file mode to 644 2015-07-09 13:44:05 +08:00
zhengfl
f6a2cea716 refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。 2015-07-09 10:08:17 +08:00
winlin
3dadad2dbc Merge branch '2.0release' into develop 2015-07-08 17:45:08 +08:00
winlin
0aed408855 refine code, to 644 and unix encoding. 2015-07-08 17:44:25 +08:00
winlin
210d0a67cb Merge branch '2.0release' into develop 2015-07-08 17:42:47 +08:00
winlin
c6c90e2643 refine code, add comments for stat on_disconnect. 2015-07-08 17:42:35 +08:00
zhengfl
db9ea4e66e rewrite #438 2015-07-08 17:08:29 +08:00
zhengfl
f9257b89e7 fix #438 
问题：edge模式，推流时异常断开。
    解决方法：增加edge模式推流检测。
 2015-07-08 15:43:09 +08:00
zhengfl
120033e0a2 fix #437 
edge模式，重新从源站拉流时，导致forwarders异常
 2015-07-08 11:47:34 +08:00
winlin
f39faa78bb refine config default values of srs, prepare to move each default values to functions. 2015-07-06 11:11:59 +08:00
winlin
9c716d4791 Merge branch '2.0release' into develop 2015-07-06 10:32:47 +08:00
winlin
3b8daafc03 use local openssl header files to avoid warnings on osx. 2015-07-06 10:32:28 +08:00
winlin
c8fef99cb6 merge from 2.0release 2015-07-01 14:51:27 +08:00
winlin
438914c481 fix #433, fix the sps parse bug. 2.0.176 2015-07-01 14:50:45 +08:00
winlin
312366bba2 add srs_recvi_bytes for intranet bytes stat. 2015-06-19 14:38:05 +08:00
winlin
750399ace4 fix network device compare bug. 2015-06-19 13:51:40 +08:00
winlin
8cd68a1eb3 ignore any intranet bandwidth. 2015-06-19 11:59:41 +08:00
zhengfl
52110990c1 修正编码风格问题 2015-06-18 16:21:00 +08:00
zhengfl
b4ff9cfba1 fix bug 
某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。
 2015-06-17 23:09:17 +08:00
winlin
8951752086 Merge branch '2.0release' into develop 2015-06-17 16:47:08 +08:00
winlin
8102a22606 add comments for async call. 2015-06-17 16:42:43 +08:00
winlin
6f685e66b1 Merge branch '2.0release' into develop 2015-06-14 19:42:53 +08:00
winlin
3211282b0c refine the http code. 2015-06-14 19:42:43 +08:00
winlin
f8f6e438cc extract http static and http stream from http conn. 2015-06-14 14:06:39 +08:00
winlin
e743795f3d Merge branch '2.0release' into develop 2015-06-14 08:43:53 +08:00
winlin
baa892a762 merge srs_app_st_socket to srs_app_st. 2015-06-14 08:43:38 +08:00
winlin
c58b7231e2 Merge branch '2.0release' into develop 2015-06-13 17:23:53 +08:00
winlin
17c276113e refine the hls dispose, when not cycle always dispose it. 2015-06-13 17:23:38 +08:00
winlin
ec90ae2082 refine the space of code. 2015-06-13 16:42:05 +08:00
winlin
2f44a29b76 Merge branch '2.0release' into develop 2015-06-13 16:05:26 +08:00
winlin
d103557a8b merge the rtmp sdk to stack. 2015-06-13 16:04:59 +08:00
winlin
0d66e92ab5 refine code, support configure to enable --memory-watch 2015-06-13 15:45:25 +08:00
winlin
69b7c57511 Merge branch '2.0release' into develop 2015-06-12 16:08:58 +08:00
winlin
0d6a574216 fix the hls_dispose bug, ignore for 0. 2015-06-12 16:08:47 +08:00
winlin
b0ce38dc8f merge from 2.0 2015-06-10 15:38:44 +08:00
winlin
56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 2015-06-10 15:38:13 +08:00
winlin
12eab8a128 merge from srs2. 2015-06-10 13:53:57 +08:00
winlin
6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 2015-06-10 13:53:13 +08:00
winlin
8e8c8108fc refine the time jitter code. 2015-06-09 21:04:30 +08:00
winlin
1f1776a0d8 fix the export project bug. wakeup connection when dispose server. 2015-06-09 14:38:05 +08:00
winlin
bf9166dbec Merge branch '2.0release' into develop 2015-06-09 11:51:49 +08:00
winlin
969ed7b0ae refine build summary. 2015-06-09 11:51:40 +08:00
winlin
66837ffa6e fix the thread stop bug, must wait when not joinable. 2015-06-09 11:47:04 +08:00
winlin
d317528af9 refine the signal manager. 2015-06-09 11:19:28 +08:00
winlin
7996b3b789 add warning for gmp, use gmc to detect memory leak. 2015-06-09 10:52:32 +08:00
winlin
f347099fd1 for memory leak detect, move the payload create to message. 2015-06-09 10:13:25 +08:00
winlin
863dddde09 fix typo of code. 2015-06-08 17:43:28 +08:00
winlin
19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 2015-06-08 17:28:39 +08:00
winlin
00d1fdded0 Merge branch '2.0release' into develop 2015-06-08 15:02:30 +08:00
winlin
574cf6a094 use libfdk_aac for srs2. 2015-06-08 15:02:19 +08:00
winlin
00a25ee5c5 cleanup connections when terminate server. 2015-06-08 14:08:12 +08:00
winlin
d7e5df2578 cleanup connections when terminate server. 2015-06-08 14:03:16 +08:00
winlin
573495a19f refine the memory watcher. 2015-06-08 09:47:45 +08:00
winlin
bb4db61192 add srs memory watcher. 2015-06-07 15:12:55 +08:00
winlin
811ef4bcf6 dispose the gop cache 2015-06-07 09:27:47 +08:00
winlin
600e8e10d0 Merge branch '2.0release' into develop 2015-06-06 22:04:37 +08:00
winlin
beb0431746 detect the monotonically increase and warn to use mix_correct 2015-06-06 22:04:24 +08:00
winlin
57f01185f5 Merge branch '2.0release' into develop 2015-06-06 21:54:54 +08:00
winlin
2d9f258eaf refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio. 2015-06-06 21:54:43 +08:00
winlin
17d6016bf6 Merge branch '2.0release' into develop 2015-06-06 21:42:12 +08:00
winlin
ec24533955 use smaller value for publish timeout. 2015-06-06 21:42:01 +08:00
winlin
a6dd8fb3a1 fix #421, when mix correct on, must check the type of dequeue msg. 2015-06-06 21:31:39 +08:00
winlin
5d75e32e1d Merge branch '2.0release' into develop 2015-06-06 21:24:06 +08:00
winlin
a1dd734318 fix #421, drop video for unkown RTMP header. 2015-06-06 21:23:57 +08:00
winlin
679b4317d8 fix the build failed bug. 2015-06-06 20:34:49 +08:00
winlin
0fbfad4172 fix gop cache, drop video only when video and not h.264 2015-06-06 20:23:18 +08:00
winlin
2a1db36750 refine the pithy print of ingesters. 2015-06-06 18:57:41 +08:00
winlin
d10d57716a Merge branch '2.0release' into develop 2015-06-05 21:34:39 +08:00
winlin
e4c27a51b8 fix the hls bug 2015-06-05 21:34:28 +08:00
winlin
4400b12515 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-06-05 20:38:51 +08:00
winlin
26b76c0e4c fix #420, remove ts for hls ram mode. 2015-06-05 20:38:01 +08:00
winlin
5dd81d182c Merge branch '2.0release' into develop 2015-06-03 10:13:58 +08:00
winlin
af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 2015-06-03 10:13:46 +08:00
winlin
982a937e84 Merge branch '2.0release' into develop 2015-06-02 12:56:17 +08:00
winlin
4e42b9c628 copy the request for hls. 2015-06-02 12:56:04 +08:00
winlin
091b480ac9 Merge branch '2.0release' into develop 2015-06-01 10:14:58 +08:00
winlin
679583dad6 refine comments of ffmpeg. 2015-06-01 10:14:46 +08:00
winlin
c1172c9940 Merge branch '2.0release' into develop 2015-05-30 21:40:51 +08:00
winlin
03d951c0fb fix the audio or video pid generate bug. 2015-05-30 21:40:39 +08:00
winlin
c3c4cb2f2a Merge branch '2.0release' into develop 2015-05-30 21:20:21 +08:00
winlin
96f8f1f502 fix build bug. 2015-05-30 21:20:07 +08:00
winlin
09750082e5 Merge branch '2.0release' into develop 2015-05-30 21:14:56 +08:00
winlin
0a87b567f6 fix the build failed bug. 2015-05-30 21:14:10 +08:00
winlin
9dce971d57 merge from srs2 2015-05-30 14:41:47 +08:00
winlin
223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 2015-05-30 14:41:09 +08:00
winlin
4a80a5a71e for #209, support cleanup when srs stop. 2015-05-30 13:48:29 +08:00
winlin
860d68e6e7 for #374, use fast stop for ingesters to stop many FFMPEG. 2015-05-30 11:25:33 +08:00
winlin
d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 2015-05-30 10:48:02 +08:00
winlin
567d84e997 fix #374: when terminate srs, cleanup to ensure FFMPEG quit. 2015-05-30 09:58:17 +08:00
winlin
db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 2015-05-30 09:32:03 +08:00
winlin
597993d414 support pure video hls. 2015-05-29 21:53:37 +08:00
winlin
5caafadd45 fix #409: support pure video hls. 2.0.172. 2015-05-29 21:43:17 +08:00
winlin
27a1fee6b9 Merge branch '2.0release' into develop 2015-05-28 21:02:50 +08:00
winlin
af4eec90ac for srs-dolphin, support HTTP and RTMP. 2015-05-28 21:02:43 +08:00
winlin
b44987fac7 Merge branch '2.0release' into develop 2015-05-28 14:59:19 +08:00
winlin
394e070b2e support dolphin 2015-05-28 14:59:12 +08:00
winlin
e5461d2df9 refine code 2015-05-28 07:03:38 +08:00
winlin
60775485c4 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-05-27 23:44:07 +08:00
winlin
385ee893f5 update readme 2015-05-27 23:43:44 +08:00
zhengfl
4864e796d6 fix #408:Queue丢视频时，不应该丢弃SequenceHeader 2015-05-27 16:16:15 +08:00
winlin
7e04975b8d fix the test configure script 2015-05-27 11:38:10 +08:00
winlin
1150cde829 fix the verbose build failed. 2015-05-27 11:12:52 +08:00
winlin
ca01bd407b fix the bug of test configure script. 2015-05-27 10:55:46 +08:00
winlin
fec8422d6b fix bug of configure. 2015-05-27 10:23:40 +08:00
winlin
eb488e3bde fix the test configure script bug 2015-05-27 07:32:51 +08:00
winlin
02c4741d64 add usage and make jobs support for configure test script 2015-05-27 07:30:37 +08:00
winlin
c1b9541b5c support disable all 2015-05-27 07:22:44 +08:00
winlin
9ab579c6e8 refine the configure test script. 2015-05-27 07:06:16 +08:00
winlin
409c1e4823 Merge branch '2.0release' into develop 2015-05-25 08:17:22 +08:00
winlin
2e1ca3c751 fix the build failed bug. 2015-05-25 08:17:11 +08:00
winlin
cd162c2848 merge from 2.0 2015-05-25 01:04:04 +08:00
winlin
d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 2015-05-25 01:02:06 +08:00
winlin
4df19ba99a for #405, improve the http flv to 3k. 2.0.170 2015-05-24 23:29:17 +08:00