Chromium Code Reviews| Index: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc |
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc |
| index 15fb3255757cb362a4b958623052bb6a58eaef97..2134e08eb2c6b25e130a9a5c472aa9e9d77afb00 100644 |
| --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc |
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc |
| @@ -229,6 +229,10 @@ void ModuleRtpRtcpImpl::SetRtxSendPayloadType(int payload_type, |
| rtp_sender_.SetRtxPayloadType(payload_type, associated_payload_type); |
| } |
| +rtc::Optional<uint32_t> ModuleRtpRtcpImpl::FlexfecSsrc() const { |
| + return rtp_sender_.FlexfecSsrc(); |
| +} |
| + |
| int32_t ModuleRtpRtcpImpl::IncomingRtcpPacket( |
| const uint8_t* rtcp_packet, |
| const size_t length) { |
| @@ -400,12 +404,11 @@ bool ModuleRtpRtcpImpl::TimeToSendPacket(uint32_t ssrc, |
| int64_t capture_time_ms, |
| bool retransmission, |
| int probe_cluster_id) { |
| - if (SendingMedia() && ssrc == rtp_sender_.SSRC()) { |
| - return rtp_sender_.TimeToSendPacket(sequence_number, capture_time_ms, |
| - retransmission, probe_cluster_id); |
| + if (!SendingMedia()) { |
|
brandtr
2016/11/11 10:28:16
Moved SSRC check to RTPSender.
danilchap
2016/11/11 15:26:06
yep, it nicer that way.
may be move !SendingMedia
brandtr
2016/11/14 09:48:08
Done.
|
| + return true; |
| } |
| - // No RTP sender is interested in sending this packet. |
| - return true; |
| + return rtp_sender_.TimeToSendPacket(ssrc, sequence_number, capture_time_ms, |
| + retransmission, probe_cluster_id); |
| } |
| size_t ModuleRtpRtcpImpl::TimeToSendPadding(size_t bytes, |