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

1912 commits

Author SHA1 Message Date
winlin
07b207b7e3 remove test code for api-server. 2015-01-02 10:30:25 +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
8757473a7a Merge branch '1.0release' into develop 2014-12-26 22:45:22 +08:00
winlin
dec4f6b989 hotfix 1.0release, add remote gitlab 2014-12-26 22:45:09 +08:00
winlin
8ea6da2607 Merge branch '1.0release' into develop 2014-12-26 21:49:22 +08:00
winlin
dfd4eeca45 hotfix 1.0release, git checkout develop when commit 2014-12-26 21:49:04 +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
0c132e9781 update the log position. 2014-11-28 10:58:16 +08:00
winlin
127b96b255 add git2unix and git commit script. 2014-11-28 10:42:47 +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
be53b10ed3 refine log position 2014-11-27 08:04:39 +08:00
winlin
d91a9dfa9d udpate the srs_bwt. 2014-11-25 11:10:54 +08:00
winlin
cd0ab5fb43 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:50:59 +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
2175102ea2 remove the sync script for mirror, which maybe updated. 2014-10-27 11:41:28 +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
fca500fae6 update package for pi, check the lsb_release. 2014-10-09 14:07:20 +08:00
winlin
024611cc08 update package for pi, check the lsb_release. 2014-10-09 14:06:54 +08:00
winlin
dddec3484e update to 1.0beta, 1.0.0 2014-10-09 12:55:25 +08:00
winlin
effcd89f66 refine script. 2014-10-09 12:09:01 +08:00
winlin
6468b9e92b refine script, to disable iptables and selinux. 0.9.225 2014-10-09 12:07:56 +08:00
winlin
5e8f8ad3b9 add add hosts and wiki. 2014-10-09 11:53:59 +08:00
winlin
3fcbb60b1c add add hosts and wiki. 2014-10-09 11:53:21 +08:00
winlin
bea53dca97 refine the run script for centos7 2014-10-09 11:32:12 +08:00
winlin
a9cceee943 refine the run script for centos7 2014-10-09 11:27:49 +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
3f9a53de0e refine cmake list, only for clion. 2014-10-08 13:53:04 +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
winlin
279b4ff4c9 refine macros 2014-12-04 21:37:04 +08:00
winlin
b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 2014-12-04 21:35:13 +08:00
winlin
72fa33d9fb update performance to 4k, when mr_sleep to 2000ms. 2.0.52 2014-12-04 18:46:08 +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
57f844b636 for bug #249, simplify the macro, 0 to disable chunk stream cache. 2014-12-04 15:49:24 +08:00
winlin
159ef3823c for bug#241, simplify the buffer, donot realloc it. 2014-12-04 15:45:25 +08:00
winlin
a23b5b9a4b for bug#241, simplify the buffer, donot change its size. 2014-12-04 15:43:37 +08:00
winlin
d026861e23 for bug #241, simplify the buffer, donot reset when chunk size change. 2014-12-04 15:35:39 +08:00
winlin
4b09531e2f for bug #241, simplify the merged read config macros. 2014-12-04 15:33:17 +08:00
winlin
f57801eb46 fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51 2014-12-04 14:58:40 +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
29324fab46 fix #248, improve about 15% performance for fast buffer. 2.0.49 2014-12-04 13:05:13 +08:00
winlin
8423974e3b for bug #248, rename SrsBuffer to SrsFastBuffer. 2014-12-04 11:32:32 +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
d1d6023c70 for bug #241, limit the buffer for input chunk size. 2014-12-03 23:11:13 +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
2fdf994350 for bug #241, use heap to alloc the socket buffer. 2014-12-03 14:27:36 +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
b28dc7364e refine the srs-librtmp, add hijack get the object. 2014-12-02 14:02:28 +08:00
winlin
a94dbecdc4 refine macro of srs-librtmp. 2.0.43 2014-12-02 13:41:41 +08:00
winlin
9387d09f5f refine the macros for windows of srs-librtmp 2014-12-02 13:38:30 +08:00
winlin
15ae4745f4 add macro to disable log. 2014-12-02 13:21:26 +08:00
winlin
07d55010fe remove the free bytes api of srs-librtmp. use system default is ok. 2014-12-02 13:03:25 +08:00
winlin
f6032ffe6b always use system log and context. allow hijack the human print macro. 2014-12-02 12:51:07 +08:00
winlin
3584bdb7b6 srs-librtmp support hijack io apis for st-load. 2.0.42. 2014-12-02 12:19:17 +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
af83e18d7e update the README for 1.5k publishers. 2.0.41 2014-12-02 07:27:20 +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
1847c5fef7 ignore the actual length of share key. 2.0.40 2014-12-01 22:09:09 +08:00
winlin
d171a26758 disable gop cache when not h.264. fix some warning. 2014-12-01 21:34:35 +08:00
winlin
c5dd334645 fix the warning of ts_info 2014-12-01 20:54:19 +08:00
winlin
47b4b694be add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39. 2014-12-01 10:58:17 +08:00
winlin
3e521d317d update upp dir to srs. 2014-11-30 16:54:57 +08:00
winlin
b4057916b6 add qt project file. fix cmake file for clion. 2014-11-30 16:06:37 +08:00
winlin
efb73c5487 fix #235, refine handshake, replace union with template method. 2.0.38. 2014-11-29 18:41:14 +08:00
winlin
abb0fce3d8 fix bug for utest of message array, it does not free messages now. 2014-11-29 18:36:40 +08:00
winlin
23f4aa5737 for bug #235, fix bug of utest. 2014-11-29 18:33:43 +08:00
winlin
e167c97786 for bug #235, fix the return code bug. 2014-11-29 18:16:15 +08:00
winlin
818000dd18 for bug #235, use constructor and destructor for block and digest. 2014-11-29 18:10:33 +08:00
winlin
b32d3fb6aa remove the read and write with SrsStream. 2014-11-29 17:58:40 +08:00
winlin
6d49cddc9d for bug #235, refine code order of c1s1 and c2s2 2014-11-29 17:05:54 +08:00
winlin
646d6f6673 for bug #235, refine schema0 and schema1, extract dup code. 2014-11-29 17:04:24 +08:00
winlin
4b9875e279 for bug #235, use strategy to implements the schema0 and schema1. 2014-11-29 16:17:07 +08:00
winlin
5d883e2e29 for bug #235, move functions of block and digest to struct. 2014-11-29 13:08:43 +08:00
winlin
ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 2014-11-28 12:26:36 +08:00
winlin
0d98dc88bf Merge branch '1.0release' 2014-11-28 11:09:33 +08:00
winlin
7f121efd7a merge from allspace srs-librtmp for win vs2010. 2.0.36 2014-11-28 10:33:36 +08:00
winlin
14fca601f9 merge from 1.0 hotfix. 3.0.35 2014-11-27 18:50:54 +08:00
winlin
03f72fb1a6 for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34 2014-11-27 18:39:02 +08:00
winlin
bb85a0c856 for bug #229, remove the windows vs2010 build files for srs-librtmp build failed on windows. 2014-11-27 18:31:25 +08:00
winlin
eb4e7aad69 try to build srs-librtmp on vs2010, failed. 2014-11-27 18:20:13 +08:00
winlin
904a06cadf Merge branch '1.0release' 2014-11-27 17:47:23 +08:00
winlin
62b861718f Revert "remove vs2010 files from master" 
This reverts commit f8a2c22f3a.
 2014-11-27 17:02:30 +08:00
winlin
f8a2c22f3a remove vs2010 files from master 2014-11-27 16:16:04 +08:00
winlin
4c0c3a9ada refine merged code for allspace. 2014-11-27 15:29:24 +08:00
winlin
468941833c change srs version to 2.0.33 2014-11-27 15:23:16 +08:00
winlin
18c308248e refine code by winlin, for merged from allspace. 2014-11-27 15:22:39 +08:00
winlin
1855c9429c merge from allspace, to srs-librtmp, for vs2010 2014-11-27 14:46:05 +08:00
winlin
bb54194c26 checkout master 2014-11-27 12:53:21 +08:00