external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity
5607 commits 13 branches 107 tags 375 MiB
Commit graph

292 commits

Author SHA1 Message Date
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
5969f72354 for #340, refine ts prefix code. 2015-03-13 01:32:51 +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
winlin
b0953c1d3a add comments of audio profile supported by srs. 2015-03-08 20:02:43 +08:00
winlin
b360fe279d remove libaacplus. 2015-03-06 22:35:02 +08:00
winlin
012c29e124 for #133, update the wiki. 2015-03-01 21:08:44 +08:00
winlin
fb3fced8d0 for #179, revert dvr http api. 2.0.128. 2015-03-01 17:57:28 +08:00
winlin
0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 2015-02-27 20:39:36 +08:00
winlin
b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 2015-02-25 09:20:11 +08:00
winlin
a3648063d5 fix #179, support dvr http api. 2.0.123. 2015-02-24 17:29:30 +08:00
winlin
d650118988 fix #179, dvr support api to start or stop. 2.0.123 2015-02-23 19:23:32 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
849e59b05d for #179, support http api to start dvr. 2015-02-21 23:09:21 +08:00
winlin
c67a4fdf97 for #179, enable http api crossdomain for dvr api. 2015-02-21 21:17:59 +08:00
winlin
7077b74d03 for #179, add dvr plan append. 2015-02-21 16:52:37 +08:00
winlin
95b4baee7c for #179, refine dvr code to more simple. 2015-02-21 16:25:04 +08:00
winlin
a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 2015-02-19 19:50:10 +08:00
winlin
1102c7a58f refine pithy print to more easyer to use 2.0.121. 2015-02-19 18:56:21 +08:00
winlin
40fbfd8560 for #133, rtsp extract tcp/udp listener. 2015-02-17 16:28:28 +08:00
winlin
c0e50265bd for #133, create rtsp framework. 2015-02-16 14:05:01 +08:00
winlin
e81e090239 for #133, add rtsp listener and handler. 2015-02-15 21:28:31 +08:00
winlin
78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 2015-02-15 18:11:24 +08:00
winlin
922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 2015-02-15 17:43:35 +08:00
winlin
25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 2015-02-12 13:34:59 +08:00
winlin
dba983d124 for #136, update the config for ram hls. 2015-02-03 16:29:59 +08:00
winlin
a23191497f fix #136, support hls without io(in ram). 2.0.112 2015-02-03 16:01:07 +08:00
winlin
89b37d3469 for #136, refine the conf for hls. 2015-02-02 13:39:23 +08:00
winlin
52891b491a listen and serve stream caster mpegts over udp. 2015-01-24 14:52:52 +08:00
winlin
6b89ffbc1d add config section for stream caster. 2015-01-23 15:06:12 +08:00
winlin
e0ee8de2fb for #299, srs http server support dash, flash request range in range or bytes. 2015-01-23 13:17:50 +08:00
winlin
a647043a06 update readme and wiki url for http ts stream 2015-01-22 18:39:53 +08:00
winlin
7d86c6d9e9 for bug #293, refine for fast cache of http stream. 2015-01-22 13:16:54 +08:00
winlin
25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 2015-01-22 09:34:33 +08:00
winlin
bb1331cc91 update conf. 2015-01-20 13:46:50 +08:00
winlin
b735e29d05 refine conf, add port. 2015-01-20 12:02:25 +08:00
winlin
e5ef4c2e66 update the conf of http static and stream. 2015-01-20 10:53:57 +08:00
winlin
b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 2015-01-19 13:17:46 +08:00
winlin
eff2d81016 for #293, add http flv stream 2015-01-18 18:00:40 +08:00
winlin
2742c0d3c2 for #277, support http vhost mount. 2015-01-18 16:38:26 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00
winlin
7f60d472e6 remove the change vhost forward. 2015-01-03 14:47:19 +08:00
winlin
45724bfaec update conf for transcode. 2015-01-03 14:46:29 +08:00
winlin
f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 2015-01-03 12:54:54 +08:00
winlin
75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 2015-01-02 16:02:13 +08:00
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 2014-12-22 17:12:09 +08:00
winlin
2e43a63bf4 fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12 2014-12-22 17:10:51 +08:00
winlin
eef8034632 merge from 1.0release for bug #264. 2.0.74 2014-12-20 11:58:39 +08:00
winlin
1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 2014-12-20 11:45:59 +08:00
winlin
595bf24a51 for bug #257, default to off the realtime(min-latency). 2014-12-13 10:13:49 +08:00
winlin
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
a3de1c71fc reset the mw_latency to 350. 2014-12-08 09:49:45 +08:00
winlin
1311b6fe65 fix #251, support 10k clients. 2.0.67 2014-12-07 16:31:47 +08:00
winlin
fad6074a25 set send socket buf. mw/mr sleep default to 350. 2014-12-05 11:24:05 +08:00
winlin
b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 2014-12-04 21:35:13 +08:00
winlin
5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 2014-12-04 18:21:04 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:28:50 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +08:00
winlin
6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:55:58 +08:00
winlin
83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 2014-09-25 10:59:29 +08:00
winlin
cc8dc0fee0 remove the not-supported features, add bug #163, #164. 2014-08-20 09:18:07 +08:00
winlin
e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 2014-08-19 10:59:59 +08:00
winlin
79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 2014-07-30 10:00:23 +08:00
winlin
37ceadd865 sync the conf file 2014-07-27 19:11:51 +08:00
winlin
6f700f3f40 rename network_device_index to network 2014-07-27 18:40:32 +08:00
winlin
f4ea48adcb rename network_device_index to network 2014-07-27 18:39:20 +08:00
winlin
b334021836 add config item for the stat disk device name 2014-07-27 16:52:00 +08:00
winlin
abef029610 refine full conf 2014-07-27 15:04:31 +08:00
winlin
e76036f40b refine config heartbeat, add new stats. 0.9.175 2014-07-27 14:43:55 +08:00
winlin
30ebba0673 add config check utest 2014-07-26 15:54:40 +08:00
winlin
2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls 2014-07-22 11:01:20 +08:00
winlin
9bf7b722db fix #119: use iformat and oformat for ffmpeg transcode. 2014-07-19 10:54:38 +08:00
winlin
55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139 2014-06-29 10:43:53 +08:00
winlin
a3f9aa7e1e fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136 2014-06-28 10:57:58 +08:00
winlin
1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 2014-06-25 17:14:11 +08:00
winlin
f173345e15 support report summaries in heartbeat. 0.9.132 2014-06-23 15:44:49 +08:00
winlin
1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 2014-06-22 20:01:25 +08:00
winlin
41857edaee support edge token traverse, fix #104. 0.9.129 2014-06-21 12:39:04 +08:00
winlin
d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 2014-05-27 14:10:46 +08:00
winlin
6bc0ecece7 add dvr, http heartbeat conf sample 2014-05-22 17:13:57 +08:00
winlin
d4b8fee61a fix bug #73, http callback api support authentication in tcUrl 2014-05-22 10:23:12 +08:00
winlin
ef0f7f4da8 support http heartbeat, 0.9.107 2014-05-19 17:39:01 +08:00
winlin
7c804277b2 add heatbeat url, add stream for api-server 2014-05-19 15:27:05 +08:00
winlin
a4410a4fa9 update pithy-print to 10s. refine log 2014-05-04 10:45:13 +08:00
winlin
fc501b050b add atc_auto to disable or enable auto detect atc 2014-04-30 12:08:11 +08:00
winlin
30bb3ff704 add dvr_plan hss to full.conf 2014-04-30 11:56:19 +08:00
winlin
0622004eff update conf, add todo for edge/forward 2014-04-29 09:10:17 +08:00
winlin
2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 2014-04-26 21:41:18 +08:00
winlin
d6948d613f add author byteman for h264 to flv. 2014-04-25 15:27:50 +08:00
winlin
bfd1d07827 update readme 2014-04-24 17:46:10 +08:00
winlin
3ed59f190b refine srs live flashP2P(integrated by chnvideo) 2014-04-24 17:38:57 +08:00
winlin
67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 2014-04-24 16:32:19 +08:00
winlin
733ca2475d call http api when dvr got keyframe 2014-04-22 17:32:45 +08:00
winlin
03af43017d update dvr config comments 2014-04-17 18:32:43 +08:00
winlin
2d1c28cff9 update dvr, support segment plan 2014-04-17 17:35:21 +08:00
winlin
73459547e1 support dvr. change to 0.9.69 2014-04-17 16:06:49 +08:00
winlin
b1877db405 fix typo of full.conf. fix api server bug 2014-04-14 17:31:59 +08:00
winlin
821b58af03 support reload atc 2014-04-12 22:00:27 +08:00
winlin
3a26b23fba change ffmpeg log to ./objs 2014-04-10 17:19:49 +08:00
winlin
4af7b6e383 update conf file, add id for ingest. 2014-04-08 15:51:43 +08:00
winlin
5a3b59d3c8 update conf file, add id for ingest. 2014-04-08 15:47:52 +08:00
winlin
c11e266d5c update readme 2014-04-07 15:04:31 +08:00
winlin
e89ab84e4e implements ingest, change to 0.9.53 2014-04-07 14:20:03 +08:00
winlin
2742679354 implements the ingest framework 2014-04-07 13:32:00 +08:00
winlin
7384ad0caa add ingest config section of full.conf 2014-04-06 21:26:57 +08:00
winlin
30e3323fe4 update readme, add SampleHTTP link 2014-04-05 13:38:05 +08:00
winlin
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +08:00
winlin
83f35d10b1 add http delivery framework 2014-04-04 18:55:21 +08:00
winlin
b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 2014-04-04 15:35:17 +08:00
winlin
3f13726544 add log level in conf. change to 0.9.45 2014-04-03 18:32:51 +08:00
winlin
aa89f9f51e change to 0.9.37, for http api/stream 2014-03-27 12:14:04 +08:00
winlin
041a07dfda add http config in srs conf 2014-03-26 23:19:50 +08:00
winlin
0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 2014-03-26 16:25:02 +08:00
winlin
ed20bd7078 default write log to file. 2014-03-23 14:51:35 +08:00
winlin
7930add7f9 add log tank config, default to console. 2014-03-23 14:40:55 +08:00
winlin
3ec3c1f532 support daemon 2014-03-23 12:42:05 +08:00
winlin
d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:21:36 +08:00
winlin
3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make. 2014-03-22 20:53:29 +08:00
winlin
f25c6558a5 write pid to ./objs/srs.pid. 2014-03-21 15:45:34 +08:00
winlin
a0c0c94cf0 refine conf, add comments for other listen type 2014-03-21 14:00:26 +08:00
winlin
b7d40b5aba support vn/an to disable video/audio, for radio streaming 2014-03-19 22:45:58 +08:00
winlin
b52a051d80 refine readme, confs 2014-03-18 15:38:34 +08:00
winlin
b36338853a refine the conf files, rename srs.conf to demo.conf 2014-03-18 15:13:25 +08:00