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

Delete obsolete interface class RtpData

Browse Source 
Unused since cl https://webrtc-review.googlesource.com/c/103503

Bug: webrtc:8995
Change-Id: I62a3cab6f7c778fd0a126afb66073da511f0abc1
Reviewed-on: https://webrtc-review.googlesource.com/c/110700
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25613}
This commit is contained in:
Niels Möller
2018-11-13 10:08:33 +01:00
committed by Commit Bot
parent fd20171d28
commit 8fb5746c5a
6 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
audio/channel_receive.h
View File

@ -104,7 +104,7 @@ class ChannelReceiveState {
State state_;
};
class ChannelReceive : public RtpData, public MediaTransportAudioSinkInterface {
class ChannelReceive : public MediaTransportAudioSinkInterface {
public:
// Used for receive streams.
ChannelReceive(ProcessThread* module_process_thread,
@ -198,11 +198,9 @@ class ChannelReceive : public RtpData, public MediaTransportAudioSinkInterface {
void OnData(uint64_t channel_id,
MediaTransportEncodedAudioFrame frame) override;
// From RtpData in the RTP/RTCP module
int32_t OnReceivedPayloadData(const uint8_t* payloadData,
size_t payloadSize,
const WebRtcRTPHeader* rtpHeader) override;
const WebRtcRTPHeader* rtpHeader);
rtc::CriticalSection _callbackCritSect;
rtc::CriticalSection volume_settings_critsect_;

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

@ -223,15 +223,6 @@ struct RtpState {
bool media_has_been_sent;
};
class RtpData {
public:
virtual ~RtpData() {}
virtual int32_t OnReceivedPayloadData(const uint8_t* payload_data,
size_t payload_size,
const WebRtcRTPHeader* rtp_header) = 0;
};
// Callback interface for packets recovered by FlexFEC or ULPFEC. In
// the FlexFEC case, the implementation should be able to demultiplex
// the recovered RTP packets based on SSRC.

3
modules/rtp_rtcp/mocks/mock_rtp_rtcp.cc
View File

@ -12,9 +12,6 @@
namespace webrtc {
MockRtpData::MockRtpData() = default;
MockRtpData::~MockRtpData() = default;
MockRtpRtcp::MockRtpRtcp() = default;
MockRtpRtcp::~MockRtpRtcp() = default;

11
modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
View File

@ -27,17 +27,6 @@
namespace webrtc {
class MockRtpData : public RtpData {
public:
MockRtpData();
~MockRtpData();
MOCK_METHOD3(OnReceivedPayloadData,
int32_t(const uint8_t* payload_data,
size_t payload_size,
const WebRtcRTPHeader* rtp_header));
};
class MockRtpRtcp : public RtpRtcp {
public:
MockRtpRtcp();

7
modules/rtp_rtcp/source/rtcp_sender_unittest.cc
View File

@ -45,7 +45,7 @@ class RtcpPacketTypeCounterObserverImpl : public RtcpPacketTypeCounterObserver {
RtcpPacketTypeCounter counter_;
};
class TestTransport : public Transport, public RtpData {
class TestTransport : public Transport {
public:
TestTransport() {}
@ -58,11 +58,6 @@ class TestTransport : public Transport, public RtpData {
parser_.Parse(data, len);
return true;
}
int OnReceivedPayloadData(const uint8_t* payload_data,
size_t payload_size,
const WebRtcRTPHeader* rtp_header) override {
return 0;
}
test::RtcpPacketParser parser_;
};

7
modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
View File

@ -49,7 +49,7 @@ class RtcpRttStatsTestImpl : public RtcpRttStats {
int64_t rtt_ms_;
};
class SendTransport : public Transport, public RtpData {
class SendTransport : public Transport {
public:
SendTransport()
: receiver_(nullptr),
@ -90,11 +90,6 @@ class SendTransport : public Transport, public RtpData {
++rtcp_packets_sent_;
return true;
}
int32_t OnReceivedPayloadData(const uint8_t* payload_data,
size_t payload_size,
const WebRtcRTPHeader* rtp_header) override {
return 0;
}
void SetKeepalivePayloadType(uint8_t payload_type) {
keepalive_payload_type_ = payload_type;
}