winlin
|
f8bdd28de6
|
add comments for hls m3u8, target duration may should not changed.
|
10 years ago |
winlin
|
693c7a5349
|
refine hls m3u8, use LR(0x0a, \n) as new line char
|
10 years ago |
winlin
|
81ea6d34ce
|
add pdf of hls rfc, corrent the content type.
|
10 years ago |
winlin
|
30b1759aa9
|
fix bug for memory hls.
|
10 years ago |
winlin
|
bdda337f33
|
fix aac adts bug, the frame length is 2bits.
|
10 years ago |
winlin
|
0af6e5e829
|
fix bug for srs-librtmp
|
10 years ago |
winlin
|
dba983d124
|
for #136, update the config for ram hls.
|
10 years ago |
winlin
|
a23191497f
|
fix #136, support hls without io(in ram). 2.0.112
|
10 years ago |
winlin
|
89b37d3469
|
for #136, refine the conf for hls.
|
10 years ago |
winlin
|
4d10cc9f59
|
for #250, add conf.
|
10 years ago |
winlin
|
16afe7ddbb
|
fix #250, support push MPEGTS over UDP to SRS. 2.0.111
|
10 years ago |
winlin
|
4246be92c9
|
for #250, merge avc to codec. use queue to dequeue.
|
10 years ago |
winlin
|
153a3a6c42
|
must user pithy print for mpegts print.
|
10 years ago |
winlin
|
70c8fe13c4
|
for #250, support h264 video for push mpegts over udp. 2.0.110
|
10 years ago |
winlin
|
66fccdbbd1
|
for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.
|
10 years ago |
winlin
|
bce78fdab6
|
for #250, add comments for elemetary stream specifed by stream_id.
|
10 years ago |
winlin
|
a384cc400a
|
for #250, use udp packet handler.
|
10 years ago |
winlin
|
35ab0ea627
|
for #250, use buffer to cache bytes, for system will split the udp packet.
|
10 years ago |
winlin
|
b38bae2a89
|
for #250, refine parse pes packet, remove the clear method.
|
10 years ago |
winlin
|
1685cdd48e
|
for #250, parse pes packet ok, ts message ok.
|
10 years ago |
winlin
|
486277089d
|
for #250, parse the PES ts packet payload.
|
10 years ago |
winlin
|
755e61e011
|
update the qt project.
|
10 years ago |
winlin
|
8374017329
|
build libfdk-aac in ffmpeg. 2.0.108
|
10 years ago |
winlin
|
cc87992fe0
|
for #250, decode the PMT and PAT
|
10 years ago |
winlin
|
7692e50fc2
|
for #250, calc and verify the crc32 of PAT.
|
10 years ago |
winlin
|
52b62918d9
|
for #250, decode the PAT of PSI ts packet.
|
10 years ago |
winlin
|
51aecb8fde
|
for #250, decode the ts packet header and adaptation field.
|
10 years ago |
winlin
|
bd395904df
|
for #250, the ts packet and adaptation field.
|
10 years ago |
winlin
|
aff7a1cb4d
|
add ts packet definition for #250.
|
10 years ago |
winlin
|
919a85b103
|
for #301, hls support h.264+mp3, ok for vlc. 2.0.107
|
10 years ago |
winlin
|
2c42350489
|
for #301, http ts stream support h.264+mp3. 2.0.106
|
10 years ago |
winlin
|
aaade0f04f
|
for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105
|
10 years ago |
winlin
|
9cbc753e8e
|
for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25
|
10 years ago |
winlin
|
c9d270fbe0
|
refine code for #250, ts remux
|
10 years ago |
winlin
|
b0daf1482d
|
update version to 1.0.24
|
10 years ago |
winlin
|
1835957a2b
|
for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24
|
10 years ago |
winlin
|
ea85ad2e20
|
for #293, #250, move the ts codec to kernel ts.
|
10 years ago |
winlin
|
d22e4e86d8
|
update projects for rtmp renamed to protocol
|
10 years ago |
winlin
|
711b6ca277
|
for #250, basic stream caster framework. 2.0.104
|
10 years ago |
winlin
|
6463d22a14
|
for #250, add mpegts over udp stream caster class.
|
10 years ago |
winlin
|
7f02bfa3a4
|
for #250, the mpegts over udp stream caster framework.
|
10 years ago |
winlin
|
52891b491a
|
listen and serve stream caster mpegts over udp.
|
10 years ago |
winlin
|
f9d1e1111a
|
merge from feilong, consumer directly sleep when paused.
|
10 years ago |
winlin
|
8ace73f30d
|
for #151, use absolutely overflow to make jwplayer happy. 2.0.103
|
10 years ago |
winlin
|
4f5cc9c403
|
for #151, use absolutely overflow to make jwplayer happy. 1.0.23
|
10 years ago |
winlin
|
6b89ffbc1d
|
add config section for stream caster.
|
10 years ago |
winlin
|
73cfdea332
|
for #299, srs http server support dash vod stream over mp4 range. 2.0.103
|
10 years ago |
winlin
|
e0ee8de2fb
|
for #299, srs http server support dash, flash request range in range or bytes.
|
10 years ago |
winlin
|
a4ba40952a
|
for #250, rename rtmp to protocol dir.
|
10 years ago |
winlin
|
d9a012164e
|
update vs2010 project.
|
10 years ago |
winlin
|
a647043a06
|
update readme and wiki url for http ts stream
|
10 years ago |
winlin
|
2a05783d5c
|
for #293, support http ts stream. 2.0.101
|
10 years ago |
winlin
|
dfe385d0c9
|
for #293, move the simple buffer to kernel.
|
10 years ago |
winlin
|
77d78eac5c
|
for #293, add http ts stream framework.
|
10 years ago |
winlin
|
0f59073400
|
refine code, rename the pts to dts although both ok for audio.
|
10 years ago |
winlin
|
913f98b902
|
for bug #293, http ts stream, move the avc codec from app to kernel.
|
10 years ago |
winlin
|
dc6299171f
|
refine http stream code.
|
10 years ago |
winlin
|
7d86c6d9e9
|
for bug #293, refine for fast cache of http stream.
|
10 years ago |
winlin
|
2167a8385c
|
update version to 3.0.101
|
10 years ago |
winlin
|
25807298ad
|
alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
|
10 years ago |
winlin
|
7305fa6f03
|
update vs2010 filter
|
10 years ago |
winlin
|
f26a2a8f0e
|
add vs2010 filters.
|
10 years ago |
winlin
|
db700a0c64
|
update vs solution
|
10 years ago |
winlin
|
31efea4f33
|
rename srs cmake ide to jetbrains clion
|
10 years ago |
winlin
|
664c85cf3d
|
Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
|
10 years ago |
winlin
|
a3607c9193
|
use ide dir for ides.
|
10 years ago |
winlin
|
49330b98b3
|
Merge pull request #296 from panda1986/develop
支持mp3音频编码
|
10 years ago |
panda1986
|
797c1b0762
|
support all acodec. not forced to aac.
|
10 years ago |
panda1986
|
e7d54c2ca9
|
Update srs_app_ffmpeg.cpp
srs develop 新增支持mp3转码后,需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
|
10 years ago |
winlin
|
bb1331cc91
|
update conf.
|
10 years ago |
winlin
|
b735e29d05
|
refine conf, add port.
|
10 years ago |
winlin
|
e5ef4c2e66
|
update the conf of http static and stream.
|
10 years ago |
winlin
|
5f194bc87c
|
merge from feilong, the crash for cosumer wait.
|
10 years ago |
winlin
|
b7b268dfbf
|
fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100.
|
10 years ago |
winlin
|
29a8932b49
|
for bug #293, use http stream cache for android weixin to happy.
|
10 years ago |
winlin
|
f9f2fcbb9c
|
for #293, add http stream cache for audio mp3/aac stream.
|
10 years ago |
winlin
|
e6549b261c
|
for #293, support http mp3 streaming
|
10 years ago |
winlin
|
d364a81d8f
|
for #293, support http mp3 streaming
|
10 years ago |
winlin
|
99bf397487
|
for bug #293, add mp3 id3 spec
|
10 years ago |
winlin
|
b04888a35d
|
for #293, #277, support http chunked encoding
|
10 years ago |
winlin
|
15d87537a1
|
for bug #293, support aac stream.
|
10 years ago |
winlin
|
3244c083c7
|
for bug #293, support http aac stream
|
10 years ago |
winlin
|
7674524c31
|
for #239, empty the aac encoder
|
10 years ago |
winlin
|
c0233542bf
|
for #293, add aac encoder for http aac stream.
|
10 years ago |
winlin
|
77e43d1813
|
refine comments of aac publish for #212
|
10 years ago |
winlin
|
c0a7752718
|
for #293, add aac mime audio/x-aac
|
10 years ago |
winlin
|
d546827b1c
|
for #293, refine the mime of content type.
|
10 years ago |
winlin
|
3b853a6dbd
|
fix #293, support rtmp remux to http flv live stream.
|
10 years ago |
winlin
|
53d9faf395
|
for #293, update readme.
|
10 years ago |
winlin
|
eea31ef4f3
|
for #293, support rtmp remux to http flv live stream.
|
10 years ago |
winlin
|
faaa9187f2
|
for #293, mount http flv stream when publish.
|
10 years ago |
winlin
|
2698e6dbae
|
for bug #293, http live streaming framework.
|
10 years ago |
winlin
|
eff2d81016
|
for #293, add http flv stream
|
10 years ago |
winlin
|
c4302b9b61
|
for bug #277, the http server subscribe the reload.
|
10 years ago |
winlin
|
f1393ee43f
|
for bug #277, use http not found when no file.
|
10 years ago |
winlin
|
398b212bfa
|
for bug #277, refine code, support default http vhost.
|
10 years ago |
winlin
|
2742c0d3c2
|
for #277, support http vhost mount.
|
10 years ago |
winlin
|
4513486266
|
refine http server, support mount dir for vhost.
|
10 years ago |
winlin
|
bfff8413b6
|
refine code for #277, the copy first param is the dest.
|
10 years ago |
winlin
|
c695a8fcbd
|
refine code for #277, extract the flv vod stream.
|
10 years ago |
winlin
|
e71bc0cbc5
|
for bug #277, refine the http server.
|
10 years ago |
winlin
|
bbe96a4b31
|
for bug #277, support flv stream.
|
10 years ago |
winlin
|
cbed2bbca4
|
fix #277, refine http server refer to go http-framework. 2.0.98
|
10 years ago |
winlin
|
9bbbaad288
|
for bug #277, refine http api refer to go http-framework. 2.0.97
|
10 years ago |
winlin
|
a1f887f46f
|
refine code, move onMetaData to consts.
|
10 years ago |
winlin
|
04aa6f8296
|
drop script data except the onMetaData packet.
|
10 years ago |
winlin
|
cc22ca4890
|
hotfix #290, use iformat only for rtmp input. 2.0.95
|
10 years ago |
winlin
|
4449a8d7b0
|
fix #290, use iformat only for rtmp input. 1.0.22
|
10 years ago |
winlin
|
29be14dd37
|
merge from feilong, fix memory leak.
|
10 years ago |
winlin
|
a4b61081cc
|
merge from feilong, fix memory leak.
|
10 years ago |
winlin
|
fae006ca7c
|
merge from feilong, fix memory leak.
|
10 years ago |
winlin
|
63309a0538
|
refine for bug #288, drop info frame without error.
|
10 years ago |
winlin
|
b705ed0b90
|
for bug #288, refine the codec decode info frame failed. 1.0.21
|
10 years ago |
winlin
|
964668dc73
|
merge from feilong, print format error.
|
10 years ago |
winlin
|
b3225100e7
|
Merge pull request #282 from tufang14/develop
add client num in statistic with traverse every client for #227
|
10 years ago |
qiang.li
|
310e49e7f3
|
add client num in statistic with traverse every client
|
10 years ago |
winlin
|
982e9555bd
|
merge from feilong, fix hls msg memory leak bug.
|
10 years ago |
winlin
|
b466756931
|
merge from feilong for bug #281.
|
10 years ago |
winlin
|
27e0521ace
|
fix #281, fix hls bug ignore type-9 send aud. 1.0.20
|
10 years ago |
winlin
|
6c833902f9
|
merge http api from tufang. 2.0.92
|
10 years ago |
winlin
|
ac584a4db2
|
Merge pull request #279 from tufang14/develop
add client num for stream in statistic for #227
|
10 years ago |
qiang.li
|
46d716612c
|
add client num for stream in statistic
|
10 years ago |
winlin
|
44f5efda21
|
refine the print info.
|
10 years ago |
winlin
|
0e9c9db3f4
|
fix the aggregate bug, adjust to starttime of msg. 2.0.91
|
10 years ago |
winlin
|
5aa31568ba
|
fix the rtmp dump, parse the aggregate msg.
|
10 years ago |
winlin
|
5661fc2676
|
refine dvr and rtmp dump, write the original data.
|
10 years ago |
winlin
|
a402ca7120
|
refine code, the consumer always alive longer than queue recv thread.
|
10 years ago |
winlin
|
89a3cf9efe
|
refine code, failed when specified complex but no ssl for srslibrtmp
|
10 years ago |
winlin
|
0e03d019a8
|
for bug #215, srs rtmp dump support conn args. 2.0.90
|
10 years ago |
qiang.li
|
08e9f6ef42
|
add play client num in statistic
|
10 years ago |
winlin
|
f1efdcd000
|
refine code, use global virtual id to generate the id of vhost and stream.
|
10 years ago |
winlin
|
ae63af6a4a
|
refine code, implements the stat.:
|
10 years ago |
winlin
|
97bea51499
|
refine the api, response the error code and data.
|
10 years ago |
winlin
|
cc796a433a
|
refine the statistic arch.
|
10 years ago |
winlin
|
40ed2249e8
|
refine code to use the one coding style.
|
10 years ago |
winlin
|
4bb17f0c81
|
replace the TAB with 4spaces
|
10 years ago |
winlin
|
344ff24f66
|
add srs_app_statistic to upp project.
|
10 years ago |
winlin
|
67adc8dc61
|
merge with security bug fix.
|
10 years ago |
qiang.li
|
a4a93613d0
|
add statistic for stream
|
10 years ago |
winlin
|
dc11418c79
|
fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89
|
10 years ago |
winlin
|
dd2c7e0b4d
|
hotfix to remove the pageUrl for http callback. 2.0.88
|
10 years ago |
winlin
|
247b772449
|
hotfix to remove the pageUrl for http callback. 1.0.19
|
10 years ago |
winlin
|
7f60d472e6
|
remove the change vhost forward.
|
10 years ago |
winlin
|
45724bfaec
|
update conf for transcode.
|
10 years ago |
winlin
|
0b9bbdbe74
|
Merge branch '1.0release' into develop
|
10 years ago |
winlin
|
f9a33fbeee
|
fix the compile failed for utest at 32bits cpus
|
10 years ago |
qiang.li
|
8d534d3470
|
get stream info use http api #227
|
10 years ago |
winlin
|
f881bc43b5
|
fix #179: dvr support custom filepath by variables. 2.0.87
|
10 years ago |
winlin
|
f89941254a
|
refine code of security deny check
|
10 years ago |
winlin
|
18b15b9099
|
refine comments of security deny check
|
10 years ago |
winlin
|
75f2607685
|
fix #211, support security allow/deny publish/play all/ip. 2.0.86
|
10 years ago |
winlin
|
f8ec7c706d
|
merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85
|
10 years ago |
winlin
|
e590537dca
|
fix #207, trim the last 0 of log. 1.0.18
|
10 years ago |
winlin
|
07b207b7e3
|
remove test code for api-server.
|
10 years ago |
winlin
|
9d34820c80
|
fix #158: http-callback check http status code ok(200). 2.0.84
|
10 years ago |
winlin
|
8df0f724d6
|
fix #216, http-callback post in application/json content-type. 2.0.83
|
10 years ago |
winlin
|
ca977ef739
|
hotfix #216, http-callback post in application/json content-type. 1.0.17
|
10 years ago |
winlin
|
518a5a72ab
|
fix #263, srs-librtmp flv read tag should init size. 2.0.82
|
10 years ago |
winlin
|
c1c01ec802
|
hotfix #270, memory leak for http client post. 2.0.81
|
10 years ago |
winlin
|
bb6dfe40c1
|
fix #270, memory leak for http client post. 1.0.16
|
10 years ago |
winlin
|
569596c10d
|
update copyright, from 2013 to 2015
|
10 years ago |
winlin
|
1824e18bd2
|
fix the comment bug.
|
10 years ago |
winlin
|
12f4abd553
|
fix #266, aac profile is object id plus one. 2.0.80
|
10 years ago |
winlin
|
c0a6c3efa3
|
merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79
|
10 years ago |
winlin
|
d9aca8ab82
|
hotfix #267, the forward dest ep should use server. 1.0.15
|
10 years ago |
winlin
|
e27c95b0e8
|
merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78
|
10 years ago |
winlin
|
513c1ec6d5
|
fix #268, the hls pcr is negative when startup. 1.0.14
|
10 years ago |
winlin
|
5e9ff71740
|
refine the log verbose
|
10 years ago |
winlin
|
2d229b09be
|
refine rtmp protocol stack comments
|
10 years ago |
winlin
|
5a229e89bf
|
refine the rtmp protocol stack comments, the stream id in little-endian.
|
10 years ago |
winlin
|
9e35664510
|
refine the simple handshake comment.
|
10 years ago |
winlin
|
8757473a7a
|
Merge branch '1.0release' into develop
|
10 years ago |
winlin
|
dec4f6b989
|
hotfix 1.0release, add remote gitlab
|
10 years ago |
winlin
|
8ea6da2607
|
Merge branch '1.0release' into develop
|
10 years ago |
winlin
|
dfd4eeca45
|
hotfix 1.0release, git checkout develop when commit
|
10 years ago |
winlin
|
9a66d22f3b
|
hotfix 1.0release, 1.0.13
|
10 years ago |
winlin
|
b8de3bd3b4
|
convert the core to unix format.
|
10 years ago |
winlin
|
92146712d8
|
fix srs-librtmp send raw aac audio channel bug. 2.0.76
|
10 years ago |
winlin
|
9788570ba5
|
fix bug for ubuntu14 to build.
|
10 years ago |
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
|
10 years ago |
winlin
|
2e43a63bf4
|
fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12
|
10 years ago |
winlin
|
b77e1de1d1
|
fix bug of utest
|
10 years ago |
winlin
|
81e70e7bdb
|
for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object.
|
10 years ago |
winlin
|
eef8034632
|
merge from 1.0release for bug #264. 2.0.74
|
10 years ago |
winlin
|
7737042795
|
fix #264, remove the test code. 1.0.11
|
10 years ago |
winlin
|
1dfac0bf1d
|
fix #264, support disconnect publish connect when hls error. 1.0.11
|
10 years ago |
winlin
|
db13c725a6
|
refine #259, rename the on_dispose to wakeup. 2.0.73
|
10 years ago |
winlin
|
61a648f1d2
|
refine for #259, chmod -x files.
|
10 years ago |
winlin
|
24815e4efe
|
refine code for bug #239
|
10 years ago |
winlin
|
304208f822
|
fix #239, traverse the token before response connect. 1.0.10.
|
10 years ago |
tufang14
|
3d0d43c5dc
|
token bug
多级origin-edge模式,edge上功能不生效
|
10 years ago |
winlin
|
0c132e9781
|
update the log position.
|
10 years ago |
winlin
|
127b96b255
|
add git2unix and git commit script.
|
10 years ago |
winlin
|
9c033c7da6
|
hotfix 1.0, author bug, use error macro. 1.0.9
|
10 years ago |
winlin
|
575e50b6e2
|
hotfix to add comments on 1.0release
|
10 years ago |
winlin
|
be53b10ed3
|
refine log position
|
10 years ago |
winlin
|
d91a9dfa9d
|
udpate the srs_bwt.
|
10 years ago |
winlin
|
cd0ab5fb43
|
update PRIMARY, AUTHORS, CONTRIBUTORS rule
|
10 years ago |
winlin
|
db7af6259a
|
update PRIMARY, AUTHORS, CONTRIBUTORS rule
|
10 years ago |
winlin
|
d672fae255
|
update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8
|
10 years ago |