external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 15:04:20 +00:00
Code Issues Releases Wiki Activity
6044 commits 14 branches 107 tags 377 MiB
Commit graph

2251 commits

Author SHA1 Message Date
winlin
03ac48f8fa Merge 2.0, for FLV latency 2018-08-05 20:25:28 +08:00
winlin
c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 2018-08-05 20:23:17 +08:00
winlin
580c94c8c0 Refine code 2018-08-05 18:58:23 +08:00
winlin
29b74c7220 For #1110, Support params in http callback. 3.0.36 2018-08-04 19:51:04 +08:00
winlin
85d3a5001c For #1110, Support params in http callback. 2.0.251 2018-08-04 19:36:42 +08:00
winlin
68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 2018-08-02 09:17:49 +08:00
winlin
09dbda5b18 For #1031, SRS forwarder support douyu.com. 2018-08-02 07:24:08 +08:00
winlin
a66d450ec1 For #1031, SRS edge support douyu.com. 3.0.34 2018-08-02 07:14:06 +08:00
winlin
586899a010 For #1031, SRS edge support douyu.com. 2.0.250 2018-08-02 06:59:57 +08:00
winlin
d27db215df For #1176, should not close fd when success. 2018-07-18 19:21:29 +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
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
winlin
b5d466f3d2 update utest 2016-09-15 14:47:42 +08:00
winlin
09895fcfc2 Merge branch '2.0release' into develop 2016-09-09 11:03:39 +08:00
Star Brilliant
a164c90e28 Flush the stdout buffer after logging to console 
Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n.
However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half).
By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.
 2016-09-08 07:58:52 -05:00
winlin
b24d1de377 Merge branch '2.0release' into develop 2016-09-05 14:56:41 +08:00
winlin
590e951739 fix memory leak of source. 2016-09-05 14:56:31 +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
8ad7da1cb6 merge from 2.0 2016-09-02 15:25:20 +08:00
xubin
49853d2b8a 修复forward崩溃 2016-09-02 15:10:43 +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
36eb0981ec merge from 2.0release 2016-08-08 14:09:10 +08:00
intliang
3fbe9d2442 fixed crash by improper srs_info use. 2016-08-08 14:07:19 +08:00
winlin
eed4626c35 use larger limit 2016-03-10 12:28:46 +08:00
winlin
8db25a0bf5 fix the log for mmap. 2016-01-21 16:18:42 +08:00
winlin
214eda745d open null dev, not close stdout or stderr. 2016-01-20 14:53:25 +08:00
winlin
03469fc37d refine code for process fork. 2016-01-20 14:09:14 +08:00
winlin
ce8f3b4478 refine the dup2 of stdout and stderr. 2016-01-20 14:05:48 +08:00
winlin
ae8bd4c2aa should never close the fd 3+, for it myabe used. 2016-01-20 14:01:18 +08:00
winlin
a6dc17a67d support redirect stdout by > 2016-01-20 14:00:01 +08:00
winlin
dfe5306327 fix process bug. 2016-01-13 16:18:50 +08:00
winlin
61c0c168b9 merge from srs2. 2016-01-13 12:52:19 +08:00
winlin
266397acee merge from srs2 2016-01-13 12:46:23 +08:00
winlin
28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 2016-01-13 12:44:51 +08:00
winlin
f971538cf3 refine http, support no host. 2016-01-12 11:53:52 +08:00
winlin
2941328ee8 rtmp edge support 302 redirect. 2016-01-11 15:46:23 +08:00
winlin
d81b2cb140 support hls mount to vhost and reload 2016-01-11 13:15:46 +08:00
winlin
041040b846 ignore ingester when vhost disabled. 2016-01-11 13:11:14 +08:00
winlin
eac5440559 merge from srs2 #558 #559 2016-01-09 16:06:22 +08:00
winlin
da722b5b5d Merge pull request #559 from tufang14/2.0release 
srs reusable thread need join
 2016-01-09 16:00:58 +08:00
