Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-14 03:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

支持动态创建GB28181收流端口并可指定stream_id:#338

Browse Source
This commit is contained in:
xiongziliang
2020-07-07 10:01:12 +08:00
parent 30260e5414
commit 477f99b756
10 changed files with 89 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Rtp/RtpSession.cpp
View File

@@ -11,8 +11,15 @@
#if defined(ENABLE_RTPPROXY)
#include "RtpSession.h"
#include "RtpSelector.h"
#include "Network/TcpServer.h"
namespace mediakit{
const string RtpSession::kStreamID = "stream_id";
void RtpSession::attachServer(const TcpServer &server) {
_stream_id = const_cast<TcpServer &>(server)[kStreamID];
}
RtpSession::RtpSession(const Socket::Ptr &sock) : TcpSession(sock) {
DebugP(this);
socklen_t addr_len = sizeof(addr);
@@ -21,7 +28,7 @@ RtpSession::RtpSession(const Socket::Ptr &sock) : TcpSession(sock) {
RtpSession::~RtpSession() {
DebugP(this);
if(_process){
RtpSelector::Instance().delProcess(_ssrc,_process.get());
RtpSelector::Instance().delProcess(_stream_id,_process.get());
}
}
@@ -36,7 +43,7 @@ void RtpSession::onRecv(const Buffer::Ptr &data) {
}
void RtpSession::onError(const SockException &err) {
WarnL << _ssrc << " " << err.what();
WarnL << _stream_id << " " << err.what();
}
void RtpSession::onManager() {
@@ -51,13 +58,19 @@ void RtpSession::onManager() {
void RtpSession::onRtpPacket(const char *data, uint64_t len) {
if (!_process) {
if (!RtpSelector::getSSRC(data + 2, len - 2, _ssrc)) {
uint32_t ssrc;
if (!RtpSelector::getSSRC(data + 2, len - 2, ssrc)) {
return;
}
_process = RtpSelector::Instance().getProcess(_ssrc, true);
if (_stream_id.empty()) {
//未指定流id就使用ssrc为流id
_stream_id = printSSRC(ssrc);
}
//tcp情况下，一个tcp链接只可能是一路流，不需要通过多个ssrc来区分，所以不需要频繁getProcess
_process = RtpSelector::Instance().getProcess(_stream_id, true);
_process->setListener(dynamic_pointer_cast<RtpSession>(shared_from_this()));
}
_process->inputRtp(_sock,data + 2, len - 2, &addr);
_process->inputRtp(_sock, data + 2, len - 2, &addr);
_ticker.resetTime();
}