mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
71 lines
2.3 KiB
C++
71 lines
2.3 KiB
C++
/*
|
|
* Copyright 2017 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/sdp_utils.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "api/jsep_session_description.h"
|
|
|
|
namespace webrtc {
|
|
|
|
std::unique_ptr<SessionDescriptionInterface> CloneSessionDescription(
|
|
const SessionDescriptionInterface* sdesc) {
|
|
RTC_DCHECK(sdesc);
|
|
return CloneSessionDescriptionAsType(sdesc, sdesc->GetType());
|
|
}
|
|
|
|
std::unique_ptr<SessionDescriptionInterface> CloneSessionDescriptionAsType(
|
|
const SessionDescriptionInterface* sdesc,
|
|
SdpType type) {
|
|
RTC_DCHECK(sdesc);
|
|
auto clone = std::make_unique<JsepSessionDescription>(type);
|
|
clone->Initialize(sdesc->description()->Clone(), sdesc->session_id(),
|
|
sdesc->session_version());
|
|
// As of writing, our version of GCC does not allow returning a unique_ptr of
|
|
// a subclass as a unique_ptr of a base class. To get around this, we need to
|
|
// std::move the return value.
|
|
return std::move(clone);
|
|
}
|
|
|
|
bool SdpContentsAll(SdpContentPredicate pred,
|
|
const cricket::SessionDescription* desc) {
|
|
RTC_DCHECK(desc);
|
|
for (const auto& content : desc->contents()) {
|
|
const auto* transport_info = desc->GetTransportInfoByName(content.name);
|
|
if (!pred(&content, transport_info)) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool SdpContentsNone(SdpContentPredicate pred,
|
|
const cricket::SessionDescription* desc) {
|
|
return SdpContentsAll(
|
|
[pred](const cricket::ContentInfo* content_info,
|
|
const cricket::TransportInfo* transport_info) {
|
|
return !pred(content_info, transport_info);
|
|
},
|
|
desc);
|
|
}
|
|
|
|
void SdpContentsForEach(SdpContentMutator fn,
|
|
cricket::SessionDescription* desc) {
|
|
RTC_DCHECK(desc);
|
|
for (auto& content : desc->contents()) {
|
|
auto* transport_info = desc->GetTransportInfoByName(content.name);
|
|
fn(&content, transport_info);
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|