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

Let FlexfecReceiveStreamImpl send RTCP RRs.

Browse Source 
This CL adds an RTP module to FlexfecReceiveStreamImpl, and wires it up
to send RTCP RRs. It further makes some methods take const refs instead
of values, to make it more clear where packet copies are made. This
change reduces the number of copies by one, for the case when media
packets are added to the FlexFEC receiver.

The end-to-end test is modified to check for RTCP RRs being sent.
Part of this modification involves some indentation changes, and the
diff thus looks bigger than it logically is.

BUG=webrtc:5654

Review-Url: https://codereview.webrtc.org/2625633003
Cr-Commit-Position: refs/heads/master@{#16106}
This commit is contained in:
brandtr
2017-01-17 01:33:54 -08:00
committed by Commit bot
parent 9506e12eba
commit fa5a368b3c
11 changed files with 215 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
webrtc/call/flexfec_receive_stream_impl.h
View File

@ -12,25 +12,31 @@
#define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_IMPL_H_
#include <memory>
#include <string>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/call/flexfec_receive_stream.h"
#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
namespace webrtc {
class FlexfecReceiver;
class ProcessThread;
class ReceiveStatistics;
class RecoveredPacketReceiver;
class RtcpRttStats;
class RtpPacketReceived;
class RtpRtcp;
class FlexfecReceiveStreamImpl : public FlexfecReceiveStream {
public:
FlexfecReceiveStreamImpl(const Config& config,
RecoveredPacketReceiver* recovered_packet_receiver);
RecoveredPacketReceiver* recovered_packet_receiver,
RtcpRttStats* rtt_stats,
ProcessThread* process_thread);
~FlexfecReceiveStreamImpl() override;
const Config& GetConfig() const { return config_; }
bool AddAndProcessReceivedPacket(RtpPacketReceived packet);
bool AddAndProcessReceivedPacket(const RtpPacketReceived& packet);
// Implements FlexfecReceiveStream.
void Start() override;
@ -38,11 +44,18 @@ class FlexfecReceiveStreamImpl : public FlexfecReceiveStream {
Stats GetStats() const override;
private:
rtc::CriticalSection crit_;
bool started_ GUARDED_BY(crit_);
// Config.
const Config config_;
bool started_ GUARDED_BY(crit_);
rtc::CriticalSection crit_;
// Erasure code interfacing.
const std::unique_ptr<FlexfecReceiver> receiver_;
// RTCP reporting.
const std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
const std::unique_ptr<RtpRtcp> rtp_rtcp_;
ProcessThread* process_thread_;
};
} // namespace webrtc