tufang14
56bffb6646 Update srs_app_thread.cpp 2016-01-09 15:54:23 +08:00
flowerwrong
d42a58faf4 Keep blank of line 2016-01-09 15:10:24 +08:00
tufang14
233ff11172 srs reusable thread need join 2016-01-09 14:58:40 +08:00
flowerwrong
9ddd0054a1 Add tcUrl to on_publish http hook for issue #548 2016-01-08 15:10:25 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
5338f21439 merge from srs2 2016-01-05 16:58:21 +08:00
winlin
8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 2016-01-05 16:49:27 +08:00
winlin
dc38ae1687 show first message when not show version. 2016-01-04 17:41:16 +08:00
winlin
9d22d09646 show signature of server. 2016-01-04 17:28:18 +08:00
winlin
973194c663 merge from srs2. 2015-12-31 16:02:01 +08:00
winlin
26211abf2e refine code. 2015-12-31 15:57:16 +08:00
winlin
f516636448 refine code for hooks and http core. 2015-12-29 18:33:02 +08:00
winlin
79fdc4e766 fix bug for rtmp client use NULL ptr. 2015-12-28 18:13:40 +08:00
winlin
96a4428bdb refine the http request parse. edge retry timeout. 2015-12-28 18:02:20 +08:00
winlin
86a7db0adb refine edge ingester, use upstream adapter. 2015-12-28 17:15:44 +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
d267b8fa19 fix bug for create connection with ip. 2015-12-24 17:38:49 +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
b881166f9a merge from srs2 2015-12-22 16:18:09 +08:00
winlin
c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 2015-12-22 16:13:49 +08:00
winlin
e124aeb614 Merge branch '2.0release' into develop 2015-12-15 16:25:27 +08:00
winlin
69d191e53f refine the hls error log. 2015-12-15 16:25:21 +08:00
winlin
0ab64ccd2a merge from srs2. 2015-12-15 16:06:40 +08:00
winlin
40457e6cab default hls_on_error to continue. 2.0.201 2015-12-15 16:02:02 +08:00
winlin
f6ff116505 refine code, persistence use isolate method. 2015-12-15 14:27:49 +08:00
winlin
b486f6fe6b refine /api/v1/summaries, with code and server id. 2015-12-15 12:46:47 +08:00
winlin
26d328e7f2 fix bug for api, level should be string. 2015-12-14 18:43:20 +08:00
winlin
ffef3905af merge from srs2. 2015-12-11 11:35:56 +08:00
winlin
5660e24953 fast stop server. 2015-12-11 11:30:36 +08:00
winlin
2830ee12c1 fix the on_hls.ts_url bug. 2015-12-11 11:29:10 +08:00
winlin
1e4c8f8bf3 fast stop server. 2015-12-11 10:30:13 +08:00
winlin
3ab5892863 refine comments. 2015-12-10 18:02:23 +08:00
winlin
5ac8177ce6 fix bugs 2015-12-08 18:32:37 +08:00
winlin
b2ae1acaa4 copy http-parser-2.1 into srs http stack. 2015-12-07 11:35:05 +08:00
winlin
17bb31cab1 fix the config bug. 2015-12-04 15:22:13 +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
97f5bb8b99 merge from srs2 2015-11-05 14:48:25 +08:00
zhengfl
1dae8fc987 fix #511, fix the bug of thread stop invalid. 2015-11-05 13:52:59 +08:00
winlin
4b5eb5ea2d fix the parse rtmp url bug for ingest. 2015-11-02 13:37:44 +08:00
winlin
ec225b2108 quit child process when fork failed. 2015-11-02 11:46:33 +08:00
winlin
9d7826c681 quit child process when fork failed. 2015-11-02 11:44:22 +08:00
winlin
f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 2015-11-02 11:29:20 +08:00
winlin
f4f76cd196 for #515, use SrsAutoFreeA to free the array. 2015-11-02 11:26:37 +08:00
winlin
8cec06e898 merge srs2, use srs_freepa for array 2015-11-02 11:05:39 +08:00
winlin
2af7749771 for #515, use srs_freepa to free the array. 2015-11-02 11:02:27 +08:00
winlin
cef1ae5a8e fix the config bug. 2015-10-28 12:55:16 +08:00
winlin
9ebb77d711 fix the warnings 2015-10-28 11:58:49 +08:00
winlin
e9e202dbf1 merge srs2 2015-10-28 11:51:32 +08:00
winlin
ef00005ab4 for ExoPlayer, remove duration for live. 2015-10-28 11:51:03 +08:00
winlin
59f5c5d6a5 Merge branch '2.0release' into develop 2015-10-27 18:21:04 +08:00
winlin
3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 2015-10-27 18:20:57 +08:00
winlin
1d57e53910 merge from 2.0release 2015-10-27 17:45:14 +08:00
winlin
d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 2015-10-27 17:44:10 +08:00
winlin
3683f06e4d for #512, write audio frame by frame for video+audio hls. 2015-10-27 16:20:02 +08:00
winlin
b8f2ba4f0d complete kafka 2015-10-23 14:42:05 +08:00
winlin
cbe4252b4d refine code. 2015-10-23 14:42:04 +08:00
winlin
d2ca51ac50 notify kafka when client close 2015-10-23 14:42:04 +08:00
winlin
71451878c9 refine kafka, simplify code. 2015-10-23 14:42:04 +08:00
winlin
8e344f1c26 add producer api messages. 2015-10-23 14:42:04 +08:00
winlin
7a0aaf5900 kafka refine code 2015-10-23 14:42:04 +08:00
winlin
f9f5b56951 kakfa erase messages when wrote. 2015-10-23 14:42:04 +08:00
winlin
22fa9a0f1f kafka use temp transport to fetch metadata. 2015-10-23 14:42:04 +08:00
winlin
531b658f8e retry when metadata empty 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
7013993c7a kafka send the accept message. 2015-10-23 14:42:04 +08:00
winlin
de41c1c9d2 kafka refine comments. 2015-10-23 14:42:04 +08:00
winlin
31a77a83ed convert metadata to partitions 2015-10-23 14:42:04 +08:00
winlin
f0e39cc330 support show the summary of kafka metadata. 2015-10-23 14:42:04 +08:00
winlin
33a015329d add function to convert kafka array to vector 2015-10-23 14:42:03 +08:00
winlin
7106934c3a kafka producer use async interface to request metadata. 2015-10-23 14:42:03 +08:00
winlin
8974fe298b connect to kafka and send metadata request. 2015-10-23 14:42:03 +08:00
winlin
a9fdb630d9 refine code, replace all rtmp connect by simple rtmp client. 2015-10-23 14:42:02 +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
a9bb6061c3 use tcp client for raw connect. 2015-10-23 14:42:02 +08:00
winlin
20fcfb3eee fix bug, use system utility 2015-10-23 14:42:02 +08:00
winlin
69cc01b696 use system utilities 2015-10-23 14:42:02 +08:00
winlin
908365a61a use string for const char* 2015-10-23 14:42:02 +08:00
winlin
d9f991ed2f use system utility for string finds 2015-10-23 14:42:02 +08:00
winlin
29122b6e70 fix #502, transcoder support snapshot. 2015-10-20 14:52:34 +08:00
winlin
9eebb89432 Merge branch '2.0release' into develop 2015-10-20 10:17:54 +08:00
winlin
91e9fc7e5b fix typo of INVLIAD to INVALID 2015-10-20 10:17:48 +08:00
winlin
ed80d9d281 merge from srs2 2015-10-04 08:10:57 +08:00
winlin
0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 2015-10-04 08:09:39 +08:00
winlin
6587c5b2f1 merge from srs2 2015-10-01 13:22:51 +08:00
winlin
7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 2015-10-01 13:20:13 +08:00
winlin
d8f18aee37 use the right int type for port. 2015-09-24 18:33:07 +08:00
winlin
1c7d5f1852 Merge branch '2.0release' into develop 2015-09-24 17:55:33 +08:00
winlin
353e3260b8 remove duplicated code 2015-09-24 17:55:27 +08:00
winlin
9ead08725d use kernel utility int2str and float2str 2015-09-24 17:54:58 +08:00
winlin
6efd2dd27e add load balance round robin for brokers. 2015-09-24 17:20:04 +08:00
winlin
2a4ab8a923 add brokers to config 2015-09-24 14:53:22 +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
b5ccc35340 add kafka config 2015-09-22 15:10:43 +08:00
winlin
df6ac8842c rename rtmp utility to protocol utility 2015-09-22 09:11:07 +08:00
winlin
82ff05c1d4 rename rtmp io to protocol io 2015-09-22 09:07:07 +08:00
winlin
168625dce2 rename rtmp amf0 to protocol amf0. 2015-09-22 09:05:21 +08:00
winlin
d32632ee8a rename SrsFastBuffer to SrsFastStream 2015-09-22 09:01:47 +08:00
winlin
4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 2015-09-22 08:59:52 +08:00
winlin
0e52fc6d5b rename SrsStream to SrsBuffer 2015-09-22 08:57:31 +08:00
winlin
ca3577e11b rename temp to stream 2015-09-22 08:52:00 +08:00
winlin
a4f51564db rename kernel stream to buffer 2015-09-22 08:48:55 +08:00
winlin
ac2b03a3ed rename srs_kernel_buffer to temp 2015-09-22 08:42:54 +08:00
winlin
b471c6e61c refine code, use json integter rather than number. 2015-09-19 14:40:32 +08:00
winlin
c5cd58761c move the srs thread to st. 2015-09-19 13:46:55 +08:00
winlin
3042115385 refine json to_str to dumps. 2015-09-19 13:37:56 +08:00
winlin
b59d9ba6a1 support amf0 and json to convert with each other. 2015-09-19 13:31:57 +08:00
winlin
3f7e69b617 json objects support dumps to string. 2015-09-19 12:27:31 +08:00
winlin
225e742657 add args3 2015-09-17 14:03:25 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
winlin
7b2b11e932 async call worker fast execute tasks. 2015-09-17 11:57:17 +08:00
winlin
087f7740b7 fix the build failed bug 2015-09-17 11:41:23 +08:00
winlin
256459e1ec fix the utest bug 2015-09-17 11:37:35 +08:00
winlin
8a90e76637 fix #459, support dvr raw api. 3.0.4 2015-09-15 23:00:00 +08:00
winlin
2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 2015-09-15 15:58:57 +08:00
winlin
8f9cfcdcf4 fix #319, http raw api support update global and vhost. 3.0.4 2015-09-15 13:03:18 +08:00
winlin
e8a00de4a3 for #319, support enable or disable vhost. 2015-09-15 12:51:14 +08:00
winlin
631e76cd32 for #319, support update and delete the disabled vhost 2015-09-15 12:15:18 +08:00
winlin
a7c4b786cf merge from 2.0 2015-09-14 18:42:31 +08:00
winlin
511627abab fix #474, config to donot parse width/height from sps. 2.0.189 2015-09-14 18:36:44 +08:00
winlin
eb578b4a39 refine the thread, set to disposed when terminate normally 2015-09-14 17:17:38 +08:00
winlin
83a9ff9f5d for #474, refine the hls publish, donot fetch from source when publish 2015-09-14 15:49:25 +08:00
winlin
44bcb4045f for #474, decode the sequence header before hls. 2015-09-14 15:32:09 +08:00
winlin
07ef8160a3 clear the queue when edge republish. 2015-09-14 15:25:01 +08:00
winlin
704624c9ec clear the queue when edge republish. 2015-09-14 15:19:49 +08:00
winlin
8be3c875af donot release stream when busy 2015-09-14 15:17:59 +08:00
winlin
3da25f3aee when thread terminated normally, set the tid to NULL. 2015-09-14 15:11:49 +08:00
winlin
a994191ddc for #474, always release publish for source. 2015-09-14 15:10:34 +08:00
winlin
eb9aa47ab1 merge from 2.0 2015-09-14 13:48:27 +08:00
winlin
0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 2015-09-14 13:47:25 +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
adb74dc74e Merge branch '2.0release' into develop 2015-09-14 11:17:19 +08:00
winlin
f0fc093b19 fix the http zero content length bug. 2015-09-14 11:17:04 +08:00
winlin
01308ecc98 for #319, support initialize the parser to whether use jsonp 2015-09-12 22:22:33 +08:00
winlin
491ec11833 for #319, raw api support add new vhost 2015-09-12 21:55:53 +08:00
winlin
a88f321d8b for #319, merge from 2.0release 2015-09-09 23:41:11 +08:00
winlin
abd7ee227c support reload utc_time. 2.0.186 2015-09-09 23:37:07 +08:00
winlin
c4feb8f6ed for #319, raw api support update all globals. 2015-09-09 23:32:02 +08:00
winlin
6aafd072db for #319, raw api support update srs log tank, level and file. 2015-09-09 22:44:34 +08:00
winlin
8107e5f9a6 for #319, raw api support set the ff_log_dir 2015-09-09 21:46:29 +08:00
winlin
c8466c36bd for #319, raw api support update the global RTMP chunk_size. 2015-09-01 21:27:04 +08:00
winlin
2bdd974227 for #319, reorder the ingesters. 2015-09-01 18:41:30 +08:00
winlin
342483bf04 for #319, when reload the listen, restart all ingesters. 2015-09-01 18:39:14 +08:00
winlin
310b5a14cb for #319, support minimal query api 2015-09-01 13:33:49 +08:00
winlin
06c7ae62ee for #319, refine the error code for RAW APi. 2015-09-01 12:27:53 +08:00
winlin
11c409688b for #319, http raw api support query. 3.0.3 2015-08-31 23:34:03 +08:00
winlin
8a2709dd2c for #319, do not apply when config not changed. 2015-08-31 12:06:22 +08:00
winlin
a62c82bd46 for #319, api raw update global.listen 2015-08-30 23:42:21 +08:00
winlin
364460f2ab for #319, support raw update global.listen 2015-08-30 23:18:14 +08:00
winlin
f8d8c3ace4 use function to dumps the engine. 2015-08-30 23:08:27 +08:00
winlin
01878e5a9c for #319, query vhost detail. 2015-08-30 22:23:47 +08:00
winlin
b1b76a4a80 for #319, allow multiple ingest and transcode. 2015-08-30 14:52:12 +08:00
winlin
873aa7bf9f for #319, refine the query global, only show true options. 2015-08-30 12:16:26 +08:00
winlin
dc11013c01 for #319, render the detail of vhost 2015-08-30 10:17:39 +08:00
winlin
2b4fa2d73e for #319, move the edge configs to cluster. 2015-08-30 08:30:04 +08:00
winlin
6bd05f9cfc for #319, refine the config forward. 2015-08-30 07:59:25 +08:00
winlin
bc24c0407b for #319, move smi and rsh to play 2015-08-30 07:36:06 +08:00
winlin
f7c893d907 for #319, move gop_cache and queue_length to play 2015-08-30 07:26:55 +08:00
winlin
06ae74dd3f for #319, move mw_latency to play. 2015-08-30 07:05:57 +08:00
winlin
4eb1874955 for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency. 2015-08-30 06:49:20 +08:00
winlin
9c4340f789 for #319, move atc and atc_auto to play 2015-08-29 23:36:03 +08:00
winlin
d6b0aa3a5b for #319, move time_jitter and mix_correct to play 2015-08-29 23:18:25 +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
winlin
a79e19599c for #319, support query the vhost info. 2015-08-29 16:12:30 +08:00
winlin
bdfd0ae09e for #319, dumps the http static, remux and globals. 2015-08-28 23:51:23 +08:00
winlin
1b1a2a1e63 fix #471, api response the width and height. 3.0.2 2015-08-28 18:00:24 +08:00
winlin
04bea781ca use amf0 encode for json encode. 2015-08-28 15:11:11 +08:00
winlin
e0219bd7aa refine code, merge json encode to amf0. 2015-08-28 14:39:29 +08:00
winlin
66ffcad635 for #319, always allow raw query. 2015-08-28 13:17:46 +08:00
winlin
f167616379 rename the config_query to query 2015-08-28 13:01:04 +08:00
winlin
75ca759e5d fix the reload http api bug. 2015-08-28 12:38:09 +08:00
winlin
2dcf3bc606 for #319, support rpc raw api to query the HTTP RAW API configs. 2015-08-28 12:28:18 +08:00
winlin
af0a76e51a fix the build failed bug on centos 2015-08-28 00:03:10 +08:00
winlin
e03d8a0115 fix the build failed bug on centos 2015-08-28 00:01:19 +08:00
winlin
555a3fbf5f for #319, support render HTTP RAW API in console. 2015-08-27 23:55:59 +08:00
winlin
8e635d9749 for #319, support HTTP RAW API config_query global data. 2015-08-27 22:46:56 +08:00
winlin
d921d59e57 for #319, support HTTP RAW API reload. 2015-08-27 18:11:50 +08:00
winlin
f74dc62046 fix the process restart bug. 2015-08-26 23:20:19 +08:00
winlin
e39e006d63 fix the exec clear bug. 2015-08-26 23:11:42 +08:00
winlin
c081a5370b Merge branch '2.0release' into develop 2015-08-26 23:03:01 +08:00
winlin
fe4cdceb15 always wait for process to terminated when SIGKILL. 2015-08-26 23:02:54 +08:00
winlin
1e0481a2d0 for #319, support signal to persistence config 2015-08-26 21:49:05 +08:00
winlin
980e3921e4 for #319, add signal to write config to file. 2015-08-26 21:11:28 +08:00
winlin
cdde293785 add todo for reload the source components. 2015-08-25 22:59:17 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
7de181004f Merge branch '2.0release' into develop 2015-08-25 11:55:44 +08:00
lovecat
9c2beffe8f statistic connection bytes before remove client. 2015-08-25 11:46:12 +08:00
winlin
039af7243c for #367, refine the comments for process. 2015-08-24 22:26:19 +08:00
winlin
6fe88d088c for #367, process support redirect stdout and stderr. 2015-08-24 22:19:57 +08:00
winlin
0e1861b084 for #367: extract the process from ffmpeg to exec programs. 2015-08-24 21:51:05 +08:00
winlin
e43d4e46b4 support JSONP DELTE/POST/PUT 2015-08-23 00:01:03 +08:00
winlin
baa70d4ddd add nb_streams for vhost 2015-08-22 22:51:59 +08:00
winlin
6e5143449e HTTP API support JSONP by specifies the query string callback=xxx. 2015-08-22 18:18:18 +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
b37797b13a for #442, add publish connection in stream.publish api 2015-08-22 13:03:10 +08:00
winlin
529803ed04 refine code for api. 2015-08-22 12:38:14 +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
20a8818a8e refine the error response. 2015-08-21 17:15:32 +08:00
winlin
2edcf1d4ff support query specified vhost 2015-08-21 17:00:52 +08:00
winlin
66a26bdce8 move json from app to protocol 2015-08-21 16:20:19 +08:00
winlin
a7589b9ad3 refine code for api, add clients and parse_rest_id 2015-08-21 16:12:48 +08:00
winlin
ab4620870d refine the stat api, support query specified stream. 2015-08-21 15:51:20 +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
c31a546eec support vhost for http flv. 2015-08-21 12:08:25 +08:00
winlin
ec87dd9cd6 refine code for srs rtmp dump 2015-08-19 19:02:33 +08:00
winlin
785a5907a8 set the default get_publish_normal_timeout to 5s 2015-08-19 16:27:22 +08:00
winlin
0bbfc5526a set the default get_publish_normal_timeout to 5s 2015-08-19 16:22:52 +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
de48b477ae drop the metadata when drop sequence header 2015-08-19 14:23:12 +08:00
winlin
f691dddc1a drop metadata when drop sequence header. support PCUC 0x1a 2015-08-19 14:20:31 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +08:00
winlin
01be68fe58 refine code, donot remove the detail when hls disabled. 2015-08-17 16:34:11 +08:00
winlin
afd05f71c3 refine code, use size cache for performance issue. 2015-08-14 15:51:02 +08:00
winlin
3b0b2e0b85 fix the bug to support dump packets with count. 2015-08-14 15:47:29 +08:00
winlin
a0a89a8ca6 use reduce_sequence_header for stream control. 2015-08-14 14:35:41 +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
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
winlin
3a6854fc2e refine code. 2015-08-11 15:36:14 +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
fbcc07d85a fix the typo of AUTIO. 2015-08-05 22:54:29 +08:00
winlin
65b2ed7ac5 refine code, move the order of functions. 2015-08-03 14:11:21 +08:00
winlin
71f2726b31 fix bug of merge code for reload http_remux for vhost 2015-08-03 13:44:24 +08:00
winlin
ccf6a4de1e remove the on_reload_vhost_http_remux_updated for vhost added. 2015-08-03 13:35:25 +08:00
winlin
bc033d5de3 refine code, move default to config function. 2015-07-23 14:20:46 +08:00
winlin
c85f92c229 fix #169, support default values for transcode. 2.0.180 2015-07-21 12:07:26 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
3b65af9bd2 fix the hstrs bug on edge. 2015-07-17 14:05:34 +08:00
winlin
99db2888e7 refine code for hstrs. 2015-07-16 18:42:27 +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
winlin
d995726fee fix the http flv mount bug. 2015-07-14 11:31:17 +08:00
winlin
9743e02541 refine the mix correct algorithm. 2015-07-14 11:28:00 +08:00
winlin
6fe36afcfa when hls timestamp jump, reset it. 2015-07-14 11:00:58 +08:00
winlin
99574bb77b ignore when no segments for there must no m3u8 2015-07-14 10:43:21 +08:00
winlin
40c264a316 always reset the max target duration for hls. 2015-07-14 10:31:42 +08:00
winlin
54bb42483b change time jitter to off for hls and forward. 2015-07-14 10:03:15 +08:00
winlin
b3b6df365e fix the stream caster build failed bug. 2015-07-10 13:50:35 +08:00
winlin
50feaacdde refine code for http remux reload. 2015-07-10 13:45:21 +08:00
winlin
0aa053433c fix #132: build failed when enable the info or verbose log. 2015-07-10 11:50:35 +08:00
zhengfl
2567a89599 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-07-09 15:49:23 +08:00
zhengfl
2263f2a610 refine code: 
优化 判断重复推流 及 推流流程
 2015-07-09 15:45:55 +08:00
