Commit Graph

90 Commits (dca9749f37d98485c1fe5f2a427c0f47a5246f8f)

Author SHA1 Message Date
winlin 1ed5118246 refine the spaces, no TABS 8 years ago
winlin 7ac932cfa0 update to 2013-2017 8 years ago
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin ffef3905af merge from srs2. 9 years ago
winlin 2830ee12c1 fix the on_hls.ts_url bug. 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin f0e39cc330 support show the summary of kafka metadata. 10 years ago
winlin d8f18aee37 use the right int type for port. 10 years ago
winlin 1c7d5f1852 Merge branch '2.0release' into develop 10 years ago
winlin 353e3260b8 remove duplicated code 10 years ago
winlin 9ead08725d use kernel utility int2str and float2str 10 years ago
winlin f187a7deef refine the startup logs. 10 years ago
winlin 168625dce2 rename rtmp amf0 to protocol amf0. 10 years ago
winlin a4f51564db rename kernel stream to buffer 10 years ago
winlin b471c6e61c refine code, use json integter rather than number. 10 years ago
winlin 3f7e69b617 json objects support dumps to string. 10 years ago
winlin 1fd83d9314 refine the order. 10 years ago
winlin c4feb8f6ed for #319, raw api support update all globals. 10 years ago
winlin c8466c36bd for #319, raw api support update the global RTMP chunk_size. 10 years ago
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