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

2545 Commits (26d328e7f294fa0e2e64a29d70531c44738f2bf3)

Author SHA1 Message Date
winlin 12d5431f3b Merge branch '2.0release' into develop
winlin b319e9ff9c ignore when sps/pps consumed all frame.
winlin c250e3e651 Merg branch '2.0release' into develop
winlin e818f36316 fix , fix build bug for centos7.
winlin 713cedfbb4 fix , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
winlin b6feb0742f fix , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
winlin d16ae193f6 Merge branch '2.0release' into develop
winlin fcab17741c fix , the dvr path rule changed.
winlin df3f24403e Merge branch '2.0release' into develop
winlin 02addf61f7 fix , remove the thread unsafe code, no static.
winlin bfa46e7a98 fix , remove the thread unsafe code, no static.
winlin f69fa7273b fix , remove the thread unsafe code, no static.
winlin 09ce6651eb Merge branch '2.0release' into develop
winlin 1cb2992808 refine build for modules, add defines.
winlin 0a7b179e14 Merge branch '2.0release' into develop
winlin 2f2aaf5ee4 for , refine code, donot check network devices for osx.
winlin e7e17cf15d fix osx bug.
winlin 33cca3e027 for , add todo for osx. 2.0.146
winlin e45c62003a Merge branch '2.0release' into develop
winlin bbac2348db for , remove the double underscore functions and variables.
winlin 7065db192c for , remove the double underscore of macro.
winlin 45d9018051 Merge branch '2.0release' into develop
winlin c6817cc422 for , remove the double underscore of macro.
winlin 3ca906d560 Merge branch '2.0release' into develop
winlin 014993ad1e remove the sudo of log.
winlin a4709a6439 for , add comments for the audio overflow ratio.
winlin b1142d83fc Merge branch '2.0release' into develop
winlin 0319e85f99 support config the audio overflow ratio.
winlin b7138ba9c5 merge from 2.0
tufang14 e319da3329 小瑕疵 
小瑕疵
winlin f564c903ac support got uptime and loadavg for osx. 2.0.145
winlin 4a50bf1894 Merge branch '2.0release' into develop
winlin fbd722bf76 refine the fast buffer to more readable.
winlin d25eb0aaa2 merge from 2.0
winlin f36e4a443d refine the fast buffer. 2.0.144
winlin 6a98758435 revert the changes for SRS2.
winlin df2644c850 merge from 2.0release
winlin 6855ab4c52 Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop
winlin 9bf6c9e9c6 Merge branch '2.0release' into develop
winlin cf3becbc17 for , osx(darwin) enable http api and stat, rusage is ok.
winlin 9f81a8b73e for , osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
winlin ab673e1300 for , osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
winlin a28c051c2c osx support build nginx and ffmpeg
winlin f3e5431d0f check what a fuck os for some fresh.
tufang14 1cc3384a19 seg fault 
seg fault
winlin 79fbeeb8c6 Merge branch '2.0release' into develop
winlin 8a4312f4ec fix bug, use size_t for string::npos
winlin 9e407d32fe change verstion to 3.0.0
winlin 2241ba0e34 for , , add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142
winlin 9c43c73d86 Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop
winlin 33e579599c refine build for osx
wenjie.zhao 65f404fb42 for , refine ts prefix code.
wenjie.zhao 5969f72354 for , refine ts prefix code.
wenjie.zhao 10da182853 add hls prefix of uri supported
wenjie.zhao efe3050d7a fix hls muxer Segmentation fault.
wenjie.zhao 73f13dfc42 fix hls muxer Segmentation fault.
winlin 9a0a8affc5 Merge pull request from tufang14/develop 
可能数组越界
winlin 685a29af83 Merge branch '2.0release' into develop
winlin c92d40e00b for , refine code, use kbps instead skt of rtmp connection.
Nimrod A. Abing (on kohima) a95bd7d30e Modified on_close webhook. 
Pass the send_bytes and recv_bytes count to the web hook.
Nimrod A. Abing (on kohima) bc93147426 for , disable st examples. for , refine the st init and event select.
tufang14 6cf5a6a7a9 可能数组越界 
可能数组越界
winlin 67671e43f9 Merge branch '2.0release' into develop
winlin 8ee0826e9a fix build failed bug.
winlin 0017ee85e0 Merge branch '2.0release' into develop
winlin 59d9af8039 update conf
winlin a21243ea12 merge from 2.0
winlin d349a3dbda update stable version check
winlin 519c25a064 fork srs2 and start srs3. 3.0.0
winlin 636bc574af start 2.0release, 80773 lines.
winlin e6058c1560 update donation
winlin 320f45c6f4 fix , support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
winlin 27cb62b7aa for , support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
winlin 995b130090 for , refine code for hstrs, support hijack handler.
winlin 5c6ef6ded6 fix warning for xcode.
winlin 6d15d0ea99 for , refine code, add hstrs config.
winlin 74fa3ba16f fix build failed for linux.
winlin a15ce1147f for , fix all warnings for mac.
wenjie.zhao 643f18abe4 add hds reload supported.#328
winlin 984145de72 for , add todo for hds, check whether disabled, support reload.
winlin 5d12a1ab20 for , add hds specification.
winlin ffef62900f for , support adobe hds. 2.0.138.
winlin da56e4fbb9 for , fix hds compile error on mac.
wenjie.zhao 07d8f060eb refine annotation
wenjie.zhao 570c0d66bd fix path issue.
wenjie.zhao e57bda8908 Merge code. 
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable.
winlin 3e5821efff enable http api for x86_x64
winlin 3732554844 remove the xcode state.
winlin 1ad0c847ce fix http parse bug
winlin f247ac9daf fix the http parse bug.
wenjie.zhao d4198ee8ba add hds supported.
winlin 5370493140 add ingest to mac.dev conf.
winlin 24616e15b5 remove the code for xcode, not required.
winlin b3aed2cb59 fix the bug of configure.
winlin f9767c91b5 fix configure bug, refine code for stream caster.
winlin 6c11207e28 fix http ts bug, the adts use id=1 which indicates the aac encoding.
winlin 5c3c38684b fix the bug of flv stream, metadata type should be 18
winlin 0ff49fd299 for , debug srs on xcode.
winlin db7ddfd510 fix , , support osx(darwin) for mac pro. 2.0.137.
winlin 20fb5f3e8e modify the colorful bash for osx.
winlin b0953c1d3a add comments of audio profile supported by srs.
winlin 5143e3a58d fix , http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136
winlin 2e9f2753c9 for , add stream codec info. 2.0.135
winlin 885b9af122 for , refine code to support he/hev2, use aac object.
winlin 8dbabe3708 fix , refine aac LC, support aac HE/HEv2. 2.0.134.
winlin d3e2838fc6 for , refine the aac profile for adts and aac object for RTMP sequence header.
winlin 04f3f2a8f8 for , add codec info to stream.
winlin 8bf60895a9 refine the kbps of server.
winlin fbbe46d272 refine the config, support directly parse file.
winlin b8e70f8538 support module
winlin ee30e6bb1f Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin 05d238f860 support modules.
winlin 688890cd7a refine configure, generate objs/makefile first.
winlin a29b8a7a5b refine configure, move auto headers to script.
winlin aaf87cf3d9 add srs module rule.
winlin b360fe279d remove libaacplus.
winlin 496f689de7 fix bug for libfdk aac.
winlin f26e719800 fix , fix http-flv stream bug, support multiple streams. 2.0.133.
winlin 1277968d4a refine http client, use initialize to set host and port.
winlin 2bcb4f811c refine http.
winlin 964e4be9d4 refine http request post. 2.0.132.
winlin 3982ec1d87 refine http request parse. 2.0.132.
winlin 4325809daf refine http
winlin 6fccfa061d refine the http request code.
winlin 025b707330 refine the http request reader.
winlin 3e394a5f06 for , set socket send buffer to smaller macro. 2.0.131
winlin 04dc60ebe1 refine http for srs, rename SrsGoHttp to SrsHttp.
winlin 983ab8fb89 pass all utest for 2.0
winlin e7fd733dc5 fix the long long warning.
winlin 3d47fbdc5c fix build failed of utest.
winlin a47dbf7a92 for , refine code.
winlin 34d6a2ece5 for , support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129
winlin f619f174e6 add readme for ide.
winlin 5d0cb7e68f update conf for rtsp
winlin 012c29e124 for , update the wiki.
winlin fb3fced8d0 for , revert dvr http api. 2.0.128.
winlin 8ed256b7e9 for , wait keyframe for dvr. 2.0.127
winlin 0213cc6466 for , refine dvr, support POST create dvr when publish not start. 2.0.126
winlin b903a7b436 for , dvr suport vhost/app/stream level control. 2.0.125.
winlin 1cb8e44b1b fix , fix hls bug, write pts/dts error. 2.0.124.
winlin a3648063d5 fix , support dvr http api. 2.0.123.
winlin d650118988 fix , dvr support api to start or stop. 2.0.123
winlin 1246989ea9 for , refine dvr, support callback when reap dvr segment.
winlin 849e59b05d for , support http api to start dvr.
winlin c67a4fdf97 for , enable http api crossdomain for dvr api.
winlin 1445086451 for , update the metadata of flv dvr file.
winlin 7077b74d03 for , add dvr plan append.
winlin 95b4baee7c for , refine dvr code to more simple.
winlin 3d225e1bc7 refine dvr, donot append the flv header.
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122.
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121.
winlin 9d233db27e fix , support push rtsp to srs. 2.0.120.
winlin a954040d29 for , rtsp parse aac from rtp packet.
winlin 0cc693a3b8 for , decode the h264 NALU from rtp.
winlin 6a64164985 for , show more info about rtp.
winlin 45c0b12958 for , finish rtsp sdp, start rtp.
winlin f14af45413 for , alloc and free rtp port.
winlin d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.
winlin ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
winlin 40fbfd8560 for , rtsp extract tcp/udp listener.
winlin 4807f7850d for , rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.
winlin 604f4cc57b for , support the rtsp options request and response.
winlin c0e50265bd for , create rtsp framework.
winlin e81e090239 for , add rtsp listener and handler.
winlin 78f34ad46f for , support config default acodec/vcodec. 2.0.118.
winlin 922150b2cf for , rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117
winlin 1ed3e283ab implements the pat/pmt write ts header.
winlin e88c1e32ee always increasing target duration, for
winlin 25af6c6847 for , use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
winlin 381e88d698 add release code. ZhouGuowen for SRS2.0
winlin b982b27f6f add dev code for each release. HuKaiqun for SRS1.0
winlin e19ee0cb99 for , set pcr_base to dts. 2.0.114.
winlin 87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114
winlin 66931a8890 try to fix hls problem, print the video packets.
winlin b8d4f68a69 try to refine hls, always flush video when reap segment.
winlin 5a3cd235fd refine hls, try to fix the hls ts corrupt problem.
winlin d5e3ac4e7d for , the aac profile must be object plus one. 1.0.26
winlin 4820d455d5 for , workaround to force to LC/MAIN, donot support SSR above. 2.0.113
winlin f8bdd28de6 add comments for hls m3u8, target duration may should not changed.
winlin 693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char
winlin 81ea6d34ce add pdf of hls rfc, corrent the content type.
winlin 30b1759aa9 fix bug for memory hls.
winlin bdda337f33 fix aac adts bug, the frame length is 2bits.
winlin 0af6e5e829 fix bug for srs-librtmp
winlin dba983d124 for , update the config for ram hls.
winlin a23191497f fix , support hls without io(in ram). 2.0.112
winlin 89b37d3469 for , refine the conf for hls.
winlin 4d10cc9f59 for , add conf.
winlin 16afe7ddbb fix , support push MPEGTS over UDP to SRS. 2.0.111
winlin 4246be92c9 for , merge avc to codec. use queue to dequeue.
winlin 153a3a6c42 must user pithy print for mpegts print.
winlin 70c8fe13c4 for , support h264 video for push mpegts over udp. 2.0.110
winlin 66fccdbbd1 for , demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.
winlin bce78fdab6 for , add comments for elemetary stream specifed by stream_id.
winlin a384cc400a for , use udp packet handler.
winlin 35ab0ea627 for , use buffer to cache bytes, for system will split the udp packet.
winlin b38bae2a89 for , refine parse pes packet, remove the clear method.
winlin 1685cdd48e for , parse pes packet ok, ts message ok.
winlin 486277089d for , parse the PES ts packet payload.
winlin 755e61e011 update the qt project.
winlin 8374017329 build libfdk-aac in ffmpeg. 2.0.108
winlin cc87992fe0 for , decode the PMT and PAT
winlin 7692e50fc2 for , calc and verify the crc32 of PAT.
winlin 52b62918d9 for , decode the PAT of PSI ts packet.
winlin 51aecb8fde for , decode the ts packet header and adaptation field.
winlin bd395904df for , the ts packet and adaptation field.
winlin aff7a1cb4d add ts packet definition for .
winlin 919a85b103 for , hls support h.264+mp3, ok for vlc. 2.0.107
winlin 2c42350489 for , http ts stream support h.264+mp3. 2.0.106
winlin aaade0f04f for , refine the pcr start at 0, dts/pts plus delay. 2.0.105
winlin 9cbc753e8e for , , refine the pcr start at 0, dts/pts plus delay. 1.0.25
winlin c9d270fbe0 refine code for , ts remux
winlin b0daf1482d update version to 1.0.24
winlin 1835957a2b for , refine pcr=dts-800ms and use dts/pts directly. 1.0.24
winlin ea85ad2e20 for , , move the ts codec to kernel ts.
winlin d22e4e86d8 update projects for rtmp renamed to protocol
winlin 711b6ca277 for , basic stream caster framework. 2.0.104
winlin 6463d22a14 for , add mpegts over udp stream caster class.
winlin 7f02bfa3a4 for , the mpegts over udp stream caster framework.
winlin 52891b491a listen and serve stream caster mpegts over udp.
winlin f9d1e1111a merge from feilong, consumer directly sleep when paused.
winlin 8ace73f30d for , use absolutely overflow to make jwplayer happy. 2.0.103
winlin 4f5cc9c403 for , use absolutely overflow to make jwplayer happy. 1.0.23
winlin 6b89ffbc1d add config section for stream caster.
winlin 73cfdea332 for , srs http server support dash vod stream over mp4 range. 2.0.103
winlin e0ee8de2fb for , srs http server support dash, flash request range in range or bytes.
winlin a4ba40952a for , rename rtmp to protocol dir.
winlin d9a012164e update vs2010 project.
winlin a647043a06 update readme and wiki url for http ts stream
winlin 2a05783d5c for , support http ts stream. 2.0.101
winlin dfe385d0c9 for , move the simple buffer to kernel.
winlin 77d78eac5c for , add http ts stream framework.
winlin 0f59073400 refine code, rename the pts to dts although both ok for audio.
winlin 913f98b902 for bug , http ts stream, move the avc codec from app to kernel.
winlin dc6299171f refine http stream code.
winlin 7d86c6d9e9 for bug , refine for fast cache of http stream.
winlin 2167a8385c update version to 3.0.101
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
winlin 7305fa6f03 update vs2010 filter
winlin f26a2a8f0e add vs2010 filters.
winlin db700a0c64 update vs solution
winlin 31efea4f33 rename srs cmake ide to jetbrains clion
winlin 664c85cf3d Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin a3607c9193 use ide dir for ides.
winlin 49330b98b3 Merge pull request from panda1986/develop 
支持mp3音频编码
panda1986 797c1b0762 support all acodec. not forced to aac.
panda1986 e7d54c2ca9 Update srs_app_ffmpeg.cpp 
srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
winlin bb1331cc91 update conf.
winlin b735e29d05 refine conf, add port.
winlin e5ef4c2e66 update the conf of http static and stream.
winlin 5f194bc87c merge from feilong, the crash for cosumer wait.
winlin b7b268dfbf fix , support http live flv/aac/mp3 stream with fast cache. 2.0.100.
winlin 29a8932b49 for bug , use http stream cache for android weixin to happy.
winlin f9f2fcbb9c for , add http stream cache for audio mp3/aac stream.
winlin e6549b261c for , support http mp3 streaming
winlin d364a81d8f for , support http mp3 streaming
winlin 99bf397487 for bug , add mp3 id3 spec
winlin b04888a35d for , , support http chunked encoding
winlin 15d87537a1 for bug , support aac stream.
winlin 3244c083c7 for bug , support http aac stream
winlin 7674524c31 for , empty the aac encoder
winlin c0233542bf for , add aac encoder for http aac stream.
winlin 77e43d1813 refine comments of aac publish for
winlin c0a7752718 for , add aac mime audio/x-aac
winlin d546827b1c for , refine the mime of content type.
winlin 3b853a6dbd fix , support rtmp remux to http flv live stream.
winlin 53d9faf395 for , update readme.
winlin eea31ef4f3 for , support rtmp remux to http flv live stream.
winlin faaa9187f2 for , mount http flv stream when publish.
winlin 2698e6dbae for bug , http live streaming framework.
winlin eff2d81016 for , add http flv stream
winlin c4302b9b61 for bug , the http server subscribe the reload.
winlin f1393ee43f for bug , use http not found when no file.
winlin 398b212bfa for bug , refine code, support default http vhost.
winlin 2742c0d3c2 for , support http vhost mount.
winlin 4513486266 refine http server, support mount dir for vhost.
winlin bfff8413b6 refine code for , the copy first param is the dest.
winlin c695a8fcbd refine code for , extract the flv vod stream.
winlin e71bc0cbc5 for bug , refine the http server.
winlin bbe96a4b31 for bug , support flv stream.
winlin cbed2bbca4 fix , refine http server refer to go http-framework. 2.0.98
winlin 9bbbaad288 for bug , refine http api refer to go http-framework. 2.0.97
winlin a1f887f46f refine code, move onMetaData to consts.
winlin 04aa6f8296 drop script data except the onMetaData packet.
winlin cc22ca4890 hotfix , use iformat only for rtmp input. 2.0.95
winlin 4449a8d7b0 fix , use iformat only for rtmp input. 1.0.22
winlin 29be14dd37 merge from feilong, fix memory leak.
winlin a4b61081cc merge from feilong, fix memory leak.
winlin fae006ca7c merge from feilong, fix memory leak.
winlin 63309a0538 refine for bug , drop info frame without error.
winlin b705ed0b90 for bug , refine the codec decode info frame failed. 1.0.21
winlin 964668dc73 merge from feilong, print format error.
winlin b3225100e7 Merge pull request from tufang14/develop 
add client num in statistic with traverse every client for
qiang.li 310e49e7f3 add client num in statistic with traverse every client
winlin 982e9555bd merge from feilong, fix hls msg memory leak bug.
winlin b466756931 merge from feilong for bug .
winlin 27e0521ace fix , fix hls bug ignore type-9 send aud. 1.0.20
winlin 6c833902f9 merge http api from tufang. 2.0.92
winlin ac584a4db2 Merge pull request from tufang14/develop 
add client num for stream in statistic for
qiang.li 46d716612c add client num for stream in statistic
winlin 44f5efda21 refine the print info.
winlin 0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91
winlin 5aa31568ba fix the rtmp dump, parse the aggregate msg.
winlin 5661fc2676 refine dvr and rtmp dump, write the original data.
winlin a402ca7120 refine code, the consumer always alive longer than queue recv thread.
winlin 89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp
winlin 0e03d019a8 for bug , srs rtmp dump support conn args. 2.0.90
qiang.li 08e9f6ef42 add play client num in statistic
winlin f1efdcd000 refine code, use global virtual id to generate the id of vhost and stream.
winlin ae63af6a4a refine code, implements the stat.:
winlin 97bea51499 refine the api, response the error code and data.
winlin cc796a433a refine the statistic arch.
winlin 40ed2249e8 refine code to use the one coding style.
winlin 4bb17f0c81 replace the TAB with 4spaces
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 7f60d472e6 remove the change vhost forward.
winlin 45724bfaec update conf for transcode.
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 07b207b7e3 remove test code for api-server.
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 8757473a7a Merge branch '1.0release' into develop
winlin dec4f6b989 hotfix 1.0release, add remote gitlab
winlin 8ea6da2607 Merge branch '1.0release' into develop
winlin dfd4eeca45 hotfix 1.0release, git checkout develop when commit
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 0c132e9781 update the log position.
winlin 127b96b255 add git2unix and git commit script.
winlin 9c033c7da6 hotfix 1.0, author bug, use error macro. 1.0.9
winlin 575e50b6e2 hotfix to add comments on 1.0release
winlin be53b10ed3 refine log position
winlin d91a9dfa9d udpate the srs_bwt.
winlin cd0ab5fb43 update PRIMARY, AUTHORS, CONTRIBUTORS rule
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 2175102ea2 remove the sync script for mirror, which maybe updated.
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 fca500fae6 update package for pi, check the lsb_release.
winlin 024611cc08 update package for pi, check the lsb_release.
winlin dddec3484e update to 1.0beta, 1.0.0
winlin effcd89f66 refine script.
winlin 6468b9e92b refine script, to disable iptables and selinux. 0.9.225
winlin 5e8f8ad3b9 add add hosts and wiki.
winlin 3fcbb60b1c add add hosts and wiki.
winlin bea53dca97 refine the run script for centos7
winlin a9cceee943 refine the run script for centos7
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 3f9a53de0e refine cmake list, only for clion.
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.