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

Reland "Remove dead code from ModuleRtpRtcpImpl2"

Browse Source 
This reverts commit f8311a1aa2887a2f01751424b948a1c20088e773.

Reason for revert: Relanding with a different approach

Original change's description:
> Revert "Remove dead code from ModuleRtpRtcpImpl2"
> 
> This reverts commit 8d4d671e9be98a090921006cc988cc1fc4fe1947.
> 
> Reason for revert: Breaks wasm builds.
> 
> 
> 
> Original change's description:
> > Remove dead code from ModuleRtpRtcpImpl2
> > 
> > Bug: webrtc:11581
> > Change-Id: I70e1df2724801c1bc7fb5cfb52cb6d1d44920b0d
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176570
> > Commit-Queue: Tommi <tommi@webrtc.org>
> > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#31467}
> 
> TBR=tommi@webrtc.org,sprang@webrtc.org
> 
> Change-Id: I790374f7fa93147824e6fa2779a0bbaf5987924f
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:11581
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176746
> Reviewed-by: Tommi <tommi@webrtc.org>
> Commit-Queue: Tommi <tommi@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31468}

TBR=tommi@webrtc.org,sprang@webrtc.org

# Not skipping CQ checks because this is a reland.

Bug: webrtc:11581
Change-Id: I6086548f1c3527ee96ebd1c97be7a5be2a9a5429
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176748
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31475}
This commit is contained in:
Tomas Gunnarsson
2020-06-09 12:09:06 +02:00
committed by Commit Bot
parent 6434864c3f
commit dffa944e07
3 changed files with 9 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/rtp_rtcp/source/rtp_rtcp_impl2.h
View File

@ -261,28 +261,6 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface,
RTPSender* RtpSender() override;
const RTPSender* RtpSender() const override;
protected:
bool UpdateRTCPReceiveInformationTimers();
RTPSender* rtp_sender() {
return rtp_sender_ ? &rtp_sender_->packet_generator : nullptr;
}
const RTPSender* rtp_sender() const {
return rtp_sender_ ? &rtp_sender_->packet_generator : nullptr;
}
RTCPSender* rtcp_sender() { return &rtcp_sender_; }
const RTCPSender* rtcp_sender() const { return &rtcp_sender_; }
RTCPReceiver* rtcp_receiver() { return &rtcp_receiver_; }
const RTCPReceiver* rtcp_receiver() const { return &rtcp_receiver_; }
Clock* clock() const { return clock_; }
// TODO(sprang): Remove when usage is gone.
DataRate SendRate() const;
DataRate NackOverheadRate() const;
private:
FRIEND_TEST_ALL_PREFIXES(RtpRtcpImpl2Test, Rtt);
FRIEND_TEST_ALL_PREFIXES(RtpRtcpImpl2Test, RttForReceiverOnly);