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
4387 commits 13 branches 107 tags 375 MiB
Commit graph

214 commits

Author SHA1 Message Date
winlin
ee068cf120 For #1109, Support without ssl for HLS key. 2018-08-25 21:15:26 +08:00
winlin
522fba99aa Merge branch 3.0release into harlanc-3.0release 2018-08-25 18:12:39 +08:00
winlin
e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 2018-08-25 18:10:55 +08:00
Harlan
22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
 2018-08-15 07:37:12 +08:00
Harlan
ac6b37de4b rewrite ff_data_to_hex 2018-08-12 14:10:18 +08:00
Harlan
43ebd5958d fix bug that only one stream can be encrypted.. 2018-04-03 22:00:32 +08:00
xialixin
aaf2905a9d add: hls configuration adds [duration] variable (#1083) 2018-03-25 17:47:37 +08:00
Harlan
52596a0b04 add HLS encryption feature 2018-03-25 12:05:52 +08:00
winlin
459272b94c Merge #1077 from 2.0release 2018-02-28 14:10:09 +08:00
RocFang
fd016ed91a use hls->initialize to set req of hls (#1077) 2018-02-28 13:35:33 +08:00
winlin
ca1395a807 Change date from 2017 to 2018 2018-01-07 10:58:53 +08:00
winlin
6eae93258a For #913, APP support complex error. 2018-01-01 19:39:57 +08:00
winlin
abcaba33ee For #913: TS/HLS/MPEGTS support complex error 2017-09-22 21:50:54 +08:00
winlin
20a42599f3 For #913, http callback use complex error 2017-09-22 19:54:50 +08:00
winlin
9db2a04c3b For #913, coroutine support complex error. 2017-06-11 18:44:20 +08:00
winlin
7cac35a289 For #913, source cycle error 2017-06-11 09:40:07 +08:00
winlin
1bf99e8f3e For #907, Wrap ST, only use in service ST. 2017-05-30 09:05:02 +08:00
HungMingWu
815d50f00a Remove warning: C++11 requires a space between string literal and macro (#874) 
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
 2017-05-06 14:05:22 +08:00
winlin
f97260be1d Merge SRS2 2017-05-01 16:44:14 +08:00
winlin
a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 2017-05-01 16:39:59 +08:00
winlin
bcd24126c5 Update comments for HLS 2017-04-16 21:43:30 +08:00
winlin
a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 2017-04-16 21:33:39 +08:00
winlin
0a57a46016 Refine LICENSE 2017-03-25 21:29:29 +08:00
winlin
f32aab3d92 For #299, refine code. 2017-03-25 17:21:39 +08:00
winlin
2980e7d3ef For #813, refine code. 2017-03-25 12:52:54 +08:00
Chengdong Zhang
8ad934a8a4 srs_info use not available variable (#813) 
srs_info use not available variable.
Variable has been removed or changed.
 2017-03-24 23:42:37 -05:00
winlin
8d679a6f9a For #299, use fragment for dvr FLV/MP4 2017-03-18 21:41:01 +08:00
winlin
da4c390d69 For #299, extract fragment and fragment window for hls 2017-03-18 21:29:08 +08:00
winlin
ede1c34a25 for #299, refine the signature of api for hls/dash 2017-02-19 21:48:32 +08:00
winlin
2fcd3972c1 for #299, refine the encoder object name 2017-02-12 21:50:02 +08:00
winlin
2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 2017-02-12 20:55:35 +08:00
winlin
caf69f193d for #299, refine the codec object name 2017-02-12 20:38:39 +08:00
winlin
d7458c4e72 For #299, refine the codec to format-frame-sample chain. 2017-02-12 18:18:18 +08:00
winlin
c4a510b834 For #299, refine the codec info structure. 2017-02-11 23:09:23 +08:00
winlin
5e419c66f8 For #299, add dash files. 2017-02-11 21:14:28 +08:00
winlin
8e5d4dc73d always enable http and hls 2017-02-11 13:29:53 +08:00
winlin
3209ad29e0 for #738, refine code for DVR mp4. 2017-02-06 20:58:52 +08:00
winlin
a1fcf66f32 for #742, always enable http utilities. 2017-01-23 17:43:59 +08:00
winlin
4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 2017-01-19 12:38:55 +08:00
winlin
a1ae48f4ac Merge branch '2.0release' into develop 2017-01-10 18:07:52 +08:00
winlin
6fbda2ae3f for #635, refine hls open/close gop. 2017-01-10 18:07:46 +08:00
winlin
ae1920e91a Merge branch '2.0release' into develop 2017-01-10 17:17:31 +08:00
winlin
4104f25069 for #635, support IDR and NonIDR(open-gop). 2017-01-10 17:17:23 +08:00
winlin
1dd877c0d6 merge srs2 2017-01-10 11:17:37 +08:00
winlin
c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 2017-01-10 11:14:20 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
664844b5f5 merge from srs2. for #513. 2016-12-15 14:54:09 +08:00
winlin
759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 2016-12-15 14:48:38 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
ffef3905af merge from srs2. 2015-12-11 11:35:56 +08:00