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

2574 commits

Author SHA1 Message Date
winlin
dd21eee7f0 srs player show current time and url 2015-08-20 18:33:33 +08:00
winlin
ce8f446494 Merge branch '2.0release' into develop 2015-08-20 18:13:17 +08:00
winlin
dfecfb65b1 support fluency and stream empty count 2015-08-20 18:13:07 +08:00
winlin
fcd2d3d445 refine code for link generation from rtmp url. 2015-08-20 16:18:32 +08:00
winlin
fe87bf1b61 support generate link page for rtmp url 2015-08-20 16:11:17 +08:00
winlin
018af55d65 refine the demo pages, move scripts after body. 2015-08-20 15:19:43 +08:00
winlin
77765b463a Merge branch '2.0release' into develop 2015-08-20 14:20:58 +08:00
winlin
575a698820 fix #380, srs-librtmp send sequence header when sps or pps changed. 2015-08-20 14:20:49 +08:00
winlin
f10e399991 Merge branch '2.0release' into develop 2015-08-19 19:02:40 +08:00
winlin
ec87dd9cd6 refine code for srs rtmp dump 2015-08-19 19:02:33 +08:00
winlin
785a5907a8 set the default get_publish_normal_timeout to 5s 2015-08-19 16:27:22 +08:00
winlin
0bbfc5526a set the default get_publish_normal_timeout to 5s 2015-08-19 16:22:52 +08:00
winlin
7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 2015-08-19 16:16:05 +08:00
winlin
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +08:00
winlin
a5dd3a8e7b Merge branch '2.0release' into develop 2015-08-19 15:14:35 +08:00
winlin
e7714cd445 add packets interval in ms to set the right send_min_interval 2015-08-19 15:14:26 +08:00
winlin
de48b477ae drop the metadata when drop sequence header 2015-08-19 14:23:12 +08:00
winlin
22491b0c99 merge from 2.0 2015-08-19 14:21:12 +08:00
winlin
f691dddc1a drop metadata when drop sequence header. support PCUC 0x1a 2015-08-19 14:20:31 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +08:00
winlin
0cb7ddfe8c Merge branch '2.0release' into develop 2015-08-18 14:09:05 +08:00
winlin
ccc4c05da9 fix #229, support vs2010 for srslibrtmp. 2015-08-18 14:08:54 +08:00
winlin
f53b2556bb Merge branch '2.0release' into develop 2015-08-17 16:34:21 +08:00
winlin
01be68fe58 refine code, donot remove the detail when hls disabled. 2015-08-17 16:34:11 +08:00
winlin
53351cd645 Merge branch '2.0release' into develop 2015-08-14 15:51:15 +08:00
winlin
afd05f71c3 refine code, use size cache for performance issue. 2015-08-14 15:51:02 +08:00
winlin
0b90af7e46 Merge branch '2.0release' into develop 2015-08-14 15:47:36 +08:00
winlin
3b0b2e0b85 fix the bug to support dump packets with count. 2015-08-14 15:47:29 +08:00
winlin
8d3d5dd10b Merge branch '2.0release' into develop 2015-08-14 14:35:47 +08:00
winlin
a0a89a8ca6 use reduce_sequence_header for stream control. 2015-08-14 14:35:41 +08:00
winlin
9fbff4b8f9 Merge branch '2.0release' into develop 2015-08-14 11:15:29 +08:00
winlin
b79d830e2c refine the default smi 2015-08-14 11:15:23 +08:00
winlin
807299589e merge from srs2. 2015-08-14 11:14:33 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
0b84c1d962 Merge branch '2.0release' into develop 2015-08-12 18:02:40 +08:00
winlin
7dcba040eb refine config. 2015-08-12 18:02:31 +08:00
winlin
653afd0700 merge from 2.0 2015-08-12 13:23:00 +08:00
winlin
9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 2015-08-12 13:22:09 +08:00
winlin
1261916eab refine the mount and dir to /console 2015-08-12 12:49:22 +08:00
winlin
b27bb48447 refine the version 2015-08-12 08:18:45 +08:00
winlin
eab538d2e4 fix the version of srs2 2015-08-11 18:37:50 +08:00
winlin
f28c9b7eb5 merge from 2.0release 2015-08-11 15:49:48 +08:00
winlin
3a6854fc2e refine code. 2015-08-11 15:36:14 +08:00
lovacat
e8c0ca7af0 fix #442: HTTP API kickoff client. 2015-08-11 15:23:46 +08:00
winlin
d761ebfa55 refine the api, move the requests and errors to rest. 2015-08-11 13:09:21 +08:00
winlin
c5bf397295 fix the http error header. 2015-08-10 16:41:25 +08:00
winlin
fbcc07d85a fix the typo of AUTIO. 2015-08-05 22:54:29 +08:00
winlin
0e3128d3e3 Merge branch '2.0release' into develop 2015-08-03 15:23:07 +08:00
winlin
65b2ed7ac5 refine code, move the order of functions. 2015-08-03 14:11:21 +08:00
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