Commit Graph

1541 Commits (ba5b3b92b18b2d3adb89958530bd113e706b77d1)

Author SHA1 Message Date
winlin b15ee26a48 fix the ssl dh key size assert error, key size maybe 127, not always 128. 0.9.195 11 years ago
winlin 67ab0fb5e0 add comments for openssl key generator assert. 11 years ago
winlin aefcaa9683 refine code, add install root message 11 years ago
winlin 0cd2b13e2e add rtmfp tsvarea 11 years ago
winlin b317abbaee refine openssl, add compute_key, for bug #148 11 years ago
winlin d4c2aa1e8e add __openssl_compute_key to calc the shared key 11 years ago
winlin 7adbe7f456 fix utest build failed, sync with src changed. 11 years ago
winlin ad2c996bd8 refine HMAC sha256 digest algorithm. 0.9.193 11 years ago
winlin 12ad95a5b8 refine HMAC sha256 digest algorithm. 0.9.193 11 years ago
winlin 156a9ed2a3 change to 0.9.192. 11 years ago
winlin 1ebaab2c6e fix #148, simplify the RTMP handshake key generation. 0.9.191. 11 years ago
winlin a9d28122f4 refine code, refine the handshake, refine the log of source_id 11 years ago
winlin 5b28355a0b fix #147, support identify the srs edge. 0.9.190. 11 years ago
winlin 3532b61e3d open all utest macro 11 years ago
winlin 798f9139a4 add reload utest. 11 years ago
winlin 33bc8755ab refine code, add comments for ossrs.net monitor. 11 years ago
winlin 67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 11 years ago
winlin ade2376da0 fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188. 11 years ago
winlin 6dd065bcc3 fix #85, fix the segment-dvr sequence header missing. 0.9.187. 11 years ago
winlin 5a95d594e7 fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186. 11 years ago
winlin d5ba529d32 fix #143, fix retrieve sys stat bug for all linux. 0.9.185. 11 years ago
winlin 7b24788445 for bug #143, build on centos5. 11 years ago
winlin 84450e1588 fix #138, fix http hooks bug, regression bug. 0.9.184. 11 years ago
winlin 721acc350a fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183. 11 years ago
winlin d5f03200a7 revert tcp stat. need more refine. 0.9.182 11 years ago
winlin f7fdbe6848 update get connections thread to sleep 10ms per 1000 connectios. 0.9.181 11 years ago
winlin 15d4993cc3 slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180 11 years ago
winlin 6539ce69f4 fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 11 years ago
winlin f0ffdcc0ae fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 11 years ago
winlin 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 11 years ago
winlin 792a6f944f refine utility of cpu, add comment for cpu percent 11 years ago
winlin c16d3585a5 refine utility of cpu, add comment for cpu percent 11 years ago
winlin e37f312f27 refine the code for ios build. add authors StevenLiu. 0.9.177 11 years ago
winlin b198d17ab9 Merge pull request #135 from T-bagwell/master
Support porting srs on MacOS OSX system Platform
11 years ago
Steven Liu b50ecd6dbe Support porting srs on MacOS OSX system Platform
Add the OSX platform cross complie options into srs
11 years ago
winlin 37ceadd865 sync the conf file 11 years ago
winlin 9c11001391 refine log for stats network and disk 11 years ago
winlin 6f700f3f40 rename network_device_index to network 11 years ago
winlin f4ea48adcb rename network_device_index to network 11 years ago
winlin b8ae5c63fc add disk io test command 11 years ago
winlin 42464cbe1f add disk io test command 11 years ago
winlin 4f4b15f500 refine the disk iops stat, get cpu info. 11 years ago
winlin ef7a02e643 refine the disk io busy, can >1 11 years ago
winlin df8414af63 api connections add udp, add disk iops. 0.9.176 11 years ago
winlin b334021836 add config item for the stat disk device name 11 years ago
winlin 7c1dd97513 refine system stat, use fgets and sscanf. 11 years ago
winlin a7a009212b refine the cpu stat, use fgets and sscanf. 11 years ago
winlin f53bfcea54 add udp stat to nb_conn_sys as nb_conn_sys_udp 11 years ago
winlin abef029610 refine full conf 11 years ago
winlin e5e0c4a68d refine the utest, add stats 11 years ago
winlin e76036f40b refine config heartbeat, add new stats. 0.9.175 11 years ago
winlin 02f7c85710 add total system in and out KBps disk stat. 0.9.174 11 years ago
winlin d2f125b6d6 refine the cpu usage calc, add total_delta. 11 years ago
winlin d0bc0884d1 refine rtmp client, add comments for the dumps_packets() 11 years ago
winlin a645b403c8 add comments for utility, the USER_HZ for /proc/stat 11 years ago
winlin 6d9d9ee3c5 updte forwarder comments 11 years ago
winlin 6ee9ea341a refine code, rename SrsSocket to SrsStSocket 11 years ago
winlin b19d2e8e2d refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp 11 years ago
winlin 13abb0d768 complete config utest. 0.9.173 11 years ago
winlin a35d403651 add utest for config check 11 years ago
winlin fbddfbc8a3 fix #134, not fix for the shrink to clear the queue. 11 years ago
winlin b10d95205a fix #134, not fix for the shrink to clear the queue. 11 years ago
winlin 30ebba0673 add config check utest 11 years ago
winlin ebf9e560b1 refine the max connections, compare the system ulimit max open files, error when exeed limit 11 years ago
winlin 5f7ff37e64 fix the utest mock config bug 11 years ago
winlin 9f2da4e095 refine log, can be used when _srs_config is NULL. 11 years ago
winlin 7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 11 years ago
winlin b17c736f3f fix #124, gop cache support disable video in publishing. 0.9.171. 11 years ago
winlin 50cd1d2360 refine the config 11 years ago
winlin 7865b0e935 refine config, check chunk size. 11 years ago
winlin 630bdf0c80 refine config, check the value of http api/stream. 11 years ago
winlin 7207c2f435 refine config, check all config item name. 11 years ago
winlin 1c27f3b913 refine config, warning when feature disabled. 11 years ago
winlin f562a98602 add configure options --log-verbose/info/trace to compile log macros. 0.9.169 11 years ago
winlin fd8c4989f5 add todo fixme for log verbose and info 11 years ago
winlin 91d2296836 fix #121, srs_info detail log compile failed. 0.9.168. 11 years ago
winlin 2e58fac5eb fix #122: edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167 11 years ago
winlin b56e7ef7ab complete main utest for config 11 years ago
winlin 2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls 11 years ago
winlin d612597a8f refine log of edge push/pull 11 years ago
winlin 77236920b6 add config utest, for default vhost 11 years ago
winlin f1b1dc0c64 add utest for config full.conf, fix the chunk-size bug 11 years ago
winlin 21f49a9875 add basic utest for config service 11 years ago
winlin 6e8c4df4b1 refine error codes. 11 years ago
winlin 0db2e6b8e9 fix the empty config error 11 years ago
winlin 75bfe2af78 refine the LF,CR 11 years ago
winlin 8cd9be4fce add comments for LF,CR 11 years ago
winlin c65a6b5d63 fix the conf_line bug of parse config directive. 11 years ago
winlin 86ad39f001 finish basic utest for config 11 years ago
winlin 9b6c22644d add basic utest for config directive 11 years ago
winlin 6f743a2fe8 pass all utest 11 years ago
winlin e47c0ae202 refine all consts 11 years ago
winlin 8497b22d4a complete the consts refine 11 years ago
winlin 1afa6ed607 refine consts. 11 years ago
winlin 2667815123 refine consts, move http consts to kernel consts 11 years ago
winlin c46b3bd193 refie http consts. 11 years ago
winlin 573952e2fc refine macros of HTTP 11 years ago
winlin 198a7f1e9d refine the rtmp consts name 11 years ago
winlin a9f7f1ecfe refine the consts to kernel consts 11 years ago
winlin baa20b2f31 refine the config consts 11 years ago
winlin 736ec48c71 move some consts to kernel consts 11 years ago
winlin 073d900674 add consts to kernel 11 years ago
winlin 24a041266c refine config 11 years ago
winlin f8423dfa90 fix #119: use iformat and oformat for ffmpeg transcode. 11 years ago
winlin 9bf7b722db fix #119: use iformat and oformat for ffmpeg transcode. 11 years ago
winlin 2f0a72d7d1 refine config, add comments 11 years ago
winlin a5f4323ea8 refine config, add comments 11 years ago
winlin b4e2d70390 refine config comments, return the engines of transcode. 11 years ago
winlin 2293700728 refine config, remove the const string& 11 years ago
winlin 1accd8c790 refine config, add comments. 11 years ago
winlin f572531eca refine config, return the vhosts vector. 11 years ago
winlin 96e0e699dd refine the get port, return a vector<string> contains ports. 11 years ago
winlin 1243d962b8 update comments of utility 11 years ago
winlin b37aeff8d5 refine config, check name 11 years ago
winlin 25180c51b4 refine the config comments. 11 years ago
winlin 1e8981eb08 extracta parse_buffer for config 11 years ago
winlin 784d7499cf refine config, add error line log 11 years ago
winlin f3e85a0063 refine the usage of csr. 11 years ago
winlin 9f7d488fa4 refine config, add comments. 11 years ago
winlin f6b084b679 remove the reload create function. 11 years ago
winlin f4ffe0aaee refine config, move file buffer to internal namespace 11 years ago
winlin 654c3c6d71 refine server, add comments 11 years ago
winlin 88dc1523d8 refine code, add comments for bandwidth; remove the bwtc configure script test item. 11 years ago
winlin 7945a42770 refine code, add the video tag comments. 11 years ago
winlin 26bfbaeb82 refine code. 11 years ago
winlin 465ff88b1f refine hls avc/aac codec, move metadata to it. 11 years ago
winlin e50968f404 refine the hls codec, add comments. 11 years ago
winlin a4d3283cdd refine hls codec sample info. 0.9.161 11 years ago
winlin f020690ed7 add comments for the FLV/RTMP enums 11 years ago
winlin 9860e390a3 refine code, for cubieboard to build ok. 11 years ago
winlin d609fbc7ce 1.0.mainline6, core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines. 11 years ago
winlin 5c4398f4a9 refine bandwidth check/test, flash publish test is ok. 11 years ago
winlin fd1e8aa882 remove src/main/srs_main_bandcheck.cpp, and --with-bwtc(use librtmp instead). 0.9.159 11 years ago
winlin 8984ba9d56 refine the usage of bwtc. 11 years ago
winlin 9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 11 years ago
winlin cc62d254f0 add librtmp bandwidth check/test client. 11 years ago
winlin cf7a48e3da refine options.sh in auto 11 years ago
winlin f24a60819f add demo config test 11 years ago
winlin 5b714ba970 fix utest bug, when ssl disable, ignore complex handshake utest. 11 years ago
winlin ccd99381e6 fix bug, when disable all, some code of HLS must be exported. 11 years ago
winlin e53655ee83 refine the build script 11 years ago
winlin 0322dbbfb2 big refine code, add author to bandwidth test/check. 11 years ago
winlin b33a61a8da finish refine bandwidth check/test server-side. 11 years ago
winlin 0fb51413f4 refine bandwidth test, use function ptr. 11 years ago
winlin 539b595604 refine the bandwidth server-side, use kbps limit and sample. 0.9.157 11 years ago
winlin e220596675 refine bandwidth server-side, use sample and kbps limit 11 years ago
winlin 79e7e2d6cc refine bandwidth server-side, use bandwidth sample and kbps limit service 11 years ago
winlin 019b25ea30 add MIT license to bandwidth check/test as/js library. 11 years ago
winlin 3a1b3dd142 fix bandwidth bug, config item interval to float. 11 years ago
winlin d8ed7cc968 refine the js library for bandwidth test. 11 years ago
winlin 0707c24b54 refine the js library for bandwidth test. 11 years ago
winlin 2ff88b9bcd move js to srs_bwt. 11 years ago
winlin c319cc6a40 refine bandwidth test client, provides js and as library 11 years ago
winlin b1dd0218be refactor bandwidth test, refactor the interface of bandwidth server object. 11 years ago
winlin e2d273f493 do performance test, support 1.8k, improve 22% 11 years ago
winlin 047fb74889 refine rtmp client/server, add comments. 11 years ago
winlin 88c94193a3 rename rtmp_stack to stack. remove the global templte function to member function. 11 years ago
winlin f7922e3823 refine protocol send. add utest for server auto response message 11 years ago
winlin 9556790a5e finish utest of protocol stack. 0.9.156 11 years ago
winlin 8e27df4cf7 refine the protocol, add comments, add utest for empty packet 11 years ago
winlin c4aec5705b fix chunk header parse bug, add utest for basic/message header 11 years ago
winlin c957fadcb1 refine recv message header, add comments, remove the fresh_packet variable which duplicated with first_chunk 11 years ago
winlin d86e07b745 finish basic protocol utest, fix the bug of fmt11 length error. 11 years ago
winlin 54fda96f37 add utest for bug #98 11 years ago
winlin 2c3cb73ad6 update utest 11 years ago
winlin 7027a125f0 refine protocol, add comments. add utest for protocol bytes and timeout. 11 years ago
winlin 1e73ae4d47 refine RTMP protocol stack, rename buffer to in_buffer, change field pp/stream to local variables. 0.9.154 11 years ago
winlin 59dff7d268 add comments for RTMP protocol stack 11 years ago
winlin 2516e3c596 complete the comments of RTMP protocol. 11 years ago
winlin c457eea692 add comments for all RTMP packets. 11 years ago
winlin 8c493e9896 fix #49, open the sample access by default. 11 years ago
winlin 2554836940 add comments for RTMP packets. 11 years ago
winlin 51f924c553 refine RTMP protocol stack, refine the packet encode/decode, remove class_name 11 years ago
winlin b551056330 add comments of io interfaces. 11 years ago
winlin 09afaa250a add comments of message array, add utest. 11 years ago
winlin 6a4b177475 refine shared ptr message, rename initialize to create 11 years ago
winlin 891bc3fe65 refine utility of protocol, add comments 11 years ago
winlin 96e0273e99 refine hls, extract the flv/aac sample rates 11 years ago
winlin e5e2729967 refine amf0 and handshake code, add comments to utest. 11 years ago
winlin 574cd15efb refine amf0, rename internal classes 11 years ago
winlin c31c607ad3 refine amf0, move declarations from cpp to hpp, use namespace _srs_internal 11 years ago
winlin d22e7cab0a add comments to amf0 11 years ago
winlin dc7b952043 change HLS audio delay to 100ms. 0.9.153 11 years ago
winlin f895523ac6 fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152 11 years ago
winlin 21a75924ad fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152 11 years ago
winlin aefff75d08 fix #103, support all aac sample rate, add detail codec logs. 11 years ago
winlin f53abfa1d1 update comments for aac he or he-v2 11 years ago
winlin b2303c5704 refine code, use macro for hls resample audio 11 years ago
winlin 921b7d239f refine code, use macro for hls resample audio 11 years ago
winlin 63214d0f2b fix #81: support all aac sample rate, for instance, 48000. to 0.9.150 11 years ago
winlin 7805f7b12a add prefix Protocol to AMF0 and Handshake utest 11 years ago
winlin 5a41b1b538 finish kernel utest. to 0.9.149 11 years ago
winlin ad920915a2 merge handshake to protocol 11 years ago
winlin b13fd5112b merge buffer to kernel utest 11 years ago
winlin 1e395e7c10 add assert to flv. 11 years ago
winlin 95e73d0be1 remove the config log http api. 0.9.148 11 years ago
winlin d219a7b67e complete the normal kernel flv utest. 0.9.147 11 years ago
winlin 010eb09a30 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 11 years ago
winlin 8271bd657b refine flv codec, rename fast encoder to flv vod stream decoder 11 years ago
winlin 032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 11 years ago
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.
11 years ago
winlin ba2e7bbf76 support create stream twice. 0.9.145 11 years ago
winlin fb70602f93 fix #111, always use 31bits timestamp. 0.9.143. 11 years ago
winlin 0bd7d268e8 add mock for file reader/writer 11 years ago
winlin a888e52df1 donot mix the read and write for librtmp 11 years ago
winlin 1eee4d25cf refine the librtmp, open writer then reader. 11 years ago
winlin 1a7735182f refine the file stream, to file reader and writer. 0.9.142 11 years ago
winlin ed3f9f0a40 add core utest 11 years ago
winlin f5f54e6008 add utest for kernel codec 11 years ago
winlin 492665e166 refine tcp client connect, extract to utility srs_socket_connect. 0.9.141 11 years ago
winlin 051c9e6268 refine the protocol utility, add utest, 0.9.140 11 years ago
winlin 6a2f0a3dc9 add configure preset --demo 11 years ago
winlin 55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139 11 years ago
winlin cb2967c967 refine forward, use utility to generate the tcUrl 11 years ago
winlin 4d45b3305b srs demo requires ffmpeg to transcode. 11 years ago
winlin 18534ecdb2 donot start nginx for demo, use cherrypy to delivery HLS. 11 years ago
winlin ee07210105 fix demo script, start nginx. fix warning of utest on ubuntu14 11 years ago
winlin e6f524281c support build on ubuntu14, 0.9.138 11 years ago
winlin aad42d7941 fix ubuntu14 build warnings 11 years ago
winlin 594c1d8bf7 fix ssl make install on ubuntu 14, change to make install_sw 11 years ago
winlin bfeb24c52b update call response, add comments. 11 years ago
winlin fea8755719 response the call message with null. 0.9.137 11 years ago
winlin 53ad510766 add comments for the connection remove 11 years ago
winlin a3f9aa7e1e fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136 11 years ago
winlin efed34301c add virtual destructor to SrsRefer 11 years ago
winlin b357504b1d fix #109: fix the system jump time, adjust system startup time. 0.9.135 11 years ago
winlin 6ae6f6e60d add freetype2 to pkg-config path. 11 years ago
winlin 0cd0761508 fix time jitter zero algorithm bug, reset when timestamp overflow. 11 years ago
winlin 1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 11 years ago
winlin f173345e15 support report summaries in heartbeat. 0.9.132 11 years ago
winlin db253bc76b fix fms token traverse bug, always update the token by the latest valid client. 11 years ago
winlin 1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 11 years ago
winlin e9c96af91a add wiki and conf for token traverse auth 11 years ago
winlin 41857edaee support edge token traverse, fix #104. 0.9.129 11 years ago
winlin 10953c9743 support token auth in connect args. 0.9.128 11 years ago
winlin 6ff193c989 donot need to yum install pkg-config, for centos always installed it 11 years ago
winlin 94e5e7070d fix bug of freetype2 build for ffmpeg, depends on pkg-config 11 years ago
winlin 094d82bd06 add connections count to api summaries. 0.9.127 11 years ago
winlin 603b3bcdcc add libfreetype2 for ffmpeg, remove the depends of freetype of build_ffmpeg. 11 years ago
winlin 6ee2ba049b add srs bytes and kbps to api summaries. 0.9.126 11 years ago
winlin 8fabd5d987 refine cubieboard configure, use ubuntu prepare to install tools 11 years ago
winlin 46611ac062 refine configure, add cubieboard. use IProtocolStatistic in kbps. 11 years ago
winlin 46c1367fe8 refine the protocol io reader writer arch. 11 years ago
winlin b0e4dc8085 refine network bytes of summaries, remove the lo data. 11 years ago
winlin d0b08d0d51 add network bytes to api summaries. 0.9.125 11 years ago
winlin f893711499 fix #98: workaround for librtmp ping(fmt=1,cid=2 fresh stream). 11 years ago
winlin 3f9c23d834 fix #101: for ubuntu14 build error. 11 years ago
winlin cbc1486688 refine message, add license 11 years ago
winlin 55b99c90c7 refine detect tool, support atc stream. 11 years ago
winlin 17cb8c4550 finish the research for python-subprocess 11 years ago