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 |
|
winlin
|
eefd74e0e4
|
Merge branch '3.0release' into develop
|
2020-02-18 20:25:07 +08:00 |
|
winlin
|
3c597545b1
|
For #1579, support gracefully quit. 3.0.119
|
2020-02-18 19:59:47 +08:00 |
|
winlin
|
f4c7b882c5
|
For #1579, define signals for fast/grace quit and upgrade
|
2020-02-18 09:53:40 +08:00 |
|
夏立新
|
d6e11706ec
|
Fix disconnect RTSP connection has assertion, resulting in program exit
|
2020-02-17 18:46:05 +08:00 |
|
winlin
|
77114c7df0
|
Merge SRS3
|
2020-01-29 20:30:06 +08:00 |
|
winlin
|
23ece94064
|
Fix #1206, dispose ingester while server quiting. 3.0.111
|
2020-01-29 20:22:28 +08:00 |
|
winlin
|
5f174552f3
|
Merge SRT
|
2020-01-24 16:10:40 +08:00 |
|
winlin
|
33c6bf1f8f
|
Refactor SRT, using reverse dependency, SRT depends on APP.
|
2020-01-23 19:40:40 +08:00 |
|
winlin
|
1959d1d920
|
Extract hybrid server for SRT
|
2020-01-23 18:21:11 +08:00 |
|
winlin
|
f143757429
|
Use macro to disable SRT in code
|
2020-01-23 14:23:09 +08:00 |
|
runner365
|
5c5fd805c5
|
add srt mpegts to rtmp
|
2020-01-21 19:20:09 +08:00 |
|
winlin
|
9dbd049e79
|
For #1568, extract SrsSourceManager from SrsSource.
|
2020-01-16 17:56:55 +08:00 |
|
runner365
|
aeee3011ef
|
add srt server file
|
2020-01-11 23:05:10 +08:00 |
|
winlin
|
d783a12f89
|
Happy 2020
|
2019-12-30 10:10:35 +08:00 |
|
winlin
|
e045b0a619
|
We prefer ipv4, only use ipv6 if ipv4 is disabled. 3.0.59
|
2019-10-07 10:34:55 +08:00 |
|
winlin
|
5d17bb8bb0
|
Remove KAFKA. 3.0.53
|
2019-10-03 12:45:38 +08:00 |
|
winlin
|
5d8fb01b45
|
Fix #1352, fix typo of daemon.
|
2019-05-07 07:46:20 +08:00 |
|
winlin
|
d306ee7506
|
Refine ms in time unit
|
2019-04-18 08:50:43 +08:00 |
|
winlin
|
9b7c0802a9
|
Refine srs_update_system_time in time unit
|
2019-04-10 08:32:46 +08:00 |
|
winlin
|
60f9561d2d
|
Refine get_heartbeat_interval in time unit
|
2019-04-09 08:47:18 +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
|
2e9bf2af83
|
Always enable SRS_StreamCaster
|
2018-12-22 20:45:25 +08:00 |
|
winlin
|
aa1a5442f9
|
Always enable SRS_Ingest
|
2018-12-22 20:30:13 +08:00 |
|