| commit | 159a2fe9da7194492d688f6b46f6e665821ddb8a | [log] [tgz] |
|---|---|---|
| author | stefan <stefan@webrtc.org> | Mon Jul 18 11:14:11 2016 |
| committer | Commit bot <commit-bot@chromium.org> | Mon Jul 18 11:14:18 2016 |
| tree | a59b757586f5c60adca3ac09c98de5a6c5f21fbb | |
| parent | 433ed0680083d4f5315f5ec5e8122ef34901519a [diff] [blame] |
Fix crash which happens when there's reordering in the beginning of a call. The added unittest triggers this CHECK: https://chromium.googlesource.com/external/webrtc/+/433ed0680083d4f5315f5ec5e8122ef34901519a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc#146 It happens because the unwrap of the sequence number fails if the unwrappers last sequence number is small, but the newly added sequence number is large (greater than last seq num + 2^15), and therefore should have been interpreted as a reordering and a backwards wrap. Since that would mean the sequence number returned from the unwrapper would be negative, it simply returns the original sequence number instead. This causes problems later where the wrap is correctly handled, and everything breaks. The real solution should be to correctly handle wraps, but to prevent the crash this is a reasonable workaround for now. BUG= Review-Url: https://codereview.webrtc.org/2157843002 Cr-Commit-Position: refs/heads/master@{#13496}
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h index 66373e2..1278863 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h
@@ -54,7 +54,7 @@ private: void OnPacketArrival(uint16_t sequence_number, int64_t arrival_time) EXCLUSIVE_LOCKS_REQUIRED(&lock_); - bool BuildFeedbackPacket(rtcp::TransportFeedback* feedback_packetket); + bool BuildFeedbackPacket(rtcp::TransportFeedback* feedback_packet); Clock* const clock_; PacketRouter* const packet_router_;