THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修订多track时rtmp协议异常问题

This commit is contained in:
xia-chu 2023-12-09 21:24:34 +08:00
parent 542029c1f9
commit f5f658e474
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Rtmp/RtmpMuxer.cpp
View File

@ -23,17 +23,22 @@ RtmpMuxer::RtmpMuxer(const TitleMeta::Ptr &title) {
} }
bool RtmpMuxer::addTrack(const Track::Ptr &track) { bool RtmpMuxer::addTrack(const Track::Ptr &track) {
auto &encoder = _encoder[track->getTrackType()]; if (_track_existed[track->getTrackType()]) {
if (encoder) { // rtmp不支持多个同类型track
WarnL << "Already add a track kind of: " << track->getTrackTypeStr() WarnL << "Already add a track kind of: " << track->getTrackTypeStr() << ", ignore track: " << track->getCodecName();
<< ", ignore track: " << track->getCodecName();
return false; return false;
} }
auto &encoder = _encoders[track->getIndex()];
CHECK(!encoder);
encoder = Factory::getRtmpEncoderByTrack(track); encoder = Factory::getRtmpEncoderByTrack(track);
if (!encoder) { if (!encoder) {
return false; return false;
} }
// 标记已经存在该类型track
_track_existed[track->getTrackType()] = true;
// 设置rtmp输出环形缓存 // 设置rtmp输出环形缓存
encoder->setRtmpRing(_rtmp_ring); encoder->setRtmpRing(_rtmp_ring);
@ -43,22 +48,22 @@ bool RtmpMuxer::addTrack(const Track::Ptr &track) {
} }
bool RtmpMuxer::inputFrame(const Frame::Ptr &frame) { bool RtmpMuxer::inputFrame(const Frame::Ptr &frame) {
auto &encoder = _encoder[frame->getTrackType()]; auto &encoder = _encoders[frame->getIndex()];
return encoder ? encoder->inputFrame(frame) : false; return encoder ? encoder->inputFrame(frame) : false;
} }
void RtmpMuxer::flush() { void RtmpMuxer::flush() {
for (auto &encoder : _encoder) { for (auto &pr : _encoders) {
if (encoder) { if (pr.second) {
encoder->flush(); pr.second->flush();
} }
} }
} }
void RtmpMuxer::makeConfigPacket() { void RtmpMuxer::makeConfigPacket() {
for (auto &encoder : _encoder) { for (auto &pr : _encoders) {
if (encoder) { if (pr.second) {
encoder->makeConfigPacket(); pr.second->makeConfigPacket();
} }
} }
} }
@ -73,9 +78,8 @@ RtmpRing::RingType::Ptr RtmpMuxer::getRtmpRing() const {
void RtmpMuxer::resetTracks() { void RtmpMuxer::resetTracks() {
_metadata.clear(); _metadata.clear();
for (auto &encoder : _encoder) { _encoders.clear();
encoder = nullptr; CLEAR_ARR(_track_existed);
}
} }
} /* namespace mediakit */ } /* namespace mediakit */

7
src/Rtmp/RtmpMuxer.h
View File

@ -64,10 +64,13 @@ public:
* 生成config包 * 生成config包
*/ */
void makeConfigPacket(); void makeConfigPacket();
private: private:
RtmpRing::RingType::Ptr _rtmp_ring; bool _track_existed[2] = { false, false };
AMFValue _metadata; AMFValue _metadata;
RtmpCodec::Ptr _encoder[TrackMax]; RtmpRing::RingType::Ptr _rtmp_ring;
std::unordered_map<int, RtmpCodec::Ptr> _encoders;
}; };