winlin
08312ddc42
Support config the mw_sleep and mw_msgs
2020-04-18 10:04:45 +08:00
winlin
fdc0c44b7e
For #307 , for realtime, change wait messages from 0 to 2
2020-04-14 13:55:55 +08:00
winlin
40c95b04ca
Merge remote-tracking branch 'winlin/feature/perf_stat' into feature/rtc
2020-04-05 23:01:21 +08:00
winlin
90a39ec46d
Add api to stat mw iovec
2020-03-27 13:37:39 +08:00
winlin
fc84f1e545
Refactor source cid with pid
2020-03-17 18:43:11 +08:00
winlin
c1e07d6a96
For #1634 , always check status in thread loop. 3.0.126
2020-03-12 08:59:13 +08:00
winlin
5be69d290f
For #1601 , flush async on_dvr/on_hls events before stop. 3.0.118
2020-02-17 11:53:04 +08:00
winlin
9dbd049e79
For #1568 , extract SrsSourceManager from SrsSource.
2020-01-16 17:56:55 +08:00
winlin
0e750ab3eb
For #1575 , use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100
2020-01-16 14:28:05 +08:00
winlin
d783a12f89
Happy 2020
2019-12-30 10:10:35 +08:00
winlin
d7078a72d4
For #1520 , add TODO list for configing server itself in coworker.
2019-12-19 14:15:21 +08:00
winlin
acfeb8a66f
Fix #1520 , #1223 , bug for origin cluster 3+ servers. 3.0.74
2019-12-19 14:04:26 +08:00
winlin
191b07668d
Refactor HTTP stream to disconnect client when unpublish
2019-12-17 16:54:06 +08:00
winlin
5a3fd1e68a
Release v3.0-a2, 3.0.67
2019-12-01 19:24:17 +08:00
winlin
4cd03a7c06
Refine debug info for edge. 3.0.64
2019-11-30 17:31:27 +08:00
winlin
88df9a2497
Support go-oryx rtmplb with proxy protocol. 3.0.56
2019-10-04 19:03:34 +08:00
winlin
130c545f9a
Refine origin cluster log
2019-10-04 06:51:15 +08:00
winlin
5d17bb8bb0
Remove KAFKA. 3.0.53
2019-10-03 12:45:38 +08:00
winlin
e436cc5665
Refine SrsBasicRtmpClient in time unit.
2019-04-22 08:03:12 +08:00
winlin
c6dcc76fea
Refine SrsRequest.duration in time unit.
2019-04-19 08:48:44 +08:00
winlin
5af572ab50
Refine SrsRtmpConn.duration in time unit.
2019-04-18 08:46:42 +08:00
winlin
f6f49c68da
Refine SrsRecvThread timeout in time unit
2019-04-18 08:42:43 +08:00
winlin
33c66b64c5
Refine name TMMS to TIMEOUT
2019-04-18 07:47:35 +08:00
winlin
feb34ed225
Refine SrsStSocket in time unit
2019-04-17 09:21:38 +08:00
winlin
d3dc45f357
Refine set_recv_timeout in time unit
2019-04-17 08:31:53 +08:00
winlin
f4bee37e76
Refine set_send_timeout in time unit
2019-04-17 08:18:37 +08:00
winlin
61afca7160
Refine SrsTcpClient timeout in time unit
2019-04-17 07:56:28 +08:00
winlin
402e614471
Refine get_send_min_interval in time unit
2019-04-16 07:59:27 +08:00
winlin
92980a0ca2
Refine SRS_CONSTS_RTMP_TMMS in time unit
2019-04-11 09:18:20 +08:00
winlin
695d430dcf
Refine SrsMessageQueue.duration in time unit.
2019-04-11 08:35:57 +08:00
winlin
9b1222a79c
Refine get_publish_normal_timeout in time unit
2019-04-10 07:58:39 +08:00
winlin
170872135d
Refine get_publish_1stpkt_timeout in time unit
2019-04-10 07:53:09 +08:00
winlin
d6828a3e58
Refine get_mw_sleep in time unit
2019-04-09 09:39:16 +08:00
winlin
839a496d50
Refine get_mr_sleep in time unit
2019-04-09 09:20:44 +08:00
winlin
6239dfa489
Apply time unit
2019-04-07 16:25:52 +08:00
winlin
b2d1d84634
Change to 2019
2019-01-01 21:37:28 +08:00
winlin
6234905532
Refactor ISrsKbpsDelta
2019-01-01 17:36:27 +08:00
winlin
c26b475bae
Refine kbps, stub wall clock
2018-12-23 20:47:17 +08:00
winlin
4c40370986
Refine kbps more testable
2018-12-23 20:30:12 +08:00
winlin
d607c7f905
Refine HTTP-FLV latency, support realtime mode.3.0.38
2018-08-05 20:30:04 +08:00
winlin
29b74c7220
For #1110 , Support params in http callback. 3.0.36
2018-08-04 19:51:04 +08:00
winlin
459272b94c
Merge #1077 from 2.0release
2018-02-28 14:10:09 +08:00
winlin
c70421e656
Fix #464 , support origin cluster
2018-02-16 16:39:07 +08:00
winlin
2f09ec4353
For #464 , refine result of origin cluster api
2018-02-16 14:13:14 +08:00
winlin
a2cefe4dbd
For #1059 , show more information from stream
2018-02-13 09:02:46 +08:00
winlin
681138d2af
Fix #1059 , merge from 2.0, supports url with vhost in stream. 3.0.27
2018-02-13 08:52:57 +08:00
winlin
1721e4ea4b
Fix #1059 , support vhost in stream parameters. 2.0.246
2018-02-13 08:31:25 +08:00
winlin
ca1395a807
Change date from 2017 to 2018
2018-01-07 10:58:53 +08:00
Thomas Dreibholz
feaae341b9
IPv6 support (for 3.0 release) ( #988 )
...
* IPv6 support, part 1.
* IPv6 support, part 2.
* Some more IPv6 work.
* Made functions for address:port paŕsing IPv6-capable.
* Fixed type (compile warning).
* Fixed formatting.
* Reverted option change.
* Replaced abort() by proper error handling.
* Also retrieving local IPv6 addresses now.
2018-01-01 22:43:58 +08:00
winlin
6eae93258a
For #913 , APP support complex error.
2018-01-01 19:39:57 +08:00
winlin
9802dc326e
For #913 , source support complex error
2017-09-23 22:12:33 +08:00
winlin
abcaba33ee
For #913 : TS/HLS/MPEGTS support complex error
2017-09-22 21:50:54 +08:00
winlin
20a42599f3
For #913 , http callback use complex error
2017-09-22 19:54:50 +08:00
winlin
fd91df9411
For #913 , reload use complex error
2017-09-22 16:14:30 +08:00
winlin
9f5224c34a
For #913 , use complex error for http
2017-07-29 21:39:57 +08:00
winlin
5c9a12e72a
For #913 , use complex error for listener
2017-07-29 12:45:17 +08:00
winlin
9db2a04c3b
For #913 , coroutine support complex error.
2017-06-11 18:44:20 +08:00
winlin
1bf99e8f3e
For #907 , Wrap ST, only use in service ST.
2017-05-30 09:05:02 +08:00
winlin
2ed2513f08
For #906 , #902 , use coroutine for one cycle thread
2017-05-29 19:45:19 +08:00
HungMingWu
815d50f00a
Remove warning: C++11 requires a space between string literal and macro ( #874 )
...
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
2017-05-06 14:05:22 +08:00
winlin
c97f2233a2
Merge SRS2 for #851
2017-04-23 21:00:06 +08:00
winlin
ff87318b95
Fix #851 , HTTP API support number of video frames for FPS. 2.0.240
2017-04-23 20:55:51 +08:00
winlin
18d9f6c8f1
Fix build failed.
2017-04-16 15:54:30 +08:00
winlin
1054b0a90f
Merge SRS2
2017-04-15 20:46:00 +08:00
winlin
33a0abdeff
Fix #844 , support Haivision encoder. 2.0.238
2017-04-15 20:44:02 +08:00
winlin
33375db401
Merge from SRS2, for #834
2017-04-09 18:52:21 +08:00
winlin
b11ddc7f41
Fix #834 , crash for TS context corrupt. 2.0.235
2017-04-09 18:45:42 +08:00
winlin
e3526c0cf6
For #820 , modules use service only.
2017-03-26 13:40:39 +08:00
winlin
0a57a46016
Refine LICENSE
2017-03-25 21:29:29 +08:00
winlin
f32aab3d92
For #299 , refine code.
2017-03-25 17:21:39 +08:00
Chengdong Zhang
8ad934a8a4
srs_info use not available variable ( #813 )
...
srs_info use not available variable.
Variable has been removed or changed.
2017-03-24 23:42:37 -05:00
winlin
308c6fee18
Fix #786 , simply don't reuse object. 3.0.20
2017-03-02 16:43:06 +08:00
winlin
c849010fe2
Refine api for srs-librtmp
2017-02-28 19:46:09 +08:00
winlin
a1fcf66f32
for #742 , always enable http utilities.
2017-01-23 17:43:59 +08:00
winlin
79def81792
for #742 , refine the rtmp conn, use info as data cluster.
2017-01-23 17:12:04 +08:00
winlin
39aee2b318
for #742 , fix publish recv thread bug.
2017-01-23 16:44:42 +08:00
winlin
954bb186c1
identify the flash and fmle for recv thread.
2017-01-23 16:43:43 +08:00
winlin
5c959fc781
merge from srs2, for kbps free io
2017-01-22 13:16:05 +08:00
winlin
310032d8d8
merge srs2, timestamp overflow for ATC.
2017-01-18 11:48:31 +08:00
cenxinwei
762d7a8884
fix publish_normal_timeout 配置读取错误
2017-01-17 15:11:40 +08:00
winlin
3fe338d1c5
for #742 , use ms for application clock tbn.
2017-01-17 12:25:30 +08:00
winlin
dca9749f37
for #742 , refine the object live cycle. 3.0.15
2017-01-17 10:44:13 +08:00
winlin
f4c0af8bfc
refine code remove dup api for #742
2017-01-16 16:20:34 +08:00
winlin
d49f195bbf
fix #734 , log format error.
2017-01-10 09:36:51 +08:00
winlin
1b175b1107
for #730 , support config in/out ack size. 3.0.13
2017-01-06 14:57:54 +08:00
winlin
7ac932cfa0
update to 2013-2017
2016-12-16 11:57:25 +08:00
winlin
664844b5f5
merge from srs2. for #513 .
2016-12-15 14:54:09 +08:00
winlin
759c84a395
for #513 , remove hls ram from srs2 to srs3+. 2.0.224
2016-12-15 14:48:38 +08:00
winlin
9ba4bed648
merge srs2
2016-12-13 17:58:42 +08:00
winlin
cb1d47bfef
fix #713 , refine source to avoid critical fetch and create. 2.0.222
2016-12-13 17:57:49 +08:00
winlin
9a3674c624
refine kafka
2016-12-08 11:44:49 +08:00
winlin
7d96a33207
Merge branch '2.0release' into develop
2016-09-01 16:51:18 +08:00
winlin
e2865c6ac1
workaround for #511 , the fly stfd in close. 2.0.211
2016-09-01 16:51:09 +08:00
winlin
79fdc4e766
fix bug for rtmp client use NULL ptr.
2015-12-28 18:13:40 +08:00
winlin
7ae2c6bf50
merge from srs2.
2015-12-26 12:17:51 +08:00
winlin
eca46c03d2
refine code for consumer to refer the rtmp connection.
2015-12-26 12:13:17 +08:00
winlin
11e11005ac
specifies the try default vhost
2015-12-24 19:14:23 +08:00
winlin
a7bf4bfda5
refine code, ignore client when no ip.
2015-12-24 17:25:05 +08:00
winlin
d0c74fa7cd
update 2015 to 2016
2015-12-23 11:35:40 +08:00
winlin
5ac8177ce6
fix bugs
2015-12-08 18:32:37 +08:00
winlin
01c46bdbfd
rename org simle-rtmp-server to ossrs
2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455
rename org simple-rtmp-server to ossrs
2015-11-11 10:37:50 +08:00
winlin
d2ca51ac50
notify kafka when client close
2015-10-23 14:42:04 +08:00
winlin
61486a82aa
kafka use topic and partition cache
2015-10-23 14:42:04 +08:00
winlin
a08d8f83d6
refine mpegts code, use simple rtmp client
2015-10-23 14:42:02 +08:00
winlin
ad9b377d96
refine forwarder code, use simple rtmp client.
2015-10-23 14:42:02 +08:00
winlin
0f4cb8ee00
refine code, remove the rtmp recv/send macro, use one macro.
2015-10-23 14:42:02 +08:00
winlin
12e013142d
refine code, use simple rtmp client.
2015-10-23 14:42:02 +08:00
winlin
bc27481886
refine code, use simple rtmp client.
2015-10-23 14:42:02 +08:00
winlin
e4c852945f
refine code, support override vhost
2015-10-23 14:42:02 +08:00
winlin
a9ad7b211b
refine simple rtmp client for post flv stream.
2015-10-23 14:42:02 +08:00
winlin
adb8f243bf
use simple rtmp client for raw connect app
2015-10-23 14:42:02 +08:00
winlin
24b3899972
use SrsTcpClient instead raw socket.
2015-10-23 14:42:02 +08:00
winlin
d8f18aee37
use the right int type for port.
2015-09-24 18:33:07 +08:00
winlin
df6ac8842c
rename rtmp utility to protocol utility
2015-09-22 09:11:07 +08:00
winlin
168625dce2
rename rtmp amf0 to protocol amf0.
2015-09-22 09:05:21 +08:00
winlin
1fd83d9314
refine the order.
2015-09-17 13:36:02 +08:00
winlin
a7c4b786cf
merge from 2.0
2015-09-14 18:42:31 +08:00
winlin
8be3c875af
donot release stream when busy
2015-09-14 15:17:59 +08:00
winlin
a994191ddc
for #474 , always release publish for source.
2015-09-14 15:10:34 +08:00
winlin
3b483094bd
merge from 2.0
2015-09-14 12:24:57 +08:00
winlin
6d50aa1aa2
#475 , fix http hooks crash for st context switch. 2.0.187
2015-09-14 12:22:19 +08:00
winlin
bc24c0407b
for #319 , move smi and rsh to play
2015-08-30 07:36:06 +08:00
winlin
06ae74dd3f
for #319 , move mw_latency to play.
2015-08-30 07:05:57 +08:00
winlin
738642073e
for #319 , refine config, collect the mr and publish timeout
2015-08-29 22:41:50 +08:00
winlin
bc100c2867
refine the log, move default to each functions.
2015-08-29 19:46:56 +08:00
winlin
7ef3ff90c0
refine the config structure, compatible with SRS1/2
2015-08-29 18:40:18 +08:00
lovecat
9c2beffe8f
statistic connection bytes before remove client.
2015-08-25 11:46:12 +08:00
winlin
aeebddb269
for #442 , add more information for client for api.
2015-08-22 13:57:34 +08:00
winlin
94641c812b
fix #442 , support kickoff client.
2015-08-22 13:36:15 +08:00
winlin
c75f05c88b
fix the log cid display error, merge the publish recv thread log to publish connection.
2015-08-21 15:22:40 +08:00
winlin
3c402cb908
refine the tcp nodelay, effect connected connections.
2015-08-21 13:43:33 +08:00
winlin
ec87dd9cd6
refine code for srs rtmp dump
2015-08-19 19:02:33 +08:00
winlin
7273c33c35
support publish_1stpkt_timeout and publish_normal_timeout
2015-08-19 16:16:05 +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
2cf526ffc7
close #454 , support obs restart publish. 2.0.184
2015-08-18 17:43:01 +08:00
winlin
ae37fa8f3e
use send_min_interval for stream control. 2.0.183
2015-08-14 11:13:40 +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
lovacat
e8c0ca7af0
fix #442 : HTTP API kickoff client.
2015-08-11 15:23:46 +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
zhengfl
2263f2a610
refine code:
...
优化 判断重复推流 及 推流流程
2015-07-09 15:45:55 +08:00
winlin
0aed408855
refine code, to 644 and unix encoding.
2015-07-08 17:44:25 +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
52110990c1
修正编码风格问题
2015-06-18 16:21:00 +08:00
zhengfl
b4ff9cfba1
fix bug
...
某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。
2015-06-17 23:09:17 +08:00
winlin
baa892a762
merge srs_app_st_socket to srs_app_st.
2015-06-14 08:43:38 +08:00
