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
4166 commits 14 branches 107 tags 377 MiB
Commit graph

1415 commits

Author SHA1 Message Date
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
winlin
1685cdd48e for #250, parse pes packet ok, ts message ok. 2015-01-29 22:58:02 +08:00
winlin
52b62918d9 for #250, decode the PAT of PSI ts packet. 2015-01-27 16:25:46 +08:00
winlin
51aecb8fde for #250, decode the ts packet header and adaptation field. 2015-01-27 14:28:59 +08:00
winlin
919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 2015-01-25 17:06:49 +08:00
winlin
2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 2015-01-25 16:42:22 +08:00
winlin
9cbc753e8e for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25 2015-01-25 13:30:45 +08:00
winlin
c9d270fbe0 refine code for #250, ts remux 2015-01-25 13:19:22 +08:00
winlin
1835957a2b for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24 2015-01-25 13:04:12 +08:00
winlin
ea85ad2e20 for #293, #250, move the ts codec to kernel ts. 2015-01-25 10:54:25 +08:00
winlin
d22e4e86d8 update projects for rtmp renamed to protocol 2015-01-24 16:59:36 +08:00
winlin
711b6ca277 for #250, basic stream caster framework. 2.0.104 2015-01-24 16:31:32 +08:00
winlin
6463d22a14 for #250, add mpegts over udp stream caster class. 2015-01-24 16:27:30 +08:00
winlin
7f02bfa3a4 for #250, the mpegts over udp stream caster framework. 2015-01-24 15:36:11 +08:00
winlin
52891b491a listen and serve stream caster mpegts over udp. 2015-01-24 14:52:52 +08:00
winlin
f9d1e1111a merge from feilong, consumer directly sleep when paused. 2015-01-23 17:07:17 +08:00
winlin
8ace73f30d for #151, use absolutely overflow to make jwplayer happy. 2.0.103 2015-01-23 15:29:14 +08:00
winlin
4f5cc9c403 for #151, use absolutely overflow to make jwplayer happy. 1.0.23 2015-01-23 15:14:29 +08:00
winlin
73cfdea332 for #299, srs http server support dash vod stream over mp4 range. 2.0.103 2015-01-23 13:45:59 +08:00
winlin
e0ee8de2fb for #299, srs http server support dash, flash request range in range or bytes. 2015-01-23 13:17:50 +08:00
winlin
a4ba40952a for #250, rename rtmp to protocol dir. 2015-01-23 10:07:20 +08:00
winlin
2a05783d5c for #293, support http ts stream. 2.0.101 2015-01-22 18:32:10 +08:00
winlin
dfe385d0c9 for #293, move the simple buffer to kernel. 2015-01-22 18:13:33 +08:00
winlin
0f59073400 refine code, rename the pts to dts although both ok for audio. 2015-01-22 17:35:07 +08:00
winlin
913f98b902 for bug #293, http ts stream, move the avc codec from app to kernel. 2015-01-22 17:08:38 +08:00
winlin
dc6299171f refine http stream code. 2015-01-22 15:05:38 +08:00
winlin
7d86c6d9e9 for bug #293, refine for fast cache of http stream. 2015-01-22 13:16:54 +08:00
winlin
25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 2015-01-22 09:34:33 +08:00
panda1986
797c1b0762 support all acodec. not forced to aac. 2015-01-20 14:06:27 +08:00
panda1986
e7d54c2ca9 Update srs_app_ffmpeg.cpp 
srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
 2015-01-20 13:52:31 +08:00
