winlin
|
61486a82aa
|
kafka use topic and partition cache
|
9 years ago |
winlin
|
7013993c7a
|
kafka send the accept message.
|
9 years ago |
winlin
|
de41c1c9d2
|
kafka refine comments.
|
9 years ago |
winlin
|
31a77a83ed
|
convert metadata to partitions
|
9 years ago |
winlin
|
f0e39cc330
|
support show the summary of kafka metadata.
|
9 years ago |
winlin
|
d013374871
|
rename ISrsCodec size to nb_bytes.
|
9 years ago |
winlin
|
33a015329d
|
add function to convert kafka array to vector
|
9 years ago |
winlin
|
84b3981d47
|
refs #1670: support decode the metadata response.
|
9 years ago |
winlin
|
7106934c3a
|
kafka producer use async interface to request metadata.
|
9 years ago |
winlin
|
a108fa8d01
|
kafka recv and decode message.
|
9 years ago |
winlin
|
493d282255
|
kafka refine array, to decode and create object.
|
9 years ago |
winlin
|
c4862878d1
|
kafka rename message set to raw message set.
|
9 years ago |
winlin
|
6e5ed11a00
|
for kafka, support correlation id cache.
|
9 years ago |
winlin
|
2e67eb8786
|
refine comments for kafka messages.
|
9 years ago |
winlin
|
3c64e4b957
|
kafka encode and send packet.
|
9 years ago |
winlin
|
9117e1e918
|
extract ISrsCodec for code and decode object.
|
9 years ago |
winlin
|
45755fd1e7
|
refine code for kakfa request/response, string/bytes.
|
9 years ago |
winlin
|
8a4ec49064
|
add graph comments for size of request and response.
|
9 years ago |
winlin
|
8974fe298b
|
connect to kafka and send metadata request.
|
9 years ago |
winlin
|
a9fdb630d9
|
refine code, replace all rtmp connect by simple rtmp client.
|
9 years ago |
winlin
|
a08d8f83d6
|
refine mpegts code, use simple rtmp client
|
9 years ago |
winlin
|
ad9b377d96
|
refine forwarder code, use simple rtmp client.
|
9 years ago |
winlin
|
0f4cb8ee00
|
refine code, remove the rtmp recv/send macro, use one macro.
|
9 years ago |
winlin
|
12e013142d
|
refine code, use simple rtmp client.
|
9 years ago |
winlin
|
bc27481886
|
refine code, use simple rtmp client.
|
9 years ago |
winlin
|
e4c852945f
|
refine code, support override vhost
|
9 years ago |
winlin
|
a9ad7b211b
|
refine simple rtmp client for post flv stream.
|
9 years ago |
winlin
|
adb8f243bf
|
use simple rtmp client for raw connect app
|
9 years ago |
winlin
|
24b3899972
|
use SrsTcpClient instead raw socket.
|
9 years ago |
winlin
|
a9bb6061c3
|
use tcp client for raw connect.
|
9 years ago |
winlin
|
20fcfb3eee
|
fix bug, use system utility
|
9 years ago |
winlin
|
69cc01b696
|
use system utilities
|
9 years ago |
winlin
|
908365a61a
|
use string for const char*
|
9 years ago |
winlin
|
d9f991ed2f
|
use system utility for string finds
|
9 years ago |
winlin
|
ca73534d7e
|
refine comments for api key
|
9 years ago |
winlin
|
29122b6e70
|
fix #502, transcoder support snapshot.
|
9 years ago |
winlin
|
2bae6e09d3
|
for #502, snapshot 1 image per 1 seconds, choose best from 5 images.
|
9 years ago |
winlin
|
1aa4502d5f
|
for snapshot, choose the best to link to the [stream]-best.png
|
9 years ago |
winlin
|
33a282e576
|
support snapshot by http hooks for #152.
|
9 years ago |
winlin
|
9eebb89432
|
Merge branch '2.0release' into develop
|
9 years ago |
winlin
|
91e9fc7e5b
|
fix typo of INVLIAD to INVALID
|
9 years ago |
winlin
|
57a3b11b86
|
merge from srs2
|
9 years ago |
winlin
|
5de65d41f4
|
Merge pull request #499 from synote/2.0release
fix bug for build failure when configure with --log-info
|
9 years ago |
winlin
|
b5ba1043e8
|
Merge branch '2.0release' into develop
|
9 years ago |
winlin
|
9c2eafc244
|
refine the git command
|
9 years ago |
winlin
|
ed80d9d281
|
merge from srs2
|
9 years ago |
winlin
|
0c8209cccd
|
fix #448, fix the bug of response of http hooks. 2.0.195
|
9 years ago |
winlin
|
6587c5b2f1
|
merge from srs2
|
9 years ago |
winlin
|
7811b4f3f7
|
fix #497, response error when client not found to kickoff. 2.0.194
|
9 years ago |
winlin
|
8862ec1988
|
merge from srs2
|
9 years ago |
winlin
|
a3c229472e
|
fix #495, decrease the srs-librtmp size. 2.0.193
|
9 years ago |
winlin
|
070ada1d6e
|
Merge branch '2.0release' into develop
|
9 years ago |
winlin
|
65e4bf2e77
|
fix compile failed bug.
|
9 years ago |
winlin
|
d8f18aee37
|
use the right int type for port.
|
9 years ago |
winlin
|
1c7d5f1852
|
Merge branch '2.0release' into develop
|
9 years ago |
winlin
|
353e3260b8
|
remove duplicated code
|
9 years ago |
winlin
|
9ead08725d
|
use kernel utility int2str and float2str
|
9 years ago |
winlin
|
6efd2dd27e
|
add load balance round robin for brokers.
|
9 years ago |
winlin
|
2a4ab8a923
|
add brokers to config
|
9 years ago |
winlin
|
f187a7deef
|
refine the startup logs.
|
9 years ago |
winlin
|
3ab0ccaa27
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
7cdcf41d26
|
refine the api server
|
10 years ago |
winlin
|
afd6428366
|
refine code of server.
|
10 years ago |
winlin
|
8b6c78b862
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
d1de097f5e
|
fix make clean bug, donot rm when no dir
|
10 years ago |
winlin
|
396bb43672
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
8b1198562a
|
show cpu info.
|
10 years ago |
winlin
|
4e88262512
|
merge from srs2 to check cpus.
|
10 years ago |
winlin
|
cfe2082353
|
fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192
|
10 years ago |
winlin
|
f6e655396c
|
for #485, support cross build for arm
|
10 years ago |
winlin
|
d94a88a797
|
merge from srs2 for pi and cubie.
|
10 years ago |
winlin
|
16730ea031
|
refine code for cross build
|
10 years ago |
winlin
|
6990508e58
|
for #485, srs for respberrypi and cubieboard. 2.0.191
|
10 years ago |
winlin
|
f75058413d
|
Merge branch '2.0release' into develop
|
10 years ago |
winlin
|
7dcdb18588
|
support build on pi and cubie
|
10 years ago |
winlin
|
a8829e0a8b
|
support build on pi or cubie.
|
10 years ago |
winlin
|
9a9483e7d5
|
support without kafka
|
10 years ago |
winlin
|
abb5c5ad31
|
add kafka producer
|
10 years ago |
winlin
|
b5ccc35340
|
add kafka config
|
10 years ago |
winlin
|
ab1e62a886
|
create the metadata request message
|
10 years ago |
winlin
|
ca3b89aa7d
|
add kafka array, use c++ template.
|
10 years ago |
winlin
|
8a6edac4e8
|
add --x86-64 alias for --x86-x64.
|
10 years ago |
winlin
|
edead21a25
|
refine the options
|
10 years ago |
winlin
|
e415824576
|
refine the options
|
10 years ago |
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 |