winlin
|
68c48e27f5
|
Change GB28181 to feature/gb28181. 4.0.127
|
2021-06-16 08:27:37 +08:00 |
|
winlin
|
15901cacee
|
SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3
|
2021-05-31 13:42:20 +08:00 |
|
winlin
|
3cd22b6e6e
|
Use SPDX-License-Identifier: MIT. 4.0.124
|
2021-05-31 12:59:21 +08:00 |
|
winlin
|
e3bca883e1
|
SuqashSRS4: Build SRT native
|
2021-05-16 16:14:00 +08:00 |
|
winlin
|
2dd58665fa
|
Rename SrsSource* to SrsLiveSource*. 4.0.112
|
2021-05-15 12:30:13 +08:00 |
|
winlin
|
6a980683f7
|
SquashSRS4: Remove object cache and stat api
|
2021-05-14 18:17:42 +08:00 |
|
winlin
|
cd45750c9d
|
RTC: Eliminate unused stat API
|
2021-05-14 08:56:41 +08:00 |
|
winlin
|
f711eb79ed
|
SquashSRS4: Refine stat id. Fix SRT build bug
|
2021-05-14 08:26:07 +08:00 |
|
winlin
|
06f7d7d11b
|
Refine id and vid for statistic. 4.0.108
|
2021-05-14 08:21:16 +08:00 |
|
winlin
|
276bd2223e
|
SquashSRS4: Support circuit breaker
|
2021-05-08 10:04:44 +08:00 |
|
winlin
|
92fc0af8f4
|
RTC: Support circuit breaker. 4.0.103
|
2021-05-07 17:43:05 +08:00 |
|
winlin
|
eba78149ad
|
SquashSRS4: Change push-RTSP as deprecated feature.
|
2021-04-24 21:40:09 +08:00 |
|
winlin
|
5516d3751f
|
Change push-RTSP as deprecated feature.
|
2021-04-24 21:33:44 +08:00 |
|
winlin
|
8b74c7cb89
|
SquashSRS4: Happy 2021
|
2021-04-16 09:29:43 +08:00 |
|
winlin
|
d01e603b25
|
Happy 2021
|
2021-04-16 09:25:55 +08:00 |
|
winlin
|
9ab12f9f2f
|
RTC: Stat the drop of UDP packets.
|
2021-03-02 19:30:40 +08:00 |
|
winlin
|
3a7c742f07
|
RTC: Stat the drop of UDP packets.
|
2021-02-24 18:53:49 +08:00 |
|
winlin
|
1f621a6db3
|
Remove dead code: memory watch
|
2021-02-19 18:53:40 +08:00 |
|
winlin
|
d8563398b2
|
Clock: Update stat. Insert timer to execute first
|
2021-02-19 18:53:02 +08:00 |
|
winlin
|
f987198af0
|
Clock: Use one system wall clock
|
2021-02-19 18:52:58 +08:00 |
|
winlin
|
57919e4351
|
Refine code, move SRS adapter.
|
2021-02-15 20:01:49 +08:00 |
|
winlin
|
4ef1acb700
|
Remove dead code: memory watch
|
2021-02-15 19:33:40 +08:00 |
|
winlin
|
321f555e30
|
Clock: Update stat. Insert timer to execute first
|
2021-02-11 17:34:03 +08:00 |
|
winlin
|
fb61a6979c
|
Clock: Use one system wall clock
|
2021-02-11 13:39:43 +08:00 |
|
winlin
|
7114682eec
|
Timer: Apply timer(HourGlass) to server and sources
|
2021-02-10 16:16:58 +08:00 |
|
winlin
|
77cffd3e04
|
Main: Refine sever manager.
|
2021-02-10 16:16:56 +08:00 |
|
winlin
|
a357c013cd
|
Timer: Apply timer(HourGlass) to server and sources
|
2021-02-09 17:15:25 +08:00 |
|
winlin
|
ee1d06c613
|
Main: Refine sever manager.
|
2021-02-09 12:44:56 +08:00 |
|
winlin
|
bfa156247c
|
Merge branch '4.0release' into develop
|
2021-01-07 17:47:54 +08:00 |
|
winlin
|
1c41f5d796
|
Merge SRS3, change id of stat to string
|
2021-01-07 17:04:11 +08:00 |
|
winlin
|
fb7c051833
|
Change id from int to string for the statistics. 3.0.157
|
2021-01-07 16:47:49 +08:00 |
|
yinjiaoyuan
|
fe65c7bf84
|
For 2034, GB28181: Support transport over TCP
|
2020-11-15 22:50:59 +08:00 |
|
winlin
|
32c1832d64
|
For #1657, refine code
|
2020-11-07 07:39:50 +08:00 |
|
winlin
|
30ba5a32ed
|
For #1657, Support HTTPS Streaming
|
2020-11-06 17:22:23 +08:00 |
|
winlin
|
272ca9d0f6
|
For #1657, Support HTTPS API
|
2020-11-06 15:05:01 +08:00 |
|
winlin
|
fc21b31714
|
For #1657, refine the context for disposing
|
2020-11-05 17:16:59 +08:00 |
|
winlin
|
3038dd473d
|
For #1657, refine connection interface
|
2020-11-04 20:57:07 +08:00 |
|
winlin
|
0a82719bd3
|
Refine connection structure
|
2020-11-04 18:15:43 +08:00 |
|
winlin
|
365d3b8bda
|
Merge SRS3.0
|
2020-10-31 21:53:15 +08:00 |
|
winlin
|
9a963c6fd2
|
Fix #509, Always malloc stack on heap. 3.0.153
|
2020-10-31 21:27:09 +08:00 |
|
winlin
|
42a2dea5e0
|
Refine code
|
2020-09-30 11:14:49 +08:00 |
|
winlin
|
64705d1cc8
|
RTC: Refine resouce management
|
2020-09-19 10:30:05 +08:00 |
|
winlin
|
66c680edb1
|
Refine code, use SrsConnectionManager
|
2020-09-11 18:55:18 +08:00 |
|
winlin
|
4eae93d27b
|
Rename SrsCoroutineManager to SrsConnectionManager
|
2020-09-11 17:20:41 +08:00 |
|
winlin
|
88826aae8f
|
Rename SrsConnection to SrsTcpConnection
|
2020-09-11 16:59:22 +08:00 |
|
winlin
|
2135b638b1
|
Merge srs_app_thread.hpp to srs_app_conn.hpp
|
2020-09-11 16:44:40 +08:00 |
|
winlin
|
2bc6632a22
|
Server: Add callback for logrotate
|
2020-08-31 15:09:33 +08:00 |
|
winlin
|
ef8f3d6189
|
Refine cid for signal thread
|
2020-08-30 11:46:50 +08:00 |
|
winlin
|
a826926073
|
SRS: Fix bug
|
2020-08-21 21:14:18 +08:00 |
|
winlin
|
7a9e89d7b3
|
Fix memory leak
|
2020-08-20 17:15:07 +08:00 |
|
winlin
|
22ed55e2e5
|
Log: Server use the root context
|
2020-07-09 18:30:48 +08:00 |
|
winlin
|
bbc168d980
|
RTC: Refine generate_id, never set the cid for current thread
|
2020-07-09 18:11:49 +08:00 |
|
winlin
|
81a7c252d6
|
TCP: Log the remote port for client.
|
2020-07-04 17:19:08 +08:00 |
|
winlin
|
8a0c2e01f8
|
Log: Change cid from int to string
|
2020-06-18 11:45:43 +08:00 |
|
kyxlx550
|
9855e6a715
|
ps to rtmp via source, h264 start code with replace nalulen
|
2020-06-07 21:51:06 +08:00 |
|
winlin
|
4d33070c59
|
Support NACK for RTC player
|
2020-05-04 14:47:58 +08:00 |
|
winlin
|
ed338f4c0a
|
Refactor macro SRS_AUTO_XXX to SRS_XXX.
|
2020-04-29 20:02:28 +08:00 |
|
winlin
|
49f88a3326
|
Merge pull request #1691 from xialixin/dev-28181
Dev 28181
|
2020-04-09 08:28:53 +08:00 |
|
winlin
|
35a037cf05
|
Add api for tcmalloc
|
2020-04-07 14:24:14 +08:00 |
|
winlin
|
40c95b04ca
|
Merge remote-tracking branch 'winlin/feature/perf_stat' into feature/rtc
|
2020-04-05 23:01:21 +08:00 |
|
xialixin
|
ac8acc0b22
|
fix 28281 to 28181, sip heart message, timeout channel peer ip and port reset
|
2020-04-04 16:07:23 +08:00 |
|
winlin
|
608f3d0fae
|
For #1500, support push stream by GB28181. 4.0.18
|
2020-03-31 23:06:07 +08:00 |
|
winlin
|
e19b927f92
|
Merge GB28181
|
2020-03-31 22:45:20 +08:00 |
|
winlin
|
a342f460e7
|
Merge branch '4.0release' into xialixin-dev-28181
|
2020-03-31 20:09:07 +08:00 |
|
winlin
|
33455867f9
|
Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181
|
2020-03-31 20:08:24 +08:00 |
|
xialixin
|
c99fb99ab6
|
refactor gb28181, supporting SIP server enable, multiplex, API interface
|
2020-03-31 00:39:10 +08:00 |
|
winlin
|
c2b02f86fa
|
Merge 4.0release
|
2020-03-28 17:46:47 +08:00 |
|
winlin
|
217b8b94b6
|
Merge 3.0release
|
2020-03-28 17:45:14 +08:00 |
|
winlin
|
c339542ce0
|
Support macOS OSX
|
2020-03-28 17:20:40 +08:00 |
|
winlin
|
90a39ec46d
|
Add api to stat mw iovec
|
2020-03-27 13:37:39 +08:00 |
|
winlin
|
de9a004ff7
|
Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2
|
2020-03-20 21:39:04 +08:00 |
|
xialixin
|
cbe9c1dabc
|
Support gb28181 sip over udp, ps steam over rtp
|
2020-03-20 00:01:48 +08:00 |
|
winlin
|
ed2996141c
|
For #1638, #307, refine api and udp for rtc.
|
2020-03-17 18:11:03 +08:00 |
|
winlin
|
2c4dc0fb3d
|
For #1638, #307, extract rtc server to hybrid manager.
|
2020-03-17 17:56:37 +08:00 |
|
winlin
|
d21ef106a0
|
Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc
|
2020-03-13 21:18:09 +08:00 |
|
xiaozhihong
|
6decdc7838
|
adjust code style, fix some bug, add rtc session timeout
|
2020-03-13 00:24:56 +08:00 |
|
winlin
|
1382337cb4
|
Merge SRS3
|
2020-03-12 22:42:33 +08:00 |
|
winlin
|
856ed5a971
|
For #1635, inotify watch ConfigMap for reload. 3.0.134
|
2020-03-12 22:26:34 +08:00 |
|
winlin
|
bb509d23e2
|
For #1635, inotify watch ConfigMap for reload. 3.0.133
|
2020-03-12 22:08:23 +08:00 |
|
winlin
|
88368ed18d
|
For #1635, inotify watch ConfigMap for reload. 3.0.132
|
2020-03-12 21:58:29 +08:00 |
|
winlin
|
940798a9c7
|
For #1635, inotify watch ConfigMap for reload. 3.0.131
|
2020-03-12 21:45:10 +08:00 |
|
winlin
|
5e60c8f9cc
|
For #1635, inotify watch ConfigMap for reload. 3.0.130
|
2020-03-12 19:37:31 +08:00 |
|
winlin
|
9b663c070a
|
Fix #1635, support auto reaload config by inotify. 3.0.129
|
2020-03-12 18:14:23 +08:00 |
|
winlin
|
6a765ab849
|
Merge SRS3
|
2020-03-11 19:45:01 +08:00 |
|
winlin
|
927c0c8e39
|
For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124
|
2020-03-11 19:04:52 +08:00 |
|
HuyaJohn
|
3ae510b843
|
rtp dispatch done, but video can not play in chrome
|
2020-03-09 04:46:27 -07:00 |
|
xiaozhihong
|
c62901a3ac
|
make code easy, wrap udp remux socket
|
2020-03-08 00:30:31 +08:00 |
|
winlin
|
dcb0553cc8
|
For #1612, fix crash bug for RTSP. 4.0.12
|
2020-03-07 22:35:11 +08:00 |
|
winlin
|
12a74326e8
|
Merge pull request #1612 from xialixin/develop
Fix disconnect RTSP connection has assertion, resulting in program exit
|
2020-03-07 22:31:34 +08:00 |
|
xiaozhihong
|
9d5495c0c2
|
"stun and dtls done"
|
2020-03-06 23:01:48 +08:00 |
|
xiaozhihong
|
62563bdd81
|
rtc framework
|
2020-02-28 23:18:39 +08:00 |
|
winlin
|
ea305790df
|
For #1579, refactor log for gracefully quit.
|
2020-02-26 16:38:06 +08:00 |
|
xiaozhihong
|
51abb0844e
|
rtp session manager, stun codding
|
2020-02-23 23:19:40 +08:00 |
|
winlin
|
ef2b123325
|
Merge branch '3.0release' into 4.0release
|
2020-02-21 23:52:04 +08:00 |
|
winlin
|
20b9d6ab02
|
For #1598, support SLB health checking by TCP. 3.0.123
|
2020-02-21 23:51:40 +08:00 |
|
xiaozhihong
|
bc22ebe949
|
add rtc http request and response, exchange sdp.
|
2020-02-21 23:50:22 +08:00 |
|
winlin
|
388ad61cdc
|
Merge branch '3.0release' into 4.0release
|
2020-02-18 23:38:52 +08:00 |
|
winlin
|
dc0f804452
|
For #1579, support start/final wait for gracefully quit. 3.0.121
|
2020-02-18 23:37:11 +08:00 |
|
winlin
|
0c48c42f36
|
Merge branch '3.0release' into 4.0release
|
2020-02-18 22:15:29 +08:00 |
|
winlin
|
58b40478b6
|
For #1579, support force gracefully quit. 3.0.120
|
2020-02-18 22:15:12 +08:00 |
|