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

175 commits

Author SHA1 Message Date
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
5c6ef6ded6 fix warning for xcode. 2015-03-14 13:09:34 +08:00
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
wenjie.zhao
643f18abe4 add hds reload supported.#328 2015-03-12 22:38:11 +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
wenjie.zhao
d4198ee8ba add hds supported. 2015-03-11 13:34:58 +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
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
95b4baee7c for #179, refine dvr code to more simple. 2015-02-21 16:25:04 +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
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
a23191497f fix #136, support hls without io(in ram). 2.0.112 2015-02-03 16:01:07 +08:00
winlin
52891b491a listen and serve stream caster mpegts over udp. 2015-01-24 14:52:52 +08:00
winlin
a4ba40952a for #250, rename rtmp to protocol dir. 2015-01-23 10:07:20 +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
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
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
75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 2015-01-02 16:02:13 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +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
5529813fcb for bug #257, support NULL msg in msgs to send. 2014-12-13 11:22:40 +08:00
winlin
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
32d537b96b for bug #251, refine code before mic. 2014-12-06 19:56:06 +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
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:06:26 +08:00
winlin
4f21e92ae0 fix the message of config for max_connections. 2014-11-11 18:49:27 +08:00
winlin
efc85ed6df refine config, check the connections more precise 2014-11-11 17:19:56 +08:00
winlin
de5e2d0a40 Revert "Revert "for bug #194, refine the config"" 
This reverts commit b4c1d55311.
 2014-11-11 17:12:45 +08:00
winlin
b4c1d55311 Revert "for bug #194, refine the config" 
This reverts commit 2a55ae4317.
 2014-11-11 17:05:36 +08:00
winlin
2a55ae4317 for bug #194, refine the config 2014-11-11 15:38:21 +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
d24e2fd0cc remove supports for OSX. 2.0.1. 2014-10-18 13:58:23 +08:00
winlin
20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 2014-09-26 17:47:43 +08:00
winlin
83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 2014-09-25 10:59:29 +08:00