From 59b2d3ebe700fefff7f6928bad3faad8e34fa83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Tue, 26 Jan 2016 16:18:48 +0100 Subject: [PATCH] Remove zero-divide in VCMContentMetricsProcessing. Protects against zero-framerate in UpdateFrameRate. BUG=webrtc:5124 R=stefan@webrtc.org Review URL: https://codereview.webrtc.org/1636943003 . Cr-Commit-Position: refs/heads/master@{#11382} --- webrtc/modules/video_coding/content_metrics_processing.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webrtc/modules/video_coding/content_metrics_processing.cc b/webrtc/modules/video_coding/content_metrics_processing.cc index 0c3a6dbc6c..b2586fce3f 100644 --- a/webrtc/modules/video_coding/content_metrics_processing.cc +++ b/webrtc/modules/video_coding/content_metrics_processing.cc @@ -44,6 +44,8 @@ int VCMContentMetricsProcessing::Reset() { } void VCMContentMetricsProcessing::UpdateFrameRate(uint32_t frameRate) { + if (frameRate == 0) + frameRate = 1; // Update factor for recursive averaging. recursive_avg_factor_ = static_cast(1000.0f) / static_cast(frameRate * kQmMinIntervalMs);