amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 04:08:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

startSendRtp接口支持指定接收流的app和vhost参数 (#3841)

Browse Source
This commit is contained in:
wEnchanters 2024-08-22 19:50:29 +08:00 committed by GitHub
parent cb1821cf88
commit bd40c24745
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/WebApi.cpp
View File

@ -1404,6 +1404,9 @@ void installWebApi() {
args.udp_rtcp_timeout = allArgs["udp_rtcp_timeout"]; args.udp_rtcp_timeout = allArgs["udp_rtcp_timeout"];
args.recv_stream_id = allArgs["recv_stream_id"]; args.recv_stream_id = allArgs["recv_stream_id"];
args.close_delay_ms = allArgs["close_delay_ms"]; args.close_delay_ms = allArgs["close_delay_ms"];
// 记录发送流的app和vhost
args.recv_stream_app = allArgs["app"];
args.recv_stream_app = allArgs["vhost"];
src->getOwnerPoller()->async([=]() mutable { src->getOwnerPoller()->async([=]() mutable {
try { try {
src->startSendRtp(args, [val, headerOut, invoker](uint16_t local_port, const SockException &ex) mutable { src->startSendRtp(args, [val, headerOut, invoker](uint16_t local_port, const SockException &ex) mutable {

3
src/Common/MediaSource.h
View File

@ -140,6 +140,9 @@ public:
// 发送rtp同时接收，一般用于双向语言对讲, 如果不为空，说明开启接收 // 发送rtp同时接收，一般用于双向语言对讲, 如果不为空，说明开启接收
std::string recv_stream_id; std::string recv_stream_id;
std::string recv_stream_app;
std::string recv_stream_vhost;
}; };
// 开始发送ps-rtp // 开始发送ps-rtp

3
src/Rtp/RtpSender.cpp
View File

@ -239,6 +239,9 @@ void RtpSender::onConnect() {
if (!_args.recv_stream_id.empty()) { if (!_args.recv_stream_id.empty()) {
mINI ini; mINI ini;
ini[RtpSession::kStreamID] = _args.recv_stream_id; ini[RtpSession::kStreamID] = _args.recv_stream_id;
// 强制同步接收流和发送流的app和vhost
ini[RtpSession::kApp] = _args.recv_stream_app;
ini[RtpSession::kVhost] = _args.recv_stream_vhost;
_rtp_session = std::make_shared<RtpSession>(_socket_rtp); _rtp_session = std::make_shared<RtpSession>(_socket_rtp);
_rtp_session->setParams(ini); _rtp_session->setParams(ini);