Revert of Make the new jitter buffer the default jitter buffer.

Revert of Make the new jitter buffer the default jitter buffer. (patchset #2 id:290001 of https://codereview.chromium.org/2652043005/ )

Reason for revert:
Breaks downstream bots

Original issue's description:
> Reland of Make the new jitter buffer the default jitter buffer. (patchset #1 id:1 of https://codereview.webrtc.org/2638423003/ )
> 
> Reason for revert:
> Bugfixes related to the new jitter buffer has landed.
> 
> Original issue's description:
> > Revert of Make the new jitter buffer the default jitter buffer. (patchset #2 id:230001 of https://codereview.webrtc.org/2642753002/ )
> > 
> > Reason for revert:
> > Breaks tests downstream.
> > 
> > Original issue's description:
> > > Reland of Make the new jitter buffer the default jitter buffer. (patchset #1 id:1 of https://codereview.chromium.org/2632123005/ )
> > > 
> > > Reason for revert:
> > > Fix in this CL: https://codereview.chromium.org/2640793003/
> > > 
> > > Original issue's description:
> > > > Revert of Make the new jitter buffer the default jitter buffer. (patchset #7 id:120001 of https://codereview.chromium.org/2627463004/ )
> > > > 
> > > > Reason for revert:
> > > > Breaks android bots.
> > > > 
> > > > Original issue's description:
> > > > > Make the new jitter buffer the default jitter buffer.
> > > > > 
> > > > > This CL contains only the changes necessary to make the switch to the new jitter
> > > > > buffer, clean up will be done in follow up CLs.
> > > > > 
> > > > > In this CL:
> > > > >  - Removed the WebRTC-NewVideoJitterBuffer experiment and made the
> > > > >    new video jitter buffer the default one.
> > > > >  - Moved WebRTC.Video.KeyFramesReceivedInPermille and
> > > > >    WebRTC.Video.JitterBufferDelayInMs to the ReceiveStatisticsProxy.
> > > > > 
> > > > > BUG=webrtc:5514
> > > > > 
> > > > > Review-Url: https://codereview.webrtc.org/2627463004
> > > > > Cr-Commit-Position: refs/heads/master@{#16114}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/0f0763d86d5d4e7f27e8dece02560e39c6da97d6
> > > > 
> > > > TBR=stefan@webrtc.org,terelius@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:5514
> > > > 
> > > > Review-Url: https://codereview.webrtc.org/2632123005
> > > > Cr-Commit-Position: refs/heads/master@{#16117}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/c08c191f7d206dc0de945185370d18f29d556931
> > > 
> > > TBR=stefan@webrtc.org,terelius@webrtc.org
> > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > BUG=webrtc:5514
> > > 
> > > Review-Url: https://codereview.webrtc.org/2642753002
> > > Cr-Commit-Position: refs/heads/master@{#16149}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/f20dd0014d1cfc8a2e859a9e177e7fe2b21274ca
> > 
> > TBR=stefan@webrtc.org,terelius@webrtc.org,philipel@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:5514
> > 
> > Review-Url: https://codereview.webrtc.org/2638423003
> > Cr-Commit-Position: refs/heads/master@{#16159}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/04926b82641c426d764aa6e013e133db519129db
> 
> TBR=stefan@webrtc.org,terelius@webrtc.org,kjellander@webrtc.org,kjellander@google.com
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:5514
> 
> Review-Url: https://codereview.webrtc.org/2652043005
> Cr-Commit-Position: refs/heads/master@{#16293}
> Committed: https://chromium.googlesource.com/external/webrtc/+/09d6ef00fc21b9f2c2c27e50e5e2952329ac4b4b

TBR=stefan@webrtc.org,terelius@webrtc.org,kjellander@webrtc.org,kjellander@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5514
Review-Url: https://codereview.webrtc.org/2656983002
Cr-Commit-Position: refs/heads/master@{#16316}
Committed: https://chromium.googlesource.com/external/webrtc/+/27378f39ced81acb1c2a61808e5e42fcf65d4b8d

[philipel, 2017-01-26 16:45:59]

The CQ bit was checked by philipel@webrtc.org

[philipel, 2017-01-26 16:45:59]

Created Revert of Make the new jitter buffer the default jitter buffer.

[commit-bot: I haz the power, 2017-01-26 16:46:08]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-26 16:46:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-26 16:46:15]

Failed to apply patch for webrtc/video/receive_statistics_proxy.cc:
While running git apply --index -p1;
  error: patch failed: webrtc/video/receive_statistics_proxy.cc:74
  error: webrtc/video/receive_statistics_proxy.cc: patch does not apply

Patch:       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
8ac2c43e9a220e0c814e9d8fcf12bc66c313909d..68050ba6a8a440dcc3eb31a4edf22127d99949c0
100644
--- a/webrtc/video/receive_statistics_proxy.cc
+++ b/webrtc/video/receive_statistics_proxy.cc
@@ -10,9 +10,7 @@
 
 #include "webrtc/video/receive_statistics_proxy.h"
 
-#include <algorithm>
 #include <cmath>
-#include <utility>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
@@ -42,9 +40,6 @@
 const int kHighQpThresholdVp8 = 70;
 const int kLowVarianceThreshold = 1;
 const int kHighVarianceThreshold = 2;
-
-// How large window we use to calculate the framerate/bitrate.
-const int kRateStatisticsWindowSizeMs = 1000;
 }  // namespace
 
 ReceiveStatisticsProxy::ReceiveStatisticsProxy(
@@ -74,9 +69,7 @@
       render_fps_tracker_(100, 10u),
       render_pixel_tracker_(100, 10u),
       freq_offset_counter_(clock, nullptr, kFreqOffsetProcessIntervalMs),
-      first_report_block_time_ms_(-1),
-      avg_rtt_ms_(0),
-      frame_window_accumulated_bytes_(0) {
+      first_report_block_time_ms_(-1) {
   stats_.ssrc = config_.rtp.remote_ssrc;
   for (auto it : config_.rtp.rtx)
     rtx_stats_[it.second.ssrc] = StreamDataCounters();
@@ -128,17 +121,6 @@
                  << freq_offset_stats.ToString();
   }
 
-  if (stats_.frame_counts.key_frames > 0 ||
-      stats_.frame_counts.delta_frames > 0) {
-    float num_key_frames = stats_.frame_counts.key_frames;
-    float num_total_frames =
-        stats_.frame_counts.key_frames + stats_.frame_counts.delta_frames;
-    int key_frames_permille =
-        (num_key_frames * 1000.0f / num_total_frames + 0.5f);
-    RTC_HISTOGRAM_COUNTS_1000("WebRTC.Video.KeyFramesReceivedInPermille",
-                              key_frames_permille);
-  }
-
   int qp = qp_counters_.vp8.Avg(kMinRequiredSamples);
   if (qp != -1)
     RTC_HISTOGRAM_COUNTS_200("WebRTC.Video.Decoded.Vp8.Qp", qp);
@@ -150,12 +132,15 @@
   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") !=
+        "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) {
     RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.TargetDelayInMs",
target_delay_ms);
@@ -312,25 +297,8 @@
   }
 }
 
-void ReceiveStatisticsProxy::UpdateFrameAndBitrate(int64_t now_ms) const {
-  int64_t old_frames_ms = now_ms - kRateStatisticsWindowSizeMs;
-  while (!frame_window_.empty() &&
-         frame_window_.begin()->first < old_frames_ms) {
-    frame_window_accumulated_bytes_ -= frame_window_.begin()->second;
-    frame_window_.erase(frame_window_.begin());
-  }
-
-  size_t framerate =
-      (frame_window_.size() * 1000 + 500) / kRateStatisticsWindowSizeMs;
-  size_t bitrate_bps =
-      frame_window_accumulated_bytes_ * 8000 / kRateStatisticsWindowSizeMs;
-  stats_.network_frame_rate = static_cast<int>(framerate);
-  stats_.total_bitrate_bps = static_cast<int>(bitrate_bps);
-}
-
 VideoReceiveStream::Stats ReceiveStatisticsProxy::GetStats() const {
   rtc::CritScope lock(&crit_);
-  UpdateFrameAndBitrate(clock_->TimeInMilliseconds());
   return stats_;
 }
 
@@ -349,16 +317,18 @@
   rtc::CritScope lock(&crit_);
   if (stats_.rtp_stats.first_packet_time_ms != -1)
     QualitySample();
-}
-
-void ReceiveStatisticsProxy::OnFrameBufferTimingsUpdated(
-    int decode_ms,
-    int max_decode_ms,
-    int current_delay_ms,
-    int target_delay_ms,
-    int jitter_buffer_ms,
-    int min_playout_delay_ms,
-    int render_delay_ms) {
+  stats_.network_frame_rate = framerate;
+  stats_.total_bitrate_bps = bitrate_bps;
+}
+
+void ReceiveStatisticsProxy::OnDecoderTiming(int decode_ms,
+                                             int max_decode_ms,
+                                             int current_delay_ms,
+                                             int target_delay_ms,
+                                             int jitter_buffer_ms,
+                                             int min_playout_delay_ms,
+                                             int render_delay_ms,
+                                             int64_t rtt_ms) {
   rtc::CritScope lock(&crit_);
   stats_.decode_ms = decode_ms;
   stats_.max_decode_ms = max_decode_ms;
@@ -373,7 +343,7 @@
   current_delay_counter_.Add(current_delay_ms);
   // Network delay (rtt/2) + target_delay_ms (jitter delay + decode time +
   // render delay).
-  delay_counter_.Add(target_delay_ms + avg_rtt_ms_ / 2);
+  delay_counter_.Add(target_delay_ms + rtt_ms / 2);
 }
 
 void ReceiveStatisticsProxy::RtcpPacketTypesCounterUpdated(
@@ -478,20 +448,6 @@
                                                    uint32_t frameRate) {
 }
 
-void ReceiveStatisticsProxy::OnCompleteFrame(bool is_keyframe,
-                                             size_t size_bytes) {
-  rtc::CritScope lock(&crit_);
-  if (is_keyframe)
-    ++stats_.frame_counts.key_frames;
-  else
-    ++stats_.frame_counts.delta_frames;
-
-  int64_t now_ms = clock_->TimeInMilliseconds();
-  frame_window_accumulated_bytes_ += size_bytes;
-  frame_window_.insert(std::make_pair(now_ms, size_bytes));
-  UpdateFrameAndBitrate(now_ms);
-}
-
 void ReceiveStatisticsProxy::OnFrameCountsUpdated(
     const FrameCounts& frame_counts) {
   rtc::CritScope lock(&crit_);
@@ -533,10 +489,4 @@
   sum = 0;
 }
 
-void ReceiveStatisticsProxy::OnRttUpdate(int64_t avg_rtt_ms,
-                                         int64_t max_rtt_ms) {
-  rtc::CritScope lock(&crit_);
-  avg_rtt_ms_ = avg_rtt_ms;
-}
-
 }  // namespace webrtc

[philipel, 2017-01-27 10:18:45]

The CQ bit was checked by philipel@webrtc.org

[commit-bot: I haz the power, 2017-01-27 10:18:57]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-27 10:19:10]

CQ is committing da patch.

Bot data: {"patchset_id": 260001, "attempt_start_ts": 1485512325503670,
"parent_rev": "54a05b20841b5bd06d221a769cd735b67f2c9e45", "commit_rev":
"27378f39ced81acb1c2a61808e5e42fcf65d4b8d"}

[commit-bot: I haz the power, 2017-01-27 10:19:14]

Description was changed from

==========
Revert of Make the new jitter buffer the default jitter buffer. (patchset #2
id:290001 of https://codereview.chromium.org/2652043005/ )

Reason for revert:
Breaks downstream bots

Original issue's description:
> Reland of Make the new jitter buffer the default jitter buffer. (patchset #1
id:1 of https://codereview.webrtc.org/2638423003/ )
> 
> Reason for revert:
> Bugfixes related to the new jitter buffer has landed.
> 
> Original issue's description:
> > Revert of Make the new jitter buffer the default jitter buffer. (patchset #2
id:230001 of https://codereview.webrtc.org/2642753002/ )
> > 
> > Reason for revert:
> > Breaks tests downstream.
> > 
> > Original issue's description:
> > > Reland of Make the new jitter buffer the default jitter buffer. (patchset
#1 id:1 of https://codereview.chromium.org/2632123005/ )
> > > 
> > > Reason for revert:
> > > Fix in this CL: https://codereview.chromium.org/2640793003/
> > > 
> > > Original issue's description:
> > > > Revert of Make the new jitter buffer the default jitter buffer.
(patchset #7 id:120001 of https://codereview.chromium.org/2627463004/ )
> > > > 
> > > > Reason for revert:
> > > > Breaks android bots.
> > > > 
> > > > Original issue's description:
> > > > > Make the new jitter buffer the default jitter buffer.
> > > > > 
> > > > > This CL contains only the changes necessary to make the switch to the
new jitter
> > > > > buffer, clean up will be done in follow up CLs.
> > > > > 
> > > > > In this CL:
> > > > >  - Removed the WebRTC-NewVideoJitterBuffer experiment and made the
> > > > >    new video jitter buffer the default one.
> > > > >  - Moved WebRTC.Video.KeyFramesReceivedInPermille and
> > > > >    WebRTC.Video.JitterBufferDelayInMs to the ReceiveStatisticsProxy.
> > > > > 
> > > > > BUG=webrtc:5514
> > > > > 
> > > > > Review-Url: https://codereview.webrtc.org/2627463004
> > > > > Cr-Commit-Position: refs/heads/master@{#16114}
> > > > > Committed:
https://chromium.googlesource.com/external/webrtc/+/0f0763d86d5d4e7f27e8dece0...
> > > > 
> > > > TBR=stefan@webrtc.org,terelius@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:5514
> > > > 
> > > > Review-Url: https://codereview.webrtc.org/2632123005
> > > > Cr-Commit-Position: refs/heads/master@{#16117}
> > > > Committed:
https://chromium.googlesource.com/external/webrtc/+/c08c191f7d206dc0de9451853...
> > > 
> > > TBR=stefan@webrtc.org,terelius@webrtc.org
> > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > BUG=webrtc:5514
> > > 
> > > Review-Url: https://codereview.webrtc.org/2642753002
> > > Cr-Commit-Position: refs/heads/master@{#16149}
> > > Committed:
https://chromium.googlesource.com/external/webrtc/+/f20dd0014d1cfc8a2e859a9e1...
> > 
> > TBR=stefan@webrtc.org,terelius@webrtc.org,philipel@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:5514
> > 
> > Review-Url: https://codereview.webrtc.org/2638423003
> > Cr-Commit-Position: refs/heads/master@{#16159}
> > Committed:
https://chromium.googlesource.com/external/webrtc/+/04926b82641c426d764aa6e01...
> 
>
TBR=stefan@webrtc.org,terelius@webrtc.org,kjellander@webrtc.org,kjellander@go...
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:5514
> 
> Review-Url: https://codereview.webrtc.org/2652043005
> Cr-Commit-Position: refs/heads/master@{#16293}
> Committed:
https://chromium.googlesource.com/external/webrtc/+/09d6ef00fc21b9f2c2c27e50e...

TBR=stefan@webrtc.org,terelius@webrtc.org,kjellander@webrtc.org,kjellander@go...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5514
==========

to

==========
Revert of Make the new jitter buffer the default jitter buffer. (patchset #2
id:290001 of https://codereview.chromium.org/2652043005/ )

Reason for revert:
Breaks downstream bots

Original issue's description:
> Reland of Make the new jitter buffer the default jitter buffer. (patchset #1
id:1 of https://codereview.webrtc.org/2638423003/ )
> 
> Reason for revert:
> Bugfixes related to the new jitter buffer has landed.
> 
> Original issue's description:
> > Revert of Make the new jitter buffer the default jitter buffer. (patchset #2
id:230001 of https://codereview.webrtc.org/2642753002/ )
> > 
> > Reason for revert:
> > Breaks tests downstream.
> > 
> > Original issue's description:
> > > Reland of Make the new jitter buffer the default jitter buffer. (patchset
#1 id:1 of https://codereview.chromium.org/2632123005/ )
> > > 
> > > Reason for revert:
> > > Fix in this CL: https://codereview.chromium.org/2640793003/
> > > 
> > > Original issue's description:
> > > > Revert of Make the new jitter buffer the default jitter buffer.
(patchset #7 id:120001 of https://codereview.chromium.org/2627463004/ )
> > > > 
> > > > Reason for revert:
> > > > Breaks android bots.
> > > > 
> > > > Original issue's description:
> > > > > Make the new jitter buffer the default jitter buffer.
> > > > > 
> > > > > This CL contains only the changes necessary to make the switch to the
new jitter
> > > > > buffer, clean up will be done in follow up CLs.
> > > > > 
> > > > > In this CL:
> > > > >  - Removed the WebRTC-NewVideoJitterBuffer experiment and made the
> > > > >    new video jitter buffer the default one.
> > > > >  - Moved WebRTC.Video.KeyFramesReceivedInPermille and
> > > > >    WebRTC.Video.JitterBufferDelayInMs to the ReceiveStatisticsProxy.
> > > > > 
> > > > > BUG=webrtc:5514
> > > > > 
> > > > > Review-Url: https://codereview.webrtc.org/2627463004
> > > > > Cr-Commit-Position: refs/heads/master@{#16114}
> > > > > Committed:
https://chromium.googlesource.com/external/webrtc/+/0f0763d86d5d4e7f27e8dece0...
> > > > 
> > > > TBR=stefan@webrtc.org,terelius@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:5514
> > > > 
> > > > Review-Url: https://codereview.webrtc.org/2632123005
> > > > Cr-Commit-Position: refs/heads/master@{#16117}
> > > > Committed:
https://chromium.googlesource.com/external/webrtc/+/c08c191f7d206dc0de9451853...
> > > 
> > > TBR=stefan@webrtc.org,terelius@webrtc.org
> > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > BUG=webrtc:5514
> > > 
> > > Review-Url: https://codereview.webrtc.org/2642753002
> > > Cr-Commit-Position: refs/heads/master@{#16149}
> > > Committed:
https://chromium.googlesource.com/external/webrtc/+/f20dd0014d1cfc8a2e859a9e1...
> > 
> > TBR=stefan@webrtc.org,terelius@webrtc.org,philipel@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:5514
> > 
> > Review-Url: https://codereview.webrtc.org/2638423003
> > Cr-Commit-Position: refs/heads/master@{#16159}
> > Committed:
https://chromium.googlesource.com/external/webrtc/+/04926b82641c426d764aa6e01...
> 
>
TBR=stefan@webrtc.org,terelius@webrtc.org,kjellander@webrtc.org,kjellander@go...
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:5514
> 
> Review-Url: https://codereview.webrtc.org/2652043005
> Cr-Commit-Position: refs/heads/master@{#16293}
> Committed:
https://chromium.googlesource.com/external/webrtc/+/09d6ef00fc21b9f2c2c27e50e...

TBR=stefan@webrtc.org,terelius@webrtc.org,kjellander@webrtc.org,kjellander@go...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5514

Review-Url: https://codereview.webrtc.org/2656983002
Cr-Commit-Position: refs/heads/master@{#16316}
Committed:
https://chromium.googlesource.com/external/webrtc/+/27378f39ced81acb1c2a61808...
==========

[commit-bot: I haz the power, 2017-01-27 10:19:15]

Committed patchset #2 (id:260001) as
https://chromium.googlesource.com/external/webrtc/+/27378f39ced81acb1c2a61808...

[philipel, 2017-02-02 16:26:37]

A revert of this CL (patchset #2 id:260001) has been created in
https://codereview.chromium.org/2670183002/ by philipel@webrtc.org.

The reason for reverting is: Incoming fix:
https://codereview.chromium.org/2675693002/.