Commit Graph

210 Commits (6209945a07fe1571967509db958305fc69d8dce0)

Author SHA1 Message Date
winlin 922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 10 years ago
winlin 25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 10 years ago
winlin a23191497f fix #136, support hls without io(in ram). 2.0.112 10 years ago
winlin 52891b491a listen and serve stream caster mpegts over udp. 10 years ago
winlin 7d86c6d9e9 for bug #293, refine for fast cache of http stream. 10 years ago
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 10 years ago
winlin b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 10 years ago
winlin eff2d81016 for #293, add http flv stream 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin 28eedfc177 merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75 10 years ago
winlin 2e43a63bf4 fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12 10 years ago
winlin eef8034632 merge from 1.0release for bug #264. 2.0.74 10 years ago
winlin 1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 10 years ago
winlin f1192a8302 fix bug for bug #241, default to 32k for socket buffer. 10 years ago
winlin 5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 10 years ago
winlin 20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 11 years ago
winlin 002facb85b refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215 11 years ago
winlin 83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 11 years ago
winlin 901c9590e4 refine log, log important to file. 1.0.210 11 years ago
winlin e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 11 years ago
winlin cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 11 years ago
winlin 7b24788445 for bug #143, build on centos5. 11 years ago
winlin 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 11 years ago
winlin f4ea48adcb rename network_device_index to network 11 years ago
winlin b334021836 add config item for the stat disk device name 11 years ago
winlin e76036f40b refine config heartbeat, add new stats. 0.9.175 11 years ago
winlin 30ebba0673 add config check utest 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 2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls 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 c65a6b5d63 fix the conf_line bug of parse config directive. 11 years ago
winlin 86ad39f001 finish basic utest for config 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 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 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 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 921b7d239f refine code, use macro for hls resample audio 11 years ago
winlin 95e73d0be1 remove the config log http api. 0.9.148 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 1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 11 years ago
winlin 41857edaee support edge token traverse, fix #104. 0.9.129 11 years ago
winlin 55b99c90c7 refine detect tool, support atc stream. 11 years ago
winlin d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 11 years ago
winlin ef0f7f4da8 support http heartbeat, 0.9.107 11 years ago
winlin 7c804277b2 add heatbeat url, add stream for api-server 11 years ago
winlin d6355efe22 support http api json, to PUT/POST, to 0.9.103 11 years ago
winlin a1fed15789 add uptime, startup time, load to api 11 years ago
winlin a4410a4fa9 update pithy-print to 10s. refine log 11 years ago
winlin fc501b050b add atc_auto to disable or enable auto detect atc 11 years ago
winlin 30bb3ff704 add dvr_plan hss to full.conf 11 years ago
winlin 6ee49ee029 bravo auto atc per stream. 0.9.84 11 years ago
winlin f02ac02a50 auto open atc for bravo_atc set 11 years ago
winlin 23b04e2a57 completed the edge reload, to 0.9.79 11 years ago
winlin 2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 11 years ago
winlin d6948d613f add author byteman for h264 to flv. 11 years ago
winlin 67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 11 years ago
winlin 35f3a93239 support dvr to hss. change to 0.9.74 11 years ago
winlin 733ca2475d call http api when dvr got keyframe 11 years ago
winlin 117fd67950 add cpu stat 11 years ago
winlin 2d1c28cff9 update dvr, support segment plan 11 years ago
winlin 73459547e1 support dvr. change to 0.9.69 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 a0472f256d support test config file. change to 0.9.61 11 years ago
winlin dc3c3cff8e support reload http_stream 11 years ago
winlin c33ff4fdb8 support reload http_api 11 years ago
winlin 94874e77af refine reload config 11 years ago
winlin 6c5d8b4851 refine reload config 11 years ago
winlin e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57 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 4f445f2f60 support ingest stream 11 years ago
winlin e89ab84e4e implements ingest, change to 0.9.53 11 years ago
winlin 2742679354 implements the ingest framework 11 years ago
winlin 92281548b6 add ingest config 11 years ago
winlin 9107831b0e add config to read ingesters 11 years ago
winlin 00eda0d7b2 implements the http stream module. 11 years ago
winlin 83f35d10b1 add http delivery framework 11 years ago
winlin 8d7877ebd1 refine config, group by sections. 11 years ago
winlin b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 11 years ago
winlin 3f13726544 add log level in conf. change to 0.9.45 11 years ago
winlin aa89f9f51e change to 0.9.37, for http api/stream 11 years ago
winlin 0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 11 years ago
winlin 7930add7f9 add log tank config, default to console. 11 years ago
winlin 3ec3c1f532 support daemon 11 years ago
winlin d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27 11 years ago
winlin f25c6558a5 write pid to ./objs/srs.pid. 11 years ago
winlin c85dde7f3f substitute all TAB with 4spaces. 11 years ago
winlin 880f4f5dc2 final the modularity, rename the app module. 11 years ago