
In this CL, JsepTransportController and MediaSessionDescriptionFactory are updated not to assume that there only exists at most a single BUNDLE group but a list of N groups. This makes it possible to create multiple BUNDLE groups by having multiple "a=group:BUNDLE" lines in the SDP. This makes it possible to have some m= sections in one group and some other m= sections in another group. For example, you could group all audio m= sections in one group and all video m= sections in another group. This enables "send all audio tracks on one transport and all video tracks on another transport" in Unified Plan. This is something that was possible in Plan B because all ssrcs in the same m= section were implicitly bundled together forming a group of audio m= section and video m= section (even without use of the BUNDLE tag). PeerConnection will never create multiple BUNDLE groups by default, but upon setting SDP with multiple BUNDLE groups the PeerConnection will accept them if configured to accept BUNDLE. This makes it possible to accept an SFU's BUNDLE offer without having to SDP munge the answer. C++ unit tests are added. This fix has also been verified manually on: https://jsfiddle.net/henbos/to89L6ce/43/ Without fix: 0+2 get bundled, 1+3 don't get bundled. With fix: 0+2 get bundled in first group, 1+3 get bundled in second group. Bug: webrtc:10208 Change-Id: Iaf451fa5459c484730c8018274166ef154b19af8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/214487 Reviewed-by: Taylor <deadbeef@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33838}
302 lines
8.5 KiB
C++
302 lines
8.5 KiB
C++
/*
|
|
* Copyright 2010 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "pc/session_description.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "absl/algorithm/container.h"
|
|
#include "absl/memory/memory.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace cricket {
|
|
namespace {
|
|
|
|
ContentInfo* FindContentInfoByName(ContentInfos* contents,
|
|
const std::string& name) {
|
|
RTC_DCHECK(contents);
|
|
for (ContentInfo& content : *contents) {
|
|
if (content.name == name) {
|
|
return &content;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
const ContentInfo* FindContentInfoByName(const ContentInfos& contents,
|
|
const std::string& name) {
|
|
for (ContentInfos::const_iterator content = contents.begin();
|
|
content != contents.end(); ++content) {
|
|
if (content->name == name) {
|
|
return &(*content);
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
const ContentInfo* FindContentInfoByType(const ContentInfos& contents,
|
|
MediaProtocolType type) {
|
|
for (const auto& content : contents) {
|
|
if (content.type == type) {
|
|
return &content;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
ContentGroup::ContentGroup(const std::string& semantics)
|
|
: semantics_(semantics) {}
|
|
|
|
ContentGroup::ContentGroup(const ContentGroup&) = default;
|
|
ContentGroup::ContentGroup(ContentGroup&&) = default;
|
|
ContentGroup& ContentGroup::operator=(const ContentGroup&) = default;
|
|
ContentGroup& ContentGroup::operator=(ContentGroup&&) = default;
|
|
ContentGroup::~ContentGroup() = default;
|
|
|
|
const std::string* ContentGroup::FirstContentName() const {
|
|
return (!content_names_.empty()) ? &(*content_names_.begin()) : NULL;
|
|
}
|
|
|
|
bool ContentGroup::HasContentName(const std::string& content_name) const {
|
|
return absl::c_linear_search(content_names_, content_name);
|
|
}
|
|
|
|
void ContentGroup::AddContentName(const std::string& content_name) {
|
|
if (!HasContentName(content_name)) {
|
|
content_names_.push_back(content_name);
|
|
}
|
|
}
|
|
|
|
bool ContentGroup::RemoveContentName(const std::string& content_name) {
|
|
ContentNames::iterator iter = absl::c_find(content_names_, content_name);
|
|
if (iter == content_names_.end()) {
|
|
return false;
|
|
}
|
|
content_names_.erase(iter);
|
|
return true;
|
|
}
|
|
|
|
SessionDescription::SessionDescription() = default;
|
|
SessionDescription::SessionDescription(const SessionDescription&) = default;
|
|
|
|
SessionDescription::~SessionDescription() {}
|
|
|
|
std::unique_ptr<SessionDescription> SessionDescription::Clone() const {
|
|
// Copy using the private copy constructor.
|
|
// This will clone the descriptions using ContentInfo's copy constructor.
|
|
return absl::WrapUnique(new SessionDescription(*this));
|
|
}
|
|
|
|
const ContentInfo* SessionDescription::GetContentByName(
|
|
const std::string& name) const {
|
|
return FindContentInfoByName(contents_, name);
|
|
}
|
|
|
|
ContentInfo* SessionDescription::GetContentByName(const std::string& name) {
|
|
return FindContentInfoByName(&contents_, name);
|
|
}
|
|
|
|
const MediaContentDescription* SessionDescription::GetContentDescriptionByName(
|
|
const std::string& name) const {
|
|
const ContentInfo* cinfo = FindContentInfoByName(contents_, name);
|
|
if (cinfo == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
return cinfo->media_description();
|
|
}
|
|
|
|
MediaContentDescription* SessionDescription::GetContentDescriptionByName(
|
|
const std::string& name) {
|
|
ContentInfo* cinfo = FindContentInfoByName(&contents_, name);
|
|
if (cinfo == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
return cinfo->media_description();
|
|
}
|
|
|
|
const ContentInfo* SessionDescription::FirstContentByType(
|
|
MediaProtocolType type) const {
|
|
return FindContentInfoByType(contents_, type);
|
|
}
|
|
|
|
const ContentInfo* SessionDescription::FirstContent() const {
|
|
return (contents_.empty()) ? NULL : &(*contents_.begin());
|
|
}
|
|
|
|
void SessionDescription::AddContent(
|
|
const std::string& name,
|
|
MediaProtocolType type,
|
|
std::unique_ptr<MediaContentDescription> description) {
|
|
ContentInfo content(type);
|
|
content.name = name;
|
|
content.set_media_description(std::move(description));
|
|
AddContent(std::move(content));
|
|
}
|
|
|
|
void SessionDescription::AddContent(
|
|
const std::string& name,
|
|
MediaProtocolType type,
|
|
bool rejected,
|
|
std::unique_ptr<MediaContentDescription> description) {
|
|
ContentInfo content(type);
|
|
content.name = name;
|
|
content.rejected = rejected;
|
|
content.set_media_description(std::move(description));
|
|
AddContent(std::move(content));
|
|
}
|
|
|
|
void SessionDescription::AddContent(
|
|
const std::string& name,
|
|
MediaProtocolType type,
|
|
bool rejected,
|
|
bool bundle_only,
|
|
std::unique_ptr<MediaContentDescription> description) {
|
|
ContentInfo content(type);
|
|
content.name = name;
|
|
content.rejected = rejected;
|
|
content.bundle_only = bundle_only;
|
|
content.set_media_description(std::move(description));
|
|
AddContent(std::move(content));
|
|
}
|
|
|
|
void SessionDescription::AddContent(ContentInfo&& content) {
|
|
if (extmap_allow_mixed()) {
|
|
// Mixed support on session level overrides setting on media level.
|
|
content.media_description()->set_extmap_allow_mixed_enum(
|
|
MediaContentDescription::kSession);
|
|
}
|
|
contents_.push_back(std::move(content));
|
|
}
|
|
|
|
bool SessionDescription::RemoveContentByName(const std::string& name) {
|
|
for (ContentInfos::iterator content = contents_.begin();
|
|
content != contents_.end(); ++content) {
|
|
if (content->name == name) {
|
|
contents_.erase(content);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void SessionDescription::AddTransportInfo(const TransportInfo& transport_info) {
|
|
transport_infos_.push_back(transport_info);
|
|
}
|
|
|
|
bool SessionDescription::RemoveTransportInfoByName(const std::string& name) {
|
|
for (TransportInfos::iterator transport_info = transport_infos_.begin();
|
|
transport_info != transport_infos_.end(); ++transport_info) {
|
|
if (transport_info->content_name == name) {
|
|
transport_infos_.erase(transport_info);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
const TransportInfo* SessionDescription::GetTransportInfoByName(
|
|
const std::string& name) const {
|
|
for (TransportInfos::const_iterator iter = transport_infos_.begin();
|
|
iter != transport_infos_.end(); ++iter) {
|
|
if (iter->content_name == name) {
|
|
return &(*iter);
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
TransportInfo* SessionDescription::GetTransportInfoByName(
|
|
const std::string& name) {
|
|
for (TransportInfos::iterator iter = transport_infos_.begin();
|
|
iter != transport_infos_.end(); ++iter) {
|
|
if (iter->content_name == name) {
|
|
return &(*iter);
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
void SessionDescription::RemoveGroupByName(const std::string& name) {
|
|
for (ContentGroups::iterator iter = content_groups_.begin();
|
|
iter != content_groups_.end(); ++iter) {
|
|
if (iter->semantics() == name) {
|
|
content_groups_.erase(iter);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool SessionDescription::HasGroup(const std::string& name) const {
|
|
for (ContentGroups::const_iterator iter = content_groups_.begin();
|
|
iter != content_groups_.end(); ++iter) {
|
|
if (iter->semantics() == name) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
const ContentGroup* SessionDescription::GetGroupByName(
|
|
const std::string& name) const {
|
|
for (ContentGroups::const_iterator iter = content_groups_.begin();
|
|
iter != content_groups_.end(); ++iter) {
|
|
if (iter->semantics() == name) {
|
|
return &(*iter);
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
std::vector<const ContentGroup*> SessionDescription::GetGroupsByName(
|
|
const std::string& name) const {
|
|
std::vector<const ContentGroup*> content_groups;
|
|
for (const ContentGroup& content_group : content_groups_) {
|
|
if (content_group.semantics() == name) {
|
|
content_groups.push_back(&content_group);
|
|
}
|
|
}
|
|
return content_groups;
|
|
}
|
|
|
|
ContentInfo::~ContentInfo() {
|
|
}
|
|
|
|
// Copy operator.
|
|
ContentInfo::ContentInfo(const ContentInfo& o)
|
|
: name(o.name),
|
|
type(o.type),
|
|
rejected(o.rejected),
|
|
bundle_only(o.bundle_only),
|
|
description_(o.description_->Clone()) {}
|
|
|
|
ContentInfo& ContentInfo::operator=(const ContentInfo& o) {
|
|
name = o.name;
|
|
type = o.type;
|
|
rejected = o.rejected;
|
|
bundle_only = o.bundle_only;
|
|
description_ = o.description_->Clone();
|
|
return *this;
|
|
}
|
|
|
|
const MediaContentDescription* ContentInfo::media_description() const {
|
|
return description_.get();
|
|
}
|
|
|
|
MediaContentDescription* ContentInfo::media_description() {
|
|
return description_.get();
|
|
}
|
|
|
|
} // namespace cricket
|