webrtc_m130/pc/session_description.cc
Steve Anton 46afbf9481 Revert "Reland "Version 2 "Refactoring DataContentDescription class"""
This reverts commit 37f2b43274a0d718de53a4cfcf02226356edcf6e.

Reason for revert: fuzzer failures

Original change's description:
> Reland "Version 2 "Refactoring DataContentDescription class""
>
> This is a reland of 14b2758726879d21671a21291dfed8fb4fd5c21c
>
> Original change's description:
> > Version 2 "Refactoring DataContentDescription class"
> >
> > (substantial changes since version 1)
> >
> > This CL splits the cricket::DataContentDescription class into
> > two classes: cricket::RtpDataContentDescription (used for RTP data)
> > and cricket::SctpDataContentDescription (used for SCTP only).
> >
> > SctpDataContentDescription no longer inherits from
> > MediaContentDescriptionImpl, and no longer contains "codecs".
> >
> > Due to usage of internal interfaces by consumers, shimming the old
> > DataContentDescription API is needed.
> >
> > A new cricket::DataContentDescription class is defined, which is
> > a shim over RtpDataContentDescription and SctpDataContentDescription.
> > It exposes as little functionality as possible, but supports the
> > concerned consumer's usage
> >
> > Design document:
> > https://docs.google.com/document/d/1H5LfQxJA2ikMWTQ8FZ3_GAmaXM7knfVQWiSz6ph8VQ0/edit#
> >
> > Version 1 reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132700
> >
> > Bug: webrtc:10358
> > Change-Id: Icf95fb7308244d6f2ebfdb403aaffc544e358580
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133900
> > Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> > Reviewed-by: Steve Anton <steveanton@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#27853}
>
> Bug: webrtc:10358
> Change-Id: Iff45c4694167f0b31b34ff2167c1f4ffa650bcc4
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/135281
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27896}

TBR=steveanton@webrtc.org,kwiberg@webrtc.org,hbos@webrtc.org,hta@webrtc.org,shampson@webrtc.org

Change-Id: Ied6d9fb96aafe9c957f2658b34b5331b1f359b26
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10358
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/135986
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27917}
2019-05-10 18:16:09 +00:00

276 lines
8.1 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 <algorithm>
#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() {
for (ContentInfos::iterator content = contents_.begin();
content != contents_.end(); ++content) {
delete content->description;
}
}
std::unique_ptr<SessionDescription> SessionDescription::Clone() const {
// Copy the non-special portions using the private copy constructor.
auto copy = absl::WrapUnique(new SessionDescription(*this));
// Copy all ContentDescriptions.
for (ContentInfos::iterator content = copy->contents_.begin();
content != copy->contents().end(); ++content) {
content->description = content->description->Copy();
}
return copy;
}
SessionDescription* SessionDescription::Copy() const {
return Clone().release();
}
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,
MediaContentDescription* description) {
ContentInfo content(type);
content.name = name;
content.description = description;
AddContent(&content);
}
void SessionDescription::AddContent(const std::string& name,
MediaProtocolType type,
bool rejected,
MediaContentDescription* description) {
ContentInfo content(type);
content.name = name;
content.rejected = rejected;
content.description = description;
AddContent(&content);
}
void SessionDescription::AddContent(const std::string& name,
MediaProtocolType type,
bool rejected,
bool bundle_only,
MediaContentDescription* description) {
ContentInfo content(type);
content.name = name;
content.rejected = rejected;
content.bundle_only = bundle_only;
content.description = description;
AddContent(&content);
}
void SessionDescription::AddContent(ContentInfo* content) {
if (extmap_allow_mixed()) {
// Mixed support on session level overrides setting on media level.
content->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) {
delete content->description;
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;
}
} // namespace cricket