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

Enabling rtcp-rsize negotiation and fixing some issues with it.

Browse Source 
Sending of reduced size RTCP packets should be enabled only if it's
enabled in the send parameters (which corresponds to the remote description).

Since the RTCPReceiver's RtcpMode isn't used at all, I removed it to ease
confusion.

BUG=webrtc:4868
R=pbos@webrtc.org, pthatcher@google.com, pthatcher@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1713493003 .

Cr-Commit-Position: refs/heads/master@{#12057}
This commit is contained in:
Taylor Brandstetter
2016-03-18 15:02:07 -07:00
parent 1300caa3fe
commit 5f0b83b7fb
9 changed files with 42 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
View File

@ -47,7 +47,6 @@ RTCPReceiver::RTCPReceiver(
: TMMBRHelp(),
_clock(clock),
receiver_only_(receiver_only),
_method(RtcpMode::kOff),
_lastReceived(0),
_rtpRtcp(*owner),
_criticalSectionFeedbacks(
@ -103,16 +102,6 @@ RTCPReceiver::~RTCPReceiver() {
}
}
RtcpMode RTCPReceiver::Status() const {
CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
return _method;
}
void RTCPReceiver::SetRTCPStatus(RtcpMode method) {
CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
_method = method;
}
int64_t RTCPReceiver::LastReceived() {
CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
return _lastReceived;

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

@ -38,9 +38,6 @@ public:
ModuleRtpRtcpImpl* owner);
virtual ~RTCPReceiver();
RtcpMode Status() const;
void SetRTCPStatus(RtcpMode method);
int64_t LastReceived();
int64_t LastReceivedReceiverReport() const;
@ -267,7 +264,6 @@ protected:
Clock* const _clock;
const bool receiver_only_;
RtcpMode _method;
int64_t _lastReceived;
ModuleRtpRtcpImpl& _rtpRtcp;

6
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -497,16 +497,12 @@ int32_t ModuleRtpRtcpImpl::SetMaxTransferUnit(const uint16_t mtu) {
}
RtcpMode ModuleRtpRtcpImpl::RTCP() const {
if (rtcp_sender_.Status() != RtcpMode::kOff) {
return rtcp_receiver_.Status();
}
return RtcpMode::kOff;
return rtcp_sender_.Status();
}
// Configure RTCP status i.e on/off.
void ModuleRtpRtcpImpl::SetRTCPStatus(const RtcpMode method) {
rtcp_sender_.SetRTCPStatus(method);
rtcp_receiver_.SetRTCPStatus(method);
}
int32_t ModuleRtpRtcpImpl::SetCNAME(const char* c_name) {