winlin
404bc565a1 refine the pithy print mechenism. 2015-07-09 15:39:02 +08:00
winlin
bed540bac9 fix #439: http remux support reload 2015-07-09 13:52:41 +08:00
winlin
da47f1648b refine file mode to 644 2015-07-09 13:44:05 +08:00
zhengfl
f6a2cea716 refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。 2015-07-09 10:08:17 +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
zhengfl
f9257b89e7 fix #438 
问题：edge模式，推流时异常断开。
    解决方法：增加edge模式推流检测。
 2015-07-08 15:43:09 +08:00
zhengfl
120033e0a2 fix #437 
edge模式，重新从源站拉流时，导致forwarders异常
 2015-07-08 11:47:34 +08:00
winlin
f39faa78bb refine config default values of srs, prepare to move each default values to functions. 2015-07-06 11:11:59 +08:00
zhengfl
52110990c1 修正编码风格问题 2015-06-18 16:21:00 +08:00
zhengfl
b4ff9cfba1 fix bug 
某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。
 2015-06-17 23:09:17 +08:00
winlin
312366bba2 add srs_recvi_bytes for intranet bytes stat. 2015-06-19 14:38:05 +08:00
winlin
750399ace4 fix network device compare bug. 2015-06-19 13:51:40 +08:00
winlin
8cd68a1eb3 ignore any intranet bandwidth. 2015-06-19 11:59:41 +08:00
winlin
8102a22606 add comments for async call. 2015-06-17 16:42:43 +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
baa892a762 merge srs_app_st_socket to srs_app_st. 2015-06-14 08:43:38 +08:00
winlin
17c276113e refine the hls dispose, when not cycle always dispose it. 2015-06-13 17:23:38 +08:00
winlin
d103557a8b merge the rtmp sdk to stack. 2015-06-13 16:04:59 +08:00
winlin
0d66e92ab5 refine code, support configure to enable --memory-watch 2015-06-13 15:45:25 +08:00
winlin
0d6a574216 fix the hls_dispose bug, ignore for 0. 2015-06-12 16:08:47 +08:00
winlin
56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 2015-06-10 15:38:13 +08:00
winlin
6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 2015-06-10 13:53:13 +08:00
winlin
8e8c8108fc refine the time jitter code. 2015-06-09 21:04:30 +08:00
winlin
1f1776a0d8 fix the export project bug. wakeup connection when dispose server. 2015-06-09 14:38:05 +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
863dddde09 fix typo of code. 2015-06-08 17:43:28 +08:00
winlin
19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 2015-06-08 17:28:39 +08:00
winlin
574cf6a094 use libfdk_aac for srs2. 2015-06-08 15:02:19 +08:00
winlin
00a25ee5c5 cleanup connections when terminate server. 2015-06-08 14:08:12 +08:00
winlin
d7e5df2578 cleanup connections when terminate server. 2015-06-08 14:03:16 +08:00
winlin
573495a19f refine the memory watcher. 2015-06-08 09:47:45 +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
beb0431746 detect the monotonically increase and warn to use mix_correct 2015-06-06 22:04:24 +08:00
winlin
2d9f258eaf refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio. 2015-06-06 21:54:43 +08:00
winlin
ec24533955 use smaller value for publish timeout. 2015-06-06 21:42:01 +08:00
winlin
a6dd8fb3a1 fix #421, when mix correct on, must check the type of dequeue msg. 2015-06-06 21:31:39 +08:00
winlin
a1dd734318 fix #421, drop video for unkown RTMP header. 2015-06-06 21:23:57 +08:00
winlin
679b4317d8 fix the build failed bug. 2015-06-06 20:34:49 +08:00
winlin
0fbfad4172 fix gop cache, drop video only when video and not h.264 2015-06-06 20:23:18 +08:00
winlin
2a1db36750 refine the pithy print of ingesters. 2015-06-06 18:57:41 +08:00
winlin
e4c27a51b8 fix the hls bug 2015-06-05 21:34:28 +08:00
winlin
4400b12515 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-06-05 20:38:51 +08:00
winlin
26b76c0e4c fix #420, remove ts for hls ram mode. 2015-06-05 20:38:01 +08:00
winlin
af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 2015-06-03 10:13:46 +08:00
winlin
4e42b9c628 copy the request for hls. 2015-06-02 12:56:04 +08:00
winlin
679583dad6 refine comments of ffmpeg. 2015-06-01 10:14:46 +08:00
winlin
96f8f1f502 fix build bug. 2015-05-30 21:20:07 +08:00
winlin
0a87b567f6 fix the build failed bug. 2015-05-30 21:14:10 +08:00
winlin
223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 2015-05-30 14:41:09 +08:00
winlin
4a80a5a71e for #209, support cleanup when srs stop. 2015-05-30 13:48:29 +08:00
winlin
860d68e6e7 for #374, use fast stop for ingesters to stop many FFMPEG. 2015-05-30 11:25:33 +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
db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 2015-05-30 09:32:03 +08:00
winlin
5caafadd45 fix #409: support pure video hls. 2.0.172. 2015-05-29 21:43:17 +08:00
winlin
af4eec90ac for srs-dolphin, support HTTP and RTMP. 2015-05-28 21:02:43 +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
60775485c4 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-05-27 23:44:07 +08:00
winlin
385ee893f5 update readme 2015-05-27 23:43:44 +08:00
zhengfl
4864e796d6 fix #408:Queue丢视频时，不应该丢弃SequenceHeader 2015-05-27 16:16:15 +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
c1b9541b5c support disable all 2015-05-27 07:22:44 +08:00
winlin
2e1ca3c751 fix the build failed bug. 2015-05-25 08:17:11 +08:00
winlin
d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 2015-05-25 01:02:06 +08:00
winlin
4df19ba99a for #405, improve the http flv to 3k. 2.0.170 2015-05-24 23:29:17 +08:00
winlin
960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 2015-05-24 22:43:02 +08:00
winlin
fc995473eb for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 2015-05-24 21:17:00 +08:00
winlin
069ee0afc3 fix #404, register handler then start http thread. 2.0.167. 2015-05-24 15:19:09 +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
5908096fc3 refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:04:28 +08:00
winlin
68d835021e refine code, move the kbps to protocol 2015-05-23 09:58:00 +08:00
winlin
cfc0877ec9 refine the thread, add all callback. 2015-05-23 09:49:15 +08:00
winlin
e5f449ce36 refine the thread to three category. 2015-05-23 09:20:16 +08:00
winlin
2f0ef87d6d refine code, rename the sync call to common class. 2015-05-23 07:57:45 +08:00
winlin
0bb90145ba fix #391, copy request for async call. 2015-05-23 07:46:45 +08:00
winlin
6bfb743aa0 remove the unused app http file 2015-05-22 22:38:15 +08:00
winlin
f0ae66a081 merge the app http to conn. 2015-05-22 22:34:03 +08:00
winlin
ce1bb6c605 refine code, extrat the ISrsHttpMessage. 2015-05-22 22:24:05 +08:00
winlin
e2955da78f refine code, extract the http protocol sdk to module. 2015-05-22 20:47:27 +08:00
winlin
d645411392 refine the kbps comments, add one usage. 2015-05-22 20:31:07 +08:00
winlin
6ca46e84bc fix #397, the USER_HZ maybe not 100. 2.0.165 2015-05-22 17:16:33 +08:00
winlin
c17a1198cb fix #399, disconnect when not keep alive. 2015-05-22 16:27:48 +08:00
winlin
46a81372e7 fix #398, set recv timeout for http connection. 2015-05-22 13:57:04 +08:00
winlin
6f8c076b30 add comments for srs thread, add never quit thread. 2015-05-22 12:10:06 +08:00
winlin
948d200ce1 fix #400, parse when got entire http header, by feilong. 2.0.164. 2015-05-22 12:00:48 +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
c617d2aaa5 support push flv stream over HTTP POST to SRS. 2015-05-10 10:35:35 +08:00
winlin
77ee2400df fix the unicode to ascii 2015-05-09 23:12:12 +08:00
winlin
7fc1cda392 add stream status to api. 2015-05-08 16:45:25 +08:00
winlin
e221d002a2 fix the flv caster bug, when nread is 0, disconnect it. 2015-05-05 07:37:12 +08:00
winlin
ad32048c1c fix the http flv stream caster. 2015-05-04 21:55:19 +08:00
winlin
cba6675560 refine the http message, set the connection if required. 2015-05-04 19:06:38 +08:00
winlin
ba6c3132e3 refine code, use decoder to parse flv stream 2015-05-04 18:28:41 +08:00
winlin
ea1e015a4e fix the http read chunked encoding bug. 2015-05-04 18:11:52 +08:00
winlin
a95fd6d140 read the http flv stream. 2015-05-03 23:57:22 +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
tufang14
b6d650cdb4 m3u8 mount bug 2015-04-25 14:59:12 +08:00
winlin
e50996270e fix the config parse error. 2015-04-23 16:25:49 +08:00
winlin
0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url. 2015-04-23 12:05:24 +08:00
winlin
4e5ddb51e7 refine the overflow algorithm, prevent smaller piece. 2015-04-21 16:21:22 +08:00
winlin
1d973e2178 refine the overflow algorithm, prevent smaller piece. 2015-04-21 16:18:37 +08:00
winlin
d19dfa528e abs overflow also plus the deviation, for pure audio hls. 2015-04-21 14:35:28 +08:00
winlin
2239e9f1fd support ingest hls live stream to RTMP. 2015-04-20 16:25:48 +08:00
winlin
623e37e22a Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release 2015-04-20 11:28:20 +08:00
winlin
6e5c587e0a support aac_adtstoasc filter to copy mode. 2015-04-20 11:24:12 +08:00
J
aca02b6d6b for #384,refine code for empty body request. 2015-04-18 14:51:33 +08:00
J
8adbdc39e3 for #384,refine code for empty body request. 2015-04-18 14:42:16 +08:00
J
a71db53661 for #384,refine code for empty body request. 2015-04-18 14:33:57 +08:00
J
56f75cbbe9 fix #384 2015-04-17 10:12:52 +08:00
winlin
22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 2015-04-15 17:12:22 +08:00
winlin
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +08:00
winlin
542aab4557 fix the hls notify bug, pass the query to get path. 2015-04-14 17:53:53 +08:00
winlin
02a2cb7e1a for #381, refine the hls notify, report one by one. 2015-04-14 11:36:58 +08:00
winlin
a4216cc582 add todo for ts parse. 2015-04-13 16:40:31 +08:00
winlin
40eab7fc88 for #381, refine the deviation for hls. 2015-04-13 11:45:08 +08:00
winlin
dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 2015-04-13 10:32:32 +08:00
winlin
e5b8e0da01 fix async call and hls_nb_notify bug. 2015-04-10 15:00:07 +08:00
winlin
5d37e47783 support config the hls_nb_notify. 2015-04-10 14:44:18 +08:00
winlin
0a7cea063c refine http read, support c style api 2015-04-10 14:25:14 +08:00
winlin
5c00ce8a96 refine hls on_hls_notify, read a little of ts. 2015-04-10 14:17:49 +08:00
winlin
1f93fb3399 refine hls notify, support timeout. 2015-04-10 13:45:21 +08:00
winlin
310157ab77 refine the hls_on_notify, calc the spent time in ms. 2015-04-10 12:30:22 +08:00
winlin
e6d6bdfe57 refine the hls_on_notify, only read a chunk. 2015-04-10 12:27:30 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
7dbc95e085 refine the hls deviation for floor algorithm. 2015-04-10 10:21:30 +08:00
winlin
546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 2015-04-08 16:52:43 +08:00
winlin
29ac4c724b change default log tank to file. 2015-04-07 17:55:45 +08:00
winlin
e56d7add44 fix bug of config to parse the default value. 2.0.158 2015-04-07 17:42:41 +08:00
winlin
aef97db77a refine the config code. 2015-04-07 17:04:04 +08:00
winlin
e7fd309cb0 refine hls info, show the deviation in seconds and pieces. 2015-04-07 10:30:45 +08:00
winlin
bd7db5aed6 only ignore the aud message. 2015-04-04 16:05:11 +08:00
winlin
61d5b78ae5 refine the h264 parser, one ts message should parsed to one rtmp/flv message. 2015-04-04 15:53:36 +08:00
winlin
4329366c08 for #304, do not add deviation for absolute overflow. 2015-04-04 15:00:24 +08:00
winlin
77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 2015-04-04 13:30:13 +08:00
winlin
7e1749e029 refine the comments. 2015-04-03 17:20:41 +08:00
winlin
e458305f81 add utc time format. 2015-04-03 16:42:32 +08:00
winlin
56cd373015 support hls callback with duration. 2015-04-03 14:24:47 +08:00
winlin
64b065e450 for hls callback, add duration of ts. 2015-04-03 13:46:44 +08:00
winlin
c4466a8c0c fix crash bug for hls cleanup. 2015-04-03 12:43:40 +08:00
winlin
eb54ec25c9 fix compile errors. 2015-04-03 11:30:59 +08:00
winlin
17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 2015-04-03 10:56:56 +08:00
winlin
4d98cbb965 add hls config in api. 2015-04-02 15:05:09 +08:00
winlin
8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 2015-04-02 11:52:03 +08:00
winlin
717d088376 support server cycle handler. 2.0.153. 2015-03-31 18:06:55 +08:00
winlin
3b4bd194b6 refine http hooks, donot pass the known variable. 2015-03-31 17:52:49 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
97442c56b6 enhance hls in floor mode. 2015-03-31 17:03:14 +08:00
winlin
76c1957260 enhance hls, increase piece one by one. 2015-03-31 16:58:20 +08:00
winlin
b9c21b1e8f enhanced hls, warning when ts dup or jmp. 2015-03-31 15:54:05 +08:00
winlin
9be7fbba7d user smaller deviation to avoid dup ts. 2015-03-31 15:42:21 +08:00
winlin
f6e135943f enhanced hls, support deviation for duration. 2.0.151. 2015-03-31 15:39:47 +08:00
winlin
cd682ae4be update donations. fix hls path bug. 2015-03-30 14:08:17 +08:00
winlin
692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 2015-03-30 12:44:04 +08:00
winlin
01ee456649 fix the ts parse bug, should never complete message when PES packet length is 0. 2015-03-27 15:27:10 +08:00
tufang14
0faaa61be7 seg fault 
seg fault
 2015-03-26 19:57:51 +08:00
