zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused temporary fallback methods

Browse Source 
Bug: webrtc:8975
Change-Id: I74f07cfc5e4d7b92b1e8eebb2f3f4988b3e8cfec
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133888
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27729}
This commit is contained in:
Erik Språng
2019-04-24 08:09:20 +02:00
committed by Commit Bot
parent ba801f675b
commit 2a27be92d3
4 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/congestion_controller/rtp/transport_feedback_adapter.cc
View File

@ -78,19 +78,6 @@ void TransportFeedbackAdapter::DeRegisterPacketFeedbackObserver(
observers_.erase(it);
}
void TransportFeedbackAdapter::AddPacket(uint32_t ssrc,
uint16_t sequence_number,
size_t length,
const PacedPacketInfo& pacing_info,
Timestamp creation_time) {
RtpPacketSendInfo packet_info;
packet_info.ssrc = ssrc;
packet_info.transport_sequence_number = sequence_number;
packet_info.length = length;
packet_info.pacing_info = pacing_info;
AddPacket(packet_info, 0u, creation_time);
}
void TransportFeedbackAdapter::AddPacket(const RtpPacketSendInfo& packet_info,
size_t overhead_bytes,
Timestamp creation_time) {

7
modules/congestion_controller/rtp/transport_feedback_adapter.h
View File

@ -38,13 +38,6 @@ class TransportFeedbackAdapter {
void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
// TODO(webrtc:8975): Remove when downstream projects have been updated.
void AddPacket(uint32_t ssrc,
uint16_t sequence_number,
size_t length,
const PacedPacketInfo& pacing_info,
Timestamp creation_time);
void AddPacket(const RtpPacketSendInfo& packet_info,
size_t overhead_bytes,
Timestamp creation_time);

16
modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
View File

@ -404,8 +404,12 @@ TEST_F(TransportFeedbackAdapterTest, IgnoreDuplicatePacketSentCalls) {
const PacketFeedback packet(100, 200, 0, 1500, kPacingInfo0);
// Add a packet and then mark it as sent.
adapter_->AddPacket(kSsrc, packet.sequence_number, packet.payload_size,
packet.pacing_info,
RtpPacketSendInfo packet_info;
packet_info.ssrc = kSsrc;
packet_info.transport_sequence_number = packet.sequence_number;
packet_info.length = packet.payload_size;
packet_info.pacing_info = packet.pacing_info;
adapter_->AddPacket(packet_info, 0u,
Timestamp::ms(clock_.TimeInMilliseconds()));
absl::optional<SentPacket> sent_packet =
adapter_->ProcessSentPacket(rtc::SentPacket(
@ -430,8 +434,12 @@ TEST_F(TransportFeedbackAdapterTest, AllowDuplicatePacketSentCallsWithTrial) {
const PacketFeedback packet(100, 200, 0, 1500, kPacingInfo0);
// Add a packet and then mark it as sent.
adapter_->AddPacket(kSsrc, packet.sequence_number, packet.payload_size,
packet.pacing_info,
RtpPacketSendInfo packet_info;
packet_info.ssrc = kSsrc;
packet_info.transport_sequence_number = packet.sequence_number;
packet_info.length = packet.payload_size;
packet_info.pacing_info = packet.pacing_info;
adapter_->AddPacket(packet_info, 0u,
Timestamp::ms(clock_.TimeInMilliseconds()));
absl::optional<SentPacket> sent_packet =
adapter_->ProcessSentPacket(rtc::SentPacket(

20
modules/rtp_rtcp/include/rtp_rtcp_defines.h
View File

@ -309,25 +309,7 @@ class TransportFeedbackObserver {
TransportFeedbackObserver() {}
virtual ~TransportFeedbackObserver() {}
// TODO(webrtc:8975): Remove when downstream projects have been updated.
virtual void AddPacket(uint32_t ssrc,
uint16_t sequence_number, // Transport-wide.
size_t length,
const PacedPacketInfo& pacing_info) {
RtpPacketSendInfo packet_info;
packet_info.ssrc = ssrc;
packet_info.transport_sequence_number = sequence_number;
packet_info.length = length;
packet_info.pacing_info = pacing_info;
OnAddPacket(packet_info);
}
virtual void OnAddPacket(const RtpPacketSendInfo& packet_info) {
// TODO(webrtc:8975): Remove when downstream projects have been updated.
AddPacket(packet_info.ssrc, packet_info.transport_sequence_number,
packet_info.length, packet_info.pacing_info);
}
virtual void OnAddPacket(const RtpPacketSendInfo& packet_info) = 0;
virtual void OnTransportFeedback(const rtcp::TransportFeedback& feedback) = 0;
};