diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc index 56d991c80f..93e9bb0821 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc @@ -77,8 +77,7 @@ std::string NACKStringBuilder::GetResult() { } RTCPSender::FeedbackState::FeedbackState() - : send_payload_type(0), - packets_sent(0), + : packets_sent(0), media_bytes_sent(0), send_bitrate(0), last_rr_ntp_secs(0), diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h index c9088c7b97..4ccef26204 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h @@ -60,7 +60,6 @@ class RTCPSender { struct FeedbackState { FeedbackState(); - uint8_t send_payload_type; uint32_t packets_sent; size_t media_bytes_sent; uint32_t send_bitrate; diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 363526196d..36654fc569 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -318,7 +318,6 @@ RTCPSender::FeedbackState ModuleRtpRtcpImpl::GetFeedbackState() { rtp_sender_.GetDataCounters(&rtp_stats, &rtx_stats); RTCPSender::FeedbackState state; - state.send_payload_type = rtp_sender_.SendPayloadType(); state.packets_sent = rtp_stats.transmitted.packets + rtx_stats.transmitted.packets; state.media_bytes_sent = rtp_stats.transmitted.payload_bytes + diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 44d6ff88e2..2fd8b3eff5 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -276,16 +276,12 @@ int32_t RTPSender::DeRegisterSendPayload(int8_t payload_type) { return 0; } +// TODO(nisse): Delete this method, only used internally and by test code. void RTPSender::SetSendPayloadType(int8_t payload_type) { rtc::CritScope lock(&send_critsect_); payload_type_ = payload_type; } -int8_t RTPSender::SendPayloadType() const { - rtc::CritScope lock(&send_critsect_); - return payload_type_; -} - void RTPSender::SetMaxRtpPacketSize(size_t max_packet_size) { // Sanity check. RTC_DCHECK(max_packet_size >= 100 && max_packet_size <= IP_PACKET_SIZE) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h index 64eb679220..dc35a038e1 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h @@ -84,8 +84,6 @@ class RTPSender { void SetSendPayloadType(int8_t payload_type); - int8_t SendPayloadType() const; - void SetSendingMediaStatus(bool enabled); bool SendingMedia() const;