winlin
5f194bc87c merge from feilong, the crash for cosumer wait. 2015-01-19 14:05:59 +08:00
winlin
b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 2015-01-19 13:17:46 +08:00
winlin
29a8932b49 for bug #293, use http stream cache for android weixin to happy. 2015-01-19 12:56:05 +08:00
winlin
f9f2fcbb9c for #293, add http stream cache for audio mp3/aac stream. 2015-01-19 12:24:18 +08:00
winlin
d364a81d8f for #293, support http mp3 streaming 2015-01-19 10:13:43 +08:00
winlin
99bf397487 for bug #293, add mp3 id3 spec 2015-01-19 09:25:07 +08:00
winlin
b04888a35d for #293, #277, support http chunked encoding 2015-01-19 01:05:24 +08:00
winlin
3244c083c7 for bug #293, support http aac stream 2015-01-19 00:05:12 +08:00
winlin
7674524c31 for #239, empty the aac encoder 2015-01-18 22:56:01 +08:00
winlin
c0233542bf for #293, add aac encoder for http aac stream. 2015-01-18 22:51:07 +08:00
winlin
c0a7752718 for #293, add aac mime audio/x-aac 2015-01-18 21:17:41 +08:00
winlin
d546827b1c for #293, refine the mime of content type. 2015-01-18 21:04:52 +08:00
winlin
3b853a6dbd fix #293, support rtmp remux to http flv live stream. 2015-01-18 20:07:54 +08:00
winlin
eea31ef4f3 for #293, support rtmp remux to http flv live stream. 2015-01-18 19:49:03 +08:00
winlin
faaa9187f2 for #293, mount http flv stream when publish. 2015-01-18 18:50:15 +08:00
winlin
2698e6dbae for bug #293, http live streaming framework. 2015-01-18 18:39:53 +08:00
winlin
eff2d81016 for #293, add http flv stream 2015-01-18 18:00:40 +08:00
winlin
c4302b9b61 for bug #277, the http server subscribe the reload. 2015-01-18 17:17:07 +08:00
winlin
f1393ee43f for bug #277, use http not found when no file. 2015-01-18 17:02:05 +08:00
winlin
398b212bfa for bug #277, refine code, support default http vhost. 2015-01-18 17:01:39 +08:00
winlin
2742c0d3c2 for #277, support http vhost mount. 2015-01-18 16:38:26 +08:00
winlin
4513486266 refine http server, support mount dir for vhost. 2015-01-18 13:34:26 +08:00
winlin
bfff8413b6 refine code for #277, the copy first param is the dest. 2015-01-18 09:16:14 +08:00
winlin
c695a8fcbd refine code for #277, extract the flv vod stream. 2015-01-18 09:12:53 +08:00
winlin
e71bc0cbc5 for bug #277, refine the http server. 2015-01-17 23:44:21 +08:00
winlin
bbe96a4b31 for bug #277, support flv stream. 2015-01-17 23:19:30 +08:00
winlin
cbed2bbca4 fix #277, refine http server refer to go http-framework. 2.0.98 2015-01-17 23:00:40 +08:00
winlin
9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 2015-01-17 21:58:23 +08:00
winlin
cc22ca4890 hotfix #290, use iformat only for rtmp input. 2.0.95 2015-01-17 13:06:18 +08:00
winlin
4449a8d7b0 fix #290, use iformat only for rtmp input. 1.0.22 2015-01-17 13:04:52 +08:00
winlin
29be14dd37 merge from feilong, fix memory leak. 2015-01-17 11:16:13 +08:00
winlin
a4b61081cc merge from feilong, fix memory leak. 2015-01-15 11:26:30 +08:00
winlin
63309a0538 refine for bug #288, drop info frame without error. 2015-01-14 11:55:15 +08:00
winlin
b705ed0b90 for bug #288, refine the codec decode info frame failed. 1.0.21 2015-01-14 11:32:19 +08:00
winlin
964668dc73 merge from feilong, print format error. 2015-01-14 11:20:21 +08:00
winlin
b3225100e7 Merge pull request #282 from tufang14/develop 
add client num in statistic with traverse every client for #227
 2015-01-09 09:00:08 +08:00
qiang.li
310e49e7f3 add client num in statistic with traverse every client 2015-01-08 21:58:10 +08:00
winlin
982e9555bd merge from feilong, fix hls msg memory leak bug. 2015-01-08 17:48:45 +08:00
winlin
b466756931 merge from feilong for bug #281. 2015-01-08 17:44:08 +08:00
winlin
27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 2015-01-08 17:37:28 +08:00
winlin
ac584a4db2 Merge pull request #279 from tufang14/develop 
add client num for stream in statistic for #227
 2015-01-08 15:52:44 +08:00
