Calculate JitterBufferDelayInMs in the new jitter buffer.

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 b15ef682a1d587d46634e0a74ceb73fe9a533b67..fce1069a7904eded23131e25dce7e07b79b8ccbc 100644
--- a/webrtc/video/receive_statistics_proxy.cc
+++ b/webrtc/video/receive_statistics_proxy.cc
@@ -15,6 +15,7 @@
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 namespace webrtc {
@@ -92,10 +93,14 @@ void ReceiveStatisticsProxy::UpdateHistograms() {
   if (decode_ms != -1)
     RTC_HISTOGRAM_COUNTS_1000("WebRTC.Video.DecodeTimeInMs", decode_ms);
 
-  int jb_delay_ms = jitter_buffer_delay_counter_.Avg(kMinRequiredDecodeSamples);
-  if (jb_delay_ms != -1) {
-    RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.JitterBufferDelayInMs",
-                               jb_delay_ms);
+  if (!(field_trial::FindFullName("WebRTC-NewVideoJitterBuffer") ==

[terelius, 2016/11/29 12:09:15]

Shouldn't we add some corresponding metric if the new jitter buffer is used?
Maybe reduce the number of parenthesis by using "!=" instead?

[philipel, 2016/11/29 12:34:52]

See frame_buffer.cc:388.
Done :)

+        "Enabled")) {
+    int jb_delay_ms =
+        jitter_buffer_delay_counter_.Avg(kMinRequiredDecodeSamples);
+    if (jb_delay_ms != -1) {
+      RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.JitterBufferDelayInMs",
+                                 jb_delay_ms);
+    }
   }
   int target_delay_ms = target_delay_counter_.Avg(kMinRequiredDecodeSamples);
   if (target_delay_ms != -1) {