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
winlin
8e294709b0
Always enable SRS_STAT
2018-12-22 19:58:36 +08:00
winlin
e4742ddac7
Merge 2.0release
2018-07-17 13:59:51 +08:00
Hui Zhang (huzhang2)
01ed485cf3
fix #1172 #1173 #1174 #1175
...
security scan report issue
2018-07-17 10:03:13 +08:00
winlin
469250f850
For #464 , support origin cluster api
2018-02-15 20:55:34 +08:00
winlin
ca1395a807
Change date from 2017 to 2018
2018-01-07 10:58:53 +08:00
winlin
922a8f3a5c
For #988 , refine code.
2018-01-01 22:45:22 +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
fd91df9411
For #913 , reload use complex error
2017-09-22 16:14:30 +08:00
winlin
661eb8b37c
For #913 , use complex error for reload utc time
2017-07-29 20:02:38 +08:00
winlin
5c9a12e72a
For #913 , use complex error for listener
2017-07-29 12:45:17 +08:00
winlin
71dd3f3137
For #913 , use complex error for server handler.
2017-07-18 20:24:07 +08:00
winlin
9db2a04c3b
For #913 , coroutine support complex error.
2017-06-11 18:44:20 +08:00
winlin
860aac3e50
For #913 , config reload and persistence
2017-06-11 09:54:09 +08:00
winlin
7cac35a289
For #913 , source cycle error
2017-06-11 09:40:07 +08:00
winlin
a20e2c3ef6
For #913 , refine server utility
2017-06-10 15:20:48 +08:00
winlin
ca9f0bdb1e
For #913 , refine server initialize st
2017-06-10 14:29:41 +08:00
winlin
4e4091231e
Refine object create in server.
2017-06-10 14:19:10 +08:00
winlin
93710c7489
For #913 , refine the error mechanism
2017-06-09 13:29:23 +08:00
winlin
bb200b5d2d
For #913 , add complex error.
2017-06-09 11:50:35 +08:00
winlin
9ca36970aa
Fix #908 , use empty coroutine to avoid NULL pointer.
2017-06-04 19:13:56 +08:00
winlin
1bf99e8f3e
For #907 , Wrap ST, only use in service ST.
2017-05-30 09:05:02 +08:00
winlin
3ffb0980f5
For #906 , #902 , use connection manager to remove connection
2017-05-29 18:34:41 +08:00
winlin
44f542f77f
For #906 , #902 , replace the endless thread with coroutine
2017-05-29 17:56:26 +08:00
winlin
f97260be1d
Merge SRS2
2017-05-01 16:44:14 +08:00
walkermi
79e4f9f3a0
fixed compile error when add --log-info ( #860 )
...
* Update srs_app_server.cpp
fixed compile error when add --log-info
* Update srs_app_mpegts_udp.cpp
fixed compile error when add --log-info
2017-04-30 12:29:37 +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
winlin
2980e7d3ef
For #813 , refine code.
2017-03-25 12:52:54 +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
a1fcf66f32
for #742 , always enable http utilities.
2017-01-23 17:43:59 +08:00
winlin
3fe338d1c5
for #742 , use ms for application clock tbn.
2017-01-17 12:25:30 +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
2955b1fd2d
support log rotate signal SIGUSR1. 3.0.8
2016-12-08 18:23:22 +08:00
winlin
2d387035cd
refine the global variables.
2016-12-08 17:26:04 +08:00
winlin
9a3674c624
refine kafka
2016-12-08 11:44:49 +08:00
winlin
f6c8e02cca
Merge branch '2.0release' into develop
2016-11-24 18:12:31 +08:00
ME_Kun_Han
ec4d1b3b4f
fix bug: run srs at startup failed. ( #454 )
2016-11-24 18:05:43 +08:00
winlin
0e308b0fa1
merge srs2, support oryx
2016-09-23 15:33:43 +08:00
winlin
07fe35f11d
support asprocess for oryx. 2.0.218
2016-09-23 15:17:46 +08:00
winlin
b748fac23a
support asprocess for oryx. 2.0.218
2016-09-23 15:00:50 +08:00
winlin
0e9318e5d8
merge from 2.0
2016-09-05 14:16:24 +08:00
winlin
c7b97aa1c3
fix memory leak at source. 2.0.214
2016-09-05 14:13:37 +08:00
winlin
8db25a0bf5
fix the log for mmap.
2016-01-21 16:18:42 +08:00
winlin
f1e7e9d933
support gmd. change work_dir. hourglass. add utilies.
2016-01-08 13:58:19 +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
5660e24953
fast stop server.
2015-12-11 11:30:36 +08:00
winlin
1e4c8f8bf3
fast stop server.
2015-12-11 10:30:13 +08:00
winlin
5ac8177ce6
fix bugs
2015-12-08 18:32:37 +08:00
winlin
18eb8c81b3
merge from srs2
2015-11-16 18:10:06 +08:00
winlin
2310b2da59
fix #518 , fix fd leak bug when fork. 2.0.200
2015-11-16 18:06:44 +08:00
YueHonghui
eb4ca9ff5d
fix bug of fd leek in srs_app_server
2015-11-16 15:47:17 +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
9ebb77d711
fix the warnings
2015-10-28 11:58:49 +08:00
winlin
61486a82aa
kafka use topic and partition cache
2015-10-23 14:42:04 +08:00
winlin
7013993c7a
kafka send the accept message.
2015-10-23 14:42:04 +08:00
winlin
9ead08725d
use kernel utility int2str and float2str
2015-09-24 17:54:58 +08:00
winlin
f187a7deef
refine the startup logs.
2015-09-24 12:15:12 +08:00
winlin
afd6428366
refine code of server.
2015-09-23 17:21:57 +08:00
winlin
9a9483e7d5
support without kafka
2015-09-22 17:46:07 +08:00
winlin
abb5c5ad31
add kafka producer
2015-09-22 17:40:05 +08:00
winlin
0e52fc6d5b
rename SrsStream to SrsBuffer
2015-09-22 08:57:31 +08:00
winlin
364460f2ab
for #319 , support raw update global.listen
2015-08-30 23:18:14 +08:00
winlin
d921d59e57
for #319 , support HTTP RAW API reload.
2015-08-27 18:11:50 +08:00
winlin
980e3921e4
for #319 , add signal to write config to file.
2015-08-26 21:11:28 +08:00
lovecat
9c2beffe8f
statistic connection bytes before remove client.
2015-08-25 11:46:12 +08:00
winlin
6b6d951298
add api /api/v1/features
2015-08-22 11:08:56 +08:00
winlin
4763f205a2
add kbps for vhost and stream
2015-08-22 09:49:38 +08:00
winlin
a7589b9ad3
refine code for api, add clients and parse_rest_id
2015-08-21 16:12:48 +08:00
winlin
1261916eab
refine the mount and dir to /console
2015-08-12 12:49:22 +08:00
winlin
f28c9b7eb5
merge from 2.0release
2015-08-11 15:49:48 +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
31d2de3f23
fix #435 , add pageUrl for HTTP callback on_play.
2015-07-21 10:50:57 +08:00
winlin
b3b6df365e
fix the stream caster build failed bug.
2015-07-10 13:50:35 +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
0d66e92ab5
refine code, support configure to enable --memory-watch
2015-06-13 15:45:25 +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
d7e5df2578
cleanup connections when terminate server.
2015-06-08 14:03:16 +08:00
winlin
8b3bd5b4b9
add srs memory watcher.
2015-06-07 15:13:41 +08:00
winlin
811ef4bcf6
dispose the gop cache
2015-06-07 09:27:47 +08:00
winlin
26b76c0e4c
fix #420 , remove ts for hls ram mode.
2015-06-05 20:38:01 +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
394e070b2e
support dolphin
2015-05-28 14:59:12 +08:00
winlin
e5461d2df9
refine code
2015-05-28 07:03:38 +08:00
winlin
1150cde829
fix the verbose build failed.
2015-05-27 11:12:52 +08:00
winlin
fec8422d6b
fix bug of configure.
2015-05-27 10:23:40 +08:00
winlin
2e1ca3c751
fix the build failed bug.
2015-05-25 08:17:11 +08:00
winlin
f510a3d6fb
add /api/v1/versions for http server for go-sharp to detect.
2015-05-24 13:01:23 +08:00
winlin
e5f449ce36
refine the thread to three category.
2015-05-23 09:20:16 +08:00
winlin
5d7b0edccc
merge from bravo code, fix some warnings.
2015-05-22 11:20:25 +08:00
winlin
44bc7976ac
merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.
2015-05-19 18:06:20 +08:00
winlin
ea1e015a4e
fix the http read chunked encoding bug.
2015-05-04 18:11:52 +08:00
winlin
022b6aa561
refine the http remux for http flv stream.
2015-05-03 23:34:59 +08:00
winlin
f0c24eeacc
add stream caster for post flv over http.
2015-05-03 10:56:20 +08:00
winlin
b23e196f20
migarate from winlinvip to srs org, move the copyright to srs org.
2015-04-29 17:38:23 +08:00
winlin
115daa3cc1
migarate from winlinvip to srs org
2015-04-29 17:06:32 +08:00
winlin
eb54ec25c9
fix compile errors.
2015-04-03 11:30:59 +08:00
winlin
717d088376
support server cycle handler. 2.0.153.
2015-03-31 18:06:55 +08:00
winlin
b6feb0742f
fix #149 , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
2015-03-23 23:13:57 +08:00
winlin
33cca3e027
for #155 , add todo for osx. 2.0.146
2015-03-21 15:22:45 +08:00
winlin
bbac2348db
for #354 , remove the double underscore functions and variables.
2015-03-21 11:55:28 +08:00
winlin
f564c903ac
support got uptime and loadavg for osx. 2.0.145
2015-03-18 22:30:17 +08:00
winlin
cf3becbc17
for #155 , osx(darwin) enable http api and stat, rusage is ok.
2015-03-17 22:35:47 +08:00
winlin
27cb62b7aa
for #324 , support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
2015-03-14 19:45:13 +08:00
winlin
6d15d0ea99
for #324 , refine code, add hstrs config.
2015-03-14 09:52:47 +08:00
winlin
5143e3a58d
fix #316 , http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136
2015-03-08 19:59:10 +08:00
winlin
8bf60895a9
refine the kbps of server.
2015-03-08 12:55:40 +08:00
winlin
fbbe46d272
refine the config, support directly parse file.
2015-03-07 22:25:43 +08:00
winlin
04dc60ebe1
refine http for srs, rename SrsGoHttp to SrsHttp.
2015-03-04 13:09:35 +08:00
winlin
fb3fced8d0
for #179 , revert dvr http api. 2.0.128.
2015-03-01 17:57:28 +08:00
winlin
c67a4fdf97
for #179 , enable http api crossdomain for dvr api.
2015-02-21 21:17:59 +08:00
winlin
f14af45413
for #133 , alloc and free rtp port.
2015-02-17 21:10:06 +08:00
winlin
40fbfd8560
for #133 , rtsp extract tcp/udp listener.
2015-02-17 16:28:28 +08:00
winlin
c0e50265bd
for #133 , create rtsp framework.
2015-02-16 14:05:01 +08:00
winlin
e81e090239
for #133 , add rtsp listener and handler.
2015-02-15 21:28:31 +08:00
winlin
a23191497f
fix #136 , support hls without io(in ram). 2.0.112
2015-02-03 16:01:07 +08:00
winlin
d22e4e86d8
update projects for rtmp renamed to protocol
2015-01-24 16:59:36 +08:00
winlin
711b6ca277
for #250 , basic stream caster framework. 2.0.104
2015-01-24 16:31:32 +08:00
winlin
6463d22a14
for #250 , add mpegts over udp stream caster class.
2015-01-24 16:27:30 +08:00
winlin
7f02bfa3a4
for #250 , the mpegts over udp stream caster framework.
2015-01-24 15:36:11 +08:00
winlin
52891b491a
listen and serve stream caster mpegts over udp.
2015-01-24 14:52:52 +08:00
winlin
2698e6dbae
for bug #293 , http live streaming framework.
2015-01-18 18:39:53 +08:00
winlin
c4302b9b61
for bug #277 , the http server subscribe the reload.
2015-01-18 17:17:07 +08:00
winlin
cbed2bbca4
fix #277 , refine http server refer to go http-framework. 2.0.98
2015-01-17 23:00:40 +08:00
winlin
9bbbaad288
for bug #277 , refine http api refer to go http-framework. 2.0.97
2015-01-17 21:58:23 +08:00
winlin
569596c10d
update copyright, from 2013 to 2015
2014-12-31 20:32:09 +08:00
winlin
c457364321
for bug #237 , add name for thread. 2.0.47
2014-12-03 14:05:15 +08:00
winlin
9f60a6738a
add comments for listen
2014-11-17 10:27:05 +08:00
winlin
77cf885d8c
add comments for #161
2014-11-13 13:49:50 +08:00
winlin
4af2e78c59
refine code for bug #194 , add comments to macros.
2014-11-13 12:45:54 +08:00
winlin
bc1b5f4bbf
for bug #194 , disable the srs fd poll.
2014-11-12 10:05:42 +08:00
