Fix incorrect InterframeDelayMaxInMs histogram metrics

webrtc/video/receive_statistics_proxy.cc

Index: webrtc/video/receive_statistics_proxy.cc
diff --git a/webrtc/video/receive_statistics_proxy.cc b/webrtc/video/receive_statistics_proxy.cc
index 4673707cd95b10654f3f344bccebc9098c3bf122..7852a059134c47e17a198612385afd0ed35d2fa2 100644
--- a/webrtc/video/receive_statistics_proxy.cc
+++ b/webrtc/video/receive_statistics_proxy.cc
@@ -216,6 +216,11 @@ void ReceiveStatisticsProxy::UpdateHistograms() {
   if (interframe_delay_ms_screenshare != -1) {
     RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.Screenshare.InterframeDelayInMs",
                                interframe_delay_ms_screenshare);
+    RTC_DCHECK_GE(interframe_delay_max_ms_screenshare_,
+                  interframe_delay_ms_screenshare);
+    RTC_HISTOGRAM_COUNTS_10000(
+        "WebRTC.Video.Screenshare.InterframeDelayMaxInMs",
+        interframe_delay_max_ms_screenshare_);
   }
 
   int interframe_delay_ms_video =
@@ -223,24 +228,11 @@ void ReceiveStatisticsProxy::UpdateHistograms() {
   if (interframe_delay_ms_video != -1) {
     RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.InterframeDelayInMs",
                                interframe_delay_ms_video);
+    RTC_DCHECK_GE(interframe_delay_max_ms_video_, interframe_delay_ms_video);
+    RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.InterframeDelayMaxInMs",
+                               interframe_delay_max_ms_video_);
   }
 
-  int interframe_delay_max_ms_screenshare =
-      interframe_delay_max_ms_screenshare_;
-  if (interframe_delay_max_ms_screenshare != -1) {
-    RTC_HISTOGRAM_COUNTS_10000(
-        "WebRTC.Video.Screenshare.InterframeDelayMaxInMs",
-        interframe_delay_ms_screenshare);
-  }
-
-  int interframe_delay_max_ms_video = interframe_delay_max_ms_video_;
-  if (interframe_delay_max_ms_video != -1) {
-    RTC_HISTOGRAM_COUNTS_10000(
-        "WebRTC.Video.InterframeDelayMaxInMs",
-        interframe_delay_ms_video);
-  }
-
-
   StreamDataCounters rtp = stats_.rtp_stats;
   StreamDataCounters rtx;
   for (auto it : rtx_stats_)