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

816 commits

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