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

24
webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
View File

@ -20,23 +20,39 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
#include "webrtc/typedefs.h"
namespace webrtc {
class ModuleRtpRtcpImpl;
namespace rtcp {
class TmmbItem;
} // namespace rtcp
class RTCPReceiver {
public:
class ModuleRtpRtcp {
public:
virtual void SetTmmbn(std::vector<rtcp::TmmbItem> bounding_set) = 0;
virtual void OnRequestSendReport() = 0;
virtual void OnReceivedNack(
const std::vector<uint16_t>& nack_sequence_numbers) = 0;
virtual void OnReceivedRtcpReportBlocks(
const ReportBlockList& report_blocks) = 0;
protected:
virtual ~ModuleRtpRtcp() = default;
};
RTCPReceiver(Clock* clock,
bool receiver_only,
RtcpPacketTypeCounterObserver* packet_type_counter_observer,
RtcpBandwidthObserver* rtcp_bandwidth_observer,
RtcpIntraFrameObserver* rtcp_intra_frame_observer,
TransportFeedbackObserver* transport_feedback_observer,
ModuleRtpRtcpImpl* owner);
ModuleRtpRtcp* owner);
virtual ~RTCPReceiver();
bool IncomingPacket(const uint8_t* packet, size_t packet_size);
int64_t LastReceived();
int64_t LastReceivedReceiverReport() const;
@ -257,7 +273,7 @@ class RTCPReceiver {
Clock* const _clock;
const bool receiver_only_;
int64_t _lastReceived;
ModuleRtpRtcpImpl& _rtpRtcp;
ModuleRtpRtcp& _rtpRtcp;
rtc::CriticalSection _criticalSectionFeedbacks;
RtcpBandwidthObserver* const _cbRtcpBandwidthObserver;