Commit Graph

399 Commits (9c6774b644fc805a666458a6557d0cf6c2fdb12c)

Author SHA1 Message Date
winlin 516f33888c refine config 9 years ago
winlin f87646d489 fix typo of config. 9 years ago
winlin 892591f9a6 merge from @mbeacom 9 years ago
winlin d81b2cb140 support hls mount to vhost and reload 9 years ago
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 9 years ago
winlin 0ab64ccd2a merge from srs2. 9 years ago
winlin 40457e6cab default hls_on_error to continue. 2.0.201 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 8974fe298b connect to kafka and send metadata request. 9 years ago
winlin 29122b6e70 fix #502, transcoder support snapshot. 9 years ago
winlin 2a4ab8a923 add brokers to config 9 years ago
winlin b5ccc35340 add kafka config 9 years ago
winlin 2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 10 years ago
winlin a7c4b786cf merge from 2.0 10 years ago
winlin 511627abab fix #474, config to donot parse width/height from sps. 2.0.189 10 years ago
winlin 7ae76b579e refine the conf, use srs3 style 10 years ago
winlin f8d8c3ace4 use function to dumps the engine. 10 years ago
winlin 01878e5a9c for #319, query vhost detail. 10 years ago
winlin b1b76a4a80 for #319, allow multiple ingest and transcode. 10 years ago
winlin d1336e0d80 refine conf 10 years ago
winlin dc11013c01 for #319, render the detail of vhost 10 years ago
winlin 0109a74840 for #319, refine the config structure. 10 years ago
winlin 2b4fa2d73e for #319, move the edge configs to cluster. 10 years ago
winlin 6bd05f9cfc for #319, refine the config forward. 10 years ago
winlin bc24c0407b for #319, move smi and rsh to play 10 years ago
winlin f7c893d907 for #319, move gop_cache and queue_length to play 10 years ago
winlin 06ae74dd3f for #319, move mw_latency to play. 10 years ago
winlin 4eb1874955 for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency. 10 years ago
winlin 9c4340f789 for #319, move atc and atc_auto to play 10 years ago
winlin d6b0aa3a5b for #319, move time_jitter and mix_correct to play 10 years ago
winlin 738642073e for #319, refine config, collect the mr and publish timeout 10 years ago
winlin 7ef3ff90c0 refine the config structure, compatible with SRS1/2 10 years ago
winlin a79e19599c for #319, support query the vhost info. 10 years ago
winlin bdfd0ae09e for #319, dumps the http static, remux and globals. 10 years ago
winlin 66ffcad635 for #319, always allow raw query. 10 years ago
winlin f167616379 rename the config_query to query 10 years ago
winlin 2dcf3bc606 for #319, support rpc raw api to query the HTTP RAW API configs. 10 years ago
winlin d921d59e57 for #319, support HTTP RAW API reload. 10 years ago
winlin c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 10 years ago
winlin 74d4c96423 for #367, design the config for exec. 10 years ago
winlin cbfe438e73 for #367, design the config for exec. 10 years ago
winlin 7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 10 years ago
winlin e7714cd445 add packets interval in ms to set the right send_min_interval 10 years ago
winlin a0a89a8ca6 use reduce_sequence_header for stream control. 10 years ago
winlin b79d830e2c refine the default smi 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 10 years ago
winlin 7dcba040eb refine config. 10 years ago
winlin 9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 10 years ago
winlin c85f92c229 fix #169, support default values for transcode. 2.0.180 10 years ago
winlin 31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 10 years ago
winlin af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 10 years ago
winlin d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 10 years ago
winlin 5caafadd45 fix #409: support pure video hls. 2.0.172. 10 years ago
winlin ffdabf32ed add push flv conf 10 years ago
winlin f0c24eeacc add stream caster for post flv over http. 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
winlin 0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url. 10 years ago
winlin 22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 10 years ago
winlin 8fbc6526bb for #383, refine code to support mix correct algorithm. 10 years ago
winlin 02a2cb7e1a for #381, refine the hls notify, report one by one. 10 years ago
winlin dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 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 e458305f81 add utc time format. 10 years ago
winlin 64b065e450 for hls callback, add duration of ts. 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 76c1957260 enhance hls, increase piece one by one. 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 fcab17741c fix #222, the dvr path rule changed. 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 5969f72354 for #340, refine ts prefix code. 10 years ago
winlin 59d9af8039 update conf 10 years ago
winlin 6d15d0ea99 for #324, refine code, add hstrs config. 10 years ago
winlin ffef62900f for #328, support adobe hds. 2.0.138. 10 years ago
winlin b0953c1d3a add comments of audio profile supported by srs. 10 years ago
winlin b360fe279d remove libaacplus. 10 years ago
winlin 012c29e124 for #133, update the wiki. 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 b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 10 years ago
winlin a3648063d5 fix #179, support dvr http api. 2.0.123. 10 years ago
winlin d650118988 fix #179, dvr support api to start or stop. 2.0.123 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 7077b74d03 for #179, add dvr plan append. 10 years ago
winlin 95b4baee7c for #179, refine dvr code to more simple. 10 years ago
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 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 c0e50265bd for #133, create rtsp framework. 10 years ago
winlin e81e090239 for #133, add rtsp listener and handler. 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 dba983d124 for #136, update the config for ram hls. 10 years ago
winlin a23191497f fix #136, support hls without io(in ram). 2.0.112 10 years ago
winlin 89b37d3469 for #136, refine the conf for hls. 10 years ago
winlin 52891b491a listen and serve stream caster mpegts over udp. 10 years ago
winlin 6b89ffbc1d add config section for stream caster. 10 years ago
winlin e0ee8de2fb for #299, srs http server support dash, flash request range in range or bytes. 10 years ago
winlin a647043a06 update readme and wiki url for http ts stream 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 bb1331cc91 update conf. 10 years ago
winlin b735e29d05 refine conf, add port. 10 years ago
winlin e5ef4c2e66 update the conf of http static and stream. 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 2742c0d3c2 for #277, support http vhost mount. 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin 7f60d472e6 remove the change vhost forward. 10 years ago
winlin 45724bfaec update conf for transcode. 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 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 595bf24a51 for bug #257, default to off the realtime(min-latency). 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin a3de1c71fc reset the mw_latency to 350. 10 years ago
winlin 1311b6fe65 fix #251, support 10k clients. 2.0.67 10 years ago
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350. 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 59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 10 years ago
winlin fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 10 years ago
winlin e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 10 years ago
winlin 6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 10 years ago
winlin 83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 11 years ago
winlin cc8dc0fee0 remove the not-supported features, add bug #163, #164. 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 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 11 years ago
winlin 37ceadd865 sync the conf file 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 abef029610 refine full conf 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 2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls 11 years ago
winlin 9bf7b722db fix #119: use iformat and oformat for ffmpeg transcode. 11 years ago
winlin 55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139 11 years ago
winlin a3f9aa7e1e fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136 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 d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 11 years ago
winlin 6bc0ecece7 add dvr, http heartbeat conf sample 11 years ago
winlin d4b8fee61a fix bug #73, http callback api support authentication in tcUrl 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 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 0622004eff update conf, add todo for edge/forward 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 bfd1d07827 update readme 11 years ago
winlin 3ed59f190b refine srs live flashP2P(integrated by chnvideo) 11 years ago
winlin 67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 11 years ago
winlin 733ca2475d call http api when dvr got keyframe 11 years ago
winlin 03af43017d update dvr config comments 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 b1877db405 fix typo of full.conf. fix api server bug 11 years ago
winlin 821b58af03 support reload atc 11 years ago
winlin 3a26b23fba change ffmpeg log to ./objs 11 years ago
winlin 4af7b6e383 update conf file, add id for ingest. 11 years ago
winlin 5a3b59d3c8 update conf file, add id for ingest. 11 years ago
winlin c11e266d5c update readme 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 7384ad0caa add ingest config section of full.conf 11 years ago
winlin 30e3323fe4 update readme, add SampleHTTP link 11 years ago
winlin 00eda0d7b2 implements the http stream module. 11 years ago
winlin 83f35d10b1 add http delivery framework 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 041a07dfda add http config in srs conf 11 years ago
winlin 0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 11 years ago
winlin ed20bd7078 default write log to file. 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 3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make. 11 years ago
winlin f25c6558a5 write pid to ./objs/srs.pid. 11 years ago
winlin a0c0c94cf0 refine conf, add comments for other listen type 11 years ago
winlin b7d40b5aba support vn/an to disable video/audio, for radio streaming 11 years ago
winlin b52a051d80 refine readme, confs 11 years ago
winlin b36338853a refine the conf files, rename srs.conf to demo.conf 11 years ago