1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Commit graph

282 commits

Author SHA1 Message Date
winlin
53f4ce3604 for #367, update wiki to v3 2015-08-25 22:41:57 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
74d4c96423 for #367, design the config for exec. 2015-08-23 21:58:06 +08:00
winlin
cbfe438e73 for #367, design the config for exec. 2015-08-23 21:53:20 +08:00
winlin
7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 2015-08-19 16:16:05 +08:00
winlin
e7714cd445 add packets interval in ms to set the right send_min_interval 2015-08-19 15:14:26 +08:00
winlin
a0a89a8ca6 use reduce_sequence_header for stream control. 2015-08-14 14:35:41 +08:00
winlin
b79d830e2c refine the default smi 2015-08-14 11:15:23 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
7dcba040eb refine config. 2015-08-12 18:02:31 +08:00
winlin
9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 2015-08-12 13:22:09 +08:00
winlin
c85f92c229 fix #169, support default values for transcode. 2.0.180 2015-07-21 12:07:26 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 2015-06-03 10:13:46 +08:00
winlin
d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 2015-05-30 10:48:02 +08:00
winlin
5caafadd45 fix #409: support pure video hls. 2.0.172. 2015-05-29 21:43:17 +08:00
winlin
94efe3f727 update wiki 2015-05-24 09:15:30 +08:00
winlin
5840bc1053 add flv cluster confs. 2015-05-24 08:41:29 +08:00
winlin
f6252c7f72 enable hls for push flv. 2015-05-07 11:07:32 +08:00
winlin
ffdabf32ed add push flv conf 2015-05-05 11:44:20 +08:00
winlin
f0c24eeacc add stream caster for post flv over http. 2015-05-03 10:56:20 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url. 2015-04-23 12:05:24 +08:00
winlin
22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 2015-04-15 17:12:22 +08:00
winlin
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +08:00
winlin
02a2cb7e1a for #381, refine the hls notify, report one by one. 2015-04-14 11:36:58 +08:00
winlin
dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 2015-04-13 10:32:32 +08:00
winlin
5d37e47783 support config the hls_nb_notify. 2015-04-10 14:44:18 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
e458305f81 add utc time format. 2015-04-03 16:42:32 +08:00
winlin
64b065e450 for hls callback, add duration of ts. 2015-04-03 13:46:44 +08:00
winlin
17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 2015-04-03 10:56:56 +08:00
winlin
8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 2015-04-02 11:52:03 +08:00
winlin
76c1957260 enhance hls, increase piece one by one. 2015-03-31 16:58:20 +08:00
winlin
f6e135943f enhanced hls, support deviation for duration. 2.0.151. 2015-03-31 15:39:47 +08:00
winlin
692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 2015-03-30 12:44:04 +08:00
winlin
b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 2015-03-23 23:13:57 +08:00
winlin
fcab17741c fix #222, the dvr path rule changed. 2015-03-23 22:06:18 +08:00
winlin
0319e85f99 support config the audio overflow ratio. 2015-03-19 17:24:27 +08:00
winlin
2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 2015-03-17 07:57:58 +08:00
wenjie.zhao
65f404fb42 for #340, refine ts prefix code. 2015-03-13 02:01:24 +08:00
wenjie.zhao
5969f72354 for #340, refine ts prefix code. 2015-03-13 01:32:51 +08:00
wenjie.zhao
10da182853 add hls prefix of uri supported 2015-03-13 00:22:55 +08:00
winlin
59d9af8039 update conf 2015-03-15 19:34:04 +08:00
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
wenjie.zhao
e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
2015-03-11 14:18:09 +08:00
winlin
5370493140 add ingest to mac.dev conf. 2015-03-11 13:24:14 +08:00
winlin
0ff49fd299 for #155, debug srs on xcode. 2015-03-10 13:13:31 +08:00
winlin
b0953c1d3a add comments of audio profile supported by srs. 2015-03-08 20:02:43 +08:00