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

Remove the unused code.

Browse Source 
In BaseChannel, |selected_candidate_pair| is removed.
In MediaContentDescription, |buffered_mode_latency_| and its
getter/setter are removed.

TBR=pthatcher@webrtc.org

Bug: None
Change-Id: I68c0a61136dcd078f587105f09c72098d7f8e620
Reviewed-on: https://webrtc-review.googlesource.com/23520
Commit-Queue: Zhi Huang <zhihuang@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20694}
This commit is contained in:
Zhi Huang 2017-11-15 15:58:49 -08:00 committed by Commit Bot
parent 801b868bd8
commit 1d88d7446e
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pc/channel.cc
View File

@ -152,8 +152,7 @@ BaseChannel::BaseChannel(rtc::Thread* worker_thread,
content_name_(content_name),
rtcp_mux_required_(rtcp_mux_required),
srtp_required_(srtp_required),
media_channel_(std::move(media_channel)),
selected_candidate_pair_(nullptr) {
media_channel_(std::move(media_channel)) {
RTC_DCHECK_RUN_ON(worker_thread_);
if (srtp_required) {
auto transport =
@ -768,13 +767,6 @@ void BaseChannel::ChannelWritable_n() {
RTC_LOG(LS_INFO) << "Channel writable (" << content_name_ << ")"
<< (was_ever_writable_ ? "" : " for the first time");
if (selected_candidate_pair_)
RTC_LOG(LS_INFO)
<< "Using "
<< selected_candidate_pair_->local_candidate().ToSensitiveString()
<< "->"
<< selected_candidate_pair_->remote_candidate().ToSensitiveString();
was_ever_writable_ = true;
MaybeSetupDtlsSrtp_n();
writable_ = true;

1
pc/channel.h
View File

@ -415,7 +415,6 @@ class BaseChannel
std::vector<StreamParams> remote_streams_;
MediaContentDirection local_content_direction_ = MD_INACTIVE;
MediaContentDirection remote_content_direction_ = MD_INACTIVE;
CandidatePairInterface* selected_candidate_pair_;
// The cached encrypted header extension IDs.
rtc::Optional<std::vector<int>> catched_send_extension_ids_;

7
pc/mediasession.h
View File

@ -69,7 +69,6 @@ extern const char kMediaProtocolTcpDtlsSctp[];
// Options to control how session descriptions are generated.
const int kAutoBandwidth = -1;
const int kBufferedModeDisabled = 0;
// Default RTCP CNAME for unit tests.
const char kDefaultRtcpCname[] = "DefaultRtcpCname";
@ -294,11 +293,6 @@ class MediaContentDescription : public ContentDescription {
void set_partial(bool partial) { partial_ = partial; }
bool partial() const { return partial_; }
void set_buffered_mode_latency(int latency) {
buffered_mode_latency_ = latency;
}
int buffered_mode_latency() const { return buffered_mode_latency_; }
// https://tools.ietf.org/html/rfc4566#section-5.7
// May be present at the media or session level of SDP. If present at both
// levels, the media-level attribute overwrites the session-level one.
@ -322,7 +316,6 @@ class MediaContentDescription : public ContentDescription {
StreamParamsVec streams_;
bool conference_mode_ = false;
bool partial_ = false;
int buffered_mode_latency_ = kBufferedModeDisabled;
MediaContentDirection direction_ = MD_SENDRECV;
rtc::SocketAddress connection_address_;
};