cdb87f1a65
jsepicecandidate.cc uses absl::make_unique without including absl/memory/memory.h. This happens to work in C++14 due to a transitive #include, but doesn't work in C++17. Bug: chromium:752720 Change-Id: I995496f452b9eaa2e70b82cd3b7926b936d7dac0 Reviewed-on: https://webrtc-review.googlesource.com/94340 Reviewed-by: Steve Anton <steveanton@webrtc.org> Commit-Queue: Steve Anton <steveanton@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24294}
66 lines
2.1 KiB
C++
66 lines
2.1 KiB
C++
/*
|
|
* Copyright 2012 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 "api/jsepicecandidate.h"
|
|
|
|
#include <vector>
|
|
|
|
#include "absl/memory/memory.h"
|
|
#include "pc/webrtcsdp.h"
|
|
#include "rtc_base/stringencode.h"
|
|
|
|
namespace webrtc {
|
|
|
|
IceCandidateInterface* CreateIceCandidate(const std::string& sdp_mid,
|
|
int sdp_mline_index,
|
|
const std::string& sdp,
|
|
SdpParseError* error) {
|
|
JsepIceCandidate* jsep_ice = new JsepIceCandidate(sdp_mid, sdp_mline_index);
|
|
if (!jsep_ice->Initialize(sdp, error)) {
|
|
delete jsep_ice;
|
|
return NULL;
|
|
}
|
|
return jsep_ice;
|
|
}
|
|
|
|
std::unique_ptr<IceCandidateInterface> CreateIceCandidate(
|
|
const std::string& sdp_mid,
|
|
int sdp_mline_index,
|
|
const cricket::Candidate& candidate) {
|
|
return absl::make_unique<JsepIceCandidate>(sdp_mid, sdp_mline_index,
|
|
candidate);
|
|
}
|
|
|
|
JsepIceCandidate::JsepIceCandidate(const std::string& sdp_mid,
|
|
int sdp_mline_index)
|
|
: sdp_mid_(sdp_mid), sdp_mline_index_(sdp_mline_index) {}
|
|
|
|
JsepIceCandidate::JsepIceCandidate(const std::string& sdp_mid,
|
|
int sdp_mline_index,
|
|
const cricket::Candidate& candidate)
|
|
: sdp_mid_(sdp_mid),
|
|
sdp_mline_index_(sdp_mline_index),
|
|
candidate_(candidate) {}
|
|
|
|
JsepIceCandidate::~JsepIceCandidate() {}
|
|
|
|
bool JsepIceCandidate::Initialize(const std::string& sdp, SdpParseError* err) {
|
|
return SdpDeserializeCandidate(sdp, this, err);
|
|
}
|
|
|
|
bool JsepIceCandidate::ToString(std::string* out) const {
|
|
if (!out)
|
|
return false;
|
|
*out = SdpSerializeCandidate(*this);
|
|
return !out->empty();
|
|
}
|
|
|
|
} // namespace webrtc
|