external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 06:54:22 +00:00
Code Issues Releases Wiki Activity
4867 commits 14 branches 107 tags 376 MiB
Commit graph

1641 commits

Author SHA1 Message Date
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
Harlan
e9cb8210fc fix default value error 2018-05-15 11:20:52 +08:00
Harlan
43ebd5958d fix bug that only one stream can be encrypted.. 2018-04-03 22:00:32 +08:00
winlin
dba44c7c3f Merge branch 'develop' into 3.0release 2018-03-25 20:00:33 +08:00
xialixin
aaf2905a9d add: hls configuration adds [duration] variable (#1083) 2018-03-25 17:47:37 +08:00
Harlan
52596a0b04 add HLS encryption feature 2018-03-25 12:05:52 +08:00
winlin
0d78b908a7 Fix client tools resolve dns failed bug 2018-03-20 19:50:46 +08:00
winlin
bd797ad385 Fix utest build failed for ::atoi 2018-03-03 09:33:15 +08:00
winlin
459272b94c Merge #1077 from 2.0release 2018-02-28 14:10:09 +08:00
RocFang
fd016ed91a use hls->initialize to set req of hls (#1077) 2018-02-28 13:35:33 +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
92f2bcd878 For #464, support config origin cluster 2018-02-16 10:31:19 +08:00
winlin
55c96192e2 For #464, refine code 2018-02-16 10:19:48 +08:00
winlin
ec362b2774 For #464, query origin info and ip addresses 2018-02-16 09:37:31 +08:00
winlin
469250f850 For #464, support origin cluster api 2018-02-15 20:55:34 +08:00
winlin
d0fbf44d18 For #464, support config for origin cluster. 2018-02-14 21:52:40 +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
93d3e1464a For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:57 +08:00
winlin
366309ce2d For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:14 +08:00
winlin
049e7c82c0 Merge #1044, for #1045, set TCP SO_KEEPALIVE 2018-01-07 17:23:36 +08:00
winlin
911cd448f1 Merge #1045, for #1044, TCP connection alive detection. 2.0.245 2018-01-07 17:18:43 +08:00
juntaoliu
a6871052af set tcp keepalive for tcp socket (#1045) 2018-01-07 17:03:13 +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
winlin
823dc2df21 Refine help 2018-01-01 22:44:48 +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
db08f1586c For #913, APP support complex error. 2018-01-01 22:32:54 +08:00
winlin
e2c1f58674 For #913, APP support complex error. 2018-01-01 21:20:57 +08:00
winlin
6eae93258a For #913, APP support complex error. 2018-01-01 19:39:57 +08:00
winlin
204ef041da For #913, Kernel MP4 FLV HTTP support complex error. 2017-12-31 12:11:48 +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
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
b5c14938d9 For #913, config and log support complex error. 2017-06-11 14:03:19 +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
69374c8d6d For #299, use format for v/a sequence header. 2017-06-04 19:35:52 +08:00
winlin
9ca36970aa Fix #908, use empty coroutine to avoid NULL pointer. 2017-06-04 19:13:56 +08:00
winlin
0e9e1792fe For #299, write fMP4 for DASH. 2017-06-04 15:10:35 +08:00
winlin
1bf99e8f3e For #907, Wrap ST, only use in service ST. 2017-05-30 09:05:02 +08:00
winlin
54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 2017-05-30 07:40:18 +08:00
winlin
6993ac226f For #906, #902, use coroutine for reusable2 thread 2017-05-29 20:49:29 +08:00
winlin
ea9a5f26d9 For #906, #902, use coroutine for reusable thread 2017-05-29 20:33:32 +08:00
winlin
2ed2513f08 For #906, #902, use coroutine for one cycle thread 2017-05-29 19:45:19 +08:00
winlin
b21f92f97a For #906, #902, remove the thread start and stop event 2017-05-29 18:42:36 +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
fc380fe48d For #906, #902, refine thread object. 2017-05-29 17:19:06 +08:00
xialixin
92c8c0505d Fix the timebase bug, change from us to ms. (#876) 
* fix SRS_CONSTS_RTMP_PULSE_TMMS (int64_t)(500*1000LL)

* fix SrsBufferCache::cycle st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)

* fix st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)
 2017-05-13 09:21:02 +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
a58874178b Fix merge build failed. 2017-05-01 16:49:09 +08:00
winlin
f97260be1d Merge SRS2 2017-05-01 16:44:14 +08:00
winlin
a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 2017-05-01 16:39:59 +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
ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 2017-04-30 12:03:31 +08:00
HungMingWu
98d4b6ae11 Refine srs_kernel_codec audio & video config code (#854) 2017-04-24 10:08:57 +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
bcd24126c5 Update comments for HLS 2017-04-16 21:43:30 +08:00
winlin
a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 2017-04-16 21:33:39 +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
d6e28bde69 Merge from SRS2. 2017-04-15 17:09:50 +08:00
HungMingWu
14acc59a19 Refine kernel/mp4 code (#823) 2017-04-15 17:05:05 +08:00
haofz
52b6823a90 fix #826, fix memory leak in streamCasterFlv (#836) 2017-04-15 16:56:28 +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
7d618fed43 For #820, fix utest failed. 2017-03-26 14:25:08 +08:00
winlin
e3526c0cf6 For #820, modules use service only. 2017-03-26 13:40:39 +08:00
winlin
ff822b55cd For #820, extract service module. 2017-03-26 10:16:21 +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
9ab5e6a916 For #299, fix bug of fragment url 2017-03-19 12:49:58 +08:00
winlin
c71e8fa947 For #299, fragment reap workflow 2017-03-19 12:30:02 +08:00
winlin
721a8457c2 For #299, Refine init mp4, use fragment 2017-03-19 12:29:38 +08:00
winlin
8d679a6f9a For #299, use fragment for dvr FLV/MP4 2017-03-18 21:41:01 +08:00
winlin
da4c390d69 For #299, extract fragment and fragment window for hls 2017-03-18 21:29:08 +08:00
winlin
6da6e0511d For #803, should refine code. 2017-03-11 16:28:18 +08:00
Chengdong Zhang
a6eebacc99 Streams API is not correct. (#800) 
HTTP API for streams is not correct. When stream stopped, API does not
remove it.
 2017-03-11 16:21:33 +08:00
winlin
3ec9df6578 For #299, A/V init mp4 are fine. 2017-03-05 18:44:37 +08:00
winlin
886930c22a For #299, refine the comments. 2017-03-05 14:17:39 +08:00
winlin
308c6fee18 Fix #786, simply don't reuse object. 3.0.20 2017-03-02 16:43:06 +08:00
winlin
44014683e1 Refine thread. 2017-03-01 12:23:44 +08:00
winlin
c849010fe2 Refine api for srs-librtmp 2017-02-28 19:46:09 +08:00
winlin
747d6f2f52 For #299, write legal MPD, fix CORS. 2017-02-26 21:45:08 +08:00
winlin
8ab727f3c5 For #299, write MPD file. 2017-02-26 20:40:33 +08:00
winlin
d786d61685 Merge branch '2.0release' into develop 2017-02-25 11:21:56 +08:00
winlin
0059b1cf7a For #783, use directly free to replace auto free 2017-02-25 11:18:54 +08:00
ljx0305
b0d16840b5 fix Repeated release (#783) 
fix  Repeated release
 2017-02-25 11:15:27 +08:00
winlin
cee9d736a4 for #299, refine code. 2017-02-19 22:03:51 +08:00
winlin
ede1c34a25 for #299, refine the signature of api for hls/dash 2017-02-19 21:48:32 +08:00
winlin
2fcd3972c1 for #299, refine the encoder object name 2017-02-12 21:50:02 +08:00
winlin
2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 2017-02-12 20:55:35 +08:00
winlin
d612a21bad for #299, refine audio codec object name 2017-02-12 20:46:24 +08:00
winlin
caf69f193d for #299, refine the codec object name 2017-02-12 20:38:39 +08:00
winlin
d7458c4e72 For #299, refine the codec to format-frame-sample chain. 2017-02-12 18:18:18 +08:00
winlin
c4a510b834 For #299, refine the codec info structure. 2017-02-11 23:09:23 +08:00
winlin
5e419c66f8 For #299, add dash files. 2017-02-11 21:14:28 +08:00
winlin
7fd221ef63 Always enable DVR 2017-02-11 17:27:40 +08:00
winlin
8e5d4dc73d always enable http and hls 2017-02-11 13:29:53 +08:00
winlin
477414106a add dash files. 2017-02-11 12:30:21 +08:00
winlin
5fec59ace2 merge from srs2, fix #503 2017-02-09 14:33:56 +08:00
winlin
99bffea328 fix #503, disable utilities when reload a source. 2.0.233 2017-02-09 14:29:57 +08:00
winlin
afbc3443f3 fix #738, support DVR general mp4. 3.0.17 2017-02-07 21:56:20 +08:00
winlin
3209ad29e0 for #738, refine code for DVR mp4. 2017-02-06 20:58:52 +08:00
winlin
0a054cd6bd for #738, remove the dvr plan append for it's no use 2017-02-06 20:22:07 +08:00
winlin
8c01f52372 for #738, refine the dvr segmenter. 2017-02-06 18:33:26 +08:00
winlin
733ba73d54 for #738, write mp4 samples. 2017-02-05 09:15:46 +08:00
winlin
9d21a8bb33 for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov). 2017-02-03 22:49:19 +08:00
winlin
ac7ee10b60 fix #751,#756, refine code 2017-02-03 11:56:02 +08:00
Chengdong Zhang
80540e4dc1 change TAB space 
change TAB space for line 794
 2017-02-03 10:58:32 +08:00
eagle-zhang
7b02e3543f Clients Api support start and count 
Clients Api support start and count
line 794~810 && line 830
 2017-02-03 10:49:06 +08:00
winlin
eaa222f034 for #742, refine the file reader and writer interface. 2017-01-30 19:35:04 +08:00
winlin
b16ab038ce for #742, refine the u_intxx_t to uintxx_t 2017-01-30 17:32:18 +08:00
winlin
136a7ef488 for #299, refine docs. 2017-01-26 17:28:49 +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
4583a63789 for #742, refine code for recv thread. 2017-01-23 16:38:23 +08:00
winlin
a07986f4ee for #742, refine code 2017-01-22 17:07:55 +08:00
winlin
5c959fc781 merge from srs2, for kbps free io 2017-01-22 13:16:05 +08:00
winlin
6706bda42c for #752, release the io then free it for kbps. 2.0.232 2017-01-22 13:12:56 +08:00
winlin
a3ea83f504 directly free the transport, not need to close for maybe NULL 2017-01-20 12:11:52 +08:00
winlin
99c13fb1c1 convert ms to us for st 2017-01-19 15:51:55 +08:00
winlin
7bfb648bd8 refine the meta cache name 2017-01-19 15:51:34 +08:00
winlin
4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 2017-01-19 12:38:55 +08:00
winlin
310032d8d8 merge srs2, timestamp overflow for ATC. 2017-01-18 11:48:31 +08:00
winlin
d76419e3bb fix #749, timestamp overflow for ATC. 2.0.230 2017-01-18 11:47:43 +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
1ed5118246 refine the spaces, no TABS 2017-01-16 15:47:26 +08:00
winlin
750f4413c8 merge srs2 for #536 2017-01-16 12:47:48 +08:00
winlin
142a9733b2 refine encoder code for #536. 2017-01-16 12:42:25 +08:00
winlin
ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common. 2017-01-11 17:43:29 +08:00
winlin
e6eafd3b97 fix #740, convert ts aac audio private stream 1 to common. 2.0.229 2017-01-11 17:42:34 +08:00
winlin
7fe60b5bbf fix #735 config transform refer_publish invalid. 3.0.14 2017-01-11 09:45:22 +08:00
winlin
7bbb3bae42 merge srs2 2017-01-11 09:33:26 +08:00
winlin
e3aa34ec5f fix #736, recovery the hls dispose. 2.0.227 2017-01-11 09:25:48 +08:00
Himer
afa704bca5 Update srs_app_source.cpp 
enabled 为true才进行转发实例创建
 2017-01-10 21:16:49 +08:00
winlin
a1ae48f4ac Merge branch '2.0release' into develop 2017-01-10 18:07:52 +08:00
winlin
6fbda2ae3f for #635, refine hls open/close gop. 2017-01-10 18:07:46 +08:00
winlin
ae1920e91a Merge branch '2.0release' into develop 2017-01-10 17:17:31 +08:00
winlin
4104f25069 for #635, support IDR and NonIDR(open-gop). 2017-01-10 17:17:23 +08:00
winlin
1dd877c0d6 merge srs2 2017-01-10 11:17:37 +08:00
winlin
c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 2017-01-10 11:14:20 +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
4709d0214c for #711, support prefile for transcode. 3.0.12 2017-01-06 10:39:37 +08:00
winlin
8bdf50b14d update feature list 2017-01-05 09:29:12 +08:00
winlin
f2efa96015 for #324, always enable hstrs. 3.0.10 2017-01-05 09:08:56 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
b231550c32 fix #717, #691, http api/static/stream support cors. 3.0.9 2016-12-15 16:22:04 +08:00
winlin
f6661989af fix typo for #513, #691 2016-12-15 15:00:08 +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
f30b3073a2 refine the cros of api for flv 2016-12-15 14:10:02 +08:00
winlin
3df8f11884 refine thread stop 2016-12-14 18:21:50 +08:00
winlin
8935fe8897 merge srs2. 2016-12-13 18:43:22 +08:00
winlin
aca8a79d95 fix #713, disable the source cleanup. 2.0.223 2016-12-13 18:41:45 +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
439c67018d remove unused macros. 2016-12-09 15:58:59 +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
b06203e777 dispose kafka 2016-12-08 11:48:50 +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
0a8d40925f merge from 2.0 2016-11-09 09:44:19 +08:00
ME_Kun_Han
f107f404ea fix bug for issues #654 (#426) 2016-11-05 10:46:24 +08:00
winlin
5796e4bf89 merge from srs2 2016-10-26 09:53:27 +08:00
hankun
4f09bcce9f fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666) 2016-10-20 10:49:59 +08:00
winlin
112d98ffdb merge srs2. 2016-10-10 11:56:10 +08:00
ME_Kun_Han
7058411cb8 fix the core dump when trying to close srs (#386) 2016-10-10 11:51:49 +08:00
winlin
3659eec9d1 update the cwd 2016-09-23 15:37:51 +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
2a01540433 support change work_dir for oryx. 2016-09-23 14:53:58 +08:00