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

优化代码

Browse Source
This commit is contained in:
xiongziliang 2020-07-08 10:09:16 +08:00
parent 248b2d5cb9
commit e58a63c528
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Rtp/RtpServer.cpp
View File

@ -23,54 +23,52 @@ RtpServer::~RtpServer() {
} }
void RtpServer::start(uint16_t local_port, const string &stream_id, bool enable_tcp, const char *local_ip) { void RtpServer::start(uint16_t local_port, const string &stream_id, bool enable_tcp, const char *local_ip) {
_udp_server.reset(new Socket(nullptr, false));
//创建udp服务器 //创建udp服务器
if (!_udp_server->bindUdpSock(local_port, local_ip)) { Socket::Ptr udp_server = std::make_shared<Socket>(nullptr, false);
_udp_server = nullptr; if (!udp_server->bindUdpSock(local_port, local_ip)) {
string err = (StrPrinter << "bindUdpSock on " << local_ip << ":" << local_port << " failed:" << get_uv_errmsg(true)); throw std::runtime_error(StrPrinter << "bindUdpSock on " << local_ip << ":" << local_port << " failed:" << get_uv_errmsg(true));
throw std::runtime_error(err);
} }
//设置udp socket读缓存 //设置udp socket读缓存
SockUtil::setRecvBuf(_udp_server->rawFD(), 4 * 1024 * 1024); SockUtil::setRecvBuf(udp_server->rawFD(), 4 * 1024 * 1024);
TcpServer::Ptr tcp_server;
if (enable_tcp) { if (enable_tcp) {
try { try {
//创建tcp服务器 //创建tcp服务器
_tcp_server = std::make_shared<TcpServer>(_udp_server->getPoller()); tcp_server = std::make_shared<TcpServer>(udp_server->getPoller());
(*_tcp_server)[RtpSession::kStreamID] = stream_id; (*tcp_server)[RtpSession::kStreamID] = stream_id;
_tcp_server->start<RtpSession>(_udp_server->get_local_port(), local_ip); tcp_server->start<RtpSession>(udp_server->get_local_port(), local_ip);
} catch (...) { } catch (...) {
_tcp_server = nullptr;
_udp_server = nullptr;
throw; throw;
} }
} }
auto sock = _udp_server;
RtpProcess::Ptr process; RtpProcess::Ptr process;
if (!stream_id.empty()) { if (!stream_id.empty()) {
//指定了流id，那么一个端口一个流(不管是否包含多个ssrc的多个流，绑定rtp源后，会筛选掉ip端口不匹配的流) //指定了流id，那么一个端口一个流(不管是否包含多个ssrc的多个流，绑定rtp源后，会筛选掉ip端口不匹配的流)
process = RtpSelector::Instance().getProcess(stream_id, true); process = RtpSelector::Instance().getProcess(stream_id, true);
_udp_server->setOnRead([sock, process](const Buffer::Ptr &buf, struct sockaddr *addr, int) { udp_server->setOnRead([udp_server, process](const Buffer::Ptr &buf, struct sockaddr *addr, int) {
process->inputRtp(sock, buf->data(), buf->size(), addr); process->inputRtp(udp_server, buf->data(), buf->size(), addr);
}); });
} else { } else {
//未指定流id，一个端口多个流，通过ssrc来分流 //未指定流id，一个端口多个流，通过ssrc来分流
auto &ref = RtpSelector::Instance(); auto &ref = RtpSelector::Instance();
_udp_server->setOnRead([&ref, sock](const Buffer::Ptr &buf, struct sockaddr *addr, int) { udp_server->setOnRead([&ref, udp_server](const Buffer::Ptr &buf, struct sockaddr *addr, int) {
ref.inputRtp(sock, buf->data(), buf->size(), addr); ref.inputRtp(udp_server, buf->data(), buf->size(), addr);
}); });
} }
_on_clearup = [sock, process, stream_id]() { _on_clearup = [udp_server, process, stream_id]() {
//去除循环引用 //去除循环引用
sock->setOnRead(nullptr); udp_server->setOnRead(nullptr);
if (process) { if (process) {
//删除rtp处理器 //删除rtp处理器
RtpSelector::Instance().delProcess(stream_id, process.get()); RtpSelector::Instance().delProcess(stream_id, process.get());
} }
}; };
_tcp_server = tcp_server;
_udp_server = udp_server;
} }
EventPoller::Ptr RtpServer::getPoller() { EventPoller::Ptr RtpServer::getPoller() {