Revert Make the new jitter buffer the default jitter buffer.

webrtc/video/video_stream_decoder.h

 /*
  *  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 50 matching lines @@
   // Implements VCMReceiveCallback.
   int32_t FrameToRender(VideoFrame& video_frame) override;  // NOLINT
   int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
   void OnIncomingPayloadType(int payload_type) override;
   void OnDecoderImplementationName(const char* implementation_name) override;
 
   // Implements VCMReceiveStatisticsCallback.
   void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override;
   void OnDiscardedPacketsUpdated(int discarded_packets) override;
   void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
-  void OnCompleteFrame(bool is_keyframe, size_t size_bytes) override;
-  void 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) override;
 
   // Implements VCMDecoderTimingCallback.
   void 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) override;
 
@@ skipping 11 matching lines @@
 
   ReceiveStatisticsProxy* const receive_stats_callback_;
   rtc::VideoSinkInterface<VideoFrame>* const incoming_video_stream_;
 
   int64_t last_rtt_ms_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_