diff options
| author | Erwin Jansen <jansene@google.com> | 2021-06-23 05:52:25 -0700 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2021-06-23 06:45:54 -0700 |
| commit | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /modules/congestion_controller/rtp/transport_feedback_demuxer.cc | |
| parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
| parent | 49cb4599560d6005d5df0dadfca2db04b288f216 (diff) | |
| download | webrtc-16be34ae72cdb525c88c2b31b21b976f35fe36d8.tar.gz | |
Merge upstream-master and enable ARM64
We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.
Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024
Diffstat (limited to 'modules/congestion_controller/rtp/transport_feedback_demuxer.cc')
| -rw-r--r-- | modules/congestion_controller/rtp/transport_feedback_demuxer.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/modules/congestion_controller/rtp/transport_feedback_demuxer.cc b/modules/congestion_controller/rtp/transport_feedback_demuxer.cc index c958a1c3cb..6ab3ad80fa 100644 --- a/modules/congestion_controller/rtp/transport_feedback_demuxer.cc +++ b/modules/congestion_controller/rtp/transport_feedback_demuxer.cc @@ -38,15 +38,16 @@ void TransportFeedbackDemuxer::DeRegisterStreamFeedbackObserver( void TransportFeedbackDemuxer::AddPacket(const RtpPacketSendInfo& packet_info) { MutexLock lock(&lock_); - if (packet_info.ssrc != 0) { - StreamFeedbackObserver::StreamPacketInfo info; - info.ssrc = packet_info.ssrc; - info.rtp_sequence_number = packet_info.rtp_sequence_number; - info.received = false; - history_.insert( - {seq_num_unwrapper_.Unwrap(packet_info.transport_sequence_number), - info}); - } + + StreamFeedbackObserver::StreamPacketInfo info; + info.ssrc = packet_info.media_ssrc; + info.rtp_sequence_number = packet_info.rtp_sequence_number; + info.received = false; + info.is_retransmission = + packet_info.packet_type == RtpPacketMediaType::kRetransmission; + history_.insert( + {seq_num_unwrapper_.Unwrap(packet_info.transport_sequence_number), info}); + while (history_.size() > kMaxPacketsInHistory) { history_.erase(history_.begin()); } |