admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline various trivial methods from the WebRtcSession merge

Browse Source 
Bug: webrtc:8323
Change-Id: I402480b71a5e9cd8936fbbc5d15d62e4f3c910a6
Reviewed-on: https://webrtc-review.googlesource.com/16381
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Peter Thatcher <pthatcher@webrtc.org>
Reviewed-by: Zhi Huang <zhihuang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20576}
This commit is contained in:
Steve Anton 2017-11-06 14:50:29 -08:00 committed by Commit Bot
parent 904c96c694
commit d25da378c7
2 changed files with 75 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

211
pc/peerconnection.cc
View File

@ -957,7 +957,7 @@ bool PeerConnection::Initialize(
certificate = configuration.certificates[0];
}
SetIceConfig(ParseIceConfig(configuration));
transport_controller_->SetIceConfig(ParseIceConfig(configuration));
if (options.disable_encryption) {
dtls_enabled_ = false;
@ -1347,7 +1347,7 @@ void PeerConnection::CreateOffer(CreateSessionDescriptionObserver* observer,
cricket::MediaSessionOptions session_options;
GetOptionsForOffer(options, &session_options);
CreateOffer(observer, options, session_options);
webrtc_session_desc_factory_->CreateOffer(observer, options, session_options);
}
void PeerConnection::CreateAnswer(
@ -1398,7 +1398,7 @@ void PeerConnection::CreateAnswer(CreateSessionDescriptionObserver* observer,
cricket::MediaSessionOptions session_options;
GetOptionsForAnswer(options, &session_options);
CreateAnswer(observer, session_options);
webrtc_session_desc_factory_->CreateAnswer(observer, session_options);
}
void PeerConnection::SetLocalDescription(
@ -1493,7 +1493,7 @@ void PeerConnection::SetLocalDescription(
// MaybeStartGathering needs to be called after posting
// MSG_SET_SESSIONDESCRIPTION_SUCCESS, so that we don't signal any candidates
// before signaling that SetLocalDescription completed.
MaybeStartGathering();
transport_controller_->MaybeStartGathering();
if (desc->type() == SessionDescriptionInterface::kAnswer) {
// TODO(deadbeef): We already had to hop to the network thread for
@ -1708,12 +1708,12 @@ bool PeerConnection::SetConfiguration(const RTCConfiguration& configuration,
if (modified_config.servers != configuration_.servers ||
modified_config.type != configuration_.type ||
modified_config.prune_turn_ports != configuration_.prune_turn_ports) {
SetNeedsIceRestartFlag();
transport_controller_->SetNeedsIceRestartFlag();
}
if (modified_config.ice_check_min_interval !=
configuration_.ice_check_min_interval) {
SetIceConfig(ParseIceConfig(modified_config));
transport_controller_->SetIceConfig(ParseIceConfig(modified_config));
}
configuration_ = modified_config;
@ -1726,13 +1726,67 @@ bool PeerConnection::AddIceCandidate(
if (IsClosed()) {
return false;
}
return ProcessIceMessage(ice_candidate);
if (!remote_description()) {
LOG(LS_ERROR) << "ProcessIceMessage: ICE candidates can't be added "
<< "without any remote session description.";
return false;
}
if (!ice_candidate) {
LOG(LS_ERROR) << "ProcessIceMessage: Candidate is NULL.";
return false;
}
bool valid = false;
bool ready = ReadyToUseRemoteCandidate(ice_candidate, nullptr, &valid);
if (!valid) {
return false;
}
// Add this candidate to the remote session description.
if (!mutable_remote_description()->AddCandidate(ice_candidate)) {
LOG(LS_ERROR) << "ProcessIceMessage: Candidate cannot be used.";
return false;
}
if (ready) {
return UseCandidate(ice_candidate);
} else {
LOG(LS_INFO) << "ProcessIceMessage: Not ready to use candidate.";
return true;
}
}
bool PeerConnection::RemoveIceCandidates(
const std::vector<cricket::Candidate>& candidates) {
TRACE_EVENT0("webrtc", "PeerConnection::RemoveIceCandidates");
return RemoveRemoteIceCandidates(candidates);
if (!remote_description()) {
LOG(LS_ERROR) << "RemoveRemoteIceCandidates: ICE candidates can't be "
<< "removed without any remote session description.";
return false;
}
if (candidates.empty()) {
LOG(LS_ERROR) << "RemoveRemoteIceCandidates: candidates are empty.";
return false;
}
size_t number_removed =
mutable_remote_description()->RemoveCandidates(candidates);
if (number_removed != candidates.size()) {
LOG(LS_ERROR) << "RemoveRemoteIceCandidates: Failed to remove candidates. "
<< "Requested " << candidates.size() << " but only "
<< number_removed << " are removed.";
}
// Remove the candidates from the transport controller.
std::string error;
bool res = transport_controller_->RemoveRemoteCandidates(candidates, &error);
if (!res && !error.empty()) {
LOG(LS_ERROR) << "Error when removing remote candidates: " << error;
}
return true;
}
void PeerConnection::RegisterUMAObserver(UMAObserver* observer) {
@ -2875,34 +2929,6 @@ void PeerConnection::OnSctpDataChannelClosed(DataChannel* channel) {
}
}
void PeerConnection::OnVoiceChannelCreated() {
SetChannelOnSendersAndReceivers<AudioRtpSender, AudioRtpReceiver>(
voice_channel(), senders_, receivers_, cricket::MEDIA_TYPE_AUDIO);
}
void PeerConnection::OnVoiceChannelDestroyed() {
SetChannelOnSendersAndReceivers<AudioRtpSender, AudioRtpReceiver,
cricket::VoiceChannel>(
nullptr, senders_, receivers_, cricket::MEDIA_TYPE_AUDIO);
}
void PeerConnection::OnVideoChannelCreated() {
SetChannelOnSendersAndReceivers<VideoRtpSender, VideoRtpReceiver>(
video_channel(), senders_, receivers_, cricket::MEDIA_TYPE_VIDEO);
}
void PeerConnection::OnVideoChannelDestroyed() {
SetChannelOnSendersAndReceivers<VideoRtpSender, VideoRtpReceiver,
cricket::VideoChannel>(
nullptr, senders_, receivers_, cricket::MEDIA_TYPE_VIDEO);
}
void PeerConnection::OnDataChannelCreated() {
for (const auto& channel : sctp_data_channels_) {
channel->OnTransportChannelCreated();
}
}
void PeerConnection::OnDataChannelDestroyed() {
// Use a temporary copy of the RTP/SCTP DataChannel list because the
// DataChannel may callback to us and try to modify the list.
@ -3151,19 +3177,6 @@ bool PeerConnection::GetSslRole(const std::string& content_name,
role);
}
void PeerConnection::CreateOffer(
CreateSessionDescriptionObserver* observer,
const PeerConnectionInterface::RTCOfferAnswerOptions& options,
const cricket::MediaSessionOptions& session_options) {
webrtc_session_desc_factory_->CreateOffer(observer, options, session_options);
}
void PeerConnection::CreateAnswer(
CreateSessionDescriptionObserver* observer,
const cricket::MediaSessionOptions& session_options) {
webrtc_session_desc_factory_->CreateAnswer(observer, session_options);
}
bool PeerConnection::SetLocalDescription(
std::unique_ptr<SessionDescriptionInterface> desc,
std::string* err_desc) {
@ -3611,68 +3624,6 @@ bool PeerConnection::EnableBundle(const cricket::ContentGroup& bundle) {
return true;
}
bool PeerConnection::ProcessIceMessage(const IceCandidateInterface* candidate) {
if (!remote_description()) {
LOG(LS_ERROR) << "ProcessIceMessage: ICE candidates can't be added "
<< "without any remote session description.";
return false;
}
if (!candidate) {
LOG(LS_ERROR) << "ProcessIceMessage: Candidate is NULL.";
return false;
}
bool valid = false;
bool ready = ReadyToUseRemoteCandidate(candidate, NULL, &valid);
if (!valid) {
return false;
}
// Add this candidate to the remote session description.
if (!mutable_remote_description()->AddCandidate(candidate)) {
LOG(LS_ERROR) << "ProcessIceMessage: Candidate cannot be used.";
return false;
}
if (ready) {
return UseCandidate(candidate);
} else {
LOG(LS_INFO) << "ProcessIceMessage: Not ready to use candidate.";
return true;
}
}
bool PeerConnection::RemoveRemoteIceCandidates(
const std::vector<cricket::Candidate>& candidates) {
if (!remote_description()) {
LOG(LS_ERROR) << "RemoveRemoteIceCandidates: ICE candidates can't be "
<< "removed without any remote session description.";
return false;
}
if (candidates.empty()) {
LOG(LS_ERROR) << "RemoveRemoteIceCandidates: candidates are empty.";
return false;
}
size_t number_removed =
mutable_remote_description()->RemoveCandidates(candidates);
if (number_removed != candidates.size()) {
LOG(LS_ERROR) << "RemoveRemoteIceCandidates: Failed to remove candidates. "
<< "Requested " << candidates.size() << " but only "
<< number_removed << " are removed.";
}
// Remove the candidates from the transport controller.
std::string error;
bool res = transport_controller_->RemoveRemoteCandidates(candidates, &error);
if (!res && !error.empty()) {
LOG(LS_ERROR) << "Error when removing remote candidates: " << error;
}
return true;
}
cricket::IceConfig PeerConnection::ParseIceConfig(
const PeerConnectionInterface::RTCConfiguration& config) const {
cricket::ContinualGatheringPolicy gathering_policy;
@ -3704,14 +3655,6 @@ cricket::IceConfig PeerConnection::ParseIceConfig(
return ice_config;
}
void PeerConnection::SetIceConfig(const cricket::IceConfig& config) {
transport_controller_->SetIceConfig(config);
}
void PeerConnection::MaybeStartGathering() {
transport_controller_->MaybeStartGathering();
}
bool PeerConnection::GetLocalTrackIdBySsrc(uint32_t ssrc,
std::string* track_id) {
if (!local_description()) {
@ -3867,10 +3810,6 @@ bool PeerConnection::IceRestartPending(const std::string& content_name) const {
pending_ice_restarts_.end();
}
void PeerConnection::SetNeedsIceRestartFlag() {
transport_controller_->SetNeedsIceRestartFlag();
}
bool PeerConnection::NeedsIceRestart(const std::string& content_name) const {
return transport_controller_->NeedsIceRestart(content_name);
}
@ -4218,9 +4157,8 @@ bool PeerConnection::CreateVoiceChannel(const cricket::ContentInfo* content,
voice_channel->SignalDtlsSrtpSetupFailure.connect(
this, &PeerConnection::OnDtlsSrtpSetupFailure);
// TODO(steveanton): This should signal which voice channel was created since
// we can have multiple.
OnVoiceChannelCreated();
SetChannelOnSendersAndReceivers<AudioRtpSender, AudioRtpReceiver>(
voice_channel, senders_, receivers_, cricket::MEDIA_TYPE_AUDIO);
voice_channel->SignalSentPacket.connect(this,
&PeerConnection::OnSentPacket_w);
return true;
@ -4267,9 +4205,8 @@ bool PeerConnection::CreateVideoChannel(const cricket::ContentInfo* content,
video_channel->SignalDtlsSrtpSetupFailure.connect(
this, &PeerConnection::OnDtlsSrtpSetupFailure);
// TODO(steveanton): This should signal which video channel was created since
// we can have multiple.
OnVideoChannelCreated();
SetChannelOnSendersAndReceivers<VideoRtpSender, VideoRtpReceiver>(
video_channel, senders_, receivers_, cricket::MEDIA_TYPE_VIDEO);
video_channel->SignalSentPacket.connect(this,
&PeerConnection::OnSentPacket_w);
return true;
@ -4328,7 +4265,9 @@ bool PeerConnection::CreateDataChannel(const cricket::ContentInfo* content,
this, &PeerConnection::OnSentPacket_w);
}
OnDataChannelCreated();
for (const auto& channel : sctp_data_channels_) {
channel->OnTransportChannelCreated();
}
return true;
}
@ -4820,9 +4759,9 @@ void PeerConnection::RemoveAndDestroyVideoChannel(
}
void PeerConnection::DestroyVideoChannel(cricket::VideoChannel* video_channel) {
// TODO(steveanton): This should take an identifier for the video channel
// since we now support more than one.
OnVideoChannelDestroyed();
SetChannelOnSendersAndReceivers<VideoRtpSender, VideoRtpReceiver,
cricket::VideoChannel>(
nullptr, senders_, receivers_, cricket::MEDIA_TYPE_VIDEO);
RTC_DCHECK(video_channel->rtp_dtls_transport());
const std::string transport_name =
video_channel->rtp_dtls_transport()->transport_name();
@ -4852,9 +4791,9 @@ void PeerConnection::RemoveAndDestroyVoiceChannel(
}
void PeerConnection::DestroyVoiceChannel(cricket::VoiceChannel* voice_channel) {
// TODO(steveanton): This should take an identifier for the voice channel
// since we now support more than one.
OnVoiceChannelDestroyed();
SetChannelOnSendersAndReceivers<AudioRtpSender, AudioRtpReceiver,
cricket::VoiceChannel>(
nullptr, senders_, receivers_, cricket::MEDIA_TYPE_AUDIO);
RTC_DCHECK(voice_channel->rtp_dtls_transport());
const std::string transport_name =
voice_channel->rtp_dtls_transport()->transport_name();

30
pc/peerconnection.h
View File

@ -452,14 +452,6 @@ class PeerConnection : public PeerConnectionInterface,
void AllocateSctpSids(rtc::SSLRole role);
void OnSctpDataChannelClosed(DataChannel* channel);
// Called when voice_channel_, video_channel_ and
// rtp_data_channel_/sctp_transport_ are created and destroyed. As a result
// of, for example, setting a new description.
void OnVoiceChannelCreated();
void OnVoiceChannelDestroyed();
void OnVideoChannelCreated();
void OnVideoChannelDestroyed();
void OnDataChannelCreated();
void OnDataChannelDestroyed();
// Called when a valid data channel OPEN message is received.
void OnDataChannelOpenMessage(const std::string& label,
@ -538,31 +530,14 @@ class PeerConnection : public PeerConnectionInterface,
// Get current SSL role used by SCTP's underlying transport.
bool GetSctpSslRole(rtc::SSLRole* role);
void CreateOffer(
CreateSessionDescriptionObserver* observer,
const PeerConnectionInterface::RTCOfferAnswerOptions& options,
const cricket::MediaSessionOptions& session_options);
void CreateAnswer(CreateSessionDescriptionObserver* observer,
const cricket::MediaSessionOptions& session_options);
bool SetLocalDescription(std::unique_ptr<SessionDescriptionInterface> desc,
std::string* err_desc);
bool SetRemoteDescription(std::unique_ptr<SessionDescriptionInterface> desc,
std::string* err_desc);
bool ProcessIceMessage(const IceCandidateInterface* ice_candidate);
bool RemoveRemoteIceCandidates(
const std::vector<cricket::Candidate>& candidates);
cricket::IceConfig ParseIceConfig(
const PeerConnectionInterface::RTCConfiguration& config) const;
void SetIceConfig(const cricket::IceConfig& ice_config);
// Start gathering candidates for any new transports, or transports doing an
// ICE restart.
void MaybeStartGathering();
// Implements DataChannelProviderInterface.
bool SendData(const cricket::SendDataParams& params,
const rtc::CopyOnWriteBuffer& payload,
@ -575,11 +550,6 @@ class PeerConnection : public PeerConnectionInterface,
cricket::DataChannelType data_channel_type() const;
// Set the "needs-ice-restart" flag as described in JSEP. After the flag is
// set, offers should generate new ufrags/passwords until an ICE restart
// occurs.
void SetNeedsIceRestartFlag();
// Called when an RTCCertificate is generated or retrieved by
// WebRTCSessionDescriptionFactory. Should happen before setLocalDescription.
void OnCertificateReady(