winlin
a5c5befad1 for parse video ts. 2015-03-26 19:52:21 +08:00
winlin
1401f2e0ab ignore when sps/pps consumed all frame. 2015-03-26 11:07:45 +08:00
winlin
b319e9ff9c ignore when sps/pps consumed all frame. 2015-03-26 10:31:13 +08:00
winlin
e818f36316 fix #360, fix build bug for centos7. 2015-03-25 20:38:51 +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
fcab17741c fix #222, the dvr path rule changed. 2015-03-23 22:06:18 +08:00
winlin
f69fa7273b fix #302, remove the thread unsafe code, no static. 2015-03-23 21:19:04 +08:00
winlin
2f2aaf5ee4 for #155, refine code, donot check network devices for osx. 2015-03-21 15:38:22 +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
7065db192c for #354, remove the double underscore of macro. 2015-03-21 10:42:55 +08:00
winlin
c6817cc422 for #354, remove the double underscore of macro. 2015-03-21 10:25:03 +08:00
winlin
a4709a6439 for #151, add comments for the audio overflow ratio. 2015-03-19 21:08:42 +08:00
winlin
0319e85f99 support config the audio overflow ratio. 2015-03-19 17:24:27 +08:00
tufang14
e319da3329 小瑕疵 
小瑕疵
 2015-03-19 10:16:58 +08:00
