Revert Make the new jitter buffer the default jitter buffer.

webrtc/video/video_stream_decoder.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 94 matching lines @@
 void VideoStreamDecoder::OnFrameCountsUpdated(const FrameCounts& frame_counts) {
   receive_stats_callback_->OnFrameCountsUpdated(frame_counts);
 }
 
 void VideoStreamDecoder::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) {}
+                                         int render_delay_ms) {
+  int last_rtt = -1;
+  {
+    rtc::CritScope lock(&crit_);
+    last_rtt = last_rtt_ms_;
+  }
 
-void VideoStreamDecoder::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) {}
-
-void VideoStreamDecoder::OnCompleteFrame(bool is_keyframe, size_t size_bytes) {}
+  receive_stats_callback_->OnDecoderTiming(
+      decode_ms, max_decode_ms, current_delay_ms, target_delay_ms,
+      jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt);
+}
 
 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) {
   video_receiver_->SetReceiveChannelParameters(max_rtt_ms);
 
   rtc::CritScope lock(&crit_);
   last_rtt_ms_ = avg_rtt_ms;
 }
 }  // namespace webrtc