qiang.li
46d716612c add client num for stream in statistic 2015-01-07 23:27:24 +08:00
winlin
0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 2015-01-07 15:37:44 +08:00
winlin
5661fc2676 refine dvr and rtmp dump, write the original data. 2015-01-07 15:01:58 +08:00
winlin
a402ca7120 refine code, the consumer always alive longer than queue recv thread. 2015-01-07 14:31:42 +08:00
qiang.li
08e9f6ef42 add play client num in statistic 2015-01-06 22:20:31 +08:00
winlin
f1efdcd000 refine code, use global virtual id to generate the id of vhost and stream. 2015-01-05 13:08:11 +08:00
winlin
ae63af6a4a refine code, implements the stat.: 2015-01-05 12:57:48 +08:00
winlin
97bea51499 refine the api, response the error code and data. 2015-01-05 12:49:00 +08:00
winlin
cc796a433a refine the statistic arch. 2015-01-05 12:40:38 +08:00
winlin
40ed2249e8 refine code to use the one coding style. 2015-01-05 12:20:46 +08:00
winlin
4bb17f0c81 replace the TAB with 4spaces 2015-01-05 12:14:02 +08:00
winlin
344ff24f66 add srs_app_statistic to upp project. 2015-01-05 12:12:21 +08:00
winlin
67adc8dc61 merge with security bug fix. 2015-01-05 12:09:15 +08:00
qiang.li
a4a93613d0 add statistic for stream 2015-01-04 22:47:12 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00
winlin
dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 2015-01-03 15:08:46 +08:00
winlin
247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 2015-01-03 15:07:12 +08:00
qiang.li
8d534d3470 get stream info use http api #227 2015-01-03 12:57:13 +08:00
winlin
f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 2015-01-03 12:54:54 +08:00
winlin
f89941254a refine code of security deny check 2015-01-02 16:06:18 +08:00
winlin
18b15b9099 refine comments of security deny check 2015-01-02 16:04:30 +08:00
winlin
75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 2015-01-02 16:02:13 +08:00
winlin
f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 2015-01-02 12:57:44 +08:00
winlin
e590537dca fix #207, trim the last 0 of log. 1.0.18 2015-01-02 12:56:15 +08:00
winlin
9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 2015-01-02 10:21:04 +08:00
winlin
8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 2015-01-02 09:22:49 +08:00
winlin
ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 2015-01-02 09:20:45 +08:00
winlin
c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 2015-01-01 11:47:18 +08:00
winlin
bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 2015-01-01 11:44:28 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
c0a6c3efa3 merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79 2014-12-29 09:07:50 +08:00
winlin
d9aca8ab82 hotfix #267, the forward dest ep should use server. 1.0.15 2014-12-29 09:05:56 +08:00
winlin
e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 2014-12-29 08:45:19 +08:00
winlin
513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 2014-12-29 08:38:29 +08:00
winlin
28eedfc177 merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75 2014-12-22 17:12:09 +08:00
winlin
2e43a63bf4 fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12 2014-12-22 17:10:51 +08:00
winlin
eef8034632 merge from 1.0release for bug #264. 2.0.74 2014-12-20 11:58:39 +08:00
winlin
7737042795 fix #264, remove the test code. 1.0.11 2014-12-20 11:56:16 +08:00
winlin
1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 2014-12-20 11:45:59 +08:00
winlin
db13c725a6 refine #259, rename the on_dispose to wakeup. 2.0.73 2014-12-19 09:19:47 +08:00
winlin
61a648f1d2 refine for #259, chmod -x files. 2014-12-19 09:07:31 +08:00
winlin
24815e4efe refine code for bug #239 2014-12-02 15:33:22 +08:00
tufang14
3d0d43c5dc token bug 
多级origin-edge模式，edge上功能不生效
 2014-12-02 14:38:54 +08:00