winlin
f564c903ac support got uptime and loadavg for osx. 2.0.145 2015-03-18 22:30:17 +08:00
winlin
6855ab4c52 Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop 2015-03-17 23:46:09 +08:00
winlin
cf3becbc17 for #155, osx(darwin) enable http api and stat, rusage is ok. 2015-03-17 22:35:47 +08:00
tufang14
1cc3384a19 seg fault 
seg fault
 2015-03-17 17:45:20 +08:00
winlin
8a4312f4ec fix bug, use size_t for string::npos 2015-03-17 15:36:12 +08:00
winlin
2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 2015-03-17 07:57:58 +08:00
wenjie.zhao
65f404fb42 for #340, refine ts prefix code. 2015-03-13 02:01:24 +08:00
wenjie.zhao
5969f72354 for #340, refine ts prefix code. 2015-03-13 01:32:51 +08:00
wenjie.zhao
10da182853 add hls prefix of uri supported 2015-03-13 00:22:55 +08:00
wenjie.zhao
efe3050d7a fix hls muxer Segmentation fault. 2015-03-12 23:50:21 +08:00
wenjie.zhao
73f13dfc42 fix hls muxer Segmentation fault. 2015-03-12 23:39:44 +08:00
winlin
c92d40e00b for #334, refine code, use kbps instead skt of rtmp connection. 2015-03-16 15:40:43 +08:00
Nimrod A. Abing (on kohima)
a95bd7d30e Modified on_close webhook. 
Pass the send_bytes and recv_bytes count to the web hook.
 2015-03-16 15:39:49 +08:00
