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

Cleanup of deprecated RTPSender code

Browse Source 
Also reformats RtpRtcpImpl::RtpSender by removing _ suffixes from
struct members.

Bug: webrtc:11036
Change-Id: I52cdcdff0727b62673323f64a6dc37d56ba4efbc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158532
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29642}
This commit is contained in:
Erik Språng
2019-10-28 18:24:32 +01:00
committed by Commit Bot
parent cb30726646
commit 9cdc9cc1c4
4 changed files with 72 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -281,10 +281,10 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
bool UpdateRTCPReceiveInformationTimers();
RTPSender* rtp_sender() {
return rtp_sender_ ? &rtp_sender_->packet_generator_ : nullptr;
return rtp_sender_ ? &rtp_sender_->packet_generator : nullptr;
}
const RTPSender* rtp_sender() const {
return rtp_sender_ ? &rtp_sender_->packet_generator_ : nullptr;
return rtp_sender_ ? &rtp_sender_->packet_generator : nullptr;
}
RTCPSender* rtcp_sender() { return &rtcp_sender_; }
@ -305,14 +305,14 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
struct RtpSenderContext {
explicit RtpSenderContext(const RtpRtcp::Configuration& config);
// Storage of packets, for retransmissions and padding, if applicable.
RtpPacketHistory packet_history_;
RtpPacketHistory packet_history;
// Handles final time timestamping/stats/etc and handover to Transport.
RtpSenderEgress packet_sender_;
RtpSenderEgress packet_sender;
// If no paced sender configured, this class will be used to pass packets
// from |packet_generator_| to |packet_sender_|.
RtpSenderEgress::NonPacedPacketSender non_paced_sender_;
RtpSenderEgress::NonPacedPacketSender non_paced_sender;
// Handles creation of RTP packets to be sent.
RTPSender packet_generator_;
RTPSender packet_generator;
};
void set_rtt_ms(int64_t rtt_ms);