Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit

This commit is contained in:
ziyue 2022-11-01 14:08:36 +08:00
commit f5a032c9a0

View File

@ -130,8 +130,8 @@ void RtpServer::start(uint16_t local_port, const string &stream_id, TcpMode tcp_
RtpProcess::Ptr process;
if (!stream_id.empty()) {
//指定了流id那么一个端口一个流(不管是否包含多个ssrc的多个流绑定rtp源后会筛选掉ip端口不匹配的流)
process = RtpSelector::Instance().getProcess(stream_id, true);
if (tcp_mode != ACTIVE) {
if (tcp_mode == NONE) {
process = RtpSelector::Instance().getProcess(stream_id, true);
RtcpHelper::Ptr helper = std::make_shared<RtcpHelper>(std::move(rtcp_socket), process);
helper->startRtcp();
rtp_socket->setOnRead(