Nimrod A. Abing (on kohima)
bc93147426 for #308, disable st examples. for #334, refine the st init and event select. 2015-03-16 15:35:01 +08:00
winlin
8ee0826e9a fix build failed bug. 2015-03-16 10:24:19 +08:00
winlin
e6058c1560 update donation 2015-03-14 20:25:21 +08:00
winlin
320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 2015-03-14 20:07:56 +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
995b130090 for #324, refine code for hstrs, support hijack handler. 2015-03-14 14:55:45 +08:00
winlin
5c6ef6ded6 fix warning for xcode. 2015-03-14 13:09:34 +08:00
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
winlin
a15ce1147f for #155, fix all warnings for mac. 2015-03-13 12:53:01 +08:00
wenjie.zhao
643f18abe4 add hds reload supported.#328 2015-03-12 22:38:11 +08:00
winlin
984145de72 for #328, add todo for hds, check whether disabled, support reload. 2015-03-12 11:52:35 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
da56e4fbb9 for #328, fix hds compile error on mac. 2015-03-12 07:26:30 +08:00
wenjie.zhao
07d8f060eb refine annotation 2015-03-11 14:36:28 +08:00
wenjie.zhao
570c0d66bd fix path issue. 2015-03-11 14:34:00 +08:00
wenjie.zhao
e57bda8908 Merge code. 
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
 2015-03-11 14:18:09 +08:00
