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

320 commits

Author SHA1 Message Date
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