Commit Graph

248 Commits (364460f2ab04b593fe2ab98c65f28931a23d4c70)

Author SHA1 Message Date
winlin 44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 10 years ago
winlin 7fc1cda392 add stream status to api. 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 e50996270e fix the config parse error. 10 years ago
winlin 22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 10 years ago
winlin dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 10 years ago
winlin e5b8e0da01 fix async call and hls_nb_notify bug. 10 years ago
winlin 5d37e47783 support config the hls_nb_notify. 10 years ago
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 10 years ago
winlin 29ac4c724b change default log tank to file. 10 years ago
winlin e56d7add44 fix bug of config to parse the default value. 2.0.158 10 years ago
winlin aef97db77a refine the config code. 10 years ago
winlin e458305f81 add utc time format. 10 years ago
winlin c4466a8c0c fix crash bug for hls cleanup. 10 years ago
winlin 17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 10 years ago
winlin 8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 10 years ago
winlin c49bc0628e support on_hls for http hooks. 2.0.152. 10 years ago
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151. 10 years ago
winlin 692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 10 years ago
winlin b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 10 years ago
winlin c6817cc422 for #354, remove the double underscore of macro. 10 years ago
winlin 0319e85f99 support config the audio overflow ratio. 10 years ago
winlin 2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 10 years ago
wenjie.zhao 65f404fb42 for #340, refine ts prefix code. 10 years ago
wenjie.zhao 5969f72354 for #340, refine ts prefix code. 10 years ago
wenjie.zhao 10da182853 add hls prefix of uri supported 10 years ago
winlin 5c6ef6ded6 fix warning for xcode. 10 years ago
winlin 6d15d0ea99 for #324, refine code, add hstrs config. 10 years ago
wenjie.zhao 643f18abe4 add hds reload supported.#328 10 years ago
wenjie.zhao e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
10 years ago
wenjie.zhao d4198ee8ba add hds supported. 10 years ago
winlin fb3fced8d0 for #179, revert dvr http api. 2.0.128. 10 years ago
winlin 0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 10 years ago
winlin 1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 10 years ago
winlin 849e59b05d for #179, support http api to start dvr. 10 years ago
winlin c67a4fdf97 for #179, enable http api crossdomain for dvr api. 10 years ago
winlin 95b4baee7c for #179, refine dvr code to more simple. 10 years ago
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121. 10 years ago
winlin 40fbfd8560 for #133, rtsp extract tcp/udp listener. 10 years ago
winlin 78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 10 years ago
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 a4ba40952a for #250, rename rtmp to protocol dir. 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 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 5529813fcb for bug #257, support NULL msg in msgs to send. 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin 32d537b96b for bug #251, refine code before mic. 10 years ago
winlin b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 10 years ago
winlin 5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 10 years ago
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 10 years ago
winlin 44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin 4f21e92ae0 fix the message of config for max_connections. 10 years ago
winlin efc85ed6df refine config, check the connections more precise 10 years ago
winlin de5e2d0a40 Revert "Revert "for bug #194, refine the config""
This reverts commit b4c1d55311.
10 years ago
winlin b4c1d55311 Revert "for bug #194, refine the config"
This reverts commit 2a55ae4317.
10 years ago
winlin 2a55ae4317 for bug #194, refine the config 10 years ago
winlin 59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 11 years ago
winlin fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 11 years ago
winlin e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 11 years ago
winlin 6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 11 years ago
winlin d24e2fd0cc remove supports for OSX. 2.0.1. 11 years ago
winlin 20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 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 839101a036 reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro. 11 years ago
winlin e656a65b6c for bug #162, add conf and connections limit. 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 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 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 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 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 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 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