weiai/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-03-21 05:20:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: handle BUNDLE filed compatibility (#4488)"

Browse Source 
This reverts commit 0b57a573c6.
This commit is contained in:
xia-chu
2025-11-25 10:41:39 +08:00
parent 52b55ded97
commit 7b2bd221ea
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/Sdp.cpp
View File

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