external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
2486 commits 13 branches 107 tags 375 MiB
Commit graph

1297 commits

Author SHA1 Message Date
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
518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 2015-01-02 09:05:16 +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
1824e18bd2 fix the comment bug. 2014-12-31 20:20:32 +08:00
winlin
12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 2014-12-29 14:24:22 +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
5e9ff71740 refine the log verbose 2014-12-28 20:17:27 +08:00
winlin
2d229b09be refine rtmp protocol stack comments 2014-12-28 15:16:34 +08:00
winlin
5a229e89bf refine the rtmp protocol stack comments, the stream id in little-endian. 2014-12-28 15:11:55 +08:00
winlin
9e35664510 refine the simple handshake comment. 2014-12-28 12:28:33 +08:00
winlin
9a66d22f3b hotfix 1.0release, 1.0.13 2014-12-26 21:43:00 +08:00
winlin
b8de3bd3b4 convert the core to unix format. 2014-12-25 10:55:12 +08:00
winlin
92146712d8 fix srs-librtmp send raw aac audio channel bug. 2.0.76 2014-12-25 09:52:18 +08:00
winlin
9788570ba5 fix bug for ubuntu14 to build. 2014-12-24 18:32:37 +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
b77e1de1d1 fix bug of utest 2014-12-22 15:31:57 +08:00
winlin
81e70e7bdb for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object. 2014-12-21 11:41:15 +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
winlin
304208f822 fix #239, traverse the token before response connect. 1.0.10. 2014-12-02 15:27:36 +08:00
tufang14
3d0d43c5dc token bug 
多级origin-edge模式，edge上功能不生效
 2014-12-02 14:38:54 +08:00
winlin
9c033c7da6 hotfix 1.0, author bug, use error macro. 1.0.9 2014-11-27 18:48:01 +08:00
winlin
575e50b6e2 hotfix to add comments on 1.0release 2014-11-27 17:47:13 +08:00
winlin
db7af6259a update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:50:25 +08:00
winlin
d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8 2014-11-25 10:07:41 +08:00
winlin
44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:06:26 +08:00
winlin
c1e9aed0ac all wiki translated to English. 1.0.7 2014-11-18 13:41:36 +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
f2f259d050 use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5. 2014-11-06 14:28:03 +08:00
winlin
3c31e6db05 for bug #186, read the args when discovery it. 1.0.4 2014-10-24 13:22:35 +08:00
winlin
e3e18b9915 for bug #186, read the args when discovery it. 1.0.4 2014-10-24 13:17:11 +08:00
winlin
fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:28:50 +08:00
winlin
aa98ca60b9 fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3. 2014-10-24 10:34:00 +08:00
winlin
77d14ff752 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 10:01:00 +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
2be014e4f5 remove the dead code for bug #180 2014-10-09 14:24:52 +08:00
winlin
dddec3484e update to 1.0beta, 1.0.0 2014-10-09 12:55:25 +08:00
winlin
6468b9e92b refine script, to disable iptables and selinux. 0.9.225 2014-10-09 12:07: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
595bf24a51 for bug #257, default to off the realtime(min-latency). 2014-12-13 10:13:49 +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
a3de1c71fc reset the mw_latency to 350. 2014-12-08 09:49:45 +08:00
winlin
1311b6fe65 fix #251, support 10k clients. 2.0.67 2014-12-07 16:31:47 +08:00
winlin
55d98fceed for bug #251, add min msgs for queue cond wait. 2014-12-07 16:15:19 +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
1bbdae6632 refine code. 2014-12-07 11:37:51 +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
330819fb74 for bug #251, refine the mic algorithm. 2.0.63 2014-12-06 22:50:51 +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
a6599f2250 remove the qt modify file. 2014-12-06 09:52:26 +08:00
winlin
9892b92258 Revert "for bug #251, somhc(session-oriented message-header cache). 2.0.61" 
It hurt performance, should never use it.

This reverts commit d073adde58.
 2014-12-06 01:19:49 +08:00
winlin
d073adde58 for bug #251, somhc(session-oriented message-header cache). 2.0.61 2014-12-06 00:59:10 +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
d3a103184a refine protocol sdk send msg, the chunk header generate. 2014-12-05 23:23:11 +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
cd317859db add mw sleep time and msgs/iovs table. 2014-12-05 17:07:27 +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
4d1c162ebd fix utest failed bug. 2014-12-04 22:28:33 +08:00
winlin
4c6cf959c1 refine fast buffer, check available bytes to read. 2014-12-04 22:10: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
09101b8d5e remove the increase timeout for read, for there is no small timeout. 2014-12-04 21:39:42 +08:00