diff --git a/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/modules/remote_bitrate_estimator/remote_estimator_proxy.cc index 367260491f..01a23ba9b0 100644 --- a/modules/remote_bitrate_estimator/remote_estimator_proxy.cc +++ b/modules/remote_bitrate_estimator/remote_estimator_proxy.cc @@ -88,28 +88,31 @@ void RemoteEstimatorProxy::IncomingPacket(const RtpPacketReceived& packet) { RTC_LOG(LS_WARNING) << "Arrival time not set."; return; } - MutexLock lock(&lock_); - send_periodic_feedback_ = packet.HasExtension(); Packet internal_packet = {.arrival_time = packet.arrival_time(), .size = DataSize::Bytes(packet.size()), .ssrc = packet.Ssrc()}; uint16_t seqnum; - absl::optional feedback_request; - if (!packet.GetExtension(&seqnum)) { - if (!packet.GetExtension(&seqnum, - &feedback_request)) { - RTC_DCHECK_NOTREACHED() << " Expected transport sequence number."; - return; - } + if (packet.GetExtension(&seqnum) || + packet.GetExtension( + &seqnum, &internal_packet.feedback_request)) { + internal_packet.transport_sequence_number = seqnum; + } else { + // This function expected to be called only for packets that have + // TransportSequenceNumber rtp header extension, however malformed RTP + // packet may contain unparsable TransportSequenceNumber. + RTC_DCHECK(packet.HasExtension() || + packet.HasExtension()) + << " Expected transport sequence number."; + return; } - internal_packet.transport_sequence_number = seqnum; - internal_packet.feedback_request = feedback_request; - uint32_t send_time_24_bits; - if (packet.GetExtension(&send_time_24_bits)) { - internal_packet.absolute_send_time_24bits = send_time_24_bits; - } + internal_packet.absolute_send_time_24bits = + packet.GetExtension(); + + MutexLock lock(&lock_); + send_periodic_feedback_ = packet.HasExtension(); + IncomingPacket(internal_packet); }