winlin
44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:06:26 +08:00
winlin
eba1740ed5 hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6. 2014-11-13 14:48:21 +08:00
winlin
fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:28:50 +08:00
winlin
6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:55:58 +08:00
winlin
bd158ec838 hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. 2014-10-19 11:33:56 +08:00
winlin
2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224 2014-10-09 10:41:24 +08:00
winlin
9789335d0b fix #151, always reap ts whatever audio or video packet. 0.9.223. 2014-10-08 15:15:57 +08:00
winlin
13b092704d refine code for bug #151, refine the source functions, add comments. 2014-10-08 14:28:09 +08:00
winlin
b830b995e6 fix bug #162, requires epoll. 0.9.222 2014-10-08 13:27:48 +08:00
zhengfl
2317f0e767 refine 2014-10-02 20:25:36 +08:00
zhengfl
bafdd83122 last 2014-10-02 19:51:01 +08:00
zhengfl
1e34d2a5cd client connection no disconnect 2014-10-02 19:45:04 +08:00
winlin
0d6b91039d fix #257, refine latency, send when got one+ msgs, 2.0.72 2014-12-16 09:26:22 +08:00
winlin
cbad7a3074 fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71 2014-12-13 12:48:49 +08:00
winlin
5529813fcb for bug #257, support NULL msg in msgs to send. 2014-12-13 11:22:40 +08:00
winlin
dac9f9c45c refine the log level. 2014-12-12 23:07:35 +08:00
winlin
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
68ade0a267 add log info for rtmp conn. change the mw_latency to 100 for realtime. 2014-12-10 18:06:09 +08:00
winlin
6bdd0af728 for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69 2014-12-10 09:18:49 +08:00
winlin
7150a99f41 for bug #251, remove the mic(message iovs cache), no use. 2014-12-10 09:15:38 +08:00
winlin
438ee30ac1 for bug #251, refine the queue fast vector. 2.0.66 2014-12-07 13:37:56 +08:00
winlin
5a2b8afead for bug #251, add queue fast vector. 2.0.66 2014-12-07 13:26:45 +08:00
winlin
8f72f79504 for bug #251, add queue fast cache. 2.0.65 2014-12-07 12:08:38 +08:00
winlin
bba6063492 for bug #251, the shared ptr message share the header. 2.0.64 2014-12-07 11:25:05 +08:00
winlin
d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 2014-12-06 20:10:05 +08:00
winlin
32d537b96b for bug #251, refine code before mic. 2014-12-06 19:56:06 +08:00
winlin
d827928eeb for bug #251, merge the performance refines. 2014-12-06 09:55:51 +08:00
winlin
de993b6465 for bug #251, refine the directly access ptrs for hls,dvr,forwarder,consumer. 2014-12-05 23:49:53 +08:00
winlin
f9b9a60de7 for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60 2014-12-05 23:03:52 +08:00
winlin
528ae1e9b1 refine source and queue dump msgs. 2014-12-05 22:00:57 +08:00
winlin
e80c8603d4 fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59 2014-12-05 20:55:19 +08:00
winlin
92ecdf088b for bug #251, use macro to define the fast cache and cond wait. 2.0.58 2014-12-05 18:47:17 +08:00
winlin
9ee138746f for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57 2014-12-05 16:44:11 +08:00
winlin
dde05c6315 for bug #251, refine the send use cond wait. 2014-12-05 14:38:43 +08:00
winlin
4c1d5c0d1e refine the log for mw and mr. 2.0.55 2014-12-05 11:31:06 +08:00
winlin
fad6074a25 set send socket buf. mw/mr sleep default to 350. 2014-12-05 11:24:05 +08:00
winlin
98647d6e67 limit the user-space buffer size to 128KB, 128MB for 1k publishers. 2014-12-04 22:00:09 +08:00
winlin
76af04c55d refine the recv buffer for mr. 2014-12-04 21:50:23 +08:00
winlin
b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 2014-12-04 21:35:13 +08:00
winlin
f1192a8302 fix bug for bug #241, default to 32k for socket buffer. 2014-12-04 18:35:50 +08:00
winlin
5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 2014-12-04 18:21:04 +08:00
winlin
a23b5b9a4b for bug#241, simplify the buffer, donot change its size. 2014-12-04 15:43:37 +08:00
winlin
4b09531e2f for bug #241, simplify the merged read config macros. 2014-12-04 15:33:17 +08:00
winlin
90992b31a3 for bug #194, add the send macro to performance. 2014-12-04 13:54:02 +08:00
winlin
60bc9c2aa0 add performance header to control options for performance. 2.0.50 2014-12-04 13:43:55 +08:00
winlin
0ea8cd9e84 for bug #248, use simple buffer for http. 2014-12-04 11:29:47 +08:00
winlin
2cb8b7dd52 for bug #248, use simple buffer for hls. 2014-12-04 11:27:07 +08:00
winlin
315f981821 refine for bug #241, increase the small bytes for merged read. 2014-12-04 09:10:57 +08:00
winlin
5791ed59fd for bug #241, refine the socket max buffer. 2014-12-03 23:05:42 +08:00
winlin
4785f882d4 for bug #241, refine the max buffer and kbps. 2014-12-03 22:51:19 +08:00
winlin
850946bb13 for bug #241, calc the small and sleep for merged read. 2014-12-03 22:39:25 +08:00
winlin
aee00877df for bug #241, change buffer size when chunk size changed. 2014-12-03 21:46:47 +08:00
winlin
f35ec2155b for bug #241, support merged read. 2.0.48 2014-12-03 19:27:27 +08:00
winlin
adf95d239e refine code, move the ISrsBufferReader to srs_protocol_io 2014-12-03 19:09:59 +08:00
winlin
ea0e837cd6 move the srs_kernel_buffer to srs_protocol_buffer. 2014-12-03 18:56:09 +08:00
winlin
6cbf732e1a for bug #237, thread donot sleep when timeout is 0. 2014-12-03 14:25:02 +08:00
winlin
c457364321 for bug #237, add name for thread. 2.0.47 2014-12-03 14:05:15 +08:00
winlin
787ab674e3 fix #244, conn thread use cond to wait for recv thread error. 2.0.47. 2014-12-03 12:08:29 +08:00
winlin
565f29ed6c Revert "for bug #241, merge big chunks for publish, no use." 
This reverts commit 6b57597718.
 2014-12-02 22:26:20 +08:00
