winlin
2da4e0a43e
For #1638 , #307 , config to discard aac for rtc
5 years ago
winlin
0cd67a997e
For #1638 , #307 , add comments for vhost rtc config
5 years ago
xiaozhihong
fa700dad64
1. Modify rtc.conf to support Bframe discard.
...
2. Rename srs_app_rtp.cpp to srs_app_rtc.cpp
5 years ago
winlin
de9a004ff7
Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2
5 years ago
xialixin
8b4f84e336
fix push.gb28181.conf, gb28181conn repeat call serve()
5 years ago
xialixin
cbe9c1dabc
Support gb28181 sip over udp, ps steam over rtp
5 years ago
winlin
a42cf3ae8d
For #1638 , #307 , refactor rtc config.
5 years ago
winlin
6f4584db53
Merge SRS4
5 years ago
winlin
51af2b4779
For #1638 , #307 , rtc conf support ENV.
5 years ago
winlin
a135eb2144
Merge SRS3
5 years ago
winlin
88336b1f5e
Remove KAFKA config, because it's removed from code
5 years ago
winlin
d21ef106a0
Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc
5 years ago
winlin
1382337cb4
Merge SRS3
5 years ago
winlin
9b663c070a
Fix #1635 , support auto reaload config by inotify. 3.0.129
5 years ago
winlin
b33751e2c1
Merge SRS3
5 years ago
winlin
ed41ca867b
For #1594 , detect and disable daemon for docker. 3.0.127
5 years ago
winlin
6a765ab849
Merge SRS3
5 years ago
winlin
c61c2a939f
For #1634 , refactor output with datetime for ingest/encoder/exec. 3.0.125
5 years ago
HuyaJohn
b730458d51
add candidates ip list, add rtc_upload.html to test
5 years ago
runner365
7f4cc6221c
1,solve audio timestamp bugs;2,solve video dts increase bugs
5 years ago
runner365
ed1a3aa37c
Merge branch 'develop' into 3.0release.srt.dev
5 years ago
runner365
4bd37d43b4
solve dts==0 bugs; solve large aac 2930bytes timestamp bugs
5 years ago
winlin
90afd06c85
For #1615 , support default app(live) for vmix SRT. 4.0.9
5 years ago
xiaozhihong
51abb0844e
rtp session manager, stun codding
5 years ago
winlin
ef2b123325
Merge branch '3.0release' into 4.0release
5 years ago
winlin
20b9d6ab02
For #1598 , support SLB health checking by TCP. 3.0.123
5 years ago
winlin
388ad61cdc
Merge branch '3.0release' into 4.0release
5 years ago
winlin
dc0f804452
For #1579 , support start/final wait for gracefully quit. 3.0.121
5 years ago
winlin
0c48c42f36
Merge branch '3.0release' into 4.0release
5 years ago
winlin
58b40478b6
For #1579 , support force gracefully quit. 3.0.120
5 years ago
winlin
eefd74e0e4
Merge branch '3.0release' into develop
5 years ago
winlin
3c597545b1
For #1579 , support gracefully quit. 3.0.119
5 years ago
winlin
8b7fbac7d4
SRT supports detail config for DynamicConfig. 4.0.4
5 years ago
Alex.CR
5f7d23f123
add srt parameter configure ( #1599 )
...
* if there isn't srt connect, it needn't epoll wait
* solve repush srt bugs
* change two thread to one thread
* mpegts discard header is not 0x47
* add srt_epoll_clear_usocks
* add srt parameter configure
5 years ago
winlin
bdc7973596
Merge branch '3.0release' into develop
5 years ago
winlin
f6fa889393
For #1592 , default ff_log_level to info
5 years ago
winlin
c6d914bc13
Fix #1592 , fix terminal echo off by redirect process stdin. 3.0.115
5 years ago
winlin
c50c51889a
For #1592 , support ff_log_level and default to warning
5 years ago
winlin
88c9c13707
Update readme for SRT
5 years ago
winlin
2775a391e0
Fix #878 , remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108
5 years ago
winlin
bbc7023f85
Merge SRS3
5 years ago
winlin
235c889e14
Update config
5 years ago
winlin
87ba204a42
Update doc for SRT url.
5 years ago
winlin
d88d422794
Update doc for SRT.
5 years ago
winlin
c7f6eef4ac
Refine config file, link to issue.
5 years ago
runner365
03ef01c635
update configure
5 years ago
runner365
746d188e6f
update srt.conf
5 years ago
runner365
5c5fd805c5
add srt mpegts to rtmp
5 years ago
runner365
7b9e3ecdc4
add ts demux
5 years ago
runner365
b53b75ea1e
srt pull/push server
5 years ago
runner365
aeee3011ef
add srt server file
5 years ago
winlin
8a28a11648
For #299 , increase dash segment size for avsync issue. 3.0.89
5 years ago
winlin
d7078a72d4
For #1520 , add TODO list for configing server itself in coworker.
5 years ago
winlin
acfeb8a66f
Fix #1520 , #1223 , bug for origin cluster 3+ servers. 3.0.74
5 years ago
winlin
cef7ec79b3
Detect whether flash enabled for srs-bwt.
5 years ago
winlin
6f453e7f46
For #547 , #1506 , default hls_dts_directly to on. 3.0.71
5 years ago
winlin
d908ee73db
Make the hls_dipose more specific
5 years ago
winlin
b4870a6d6f
Fix #1506 , support directly turn FLV timestamp to TS DTS. 3.0.68
5 years ago
winlin
f6fc31db66
Add config files for go-oryx
5 years ago
winlin
d3b142a0d9
Fix #775 , Support SO_REUSEPORT. 3.0.54
5 years ago
winlin
5df8f2f6c1
Refine get_pithy_print in time unit
6 years ago
winlin
8e55ef4b60
Refine code
7 years ago
winlin
1e2cca4712
For #1093 , Refine HLS encryption wiki
7 years ago
Harlan
22c5af62cf
Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release
...
# Conflicts:
# trunk/src/kernel/srs_kernel_utility.hpp
7 years ago
Harlan
bf12a45274
add configuration instructions for hls encryption
7 years ago
winlin
455a060fa5
Merge 2.0
7 years ago
winlin
ee43fc92ae
For #1110 , Refine conf
7 years ago
winlin
29b74c7220
For #1110 , Support params in http callback. 3.0.36
7 years ago
winlin
85d3a5001c
For #1110 , Support params in http callback. 2.0.251
7 years ago
xialixin
aaf2905a9d
add: hls configuration adds [duration] variable ( #1083 )
7 years ago
winlin
449c632e49
For #464 : Add example for origin cluster
7 years ago
winlin
c70421e656
Fix #464 , support origin cluster
7 years ago
winlin
92f2bcd878
For #464 , support config origin cluster
7 years ago
winlin
d0fbf44d18
For #464 , support config for origin cluster.
7 years ago
winlin
0e9e1792fe
For #299 , write fMP4 for DASH.
8 years ago
winlin
8b7566a007
Refine code
8 years ago
winlin
8ab727f3c5
For #299 , write MPD file.
8 years ago
winlin
d786d61685
Merge branch '2.0release' into develop
8 years ago
winlin
0059b1cf7a
For #783 , use directly free to replace auto free
8 years ago
winlin
5e419c66f8
For #299 , add dash files.
8 years ago
winlin
b0789c54e4
Update HLS wiki to v3
8 years ago
winlin
5fec59ace2
merge from srs2, fix #503
8 years ago
winlin
15570d93ce
change conf to console without daemon.
8 years ago
winlin
0a054cd6bd
for #738 , remove the dvr plan append for it's no use
8 years ago
winlin
8c01f52372
for #738 , refine the dvr segmenter.
8 years ago
winlin
8588a10775
Merge branch '2.0release' into develop
8 years ago
winlin
a37a14377a
fix the example dvr config file error
8 years ago
winlin
1b175b1107
for #730 , support config in/out ack size. 3.0.13
8 years ago
winlin
d29416a5f0
add conf sample for ingest rtsp
8 years ago
winlin
4709d0214c
for #711 , support prefile for transcode. 3.0.12
8 years ago
winlin
f2efa96015
for #324 , always enable hstrs. 3.0.10
8 years ago
winlin
b231550c32
fix #717 , #691 , http api/static/stream support cors. 3.0.9
8 years ago
winlin
664844b5f5
merge from srs2. for #513 .
8 years ago
winlin
759c84a395
for #513 , remove hls ram from srs2 to srs3+. 2.0.224
8 years ago
winlin
0e308b0fa1
merge srs2, support oryx
9 years ago
winlin
b748fac23a
support asprocess for oryx. 2.0.218
9 years ago
winlin
2a01540433
support change work_dir for oryx.
9 years ago
winlin
516f33888c
refine config
9 years ago
winlin
f87646d489
fix typo of config.
9 years ago
winlin
892591f9a6
merge from @mbeacom
9 years ago
winlin
d81b2cb140
support hls mount to vhost and reload
9 years ago
winlin
f1e7e9d933
support gmd. change work_dir. hourglass. add utilies.
9 years ago
winlin
0ab64ccd2a
merge from srs2.
9 years ago
winlin
40457e6cab
default hls_on_error to continue. 2.0.201
9 years ago
winlin
01c46bdbfd
rename org simle-rtmp-server to ossrs
9 years ago
winlin
1ffd5fd455
rename org simple-rtmp-server to ossrs
9 years ago
winlin
8974fe298b
connect to kafka and send metadata request.
9 years ago
winlin
29122b6e70
fix #502 , transcoder support snapshot.
9 years ago
winlin
2a4ab8a923
add brokers to config
10 years ago
winlin
b5ccc35340
add kafka config
10 years ago
winlin
2b9869ee52
update the wiki for dvr
10 years ago
winlin
2a1b2b69a0
for #459 , dvr support apply filter for ng-control dvr module.
10 years ago
winlin
a7c4b786cf
merge from 2.0
10 years ago
winlin
511627abab
fix #474 , config to donot parse width/height from sps. 2.0.189
10 years ago
winlin
7ae76b579e
refine the conf, use srs3 style
10 years ago
winlin
a62c82bd46
for #319 , api raw update global.listen
10 years ago
winlin
364460f2ab
for #319 , support raw update global.listen
10 years ago
winlin
f8d8c3ace4
use function to dumps the engine.
10 years ago
winlin
01878e5a9c
for #319 , query vhost detail.
10 years ago
winlin
b1b76a4a80
for #319 , allow multiple ingest and transcode.
10 years ago
winlin
d1336e0d80
refine conf
10 years ago
winlin
dc11013c01
for #319 , render the detail of vhost
10 years ago
winlin
0109a74840
for #319 , refine the config structure.
10 years ago
winlin
2b4fa2d73e
for #319 , move the edge configs to cluster.
10 years ago
winlin
6bd05f9cfc
for #319 , refine the config forward.
10 years ago
winlin
bc24c0407b
for #319 , move smi and rsh to play
10 years ago
winlin
f7c893d907
for #319 , move gop_cache and queue_length to play
10 years ago
winlin
06ae74dd3f
for #319 , move mw_latency to play.
10 years ago
winlin
4eb1874955
for #319 , the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency.
10 years ago
winlin
9c4340f789
for #319 , move atc and atc_auto to play
10 years ago
winlin
d6b0aa3a5b
for #319 , move time_jitter and mix_correct to play
10 years ago
winlin
738642073e
for #319 , refine config, collect the mr and publish timeout
10 years ago
winlin
7ef3ff90c0
refine the config structure, compatible with SRS1/2
10 years ago
winlin
a79e19599c
for #319 , support query the vhost info.
10 years ago
winlin
bdfd0ae09e
for #319 , dumps the http static, remux and globals.
10 years ago
winlin
66ffcad635
for #319 , always allow raw query.
10 years ago
winlin
f167616379
rename the config_query to query
10 years ago
winlin
2dcf3bc606
for #319 , support rpc raw api to query the HTTP RAW API configs.
10 years ago
winlin
d921d59e57
for #319 , support HTTP RAW API reload.
10 years ago
winlin
53f4ce3604
for #367 , update wiki to v3
10 years ago
winlin
c34b0c86e1
fix #367 , support nginx-rtmp exec. 3.0.1
10 years ago
winlin
74d4c96423
for #367 , design the config for exec.
10 years ago
winlin
cbfe438e73
for #367 , design the config for exec.
10 years ago
winlin
7273c33c35
support publish_1stpkt_timeout and publish_normal_timeout
10 years ago
winlin
e7714cd445
add packets interval in ms to set the right send_min_interval
10 years ago
winlin
a0a89a8ca6
use reduce_sequence_header for stream control.
10 years ago
winlin
b79d830e2c
refine the default smi
10 years ago
winlin
ae37fa8f3e
use send_min_interval for stream control. 2.0.183
10 years ago
winlin
7dcba040eb
refine config.
10 years ago
winlin
9fb4640a8f
enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182
10 years ago
winlin
c85f92c229
fix #169 , support default values for transcode. 2.0.180
10 years ago
winlin
31d2de3f23
fix #435 , add pageUrl for HTTP callback on_play.
10 years ago
winlin
af9efe9213
disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.
10 years ago
winlin
d611bb6b45
for #209 , server cycle to enable the hls to cleanup. do dispose
10 years ago
winlin
5caafadd45
fix #409 : support pure video hls. 2.0.172.
10 years ago
winlin
94efe3f727
update wiki
10 years ago
winlin
5840bc1053
add flv cluster confs.
10 years ago
winlin
f6252c7f72
enable hls for push flv.
10 years ago
winlin
ffdabf32ed
add push flv conf
10 years ago
winlin
f0c24eeacc
add stream caster for post flv over http.
10 years ago
winlin
115daa3cc1
migarate from winlinvip to srs org
10 years ago
winlin
0acb942c3a
update on_hls, add ts_url, m3u8 and m3u8_url.
10 years ago
winlin
22ca46350b
fix #383 , support mix_correct algorithm. 2.0.161.
10 years ago
winlin
8fbc6526bb
for #383 , refine code to support mix correct algorithm.
10 years ago
winlin
02a2cb7e1a
for #381 , refine the hls notify, report one by one.
10 years ago
winlin
dcac9c69d5
fix #381 , support reap hls/ts by gop or not. 2.0.160.
10 years ago
winlin
5d37e47783
support config the hls_nb_notify.
10 years ago
winlin
e3c6e52547
enhanced on_hls_notify, support HTTP GET when reap ts.
10 years ago
winlin
e458305f81
add utc time format.
10 years ago
winlin
64b065e450
for hls callback, add duration of ts.
10 years ago
winlin
17c0a5c470
fix #372 , support transform vhost of edge 2.0.155.
10 years ago
winlin
8401d9ac06
fix #366 , config hls to disable cleanup of ts. 2.0.154.
10 years ago
winlin
76c1957260
enhance hls, increase piece one by one.
10 years ago
winlin
f6e135943f
enhanced hls, support deviation for duration. 2.0.151.
10 years ago
winlin
692b751da8
for #351 , support config the m3u8/ts path for hls. 2.0.149.
10 years ago
winlin
b6feb0742f
fix #149 , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
10 years ago
winlin
fcab17741c
fix #222 , the dvr path rule changed.
10 years ago
winlin
0319e85f99
support config the audio overflow ratio.
10 years ago
winlin
2241ba0e34
for #340 , #343 , add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142
10 years ago
wenjie.zhao
65f404fb42
for #340 , refine ts prefix code.
10 years ago
wenjie.zhao
5969f72354
for #340 , refine ts prefix code.
10 years ago
wenjie.zhao
10da182853
add hls prefix of uri supported
10 years ago
winlin
59d9af8039
update conf
10 years ago
winlin
6d15d0ea99
for #324 , refine code, add hstrs config.
10 years ago
winlin
ffef62900f
for #328 , support adobe hds. 2.0.138.
10 years ago
wenjie.zhao
e57bda8908
Merge code.
...
Conflicts:
trunk/configure
trunk/src/app/srs_app_source.cpp
trunk/src/kernel/srs_kernel_error.hpp
10 years ago
winlin
5370493140
add ingest to mac.dev conf.
10 years ago
winlin
0ff49fd299
for #155 , debug srs on xcode.
10 years ago
winlin
b0953c1d3a
add comments of audio profile supported by srs.
10 years ago
winlin
b360fe279d
remove libaacplus.
10 years ago
winlin
5d0cb7e68f
update conf for rtsp
10 years ago
winlin
012c29e124
for #133 , update the wiki.
10 years ago
winlin
fb3fced8d0
for #179 , revert dvr http api. 2.0.128.
10 years ago
winlin
0213cc6466
for #179 , refine dvr, support POST create dvr when publish not start. 2.0.126
10 years ago
winlin
b903a7b436
for #179 , dvr suport vhost/app/stream level control. 2.0.125.
10 years ago
winlin
a3648063d5
fix #179 , support dvr http api. 2.0.123.
10 years ago
winlin
d650118988
fix #179 , dvr support api to start or stop. 2.0.123
10 years ago
winlin
1246989ea9
for #179 , refine dvr, support callback when reap dvr segment.
10 years ago
winlin
849e59b05d
for #179 , support http api to start dvr.
10 years ago
winlin
c67a4fdf97
for #179 , enable http api crossdomain for dvr api.
10 years ago
winlin
7077b74d03
for #179 , add dvr plan append.
10 years ago
winlin
95b4baee7c
for #179 , refine dvr code to more simple.
10 years ago
winlin
a984eeecab
refine dvr, append file when dvr file exists. 2.0.122.
10 years ago
winlin
1102c7a58f
refine pithy print to more easyer to use 2.0.121.
10 years ago
winlin
40fbfd8560
for #133 , rtsp extract tcp/udp listener.
10 years ago
winlin
c0e50265bd
for #133 , create rtsp framework.
10 years ago
winlin
e81e090239
for #133 , add rtsp listener and handler.
10 years ago
winlin
78f34ad46f
for #304 , support config default acodec/vcodec. 2.0.118.
10 years ago
winlin
922150b2cf
for #304 , rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.
10 years ago
winlin
25af6c6847
for #304 , use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
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
52891b491a
listen and serve stream caster mpegts over udp.
10 years ago
winlin
6b89ffbc1d
add config section for stream caster.
10 years ago
winlin
e0ee8de2fb
for #299 , srs http server support dash, flash request range in range or bytes.
10 years ago
winlin
a647043a06
update readme and wiki url for http ts stream
10 years ago
winlin
7d86c6d9e9
for bug #293 , refine for fast cache of http stream.
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
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
b7b268dfbf
fix #293 , support http live flv/aac/mp3 stream with fast cache. 2.0.100.
10 years ago
winlin
eff2d81016
for #293 , add http flv stream
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
dc11418c79
fix #274 : http-callback support on_dvr when reap a dvr file. 2.0.89
10 years ago
winlin
7f60d472e6
remove the change vhost forward.
10 years ago
winlin
45724bfaec
update conf for transcode.
10 years ago
winlin
f881bc43b5
fix #179 : dvr support custom filepath by variables. 2.0.87
10 years ago
winlin
75f2607685
fix #211 , support security allow/deny publish/play all/ip. 2.0.86
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
eef8034632
merge from 1.0release for bug #264 . 2.0.74
10 years ago
winlin
1dfac0bf1d
fix #264 , support disconnect publish connect when hls error. 1.0.11
10 years ago
winlin
595bf24a51
for bug #257 , default to off the realtime(min-latency).
10 years ago
winlin
10297fab51
fix #257 , support 0.1s+ latency. 2.0.70
10 years ago
winlin
68ade0a267
add log info for rtmp conn. change the mw_latency to 100 for realtime.
10 years ago
winlin
a3de1c71fc
reset the mw_latency to 350.
10 years ago
winlin
1311b6fe65
fix #251 , support 10k clients. 2.0.67
10 years ago
winlin
fad6074a25
set send socket buf. mw/mr sleep default to 350.
10 years ago
winlin
b1d7fbe668
fix #241 , add mw(merged-write) config. 2.0.53
10 years ago
winlin
5589b13d2e
for bug #241 , support mr(merged-read) config and reload. 2.0.52.
10 years ago
winlin
59f68a2655
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
10 years ago
winlin
fe59783d83
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
10 years ago
winlin
e46e7fc596
update readme, rename wiki/xxx to wiki/v1_xxx
10 years ago
winlin
6da21364f6
update readme, rename wiki/xxx to wiki/v1_xxx
10 years ago
winlin
83f266b9e2
fix #177 , dvr segment add config dvr_wait_keyframe. 0.9.213.
11 years ago
winlin
cc8dc0fee0
remove the not-supported features, add bug #163 , #164 .
11 years ago