1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

839 commits

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