winlin
6b57597718 for bug #241, merge big chunks for publish, no use. 2014-12-02 22:26:04 +08:00
winlin
463e1fbc41 for bug #237, refine the thread loop for publish thread. 2.0.47 2014-12-02 19:28:36 +08:00
winlin
24a6a723ee for bug #237, never sleep when thread interval is 0. 2014-12-02 19:22:06 +08:00
winlin
6f963b50f3 refine code, publish recv thread sleep 697ms 2014-12-02 18:19:01 +08:00
winlin
e9712cc627 refine recv thread, donot set auto response for publish recv thread. 2.0.46 2014-12-02 17:16:20 +08:00
winlin
5905e5c050 merge from 1.0release, traverse the token before response connect. 2.0.45. 2014-12-02 15:41:54 +08:00
winlin
757cffbabf for bug #237, when recv thread failed, quit the cycle. 2.0.44 2014-12-02 15:21:08 +08:00
winlin
29c6014192 refs #1670: fix the bug for bug #237, use us and ms timeout. 2014-12-02 10:40:21 +08:00
winlin
472b1742a2 for bug #237, use isolate thread to recv message. 2.0.41 2014-12-01 23:38:51 +08:00
winlin
0e7836868c for bug #235, refine the queue recv thread. 2014-12-01 22:53:03 +08:00
winlin
0b631ee80d for bug #235, pass timeout to recv thread. 2014-12-01 22:45:45 +08:00
winlin
31eb9bf1c1 for bug #237, extract a queue recv thread. 2014-12-01 22:39:22 +08:00
winlin
22524f390a rename the recv thread to queue recv thread for bug #237. 2014-12-01 22:23:05 +08:00
winlin
d171a26758 disable gop cache when not h.264. fix some warning. 2014-12-01 21:34:35 +08:00
winlin
b4057916b6 add qt project file. fix cmake file for clion. 2014-11-30 16:06:37 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
3d97048c3a fix bug #217, add reuse conn to play different player. 2014-11-22 19:15:40 +08:00
winlin
3e81e6e0f1 refine code for bug #217, use recv thread to set the timeout. 2014-11-22 18:08:45 +08:00
winlin
58136ec178 fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30. 2014-11-22 17:58:02 +08:00
winlin
622218c4dd for bug #217, use isolate thread to improve 17% performance. 2014-11-22 15:53:05 +08:00
winlin
5f48d4f566 refine comments for SrsMessageArray. 2.0.25 2014-11-19 10:44:50 +08:00
winlin
df35f75df1 refine response call, 2.0.24 2014-11-18 17:55:38 +08:00
winlin
749fac414b refine code, donot response call when transaction id is zero. 2014-11-18 17:30:40 +08:00
winlin
9f60a6738a add comments for listen 2014-11-17 10:27:05 +08:00
winlin
47ed9e33dd refine code for bug #194, use send messages for all msg array. 2014-11-14 11:24:49 +08:00
winlin
f11272e3ce add comments for bug #194, #196 2014-11-13 17:29:56 +08:00
winlin
8845bb7caf for bug #194, refine code, remove the old duplicated code. 2014-11-13 16:56:41 +08:00
winlin
62719c2b12 for bug #200, fix the writev for librtmp, add comments. 2014-11-13 14:38:23 +08:00
winlin
0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 2014-11-13 14:30:56 +08:00
winlin
77cf885d8c add comments for #161 2014-11-13 13:49:50 +08:00
winlin
4af2e78c59 refine code for bug #194, add comments to macros. 2014-11-13 12:45:54 +08:00
winlin
cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 2014-11-13 12:25:56 +08:00
winlin
d257360e96 add comments about bug #196 2014-11-12 13:46:21 +08:00
winlin
8acd143a7a fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. 2014-11-12 12:59:53 +08:00
winlin
a6f3478a74 for bug #194, remove the poll, it's no-use 2014-11-12 10:26:48 +08:00
winlin
bc1b5f4bbf for bug #194, disable the srs fd poll. 2014-11-12 10:05:42 +08:00
winlin
4f21e92ae0 fix the message of config for max_connections. 2014-11-11 18:49:27 +08:00
winlin
21f16f3a83 for bug #194, use play fd poll to improve performance, it works. 2014-11-11 18:46:35 +08:00
winlin
164f632b62 for bug #194, add fds poll, just sleep to send without recv. 2014-11-11 18:35:46 +08:00
winlin
133cc62b51 for bug #194, use play fd poll, create the singleton poll 2014-11-11 17:54:02 +08:00
winlin
efc85ed6df refine config, check the connections more precise 2014-11-11 17:19:56 +08:00
winlin
de5e2d0a40 Revert "Revert "for bug #194, refine the config"" 
This reverts commit b4c1d55311.
 2014-11-11 17:12:45 +08:00
