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

1566 Commits (02778dba4c744f52c6c83739cb21abd4230a1809)

Author SHA1 Message Date
winlin f7fdbe6848 update get connections thread to sleep 10ms per 1000 connectios. 0.9.181
winlin 15d4993cc3 slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180
winlin 6539ce69f4 fix , support tun0(vpn network device) ip retrieve. 0.9.179.
winlin f0ffdcc0ae fix , support tun0(vpn network device) ip retrieve. 0.9.179.
winlin 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178
winlin 792a6f944f refine utility of cpu, add comment for cpu percent
winlin c16d3585a5 refine utility of cpu, add comment for cpu percent
winlin e37f312f27 refine the code for ios build. add authors StevenLiu. 0.9.177
winlin b198d17ab9 Merge pull request from T-bagwell/master 
Support porting srs on MacOS OSX system Platform
Steven Liu b50ecd6dbe Support porting srs on MacOS OSX system Platform 
Add the OSX platform cross complie options into srs
winlin 37ceadd865 sync the conf file
winlin 9c11001391 refine log for stats network and disk
winlin 6f700f3f40 rename network_device_index to network
winlin f4ea48adcb rename network_device_index to network
winlin b8ae5c63fc add disk io test command
winlin 42464cbe1f add disk io test command
winlin 4f4b15f500 refine the disk iops stat, get cpu info.
winlin ef7a02e643 refine the disk io busy, can >1
winlin df8414af63 api connections add udp, add disk iops. 0.9.176
winlin b334021836 add config item for the stat disk device name
winlin 7c1dd97513 refine system stat, use fgets and sscanf.
winlin a7a009212b refine the cpu stat, use fgets and sscanf.
winlin f53bfcea54 add udp stat to nb_conn_sys as nb_conn_sys_udp
winlin abef029610 refine full conf
winlin e5e0c4a68d refine the utest, add stats
winlin e76036f40b refine config heartbeat, add new stats. 0.9.175
winlin 02f7c85710 add total system in and out KBps disk stat. 0.9.174
winlin d2f125b6d6 refine the cpu usage calc, add total_delta.
winlin d0bc0884d1 refine rtmp client, add comments for the dumps_packets()
winlin a645b403c8 add comments for utility, the USER_HZ for /proc/stat
winlin 6d9d9ee3c5 updte forwarder comments
winlin 6ee9ea341a refine code, rename SrsSocket to SrsStSocket
winlin b19d2e8e2d refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp
winlin 13abb0d768 complete config utest. 0.9.173
winlin a35d403651 add utest for config check
winlin fbddfbc8a3 fix , not fix for the shrink to clear the queue.
winlin b10d95205a fix , not fix for the shrink to clear the queue.
winlin 30ebba0673 add config check utest
winlin ebf9e560b1 refine the max connections, compare the system ulimit max open files, error when exeed limit
winlin 5f7ff37e64 fix the utest mock config bug
winlin 9f2da4e095 refine log, can be used when _srs_config is NULL.
winlin 7241fa8744 fix , srs_publiser add warnings. refine config utest.
winlin b17c736f3f fix , gop cache support disable video in publishing. 0.9.171.
winlin 50cd1d2360 refine the config
winlin 7865b0e935 refine config, check chunk size.
winlin 630bdf0c80 refine config, check the value of http api/stream.
winlin 7207c2f435 refine config, check all config item name.
winlin 1c27f3b913 refine config, warning when feature disabled.
winlin f562a98602 add configure options --log-verbose/info/trace to compile log macros. 0.9.169
winlin fd8c4989f5 add todo fixme for log verbose and info
winlin 91d2296836 fix , srs_info detail log compile failed. 0.9.168.
winlin 2e58fac5eb fix : edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167
winlin b56e7ef7ab complete main utest for config
winlin 2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls
winlin d612597a8f refine log of edge push/pull
winlin 77236920b6 add config utest, for default vhost
winlin f1b1dc0c64 add utest for config full.conf, fix the chunk-size bug
winlin 21f49a9875 add basic utest for config service
winlin 6e8c4df4b1 refine error codes.
winlin 0db2e6b8e9 fix the empty config error
winlin 75bfe2af78 refine the LF,CR
winlin 8cd9be4fce add comments for LF,CR
winlin c65a6b5d63 fix the conf_line bug of parse config directive.
winlin 86ad39f001 finish basic utest for config
winlin 9b6c22644d add basic utest for config directive
winlin 6f743a2fe8 pass all utest
winlin e47c0ae202 refine all consts
winlin 8497b22d4a complete the consts refine
winlin 1afa6ed607 refine consts.
winlin 2667815123 refine consts, move http consts to kernel consts
winlin c46b3bd193 refie http consts.
winlin 573952e2fc refine macros of HTTP
winlin 198a7f1e9d refine the rtmp consts name
winlin a9f7f1ecfe refine the consts to kernel consts
winlin baa20b2f31 refine the config consts
winlin 736ec48c71 move some consts to kernel consts
winlin 073d900674 add consts to kernel
winlin 24a041266c refine config
winlin f8423dfa90 fix : use iformat and oformat for ffmpeg transcode.
winlin 9bf7b722db fix : use iformat and oformat for ffmpeg transcode.
winlin 2f0a72d7d1 refine config, add comments
winlin a5f4323ea8 refine config, add comments
winlin b4e2d70390 refine config comments, return the engines of transcode.
winlin 2293700728 refine config, remove the const string&
winlin 1accd8c790 refine config, add comments.
winlin f572531eca refine config, return the vhosts vector.
winlin 96e0e699dd refine the get port, return a vector<string> contains ports.
winlin 1243d962b8 update comments of utility
winlin b37aeff8d5 refine config, check name
winlin 25180c51b4 refine the config comments.
winlin 1e8981eb08 extracta parse_buffer for config
winlin 784d7499cf refine config, add error line log
winlin f3e85a0063 refine the usage of csr.
winlin 9f7d488fa4 refine config, add comments.
winlin f6b084b679 remove the reload create function.
winlin f4ffe0aaee refine config, move file buffer to internal namespace
winlin 654c3c6d71 refine server, add comments
winlin 88dc1523d8 refine code, add comments for bandwidth; remove the bwtc configure script test item.
winlin 7945a42770 refine code, add the video tag comments.
winlin 26bfbaeb82 refine code.
winlin 465ff88b1f refine hls avc/aac codec, move metadata to it.
winlin e50968f404 refine the hls codec, add comments.
winlin a4d3283cdd refine hls codec sample info. 0.9.161
winlin f020690ed7 add comments for the FLV/RTMP enums
winlin 9860e390a3 refine code, for cubieboard to build ok.
winlin d609fbc7ce 1.0.mainline6, core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines.
winlin 5c4398f4a9 refine bandwidth check/test, flash publish test is ok.
winlin fd1e8aa882 remove src/main/srs_main_bandcheck.cpp, and --with-bwtc(use librtmp instead). 0.9.159
winlin 8984ba9d56 refine the usage of bwtc.
winlin 9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158
winlin cc62d254f0 add librtmp bandwidth check/test client.
winlin cf7a48e3da refine options.sh in auto
winlin f24a60819f add demo config test
winlin 5b714ba970 fix utest bug, when ssl disable, ignore complex handshake utest.
winlin ccd99381e6 fix bug, when disable all, some code of HLS must be exported.
winlin e53655ee83 refine the build script
winlin 0322dbbfb2 big refine code, add author to bandwidth test/check.
winlin b33a61a8da finish refine bandwidth check/test server-side.
winlin 0fb51413f4 refine bandwidth test, use function ptr.
winlin 539b595604 refine the bandwidth server-side, use kbps limit and sample. 0.9.157
winlin e220596675 refine bandwidth server-side, use sample and kbps limit
winlin 79e7e2d6cc refine bandwidth server-side, use bandwidth sample and kbps limit service
winlin 019b25ea30 add MIT license to bandwidth check/test as/js library.
winlin 3a1b3dd142 fix bandwidth bug, config item interval to float.
winlin d8ed7cc968 refine the js library for bandwidth test.
winlin 0707c24b54 refine the js library for bandwidth test.
winlin 2ff88b9bcd move js to srs_bwt.
winlin c319cc6a40 refine bandwidth test client, provides js and as library
winlin b1dd0218be refactor bandwidth test, refactor the interface of bandwidth server object.
winlin e2d273f493 do performance test, support 1.8k, improve 22%
winlin 047fb74889 refine rtmp client/server, add comments.
winlin 88c94193a3 rename rtmp_stack to stack. remove the global templte function to member function.
winlin f7922e3823 refine protocol send. add utest for server auto response message
winlin 9556790a5e finish utest of protocol stack. 0.9.156
winlin 8e27df4cf7 refine the protocol, add comments, add utest for empty packet
winlin c4aec5705b fix chunk header parse bug, add utest for basic/message header
winlin c957fadcb1 refine recv message header, add comments, remove the fresh_packet variable which duplicated with first_chunk
winlin d86e07b745 finish basic protocol utest, fix the bug of fmt11 length error.
winlin 54fda96f37 add utest for bug
winlin 2c3cb73ad6 update utest
winlin 7027a125f0 refine protocol, add comments. add utest for protocol bytes and timeout.
winlin 1e73ae4d47 refine RTMP protocol stack, rename buffer to in_buffer, change field pp/stream to local variables. 0.9.154
winlin 59dff7d268 add comments for RTMP protocol stack
winlin 2516e3c596 complete the comments of RTMP protocol.
winlin c457eea692 add comments for all RTMP packets.
winlin 8c493e9896 fix , open the sample access by default.
winlin 2554836940 add comments for RTMP packets.
winlin 51f924c553 refine RTMP protocol stack, refine the packet encode/decode, remove class_name
winlin b551056330 add comments of io interfaces.
winlin 09afaa250a add comments of message array, add utest.
winlin 6a4b177475 refine shared ptr message, rename initialize to create
winlin 891bc3fe65 refine utility of protocol, add comments
winlin 96e0273e99 refine hls, extract the flv/aac sample rates
winlin e5e2729967 refine amf0 and handshake code, add comments to utest.
winlin 574cd15efb refine amf0, rename internal classes
winlin c31c607ad3 refine amf0, move declarations from cpp to hpp, use namespace _srs_internal
winlin d22e7cab0a add comments to amf0
winlin dc7b952043 change HLS audio delay to 100ms. 0.9.153
winlin f895523ac6 fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152
winlin 21a75924ad fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152
winlin aefff75d08 fix , support all aac sample rate, add detail codec logs.
winlin f53abfa1d1 update comments for aac he or he-v2
winlin b2303c5704 refine code, use macro for hls resample audio
winlin 921b7d239f refine code, use macro for hls resample audio
winlin 63214d0f2b fix : support all aac sample rate, for instance, 48000. to 0.9.150
winlin 7805f7b12a add prefix Protocol to AMF0 and Handshake utest
winlin 5a41b1b538 finish kernel utest. to 0.9.149
winlin ad920915a2 merge handshake to protocol
winlin b13fd5112b merge buffer to kernel utest
winlin 1e395e7c10 add assert to flv.
winlin 95e73d0be1 remove the config log http api. 0.9.148
winlin d219a7b67e complete the normal kernel flv utest. 0.9.147
winlin 010eb09a30 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server
winlin 8271bd657b refine flv codec, rename fast encoder to flv vod stream decoder
winlin 032118581a refine http/dvr/hls to use file reader/writer. 0.9.146
wenjiegit d7454134c9 Update srs_app_hls.cpp 
for hls, srs should not allow player to cache m3u8 list.

