winlin
|
5f3d09c8a0
|
Refine hls muxer duration in time duration.
|
2019-04-15 07:47:37 +08:00 |
|
winlin
|
bc1189caee
|
Refine SrsFragment.duration in time unit.
|
2019-04-12 08:04:06 +08:00 |
|
winlin
|
6c12aa0eca
|
Refine srs_update_system_time in time unit
|
2019-04-10 09:07:03 +08:00 |
|
winlin
|
9b7c0802a9
|
Refine srs_update_system_time in time unit
|
2019-04-10 08:32:46 +08:00 |
|
winlin
|
073d42ca7d
|
CI: Refine hls ts context writer
|
2019-02-05 16:26:43 +08:00 |
|
winlin
|
b2d1d84634
|
Change to 2019
|
2019-01-01 21:37:28 +08:00 |
|
winlin
|
c6844527fb
|
Always enable SRS_SSL
|
2018-12-22 20:23:39 +08:00 |
|
winlin
|
0bc7fdbb35
|
Always enable SRS_SSL
|
2018-12-22 20:03:40 +08:00 |
|
winlin
|
1e2cca4712
|
For #1093, Refine HLS encryption wiki
|
2018-08-25 21:59:56 +08:00 |
|
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 |
|
winlin
|
2830ee12c1
|
fix the on_hls.ts_url bug.
|
2015-12-11 11:29:10 +08:00 |
|
winlin
|
01c46bdbfd
|
rename org simle-rtmp-server to ossrs
|
2015-11-11 10:45:45 +08:00 |
|
winlin
|
1ffd5fd455
|
rename org simple-rtmp-server to ossrs
|
2015-11-11 10:37:50 +08:00 |
|
winlin
|
59f5c5d6a5
|
Merge branch '2.0release' into develop
|
2015-10-27 18:21:04 +08:00 |
|
winlin
|
3b0bf1e10b
|
for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok.
|
2015-10-27 18:20:57 +08:00 |
|
winlin
|
1d57e53910
|
merge from 2.0release
|
2015-10-27 17:45:14 +08:00 |
|
winlin
|
d1979c760f
|
for #512, partical hotfix the hls pure audio. 2.0.196
|
2015-10-27 17:44:10 +08:00 |
|
winlin
|
3683f06e4d
|
for #512, write audio frame by frame for video+audio hls.
|
2015-10-27 16:20:02 +08:00 |
|
winlin
|
168625dce2
|
rename rtmp amf0 to protocol amf0.
|
2015-09-22 09:05:21 +08:00 |
|
winlin
|
d32632ee8a
|
rename SrsFastBuffer to SrsFastStream
|
2015-09-22 09:01:47 +08:00 |
|
winlin
|
1fd83d9314
|
refine the order.
|
2015-09-17 13:36:02 +08:00 |
|
winlin
|
2a1b2b69a0
|
for #459, dvr support apply filter for ng-control dvr module.
|
2015-09-15 15:58:57 +08:00 |
|
winlin
|
511627abab
|
fix #474, config to donot parse width/height from sps. 2.0.189
|
2015-09-14 18:36:44 +08:00 |
|
winlin
|
83a9ff9f5d
|
for #474, refine the hls publish, donot fetch from source when publish
|
2015-09-14 15:49:25 +08:00 |
|
winlin
|
0d57ef9373
|
fix #458, http hooks use source thread cid. 2.0.188
|
2015-09-14 13:47:25 +08:00 |
|
winlin
|
6d50aa1aa2
|
#475, fix http hooks crash for st context switch. 2.0.187
|
2015-09-14 12:22:19 +08:00 |
|
winlin
|
6fe36afcfa
|
when hls timestamp jump, reset it.
|
2015-07-14 11:00:58 +08:00 |
|
winlin
|
99574bb77b
|
ignore when no segments for there must no m3u8
|
2015-07-14 10:43:21 +08:00 |
|
winlin
|
40c264a316
|
always reset the max target duration for hls.
|
2015-07-14 10:31:42 +08:00 |
|
winlin
|
54bb42483b
|
change time jitter to off for hls and forward.
|
2015-07-14 10:03:15 +08:00 |
|
winlin
|
3211282b0c
|
refine the http code.
|
2015-06-14 19:42:43 +08:00 |
|
winlin
|
17c276113e
|
refine the hls dispose, when not cycle always dispose it.
|
2015-06-13 17:23:38 +08:00 |
|
winlin
|
d103557a8b
|
merge the rtmp sdk to stack.
|
2015-06-13 16:04:59 +08:00 |
|
winlin
|
0d6a574216
|
fix the hls_dispose bug, ignore for 0.
|
2015-06-12 16:08:47 +08:00 |
|
winlin
|
56938efdbd
|
fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175
|
2015-06-10 15:38:13 +08:00 |
|
winlin
|
4400b12515
|
Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release
|
2015-06-05 20:38:51 +08:00 |
|
winlin
|
26b76c0e4c
|
fix #420, remove ts for hls ram mode.
|
2015-06-05 20:38:01 +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
|
4e42b9c628
|
copy the request for hls.
|
2015-06-02 12:56:04 +08:00 |
|
winlin
|
223ae194b1
|
fix #209, cleanup hls when stop and timeout. 2.0.173.
|
2015-05-30 14:41:09 +08:00 |
|
winlin
|
4a80a5a71e
|
for #209, support cleanup when srs stop.
|
2015-05-30 13:48:29 +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
|
c1b9541b5c
|
support disable all
|
2015-05-27 07:22:44 +08:00 |
|
winlin
|
5908096fc3
|
refine the thread, protocol, kbps code. 2.0.166
|
2015-05-23 10:04:28 +08:00 |
|
winlin
|
2f0ef87d6d
|
refine code, rename the sync call to common class.
|
2015-05-23 07:57:45 +08:00 |
|
winlin
|
0bb90145ba
|
fix #391, copy request for async call.
|
2015-05-23 07:46:45 +08:00 |
|
winlin
|
b23e196f20
|
migarate from winlinvip to srs org, move the copyright to srs org.
|
2015-04-29 17:38:23 +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
|
4e5ddb51e7
|
refine the overflow algorithm, prevent smaller piece.
|
2015-04-21 16:21:22 +08:00 |
|