From d56ef8085718e15c497b0d9c60baa1a4640420fa Mon Sep 17 00:00:00 2001 From: "henrik.lundin" Date: Mon, 4 Sep 2017 09:02:15 -0700 Subject: [PATCH] RtpToNtpEstimator:: Add a DCHECK to avoid div-by-0 The division that follows the added DCHECK should not be div-by-0, since when params_.calculated is true, params_.frequency_khz would have been updated (with something non-zero). BUG=none Review-Url: https://codereview.webrtc.org/3006003002 Cr-Commit-Position: refs/heads/master@{#19671} --- webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc b/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc index d65bf98207..422759939a 100644 --- a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc +++ b/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc @@ -10,6 +10,7 @@ #include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h" +#include "webrtc/rtc_base/checks.h" #include "webrtc/rtc_base/logging.h" #include "webrtc/system_wrappers/include/clock.h" @@ -162,6 +163,9 @@ bool RtpToNtpEstimator::Estimate(int64_t rtp_timestamp, return false; } + // params_.calculated should not be true unless params_.frequency_khz has been + // set to something non-zero. + RTC_DCHECK_NE(params_.frequency_khz, 0.0); double rtp_ms = (static_cast(rtp_timestamp_unwrapped) - params_.offset_ms) / params_.frequency_khz +