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

Adjust RtcpReceiver to be testable with callbacks:

Browse Source 
Instead of full RtpRtcpImpl takes interface of all functions it needs from it.
Added single function for parsing packets and sending feedback, moving that
logic from RtpRtcpImpl to RtcpReceiver.

BUG=webrtc:5260

Review-Url: https://codereview.webrtc.org/2274573002
Cr-Commit-Position: refs/heads/master@{#13960}
This commit is contained in:
danilchap
2016-08-29 11:08:47 -07:00
committed by Commit bot
parent 65fc8b9138
commit 59cb2bd20e
4 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -26,7 +26,7 @@
namespace webrtc {
class ModuleRtpRtcpImpl : public RtpRtcp {
class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
public:
explicit ModuleRtpRtcpImpl(const RtpRtcp::Configuration& configuration);
@ -204,7 +204,7 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
void SetTMMBRStatus(bool enable) override;
void SetTmmbn(std::vector<rtcp::TmmbItem> bounding_set);
void SetTmmbn(std::vector<rtcp::TmmbItem> bounding_set) override;
uint16_t MaxPayloadLength() const override;
@ -311,10 +311,11 @@ class ModuleRtpRtcpImpl : public RtpRtcp {
StreamDataCountersCallback* GetSendChannelRtpStatisticsCallback()
const override;
void OnReceivedNack(const std::vector<uint16_t>& nack_sequence_numbers);
void OnReceivedRtcpReportBlocks(const ReportBlockList& report_blocks);
void OnRequestSendReport();
void OnReceivedNack(
const std::vector<uint16_t>& nack_sequence_numbers) override;
void OnReceivedRtcpReportBlocks(
const ReportBlockList& report_blocks) override;
void OnRequestSendReport() override;
protected:
bool UpdateRTCPReceiveInformationTimers();