winlin
b4c1d55311 Revert "for bug #194, refine the config" 
This reverts commit 2a55ae4317.
 2014-11-11 17:05:36 +08:00
winlin
e87eacd499 Revert "add srs pipe for bug #194" 
This reverts commit f9756ea14c.
 2014-11-11 17:05:25 +08:00
winlin
73abb1a31d Revert "for bug #194, add pipe to consumer." 
This reverts commit 1e601a6efc.
 2014-11-11 17:04:56 +08:00
winlin
306f75b267 Revert "for bug#194, open pipe for each connection." 
This reverts commit ade81bb244.
 2014-11-11 17:04:32 +08:00
winlin
ade81bb244 for bug#194, open pipe for each connection. 2014-11-11 16:41:39 +08:00
winlin
1e601a6efc for bug #194, add pipe to consumer. 2014-11-11 16:27:35 +08:00
winlin
f9756ea14c add srs pipe for bug #194 2014-11-11 16:09:44 +08:00
winlin
2a55ae4317 for bug #194, refine the config 2014-11-11 15:38:21 +08:00
winlin
36d12dd8ea for bug #194, change server main cycle to 1s. 2014-11-11 14:41:48 +08:00
winlin
8cc9a11b81 for bug #194, set the server main cycle to 1s 2014-11-11 14:38:54 +08:00
winlin
46330dd196 fix #195: remove the confuse code st_usleep(0). 2.0.13. 2014-11-11 13:40:09 +08:00
winlin
3358570be6 refine for bug#66, implements the usage. 2014-11-08 10:44:00 +08:00
winlin
72ad6894ca move the annexb decode utility to protocol. 2014-11-07 23:07:31 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +08:00
winlin
57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 2014-10-19 19:42:27 +08:00
winlin
d24e2fd0cc remove supports for OSX. 2.0.1. 2014-10-18 13:58:23 +08:00
winlin
f3002144fc fix #180: crash for multiple edge publishing the same stream. 0.9.220. 2014-09-30 11:21:46 +08:00
winlin
bc6616bd1f refine code according to inspect of clion. 0.9.219 2014-09-28 11:08:30 +08:00
winlin
bcd1b3d2d4 refine code, remove unused code of dvr. 2014-09-27 13:02:16 +08:00
winlin
20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 2014-09-26 17:47:43 +08:00