Commit Graph

372 Commits (7460729c0ec5bca0bac55a9221f213ef26631103)

Author SHA1 Message Date
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 10 years ago
winlin 2b9869ee52 update the wiki for dvr 10 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 a62c82bd46 for #319, api raw update global.listen 10 years ago
winlin 364460f2ab for #319, support raw update global.listen 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 53f4ce3604 for #367, update wiki to v3 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 94efe3f727 update wiki 10 years ago
winlin 5840bc1053 add flv cluster confs. 10 years ago
winlin f6252c7f72 enable hls for push flv. 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 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 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
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
winlin 5370493140 add ingest to mac.dev conf. 10 years ago
winlin 0ff49fd299 for #155, debug srs on xcode. 10 years ago
winlin b0953c1d3a add comments of audio profile supported by srs. 10 years ago
winlin b360fe279d remove libaacplus. 10 years ago
winlin 5d0cb7e68f update conf for rtsp 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