aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-06 10:57:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: handle BUNDLE filed compatibility (#4488)
Some checks failed
Android / build (push) Has been cancelled
Details
CodeQL / Analyze (cpp) (push) Has been cancelled
Details
CodeQL / Analyze (javascript) (push) Has been cancelled
Details
Docker / build (push) Has been cancelled
Details
Linux / build (push) Has been cancelled
Details
macOS / build (push) Has been cancelled
Details
Windows / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
baigao 2025-10-09 11:38:05 +08:00 committed by GitHub
parent 73d348ea96
commit 0b57a573c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/Sdp.cpp
View File

@ -1082,7 +1082,9 @@ RtcSessionSdp::Ptr RtcSession::toRtcSessionSdp() const {
if (connection.empty()) {
sdp.addItem(std::make_shared<SdpConnection>(connection));
}
sdp.addAttr(std::make_shared<SdpAttrGroup>(group));
if (media.size() > 1) {
sdp.addAttr(std::make_shared<SdpAttrGroup>(group));
}
sdp.addAttr(std::make_shared<SdpAttrExtmapAllowMixed>());
sdp.addAttr(std::make_shared<SdpAttrMsidSemantic>(msid_semantic));
@ -1354,7 +1356,7 @@ void RtcSession::checkValid() const {
CHECK(!session_name.empty());
CHECK(!msid_semantic.empty());
CHECK(!media.empty());
CHECK(!group.mids.empty() && group.mids.size() <= media.size(), "只支持group BUNDLE模式");
CHECK(media.size() == 1 || (!group.mids.empty() && group.mids.size() <= media.size()), "只支持group BUNDLE模式");
bool have_active_media = false;
for (auto &item : media) {
@ -1588,10 +1590,12 @@ shared_ptr<RtcSession> RtcConfigure::createOffer() const {
createMediaOffer(ret);
// 设置音视频端口复用 [AUTO-TRANSLATED:ffe27d17]
// Set audio and video port multiplexing
for (auto &m : ret->media) {
// The remote end has rejected (port 0) the m-section, so it should not be putting its mid in the group attribute.
if (m.port) {
ret->group.mids.emplace_back(m.mid);
if (ret->media.size() > 1) {
for (auto &m : ret->media) {
// The remote end has rejected (port 0) the m-section, so it should not be putting its mid in the group attribute.
if (m.port) {
ret->group.mids.emplace_back(m.mid);
}
}
}