github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,637 Commits
14 Branches
107 Tags
345 MiB
Commit Graph

1410 Commits (1102c7a58ff268ddc69af62f7eceb37456c6db07)

Author SHA1 Message Date
winlin 344ff24f66 add srs_app_statistic to upp project.
winlin 67adc8dc61 merge with security bug fix.
qiang.li a4a93613d0 add statistic for stream
winlin dc11418c79 fix : http-callback support on_dvr when reap a dvr file. 2.0.89
winlin dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88
winlin 247b772449 hotfix to remove the pageUrl for http callback. 1.0.19
winlin 0b9bbdbe74 Merge branch '1.0release' into develop
winlin f9a33fbeee fix the compile failed for utest at 32bits cpus
qiang.li 8d534d3470 get stream info use http api
winlin f881bc43b5 fix : dvr support custom filepath by variables. 2.0.87
winlin f89941254a refine code of security deny check
winlin 18b15b9099 refine comments of security deny check
winlin 75f2607685 fix , support security allow/deny publish/play all/ip. 2.0.86
winlin f8ec7c706d merge from 1.0.18, hotfix , trim the last 0 of log. 2.0.85
winlin e590537dca fix , trim the last 0 of log. 1.0.18
winlin 9d34820c80 fix : http-callback check http status code ok(200). 2.0.84
winlin 8df0f724d6 fix , http-callback post in application/json content-type. 2.0.83
winlin ca977ef739 hotfix , http-callback post in application/json content-type. 1.0.17
winlin 518a5a72ab fix , srs-librtmp flv read tag should init size. 2.0.82
winlin c1c01ec802 hotfix , memory leak for http client post. 2.0.81
winlin bb6dfe40c1 fix , memory leak for http client post. 1.0.16
winlin 569596c10d update copyright, from 2013 to 2015
winlin 1824e18bd2 fix the comment bug.
winlin 12f4abd553 fix , aac profile is object id plus one. 2.0.80
winlin c0a6c3efa3 merge from 1.0release, hotfix , the forward dest ep should use server. 2.0.79
winlin d9aca8ab82 hotfix , the forward dest ep should use server. 1.0.15
winlin e27c95b0e8 merge from 1.0release for , the hls pcr is negative when startup. 2.0.78
winlin 513c1ec6d5 fix , the hls pcr is negative when startup. 1.0.14
winlin 5e9ff71740 refine the log verbose
winlin 2d229b09be refine rtmp protocol stack comments
winlin 5a229e89bf refine the rtmp protocol stack comments, the stream id in little-endian.
winlin 9e35664510 refine the simple handshake comment.
winlin 9a66d22f3b hotfix 1.0release, 1.0.13
winlin b8de3bd3b4 convert the core to unix format.
winlin 92146712d8 fix srs-librtmp send raw aac audio channel bug. 2.0.76
winlin 9788570ba5 fix bug for ubuntu14 to build.
winlin 28eedfc177 merge from 1.0release for , ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75
winlin 2e43a63bf4 fix , ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12
winlin b77e1de1d1 fix bug of utest
winlin 81e70e7bdb for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object.
winlin eef8034632 merge from 1.0release for bug . 2.0.74
winlin 7737042795 fix , remove the test code. 1.0.11
winlin 1dfac0bf1d fix , support disconnect publish connect when hls error. 1.0.11
winlin db13c725a6 refine , rename the on_dispose to wakeup. 2.0.73
winlin 61a648f1d2 refine for , chmod -x files.
winlin 24815e4efe refine code for bug
winlin 304208f822 fix , traverse the token before response connect. 1.0.10.
tufang14 3d0d43c5dc token bug 
多级origin-edge模式，edge上功能不生效
winlin 9c033c7da6 hotfix 1.0, author bug, use error macro. 1.0.9
winlin 575e50b6e2 hotfix to add comments on 1.0release
winlin db7af6259a update PRIMARY, AUTHORS, CONTRIBUTORS rule
winlin d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8
winlin 44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule
winlin c1e9aed0ac all wiki translated to English. 1.0.7
winlin eba1740ed5 hotfix , deadloop when read/write 0 and ETIME. 1.0.6.
winlin f2f259d050 use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5.
winlin 3c31e6db05 for bug , read the args when discovery it. 1.0.4
winlin e3e18b9915 for bug , read the args when discovery it. 1.0.4
winlin fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
winlin aa98ca60b9 fix , hotfix for bug , drop connect args when not object. 1.0.3.
winlin 77d14ff752 update readme, rename wiki/xxx to wiki/v1_xxx
winlin 6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx
winlin bd158ec838 hotfix for bug , donot support AnnexB when decoding RTMP body for HLS. 1.0.1.
winlin 2be014e4f5 remove the dead code for bug
winlin dddec3484e update to 1.0beta, 1.0.0
winlin 6468b9e92b refine script, to disable iptables and selinux. 0.9.225
winlin 2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224
winlin 9789335d0b fix , always reap ts whatever audio or video packet. 0.9.223.
winlin 13b092704d refine code for bug , refine the source functions, add comments.
winlin b830b995e6 fix bug , requires epoll. 0.9.222
zhengfl 2317f0e767 refine
zhengfl bafdd83122 last
zhengfl 1e34d2a5cd client connection no disconnect
winlin 0d6b91039d fix , refine latency, send when got one+ msgs, 2.0.72
winlin cbad7a3074 fix , server latency is 0.1s+, the bottleneck is encoder. 2.0.71
winlin 5529813fcb for bug , support NULL msg in msgs to send.
winlin 595bf24a51 for bug , default to off the realtime(min-latency).
winlin dac9f9c45c refine the log level.
winlin 10297fab51 fix , support 0.1s+ latency. 2.0.70
winlin 68ade0a267 add log info for rtmp conn. change the mw_latency to 100 for realtime.
winlin 6bdd0af728 for bug , remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69
winlin 7150a99f41 for bug , remove the mic(message iovs cache), no use.
winlin a3de1c71fc reset the mw_latency to 350.
winlin 1311b6fe65 fix , support 10k clients. 2.0.67
winlin 55d98fceed for bug , add min msgs for queue cond wait.
winlin 438ee30ac1 for bug , refine the queue fast vector. 2.0.66
winlin 5a2b8afead for bug , add queue fast vector. 2.0.66
winlin 8f72f79504 for bug , add queue fast cache. 2.0.65
winlin 1bbdae6632 refine code.
winlin bba6063492 for bug , the shared ptr message share the header. 2.0.64
winlin 330819fb74 for bug , refine the mic algorithm. 2.0.63
winlin d53fd7f570 for bug , support mic(message iovs cache). 2.0.61
winlin 32d537b96b for bug , refine code before mic.
winlin d827928eeb for bug , merge the performance refines.
winlin a6599f2250 remove the qt modify file.
winlin 9892b92258 Revert "for bug , somhc(session-oriented message-header cache). 2.0.61" 
It hurt performance, should never use it.

