Skip to content

Commit

Permalink
Delete deprecated unused functions from RtpRtcp interface
Browse files Browse the repository at this point in the history 
Bug: None
Change-Id: Iceb59d726c328974c3ccbf52a782ac9e25bd57c7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/205581
Reviewed-by: Erik Språng <[email protected]>
Commit-Queue: Danil Chapovalov <[email protected]>
Cr-Commit-Position: refs/heads/master@{#33278}
  • Loading branch information
@DanilChapovalov
DanilChapovalov authored and Commit Bot committed Feb 16, 2021
1 parent 2c8d929 commit 067b050
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 127 deletions.
40 changes: 0 additions & 40 deletions modules/rtp_rtcp/include/rtp_rtcp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#define MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_

#include <memory>
#include <string>
#include <vector>

#include "modules/include/module.h"
#include "modules/rtp_rtcp/source/rtp_rtcp_interface.h"
Expand All @@ -33,44 +31,6 @@ class RtpRtcp : public Module, public RtpRtcpInterface {
static std::unique_ptr<RtpRtcp> DEPRECATED_Create(
const Configuration& configuration);

// (TMMBR) Temporary Max Media Bit Rate
RTC_DEPRECATED virtual bool TMMBR() const = 0;

RTC_DEPRECATED virtual void SetTMMBRStatus(bool enable) = 0;

// Returns -1 on failure else 0.
RTC_DEPRECATED virtual int32_t AddMixedCNAME(uint32_t ssrc,
const char* cname) = 0;

// Returns -1 on failure else 0.
RTC_DEPRECATED virtual int32_t RemoveMixedCNAME(uint32_t ssrc) = 0;

// Returns remote CName.
// Returns -1 on failure else 0.
RTC_DEPRECATED virtual int32_t RemoteCNAME(
uint32_t remote_ssrc,
char cname[RTCP_CNAME_SIZE]) const = 0;

// (De)registers RTP header extension type and id.
// Returns -1 on failure else 0.
RTC_DEPRECATED virtual int32_t RegisterSendRtpHeaderExtension(
RTPExtensionType type,
uint8_t id) = 0;

// (APP) Sets application specific data.
// Returns -1 on failure else 0.
RTC_DEPRECATED virtual int32_t SetRTCPApplicationSpecificData(
uint8_t sub_type,
uint32_t name,
const uint8_t* data,
uint16_t length) = 0;

// Returns statistics of the amount of data sent.
// Returns -1 on failure else 0.
RTC_DEPRECATED virtual int32_t DataCountersRTP(
size_t* bytes_sent,
uint32_t* packets_sent) const = 0;

// Requests new key frame.
// using PLI, https://tools.ietf.org/html/rfc4585#section-6.3.1.1
void SendPictureLossIndication() { SendRTCP(kRtcpPli); }
Expand Down
63 changes: 1 addition & 62 deletions modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void ModuleRtpRtcpImpl::Process() {
if (rtcp_sender_.TimeToSendRTCPReport())
rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpReport);

if (TMMBR() && rtcp_receiver_.UpdateTmmbrTimers()) {
if (rtcp_sender_.TMMBR() && rtcp_receiver_.UpdateTmmbrTimers()) {
rtcp_receiver_.NotifyTmmbrUpdated();
}
}
Expand Down Expand Up @@ -467,19 +467,6 @@ int32_t ModuleRtpRtcpImpl::SetCNAME(const char* c_name) {
return rtcp_sender_.SetCNAME(c_name);
}

int32_t ModuleRtpRtcpImpl::AddMixedCNAME(uint32_t ssrc, const char* c_name) {
return rtcp_sender_.AddMixedCNAME(ssrc, c_name);
}

int32_t ModuleRtpRtcpImpl::RemoveMixedCNAME(const uint32_t ssrc) {
return rtcp_sender_.RemoveMixedCNAME(ssrc);
}

int32_t ModuleRtpRtcpImpl::RemoteCNAME(const uint32_t remote_ssrc,
char c_name[RTCP_CNAME_SIZE]) const {
return rtcp_receiver_.CNAME(remote_ssrc, c_name);
}

int32_t ModuleRtpRtcpImpl::RemoteNTP(uint32_t* received_ntpsecs,
uint32_t* received_ntpfrac,
uint32_t* rtcp_arrival_time_secs,
Expand Down Expand Up @@ -527,39 +514,6 @@ int32_t ModuleRtpRtcpImpl::SendRTCP(RTCPPacketType packet_type) {
return rtcp_sender_.SendRTCP(GetFeedbackState(), packet_type);
}

int32_t ModuleRtpRtcpImpl::SetRTCPApplicationSpecificData(
const uint8_t sub_type,
const uint32_t name,
const uint8_t* data,
const uint16_t length) {
RTC_NOTREACHED() << "Not implemented";
return -1;
}

// TODO(asapersson): Replace this method with the one below.
int32_t ModuleRtpRtcpImpl::DataCountersRTP(size_t* bytes_sent,
uint32_t* packets_sent) const {
StreamDataCounters rtp_stats;
StreamDataCounters rtx_stats;
rtp_sender_->packet_sender.GetDataCounters(&rtp_stats, &rtx_stats);

if (bytes_sent) {
// TODO(http://crbug.com/webrtc/10525): Bytes sent should only include
// payload bytes, not header and padding bytes.
*bytes_sent = rtp_stats.transmitted.payload_bytes +
rtp_stats.transmitted.padding_bytes +
rtp_stats.transmitted.header_bytes +
rtx_stats.transmitted.payload_bytes +
rtx_stats.transmitted.padding_bytes +
rtx_stats.transmitted.header_bytes;
}
if (packets_sent) {
*packets_sent =
rtp_stats.transmitted.packets + rtx_stats.transmitted.packets;
}
return 0;
}

void ModuleRtpRtcpImpl::GetSendStreamDataCounters(
StreamDataCounters* rtp_counters,
StreamDataCounters* rtx_counters) const {
Expand Down Expand Up @@ -591,12 +545,6 @@ void ModuleRtpRtcpImpl::SetExtmapAllowMixed(bool extmap_allow_mixed) {
rtp_sender_->packet_generator.SetExtmapAllowMixed(extmap_allow_mixed);
}

int32_t ModuleRtpRtcpImpl::RegisterSendRtpHeaderExtension(
const RTPExtensionType type,
const uint8_t id) {
return rtp_sender_->packet_generator.RegisterRtpHeaderExtension(type, id);
}

void ModuleRtpRtcpImpl::RegisterRtpHeaderExtension(absl::string_view uri,
int id) {
bool registered =
Expand All @@ -613,15 +561,6 @@ void ModuleRtpRtcpImpl::DeregisterSendRtpHeaderExtension(
rtp_sender_->packet_generator.DeregisterRtpHeaderExtension(uri);
}

// (TMMBR) Temporary Max Media Bit Rate.
bool ModuleRtpRtcpImpl::TMMBR() const {
return rtcp_sender_.TMMBR();
}

void ModuleRtpRtcpImpl::SetTMMBRStatus(const bool enable) {
rtcp_sender_.SetTMMBRStatus(enable);
}

void ModuleRtpRtcpImpl::SetTmmbn(std::vector<rtcp::TmmbItem> bounding_set) {
rtcp_sender_.SetTmmbn(std::move(bounding_set));
}
Expand Down
25 changes: 0 additions & 25 deletions modules/rtp_rtcp/source/rtp_rtcp_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
void SetExtmapAllowMixed(bool extmap_allow_mixed) override;

// Register RTP header extension.
int32_t RegisterSendRtpHeaderExtension(RTPExtensionType type,
uint8_t id) override;
void RegisterRtpHeaderExtension(absl::string_view uri, int id) override;
int32_t DeregisterSendRtpHeaderExtension(RTPExtensionType type) override;
void DeregisterSendRtpHeaderExtension(absl::string_view uri) override;
Expand Down Expand Up @@ -166,21 +164,13 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
// Set RTCP CName.
int32_t SetCNAME(const char* c_name) override;

// Get remote CName.
int32_t RemoteCNAME(uint32_t remote_ssrc,
char c_name[RTCP_CNAME_SIZE]) const override;

// Get remote NTP.
int32_t RemoteNTP(uint32_t* received_ntp_secs,
uint32_t* received_ntp_frac,
uint32_t* rtcp_arrival_time_secs,
uint32_t* rtcp_arrival_time_frac,
uint32_t* rtcp_timestamp) const override;

int32_t AddMixedCNAME(uint32_t ssrc, const char* c_name) override;

int32_t RemoveMixedCNAME(uint32_t ssrc) override;

// Get RoundTripTime.
int32_t RTT(uint32_t remote_ssrc,
int64_t* rtt,
Expand All @@ -194,10 +184,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
// Normal SR and RR are triggered via the process function.
int32_t SendRTCP(RTCPPacketType rtcpPacketType) override;

// Statistics of the amount of data sent and received.
int32_t DataCountersRTP(size_t* bytes_sent,
uint32_t* packets_sent) const override;

void GetSendStreamDataCounters(
StreamDataCounters* rtp_counters,
StreamDataCounters* rtx_counters) const override;
Expand All @@ -215,11 +201,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
void SetRemb(int64_t bitrate_bps, std::vector<uint32_t> ssrcs) override;
void UnsetRemb() override;

// (TMMBR) Temporary Max Media Bit Rate.
bool TMMBR() const override;

void SetTMMBRStatus(bool enable) override;

void SetTmmbn(std::vector<rtcp::TmmbItem> bounding_set) override;

size_t MaxRtpPacketSize() const override;
Expand All @@ -241,12 +222,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
void SendCombinedRtcpPacket(
std::vector<std::unique_ptr<rtcp::RtcpPacket>> rtcp_packets) override;

// (APP) Application specific data.
int32_t SetRTCPApplicationSpecificData(uint8_t sub_type,
uint32_t name,
const uint8_t* data,
uint16_t length) override;

// Video part.
int32_t SendLossNotification(uint16_t last_decoded_seq_num,
uint16_t last_received_seq_num,
Expand Down

0 comments on commit 067b050

Please sign in to comment.