Commit Graph

69 Commits (7ef3ff90c030eab604a8d91027c9ffc6014383c3)

Author SHA1 Message Date
winlin 04bea781ca use amf0 encode for json encode. 10 years ago
winlin fe4cdceb15 always wait for process to terminated when SIGKILL. 10 years ago
winlin 66a26bdce8 move json from app to protocol 10 years ago
winlin 312366bba2 add srs_recvi_bytes for intranet bytes stat. 10 years ago
winlin 750399ace4 fix network device compare bug. 10 years ago
winlin 8cd68a1eb3 ignore any intranet bandwidth. 10 years ago
winlin 96f8f1f502 fix build bug. 10 years ago
winlin 0a87b567f6 fix the build failed bug. 10 years ago
winlin 860d68e6e7 for #374, use fast stop for ingesters to stop many FFMPEG. 10 years ago
winlin db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 10 years ago
winlin 68d835021e refine code, move the kbps to protocol 10 years ago
winlin 6ca46e84bc fix #397, the USER_HZ maybe not 100. 2.0.165 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
winlin e458305f81 add utc time format. 10 years ago
winlin 692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 10 years ago
winlin e818f36316 fix #360, fix build bug for centos7. 10 years ago
winlin b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 10 years ago
winlin 2f2aaf5ee4 for #155, refine code, donot check network devices for osx. 10 years ago
winlin 33cca3e027 for #155, add todo for osx. 2.0.146 10 years ago
winlin c6817cc422 for #354, remove the double underscore of macro. 10 years ago
winlin f564c903ac support got uptime and loadavg for osx. 2.0.145 10 years ago
winlin 8bf60895a9 refine the kbps of server. 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin b4057916b6 add qt project file. fix cmake file for clion. 10 years ago
winlin 72ad6894ca move the annexb decode utility to protocol. 10 years ago
winlin 57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 11 years ago
winlin bc6616bd1f refine code according to inspect of clion. 0.9.219 11 years ago
winlin 002facb85b refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215 11 years ago
zhengfl c2ac11201b amendment srs_verbose info in the get_peer_ip 11 years ago
winlin c24e68dd70 refine the stat, use one ok. 1.0.200 11 years ago
winlin 08bc34e0df refine wiki, cluster to forward. 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 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 792a6f944f refine utility of cpu, add comment for cpu percent 11 years ago
winlin 9c11001391 refine log for stats network and disk 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 e76036f40b refine config heartbeat, add new stats. 0.9.175 11 years ago