winlin
a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 2015-03-11 15:54:31 +08:00
winlin
1ad0c847ce fix http parse bug 2015-03-11 14:55:46 +08:00
winlin
f247ac9daf fix the http parse bug. 2015-03-11 14:48:51 +08:00
wenjie.zhao
d4198ee8ba add hds supported. 2015-03-11 13:34:58 +08:00
winlin
f9767c91b5 fix configure bug, refine code for stream caster. 2015-03-10 18:07:43 +08:00
winlin
5c3c38684b fix the bug of flv stream, metadata type should be 18 2015-03-10 17:04:02 +08:00
winlin
db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 2015-03-10 12:50:27 +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
2e9f2753c9 for #316, add stream codec info. 2.0.135 2015-03-08 18:33:35 +08:00
winlin
885b9af122 for #310, refine code to support he/hev2, use aac object. 2015-03-08 17:56:49 +08:00
winlin
d3e2838fc6 for #310, refine the aac profile for adts and aac object for RTMP sequence header. 2015-03-08 17:33:52 +08:00
winlin
04f3f2a8f8 for #316, add codec info to stream. 2015-03-08 15:33:08 +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
f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 2015-03-06 13:37:57 +08:00
winlin
1277968d4a refine http client, use initialize to set host and port. 2015-03-06 12:07:12 +08:00
winlin
2bcb4f811c refine http. 2015-03-06 11:56:28 +08:00
winlin
964e4be9d4 refine http request post. 2.0.132. 2015-03-06 11:51:20 +08:00
winlin
3982ec1d87 refine http request parse. 2.0.132. 2015-03-06 11:36:26 +08:00
winlin
4325809daf refine http 2015-03-05 21:45:01 +08:00
winlin
6fccfa061d refine the http request code. 2015-03-05 10:36:40 +08:00
winlin
025b707330 refine the http request reader. 2015-03-04 18:20:15 +08:00
winlin
3e394a5f06 for #320, set socket send buffer to smaller macro. 2.0.131 2015-03-04 16:52:43 +08:00
winlin
04dc60ebe1 refine http for srs, rename SrsGoHttp to SrsHttp. 2015-03-04 13:09:35 +08:00
winlin
a47dbf7a92 for #320, refine code. 2015-03-03 17:28:07 +08:00
winlin
34d6a2ece5 for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129 2015-03-03 17:22:44 +08:00
winlin
fb3fced8d0 for #179, revert dvr http api. 2.0.128. 2015-03-01 17:57:28 +08:00
winlin
8ed256b7e9 for #179, wait keyframe for dvr. 2.0.127 2015-02-27 21:11:29 +08:00
winlin
0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 2015-02-27 20:39:36 +08:00
winlin
b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 2015-02-25 09:20:11 +08:00
winlin
1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 2015-02-24 18:39:31 +08:00
winlin
a3648063d5 fix #179, support dvr http api. 2.0.123. 2015-02-24 17:29:30 +08:00
winlin
d650118988 fix #179, dvr support api to start or stop. 2.0.123 2015-02-23 19:23:32 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
849e59b05d for #179, support http api to start dvr. 2015-02-21 23:09:21 +08:00
winlin
c67a4fdf97 for #179, enable http api crossdomain for dvr api. 2015-02-21 21:17:59 +08:00
winlin
1445086451 for #179, update the metadata of flv dvr file. 2015-02-21 19:14:05 +08:00
winlin
7077b74d03 for #179, add dvr plan append. 2015-02-21 16:52:37 +08:00
winlin
95b4baee7c for #179, refine dvr code to more simple. 2015-02-21 16:25:04 +08:00
winlin
3d225e1bc7 refine dvr, donot append the flv header. 2015-02-19 20:08:56 +08:00
winlin
a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 2015-02-19 19:50:10 +08:00
winlin
1102c7a58f refine pithy print to more easyer to use 2.0.121. 2015-02-19 18:56:21 +08:00
winlin
9d233db27e fix #133, support push rtsp to srs. 2.0.120. 2015-02-18 22:28:39 +08:00
winlin
0cc693a3b8 for #133, decode the h264 NALU from rtp. 2015-02-18 11:49:42 +08:00
winlin
6a64164985 for #133, show more info about rtp. 2015-02-18 07:27:11 +08:00
winlin
45c0b12958 for #133, finish rtsp sdp, start rtp. 2015-02-17 22:20:47 +08:00
winlin
f14af45413 for #133, alloc and free rtp port. 2015-02-17 21:10:06 +08:00
winlin
d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119. 2015-02-17 21:03:39 +08:00
winlin
ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. 2015-02-17 21:01:44 +08:00
winlin
40fbfd8560 for #133, rtsp extract tcp/udp listener. 2015-02-17 16:28:28 +08:00
winlin
4807f7850d for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64. 2015-02-17 14:16:02 +08:00
winlin
604f4cc57b for #133, support the rtsp options request and response. 2015-02-16 22:15:59 +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
78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 2015-02-15 18:11:24 +08:00
winlin
922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 2015-02-15 17:43:35 +08:00
winlin
3c813847bd rewrite the ts remux of hls. 2.0.117 2015-02-15 16:37:28 +08:00
winlin
e88c1e32ee always increasing target duration, for #304 2015-02-14 16:30:04 +08:00
winlin
25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 2015-02-12 13:34:59 +08:00
winlin
381e88d698 add release code. ZhouGuowen for SRS2.0 2015-02-11 08:52:52 +08:00
winlin
b982b27f6f add dev code for each release. HuKaiqun for SRS1.0 2015-02-11 08:48:22 +08:00
winlin
66931a8890 try to fix hls problem, print the video packets. 2015-02-10 19:58:24 +08:00
winlin
b8d4f68a69 try to refine hls, always flush video when reap segment. 2015-02-10 19:32:42 +08:00
winlin
5a3cd235fd refine hls, try to fix the hls ts corrupt problem. 2015-02-10 19:09:31 +08:00
winlin
d5e3ac4e7d for #310, the aac profile must be object plus one. 1.0.26 2015-02-10 17:15:50 +08:00
winlin
4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 2015-02-10 16:58:13 +08:00
winlin
f8bdd28de6 add comments for hls m3u8, target duration may should not changed. 2015-02-10 15:18:20 +08:00
winlin
693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char 2015-02-10 11:38:14 +08:00
winlin
81ea6d34ce add pdf of hls rfc, corrent the content type. 2015-02-10 10:58:27 +08:00
winlin
30b1759aa9 fix bug for memory hls. 2015-02-07 18:01:12 +08:00
winlin
dba983d124 for #136, update the config for ram hls. 2015-02-03 16:29:59 +08:00
winlin
a23191497f fix #136, support hls without io(in ram). 2.0.112 2015-02-03 16:01:07 +08:00
winlin
16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 2015-01-31 23:20:00 +08:00
winlin
4246be92c9 for #250, merge avc to codec. use queue to dequeue. 2015-01-31 21:16:42 +08:00
winlin
153a3a6c42 must user pithy print for mpegts print. 2015-01-31 19:49:35 +08:00
winlin
70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 2015-01-31 19:46:55 +08:00
winlin
66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 2015-01-31 12:21:04 +08:00
winlin
bce78fdab6 for #250, add comments for elemetary stream specifed by stream_id. 2015-01-31 11:46:51 +08:00
winlin
a384cc400a for #250, use udp packet handler. 2015-01-30 00:04:20 +08:00
winlin
35ab0ea627 for #250, use buffer to cache bytes, for system will split the udp packet. 2015-01-29 23:54:04 +08:00