This reverts commit d073adde58.
winlin d073adde58 for bug , somhc(session-oriented message-header cache). 2.0.61
winlin de993b6465 for bug , refine the directly access ptrs for hls,dvr,forwarder,consumer.
winlin d3a103184a refine protocol sdk send msg, the chunk header generate.
winlin f9b9a60de7 for bug , remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60
winlin 528ae1e9b1 refine source and queue dump msgs.
winlin e80c8603d4 fix , revert changes, for the cond wait and fast cache queue is no use. 2.0.59
winlin 92ecdf088b for bug , use macro to define the fast cache and cond wait. 2.0.58
winlin cd317859db add mw sleep time and msgs/iovs table.
winlin 9ee138746f for bug , 9k+ clients, use fast cache for msgs queue. 2.0.57
winlin dde05c6315 for bug , refine the send use cond wait.
winlin 4c1d5c0d1e refine the log for mw and mr. 2.0.55
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350.
winlin 4d1c162ebd fix utest failed bug.
winlin 4c6cf959c1 refine fast buffer, check available bytes to read.
winlin 98647d6e67 limit the user-space buffer size to 128KB, 128MB for 1k publishers.
winlin 76af04c55d refine the recv buffer for mr.
winlin 09101b8d5e remove the increase timeout for read, for there is no small timeout.
winlin 279b4ff4c9 refine macros
winlin b1d7fbe668 fix , add mw(merged-write) config. 2.0.53
winlin 72fa33d9fb update performance to 4k, when mr_sleep to 2000ms. 2.0.52
winlin f1192a8302 fix bug for bug , default to 32k for socket buffer.
winlin 5589b13d2e for bug , support mr(merged-read) config and reload. 2.0.52.
winlin 57f844b636 for bug , simplify the macro, 0 to disable chunk stream cache.
winlin 159ef3823c for bug#241, simplify the buffer, donot realloc it.
winlin a23b5b9a4b for bug#241, simplify the buffer, donot change its size.
winlin d026861e23 for bug , simplify the buffer, donot reset when chunk size change.
winlin 4b09531e2f for bug , simplify the merged read config macros.
winlin f57801eb46 fix , cache the chunk headers info to +5% or +10% performance. 2.0.51
winlin 90992b31a3 for bug , add the send macro to performance.
winlin 60bc9c2aa0 add performance header to control options for performance. 2.0.50
winlin 29324fab46 fix , improve about 15% performance for fast buffer. 2.0.49
winlin 8423974e3b for bug , rename SrsBuffer to SrsFastBuffer.
winlin 0ea8cd9e84 for bug , use simple buffer for http.
winlin 2cb8b7dd52 for bug , use simple buffer for hls.
winlin 315f981821 refine for bug , increase the small bytes for merged read.
winlin d1d6023c70 for bug , limit the buffer for input chunk size.
winlin 5791ed59fd for bug , refine the socket max buffer.
winlin 4785f882d4 for bug , refine the max buffer and kbps.
winlin 850946bb13 for bug , calc the small and sleep for merged read.
winlin aee00877df for bug , change buffer size when chunk size changed.
winlin f35ec2155b for bug , support merged read. 2.0.48
winlin adf95d239e refine code, move the ISrsBufferReader to srs_protocol_io
winlin ea0e837cd6 move the srs_kernel_buffer to srs_protocol_buffer.
winlin 2fdf994350 for bug , use heap to alloc the socket buffer.
winlin 6cbf732e1a for bug , thread donot sleep when timeout is 0.
winlin c457364321 for bug , add name for thread. 2.0.47
winlin 787ab674e3 fix , conn thread use cond to wait for recv thread error. 2.0.47.
winlin 565f29ed6c Revert "for bug , merge big chunks for publish, no use." 
This reverts commit 6b57597718.
winlin 6b57597718 for bug , merge big chunks for publish, no use.
winlin 463e1fbc41 for bug , refine the thread loop for publish thread. 2.0.47
winlin 24a6a723ee for bug , never sleep when thread interval is 0.
winlin 6f963b50f3 refine code, publish recv thread sleep 697ms
winlin e9712cc627 refine recv thread, donot set auto response for publish recv thread. 2.0.46
winlin 5905e5c050 merge from 1.0release, traverse the token before response connect. 2.0.45.
winlin 757cffbabf for bug , when recv thread failed, quit the cycle. 2.0.44
winlin b28dc7364e refine the srs-librtmp, add hijack get the object.
winlin a94dbecdc4 refine macro of srs-librtmp. 2.0.43
winlin 9387d09f5f refine the macros for windows of srs-librtmp
winlin 15ae4745f4 add macro to disable log.
winlin 07d55010fe remove the free bytes api of srs-librtmp. use system default is ok.
winlin f6032ffe6b always use system log and context. allow hijack the human print macro.
winlin 3584bdb7b6 srs-librtmp support hijack io apis for st-load. 2.0.42.
winlin 29c6014192 refs : fix the bug for bug , use us and ms timeout.
winlin af83e18d7e update the README for 1.5k publishers. 2.0.41
winlin 472b1742a2 for bug , use isolate thread to recv message. 2.0.41
winlin 0e7836868c for bug , refine the queue recv thread.
winlin 0b631ee80d for bug , pass timeout to recv thread.
winlin 31eb9bf1c1 for bug , extract a queue recv thread.
winlin 22524f390a rename the recv thread to queue recv thread for bug .
winlin 1847c5fef7 ignore the actual length of share key. 2.0.40
winlin d171a26758 disable gop cache when not h.264. fix some warning.
winlin c5dd334645 fix the warning of ts_info
winlin 47b4b694be add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39.
winlin 3e521d317d update upp dir to srs.
winlin b4057916b6 add qt project file. fix cmake file for clion.
winlin efb73c5487 fix , refine handshake, replace union with template method. 2.0.38.
winlin abb0fce3d8 fix bug for utest of message array, it does not free messages now.
winlin 23f4aa5737 for bug , fix bug of utest.
winlin e167c97786 for bug , fix the return code bug.
winlin 818000dd18 for bug , use constructor and destructor for block and digest.
winlin b32d3fb6aa remove the read and write with SrsStream.
winlin 6d49cddc9d for bug , refine code order of c1s1 and c2s2
winlin 646d6f6673 for bug , refine schema0 and schema1, extract dup code.
winlin 4b9875e279 for bug , use strategy to implements the schema0 and schema1.
winlin 5d883e2e29 for bug , move functions of block and digest to struct.
winlin ff5cdb1cc1 for bug , add srs_rtmp_dump tool. 2.0.37.
winlin 7f121efd7a merge from allspace srs-librtmp for win vs2010. 2.0.36
winlin 14fca601f9 merge from 1.0 hotfix. 3.0.35
winlin 03f72fb1a6 for bug , revert changes of allspace, for srs-librtmp branch build failed. 2.0.34
winlin eb4e7aad69 try to build srs-librtmp on vs2010, failed.
winlin 904a06cadf Merge branch '1.0release'
winlin 4c0c3a9ada refine merged code for allspace.
winlin 468941833c change srs version to 2.0.33
winlin 18c308248e refine code by winlin, for merged from allspace.
winlin 1855c9429c merge from allspace, to srs-librtmp, for vs2010
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.
winlin e492fa5353 fix , support publish aac adts raw stream. 2.0.31.
winlin 3d97048c3a fix bug , add reuse conn to play different player.
winlin 3e81e6e0f1 refine code for bug , use recv thread to set the timeout.
winlin 58136ec178 fix , remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30.
winlin 622218c4dd for bug , use isolate thread to improve 17% performance.
winlin d3c770d252 refine librtmp, add audio video detail.
winlin d80b580c2f refine librtmp, remove the _get_ for some attribute get.
winlin bb7a19636a fix the bandwidth file name bug.