winlin
|
2d5cc7a3e4
|
add structures for kafka
|
10 years ago |
winlin
|
83f40697e2
|
refine the hpp macro defines.
|
10 years ago |
winlin
|
df6ac8842c
|
rename rtmp utility to protocol utility
|
10 years ago |
winlin
|
82ff05c1d4
|
rename rtmp io to protocol io
|
10 years ago |
winlin
|
168625dce2
|
rename rtmp amf0 to protocol amf0.
|
10 years ago |
winlin
|
1310c0f577
|
rename srs_protocol_buffer to srs_protocol_stream
|
10 years ago |
winlin
|
d32632ee8a
|
rename SrsFastBuffer to SrsFastStream
|
10 years ago |
winlin
|
4f3d2c8607
|
rename SrsSimpleBuffer to SrsSimpleStream
|
10 years ago |
winlin
|
dadfe101b4
|
rename SrsBitStream to SrsBitBuffer
|
10 years ago |
winlin
|
0e52fc6d5b
|
rename SrsStream to SrsBuffer
|
10 years ago |
winlin
|
ca3577e11b
|
rename temp to stream
|
10 years ago |
winlin
|
f33d736442
|
rename kernel stream to buffer
|
10 years ago |
winlin
|
a4f51564db
|
rename kernel stream to buffer
|
10 years ago |
winlin
|
495f575ac3
|
rename kernel buffer to temp
|
10 years ago |
winlin
|
ac2b03a3ed
|
rename srs_kernel_buffer to temp
|
10 years ago |
winlin
|
faf6d15878
|
add replace script.
|
10 years ago |
winlin
|
1de2bb0801
|
add kafka protocol files.
|
10 years ago |
winlin
|
b5996567e8
|
refine the role of srs, to cluster.
|
10 years ago |
winlin
|
e4e36a0166
|
merge from srs2, fix openssl build
|
10 years ago |
winlin
|
d8a64aaab5
|
fix #484, hotfix the openssl build script 2.0.190
|
10 years ago |
winlin
|
b471c6e61c
|
refine code, use json integter rather than number.
|
10 years ago |
winlin
|
c5cd58761c
|
move the srs thread to st.
|
10 years ago |
winlin
|
3042115385
|
refine json to_str to dumps.
|
10 years ago |
winlin
|
b59d9ba6a1
|
support amf0 and json to convert with each other.
|
10 years ago |
winlin
|
3f7e69b617
|
json objects support dumps to string.
|
10 years ago |
winlin
|
b78781707e
|
update the srs player
|
10 years ago |
winlin
|
5073a6fa08
|
merge from srs2
|
10 years ago |
winlin
|
225e742657
|
add args3
|
10 years ago |
winlin
|
1fd83d9314
|
refine the order.
|
10 years ago |
没——问题
|
e8680527c3
|
allow domain *
在使用时,srs_player可能和所在页面部署在不同的域名下。
所以在此处添加跨域许可。
|
10 years ago |
winlin
|
7b2b11e932
|
async call worker fast execute tasks.
|
10 years ago |
没——问题
|
c548ab5019
|
function set_srs_player_url(url, params)
在实际环境中,player.swf 等静态资源 和页面可能部署到不同的域名或路径下。
所以在此处提供设置 srs_player.swf 的url的方法。
|
10 years ago |
winlin
|
087f7740b7
|
fix the build failed bug
|
10 years ago |
winlin
|
256459e1ec
|
fix the utest bug
|
10 years ago |
winlin
|
240a1bfadb
|
rename kafka protocol
|
10 years ago |
winlin
|
c4e4711b93
|
add kafka protocol
|
10 years ago |
winlin
|
8a90e76637
|
fix #459, support dvr raw api. 3.0.4
|
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
|
8f9cfcdcf4
|
fix #319, http raw api support update global and vhost. 3.0.4
|
10 years ago |
winlin
|
e8a00de4a3
|
for #319, support enable or disable vhost.
|
10 years ago |
winlin
|
631e76cd32
|
for #319, support update and delete the disabled vhost
|
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
|
eb578b4a39
|
refine the thread, set to disposed when terminate normally
|
10 years ago |
winlin
|
83a9ff9f5d
|
for #474, refine the hls publish, donot fetch from source when publish
|
10 years ago |
winlin
|
44bcb4045f
|
for #474, decode the sequence header before hls.
|
10 years ago |
winlin
|
07ef8160a3
|
clear the queue when edge republish.
|
10 years ago |
winlin
|
704624c9ec
|
clear the queue when edge republish.
|
10 years ago |
winlin
|
8be3c875af
|
donot release stream when busy
|
10 years ago |
winlin
|
3da25f3aee
|
when thread terminated normally, set the tid to NULL.
|
10 years ago |
winlin
|
a994191ddc
|
for #474, always release publish for source.
|
10 years ago |
winlin
|
eb9aa47ab1
|
merge from 2.0
|
10 years ago |
winlin
|
0d57ef9373
|
fix #458, http hooks use source thread cid. 2.0.188
|
10 years ago |
winlin
|
3b483094bd
|
merge from 2.0
|
10 years ago |
winlin
|
6d50aa1aa2
|
#475, fix http hooks crash for st context switch. 2.0.187
|
10 years ago |
winlin
|
adb74dc74e
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
f0fc093b19
|
fix the http zero content length bug.
|
10 years ago |
winlin
|
01308ecc98
|
for #319, support initialize the parser to whether use jsonp
|
10 years ago |
winlin
|
491ec11833
|
for #319, raw api support add new vhost
|
10 years ago |
winlin
|
0d6c24581d
|
refine json number, use int64 when number is int.
|
10 years ago |
winlin
|
7ae76b579e
|
refine the conf, use srs3 style
|
10 years ago |
winlin
|
a88f321d8b
|
for #319, merge from 2.0release
|
10 years ago |
winlin
|
abd7ee227c
|
support reload utc_time. 2.0.186
|
10 years ago |
winlin
|
c4feb8f6ed
|
for #319, raw api support update all globals.
|
10 years ago |
winlin
|
6aafd072db
|
for #319, raw api support update srs log tank, level and file.
|
10 years ago |
winlin
|
8107e5f9a6
|
for #319, raw api support set the ff_log_dir
|
10 years ago |
winlin
|
c8466c36bd
|
for #319, raw api support update the global RTMP chunk_size.
|
10 years ago |
winlin
|
2cfb71616e
|
for #319, copy all data to request for source.
|
10 years ago |
winlin
|
2bdd974227
|
for #319, reorder the ingesters.
|
10 years ago |
winlin
|
342483bf04
|
for #319, when reload the listen, restart all ingesters.
|
10 years ago |
winlin
|
310b5a14cb
|
for #319, support minimal query api
|
10 years ago |
winlin
|
06c7ae62ee
|
for #319, refine the error code for RAW APi.
|
10 years ago |
winlin
|
11c409688b
|
for #319, http raw api support query. 3.0.3
|
10 years ago |
winlin
|
8a2709dd2c
|
for #319, do not apply when config not changed.
|
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
|
873aa7bf9f
|
for #319, refine the query global, only show true options.
|
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
|
bc100c2867
|
refine the log, move default to each functions.
|
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
|
1b1a2a1e63
|
fix #471, api response the width and height. 3.0.2
|
10 years ago |
winlin
|
04bea781ca
|
use amf0 encode for json encode.
|
10 years ago |
winlin
|
e0219bd7aa
|
refine code, merge json encode to amf0.
|
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
|
75ca759e5d
|
fix the reload http api bug.
|
10 years ago |
winlin
|
2dcf3bc606
|
for #319, support rpc raw api to query the HTTP RAW API configs.
|
10 years ago |
synote
|
9b01aad220
|
fix bug for build failure when configure with --log-info
wrong use of size in SrsStream::initialize of srs_kernel_stream.cpp
|
10 years ago |
winlin
|
af0a76e51a
|
fix the build failed bug on centos
|
10 years ago |
winlin
|
e03d8a0115
|
fix the build failed bug on centos
|
10 years ago |
winlin
|
555a3fbf5f
|
for #319, support render HTTP RAW API in console.
|
10 years ago |
winlin
|
8e635d9749
|
for #319, support HTTP RAW API config_query global data.
|
10 years ago |
winlin
|
d921d59e57
|
for #319, support HTTP RAW API reload.
|
10 years ago |
winlin
|
f74dc62046
|
fix the process restart bug.
|
10 years ago |
winlin
|
e39e006d63
|
fix the exec clear bug.
|
10 years ago |
winlin
|
c081a5370b
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
fe4cdceb15
|
always wait for process to terminated when SIGKILL.
|
10 years ago |
winlin
|
1e0481a2d0
|
for #319, support signal to persistence config
|
10 years ago |
winlin
|
980e3921e4
|
for #319, add signal to write config to file.
|
10 years ago |
winlin
|
cdde293785
|
add todo for reload the source components.
|
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
|
7de181004f
|
Merge branch '2.0release' into develop
|
10 years ago |
lovecat
|
9c2beffe8f
|
statistic connection bytes before remove client.
|
10 years ago |
winlin
|
039af7243c
|
for #367, refine the comments for process.
|
10 years ago |
winlin
|
6fe88d088c
|
for #367, process support redirect stdout and stderr.
|
10 years ago |
winlin
|
0e1861b084
|
for #367: extract the process from ffmpeg to exec programs.
|
10 years ago |
winlin
|
3a8c03a471
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
a242aa35dc
|
add pid to srs rtmp dump
|
10 years ago |
winlin
|
15102a7345
|
refine commit script
|
10 years ago |
winlin
|
2a4b448cce
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
a7f4104d45
|
fix bug of commit script
|
10 years ago |
winlin
|
d8030faabe
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
064031cac1
|
refine commit script
|
10 years ago |
winlin
|
8e259eb0c2
|
refine the commit script
|
10 years ago |
winlin
|
4118138cf0
|
update commit script
|
10 years ago |
winlin
|
b25c45c643
|
refine srs player, support set the bufferTimeMax.
|
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
|
28791fd14a
|
release 2.0alpha0, the 2.0a0, 2.0.185
|
10 years ago |
winlin
|
5721bc371c
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
e43d4e46b4
|
support JSONP DELTE/POST/PUT
|
10 years ago |
winlin
|
baa70d4ddd
|
add nb_streams for vhost
|
10 years ago |
winlin
|
7a2836ae2a
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
6e5143449e
|
HTTP API support JSONP by specifies the query string callback=xxx.
|
10 years ago |
winlin
|
22485ce5e9
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
aeebddb269
|
for #442, add more information for client for api.
|
10 years ago |
winlin
|
94641c812b
|
fix #442, support kickoff client.
|
10 years ago |
winlin
|
b37797b13a
|
for #442, add publish connection in stream.publish api
|
10 years ago |
winlin
|
529803ed04
|
refine code for api.
|
10 years ago |
winlin
|
1962449770
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
6b6d951298
|
add api /api/v1/features
|
10 years ago |
winlin
|
4763f205a2
|
add kbps for vhost and stream
|
10 years ago |
winlin
|
0a4d78383c
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
20a8818a8e
|
refine the error response.
|
10 years ago |
winlin
|
2edcf1d4ff
|
support query specified vhost
|
10 years ago |
winlin
|
66a26bdce8
|
move json from app to protocol
|
10 years ago |
winlin
|
a7589b9ad3
|
refine code for api, add clients and parse_rest_id
|
10 years ago |
winlin
|
ab4620870d
|
refine the stat api, support query specified stream.
|
10 years ago |
winlin
|
32a484164a
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
c75f05c88b
|
fix the log cid display error, merge the publish recv thread log to publish connection.
|
10 years ago |
winlin
|
9528243b81
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
3c402cb908
|
refine the tcp nodelay, effect connected connections.
|
10 years ago |
winlin
|
71aacebcbc
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
c31a546eec
|
support vhost for http flv.
|
10 years ago |
winlin
|
0afe4963bc
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
dd21eee7f0
|
srs player show current time and url
|
10 years ago |
winlin
|
ce8f446494
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
dfecfb65b1
|
support fluency and stream empty count
|
10 years ago |
winlin
|
fcd2d3d445
|
refine code for link generation from rtmp url.
|
10 years ago |
winlin
|
fe87bf1b61
|
support generate link page for rtmp url
|
10 years ago |
winlin
|
018af55d65
|
refine the demo pages, move scripts after body.
|
10 years ago |
winlin
|
77765b463a
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
575a698820
|
fix #380, srs-librtmp send sequence header when sps or pps changed.
|
10 years ago |
winlin
|
f10e399991
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
ec87dd9cd6
|
refine code for srs rtmp dump
|
10 years ago |
winlin
|
785a5907a8
|
set the default get_publish_normal_timeout to 5s
|
10 years ago |
winlin
|
0bbfc5526a
|
set the default get_publish_normal_timeout to 5s
|
10 years ago |
winlin
|
7273c33c35
|
support publish_1stpkt_timeout and publish_normal_timeout
|
10 years ago |
winlin
|
170ad05148
|
add gfps and nb_packets
|
10 years ago |
winlin
|
a5dd3a8e7b
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
e7714cd445
|
add packets interval in ms to set the right send_min_interval
|
10 years ago |
winlin
|
de48b477ae
|
drop the metadata when drop sequence header
|
10 years ago |
winlin
|
22491b0c99
|
merge from 2.0
|
10 years ago |
winlin
|
f691dddc1a
|
drop metadata when drop sequence header. support PCUC 0x1a
|
10 years ago |
winlin
|
2cf526ffc7
|
close #454, support obs restart publish. 2.0.184
|
10 years ago |
winlin
|
0cb7ddfe8c
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
ccc4c05da9
|
fix #229, support vs2010 for srslibrtmp.
|
10 years ago |
winlin
|
f53b2556bb
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
01be68fe58
|
refine code, donot remove the detail when hls disabled.
|
10 years ago |
winlin
|
53351cd645
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
afd05f71c3
|
refine code, use size cache for performance issue.
|
10 years ago |
winlin
|
0b90af7e46
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
3b0b2e0b85
|
fix the bug to support dump packets with count.
|
10 years ago |
winlin
|
8d3d5dd10b
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
a0a89a8ca6
|
use reduce_sequence_header for stream control.
|
10 years ago |
winlin
|
9fbff4b8f9
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
b79d830e2c
|
refine the default smi
|
10 years ago |
winlin
|
807299589e
|
merge from srs2.
|
10 years ago |
winlin
|
ae37fa8f3e
|
use send_min_interval for stream control. 2.0.183
|
10 years ago |
winlin
|
0b84c1d962
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
7dcba040eb
|
refine config.
|
10 years ago |
winlin
|
653afd0700
|
merge from 2.0
|
10 years ago |