Commit Graph

60 Commits (62b7204514cb224917466d10b09077e74ca1c508)

Author SHA1 Message Date
winlin 3fe338d1c5 for #742, use ms for application clock tbn. 8 years ago
winlin 7ac932cfa0 update to 2013-2017 8 years ago
winlin 041040b846 ignore ingester when vhost disabled. 9 years ago
winlin d0c74fa7cd update 2015 to 2016 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 4b5eb5ea2d fix the parse rtmp url bug for ingest. 9 years ago
winlin d9f991ed2f use system utility for string finds 10 years ago
winlin d8f18aee37 use the right int type for port. 10 years ago
winlin 2bdd974227 for #319, reorder the ingesters. 10 years ago
winlin 342483bf04 for #319, when reload the listen, restart all ingesters. 10 years ago
winlin 65b2ed7ac5 refine code, move the order of functions. 10 years ago
winlin f39faa78bb refine config default values of srs, prepare to move each default values to functions. 10 years ago
winlin 679b4317d8 fix the build failed bug. 10 years ago
winlin 2a1db36750 refine the pithy print of ingesters. 10 years ago
winlin 860d68e6e7 for #374, use fast stop for ingesters to stop many FFMPEG. 10 years ago
winlin 567d84e997 fix #374: when terminate srs, cleanup to ensure FFMPEG quit. 10 years ago
winlin e5f449ce36 refine the thread to three category. 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 10 years ago
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121. 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin c457364321 for bug #237, add name for thread. 2.0.47 10 years ago
winlin bc6616bd1f refine code according to inspect of clion. 0.9.219 11 years ago
winlin 7b24788445 for bug #143, build on centos5. 11 years ago
winlin 573952e2fc refine macros of HTTP 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 f8423dfa90 fix #119: use iformat and oformat for ffmpeg transcode. 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 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 31b568b013 refine core, move specified functions to kernel utility. 11 years ago
winlin d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 11 years ago
winlin 0eb9e0af5b fix #78 st joinable thread must be stop by other threads, 0.9.113 11 years ago
winlin fd0efecbc8 refine ingester pithy print 11 years ago
winlin 2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 11 years ago
winlin fdd0678bcb add thread cid to log 11 years ago
winlin 23a1b29935 add dvr option. refine macros of auto headers 11 years ago
winlin 73c310cd2e refine the macro. 11 years ago
winlin 9ed3421586 rename from get_ingest to get_ingest_by_id of config 11 years ago
winlin e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57. 11 years ago
winlin e6d8bc1e5c ingest reload: support disable vhost 11 years ago
winlin dc71eef394 support ingest reload: add new vhost with ingester 11 years ago
winlin e5646e3bb5 refine ingester, add vhost/id info to ingester 11 years ago
winlin 9372a7065a refine the ingest log 11 years ago
winlin ccf0a423be change sleep time from 3s to 0.6s for ingester. 11 years ago