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

完善rtp服务器对各编码类型es流的支持

Browse Source
This commit is contained in:
xia-chu 2024-11-30 08:50:07 +08:00
parent 892108d6ba
commit d1f3961326
1 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Rtp/GB28181Process.cpp
View File

@ -83,29 +83,22 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
// Prevent too many pt types from causing memory overflow // Prevent too many pt types from causing memory overflow
WarnL << "Rtp payload type more than 2 types: " << _rtp_receiver.size(); WarnL << "Rtp payload type more than 2 types: " << _rtp_receiver.size();
} }
switch (pt) {
case Rtsp::PT_PCMA: do {
case Rtsp::PT_PCMU: { if (pt < 96) {
// CodecG711U or CodecG711A auto codec = RtpPayload::getCodecId(pt);
ref = std::make_shared<RtpReceiverImp>(8000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); }); if (codec != CodecInvalid && codec != CodecTS) {
auto track = Factory::getTrackByCodecId(pt == Rtsp::PT_PCMU ? CodecG711U : CodecG711A, 8000, 1, 16); auto sample_rate = RtpPayload::getClockRate(pt);
auto channels = RtpPayload::getAudioChannel(pt);
ref = std::make_shared<RtpReceiverImp>(sample_rate, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); });
auto track = Factory::getTrackByCodecId(codec, sample_rate, channels);
CHECK(track); CHECK(track);
track->setIndex(pt); track->setIndex(pt);
_interface->addTrack(track); _interface->addTrack(track);
_rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId()); _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
break; break;
} }
case Rtsp::PT_JPEG: {
// mjpeg
ref = std::make_shared<RtpReceiverImp>(90000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); });
auto track = Factory::getTrackByCodecId(CodecJPEG);
CHECK(track);
track->setIndex(pt);
_interface->addTrack(track);
_rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
break;
} }
default: {
if (pt == opus_pt) { if (pt == opus_pt) {
// opus负载 [AUTO-TRANSLATED:defa6a8d] // opus负载 [AUTO-TRANSLATED:defa6a8d]
// opus payload // opus payload
@ -115,7 +108,9 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
track->setIndex(pt); track->setIndex(pt);
_interface->addTrack(track); _interface->addTrack(track);
_rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId()); _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
} else if (pt == h265_pt) { break;
}
if (pt == h265_pt) {
// H265负载 [AUTO-TRANSLATED:61fbcf7f] // H265负载 [AUTO-TRANSLATED:61fbcf7f]
// H265 payload // H265 payload
ref = std::make_shared<RtpReceiverImp>(90000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); }); ref = std::make_shared<RtpReceiverImp>(90000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); });
@ -124,7 +119,9 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
track->setIndex(pt); track->setIndex(pt);
_interface->addTrack(track); _interface->addTrack(track);
_rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId()); _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
} else if (pt == h264_pt) { break;
}
if (pt == h264_pt) {
// H264负载 [AUTO-TRANSLATED:6f3fbb0d] // H264负载 [AUTO-TRANSLATED:6f3fbb0d]
// H264 payload // H264 payload
ref = std::make_shared<RtpReceiverImp>(90000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); }); ref = std::make_shared<RtpReceiverImp>(90000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); });
@ -133,7 +130,9 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
track->setIndex(pt); track->setIndex(pt);
_interface->addTrack(track); _interface->addTrack(track);
_rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId()); _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
} else { break;
}
if (pt != Rtsp::PT_MP2T && pt != ps_pt) { if (pt != Rtsp::PT_MP2T && pt != ps_pt) {
WarnL << "Unknown rtp payload type(" << (int)pt << "), decode it as mpeg-ps or mpeg-ts"; WarnL << "Unknown rtp payload type(" << (int)pt << "), decode it as mpeg-ps or mpeg-ts";
} }
@ -152,10 +151,8 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
} }
}); });
} }
} } while (false);
break;
}
}
// 设置frame回调 [AUTO-TRANSLATED:dec7590f] // 设置frame回调 [AUTO-TRANSLATED:dec7590f]
// Set frame callback // Set frame callback
_rtp_decoder[pt]->addDelegate([this, pt](const Frame::Ptr &frame) { _rtp_decoder[pt]->addDelegate([this, pt](const Frame::Ptr &frame) {
@ -169,7 +166,12 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
} }
void GB28181Process::onRtpDecode(const Frame::Ptr &frame) { void GB28181Process::onRtpDecode(const Frame::Ptr &frame) {
if (frame->getCodecId() != CodecInvalid) { switch (frame->getCodecId()) {
case CodecInvalid:
case CodecTS:
case CodecPS: break;
default:
// 这里不是ps或ts [AUTO-TRANSLATED:6f79ac69] // 这里不是ps或ts [AUTO-TRANSLATED:6f79ac69]
// This is not ps or ts // This is not ps or ts
_interface->inputFrame(frame); _interface->inputFrame(frame);