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

webrtc/modules/video_coding/timing.h

 /*
  *  Copyright (c) 2011 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 76 matching lines @@
   // Returns the current target delay which is required delay + decode time +
   // render delay.
   int TargetVideoDelay() const;
 
   // Calculates whether or not there is enough time to decode a frame given a
   // certain amount of processing time.
   bool EnoughTimeToDecode(uint32_t available_processing_time_ms) const;
 
   // Return current timing information. Returns true if the first frame has been
   // decoded, false otherwise.
-  bool GetTimings(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) const;
+  virtual bool GetTimings(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) const;
 
   enum { kDefaultRenderDelayMs = 10 };
   enum { kDelayMaxChangeMsPerS = 100 };
 
  protected:
   int RequiredDecodeTimeMs() const EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
   int64_t RenderTimeMsInternal(uint32_t frame_timestamp, int64_t now_ms) const
       EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
   int TargetDelayInternal() const EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
 
@@ skipping 20 matching lines @@
 
   // Statistics.
   size_t num_decoded_frames_ GUARDED_BY(crit_sect_);
   size_t num_delayed_decoded_frames_ GUARDED_BY(crit_sect_);
   int64_t first_decoded_frame_ms_ GUARDED_BY(crit_sect_);
   uint64_t sum_missed_render_deadline_ms_ GUARDED_BY(crit_sect_);
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_TIMING_H_