add #EXT-X-ALLOW-CACHE:NO to m3u8 file.
winlin ba2e7bbf76 support create stream twice. 0.9.145
winlin fb70602f93 fix , always use 31bits timestamp. 0.9.143.
winlin 0bd7d268e8 add mock for file reader/writer
winlin a888e52df1 donot mix the read and write for librtmp
winlin 1eee4d25cf refine the librtmp, open writer then reader.
winlin 1a7735182f refine the file stream, to file reader and writer. 0.9.142
winlin ed3f9f0a40 add core utest
winlin f5f54e6008 add utest for kernel codec
winlin 492665e166 refine tcp client connect, extract to utility srs_socket_connect. 0.9.141
winlin 051c9e6268 refine the protocol utility, add utest, 0.9.140
winlin 6a2f0a3dc9 add configure preset --demo
winlin 55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139
winlin cb2967c967 refine forward, use utility to generate the tcUrl
winlin 4d45b3305b srs demo requires ffmpeg to transcode.
winlin 18534ecdb2 donot start nginx for demo, use cherrypy to delivery HLS.
winlin ee07210105 fix demo script, start nginx. fix warning of utest on ubuntu14
winlin e6f524281c support build on ubuntu14, 0.9.138
winlin aad42d7941 fix ubuntu14 build warnings
winlin 594c1d8bf7 fix ssl make install on ubuntu 14, change to make install_sw
winlin bfeb24c52b update call response, add comments.
winlin fea8755719 response the call message with null. 0.9.137
winlin 53ad510766 add comments for the connection remove
winlin a3f9aa7e1e fix , thread start segment fault, thread cycle stop destroy thread. 0.9.136
winlin efed34301c add virtual destructor to SrsRefer
winlin b357504b1d fix : fix the system jump time, adjust system startup time. 0.9.135
winlin 6ae6f6e60d add freetype2 to pkg-config path.
winlin 0cd0761508 fix time jitter zero algorithm bug, reset when timestamp overflow.
winlin 1970e18ed6 fix : disable the time jitter for encoder non-monotonical stream. 0.9.133
winlin f173345e15 support report summaries in heartbeat. 0.9.132
winlin db253bc76b fix fms token traverse bug, always update the token by the latest valid client.
winlin 1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130
winlin e9c96af91a add wiki and conf for token traverse auth
winlin 41857edaee support edge token traverse, fix . 0.9.129
winlin 10953c9743 support token auth in connect args. 0.9.128
winlin 6ff193c989 donot need to yum install pkg-config, for centos always installed it
winlin 94e5e7070d fix bug of freetype2 build for ffmpeg, depends on pkg-config
winlin 094d82bd06 add connections count to api summaries. 0.9.127
winlin 603b3bcdcc add libfreetype2 for ffmpeg, remove the depends of freetype of build_ffmpeg.
winlin 6ee2ba049b add srs bytes and kbps to api summaries. 0.9.126
winlin 8fabd5d987 refine cubieboard configure, use ubuntu prepare to install tools
winlin 46611ac062 refine configure, add cubieboard. use IProtocolStatistic in kbps.
winlin 46c1367fe8 refine the protocol io reader writer arch.
winlin b0e4dc8085 refine network bytes of summaries, remove the lo data.
winlin d0b08d0d51 add network bytes to api summaries. 0.9.125
winlin f893711499 fix : workaround for librtmp ping(fmt=1,cid=2 fresh stream).
winlin 3f9c23d834 fix : for ubuntu14 build error.
winlin cbc1486688 refine message, add license
winlin 55b99c90c7 refine detect tool, support atc stream.
winlin 17cb8c4550 finish the research for python-subprocess
winlin b7d8be46a1 add research for usage for subprocess
winlin cccc483ab3 add bytes statistic for librtmp
winlin a639eb0596 fix bug of buffer assert, erase can accept any value
winlin d48d739fa7 fix bug of detect rtmp, add error code
winlin 4d9ed6f7fe refine the code, add comments to result to self interpret
winlin 8817823462 add rtmp detecter
winlin ef6efb821c add rtmp detecter
winlin 0327c85f85 refine kernel codec, remove unused stream
winlin 6286759eaa refine codec, extract avc aac codec to app.
winlin 3dbe8ba9de update configure script
winlin 31b568b013 refine core, move specified functions to kernel utility.
winlin 7c7920698d refine utest, move the mock io to handshake where actually use it.
winlin 94cf0c1069 refine kernel buffer. complete the utest for buffer.
winlin 8992e217a9 refine srs buffer, min interfaces
winlin e6c03c6d6d complete the amf0 strict array utest
winlin 5a06909d75 update amf0 strict array test, fix bug of count zero init
winlin 373f92551d refine librtmp, remove the ssl functoins, refine the type2string memory alloc to static
winlin 48adeeb1a5 fix the demo player html text
winlin e227bd3a0e remove the srs community
winlin 7022f48a86 add rtmfp rfc doc
winlin 52971f3f81 update readme, add rtmfp
winlin 7166b666c8 refine http log.
winlin 5273509554 refine log, to 0.9.123
winlin 7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122
winlin d56f445076 remove research flv codec, to librtmp
winlin 22968c85df supprt inject flv
winlin 4970664e37 move codec to kernel.
winlin 608083d42f add flv injecter, add flv codec to librtmp.
winlin 009de72a01 fix research bug, rename srs_freepa to srs_freep
winlin 6de81fdb1c refine fast id tracer
winlin 978e985519 fix : add source id for full trackable log. 0.9.120
winlin 8d99ef27cf fix : unpublish source when edge stop, clear gop cache
winlin 7920348e5f extract get_local_ip and get_peer_ip to app utility
winlin 384687a36d add server ip to flash client.
winlin e39eed6519 add SrsPid and SrsId to client response, add pid to log
winlin 5ff1ce7cba for bug , response the server SrsId to flash.
winlin d74921e1ab fix , config to /dev/null to disable ffmpeg log. 0.9.117
winlin 14f0a2e046 for bug , add timeout for connect.
winlin 93c9c55fb9 remove the complex handshake of librtmp. refine makefile of librtmp tools
winlin 69248cedaa http streaming support flv start index. 0.9.115
winlin b13bd70c86 http streaming support flv start index.
winlin 7b69b8b5c4 fix : allow edge vhost to add or remove. 0.9.114
winlin 344a49918a fix : allow edge vhost to add or remove.
winlin cf7b6f25f6 add srs community
winlin 0eb9e0af5b fix st joinable thread must be stop by other threads, 0.9.113
winlin 6fba0db9b5 refine http stream server
winlin 9eedf1ac40 the st_thread_exit is ok, not the memory leak cause.
winlin 5f7bacf678 fix st thread exit bug, never implict invoke the st_thread_exit, which may cause memory leak. 0.9.112
winlin 6bc0ecece7 add dvr, http heartbeat conf sample
winlin 25e279b7c8 support amf0 StrictArray(0x0a). 0.9.111.
winlin 7f48590239 support amf0 StrictArray(0x0a). 0.9.111.
winlin bd24fe7d75 support flv parser, add amf0 to librtmp. 0.9.110
winlin 69eb935505 fix bug of flv parser, librtmp amf0 library
winlin d4b8fee61a fix bug , http callback api support authentication in tcUrl
winlin f37faf7236 update librtmp, add amf0 parse functions
winlin efc9f53512 fix rtmp handshake utest bug
winlin f0b54678ad fix http hooks dvr bug, check dvr macro
winlin 2a8db3ab83 refine the re of ingest flv, re cleanup always sleep
winlin 1d6b096ce9 adjust the deviation.
winlin 2265173c4d donot install tools when ffmpeg is not open, 0.9.108
winlin ef0f7f4da8 support http heartbeat, 0.9.107
winlin cb95b5909c add http heartbeat framework
winlin 7c804277b2 add heatbeat url, add stream for api-server
winlin 0186247fee support http api json, to PUT/POST. 0.9.105
winlin 3064e5ec61 fix bug of nx_json parse, to 0.9.104
winlin d6355efe22 support http api json, to PUT/POST, to 0.9.103
winlin b60e8418c6 add json base on nxjson(nx-json/nx_json) decoder for http api. 0.9.102
winlin 2c059d3a80 fix bug , also need stream_id for send_and_free_message. 0.9.101
winlin 952abbee03 use server ip or name for forward tcurl.
winlin c59576146b rename struct to class. 0.9.100
winlin 2f89c8b2e8 move some utilities from kernel to app. 0.9.99
winlin 4b8d3fe05f refine log, add overflow log
winlin 47089f0e82 add nxjson
winlin 154f084f1b add comments for json
winlin 07fbd58f39 update api server, add meiyi demo streams.