commit e525d6aba634b8442a0b9c247a89a6060d225ca3
author stefan <stefan@webrtc.org> Wed Feb 08 05:25:42 2017 -0800
committer Commit bot <commit-bot@chromium.org> Wed Feb 08 13:25:42 2017 +0000
tree 9a69a393b95add39d977722c45c592eb9aac34d5
parent 498ee8e816a9f900f0904319d899cecde8d62b14

Revert Make the new jitter buffer the default jitter buffer.

Speculative revert of https://codereview.chromium.org/2656983002/ to see if it fixes a downstream bug.

BUG=webrtc:5514

Review-Url: https://codereview.webrtc.org/2682073003
Cr-Commit-Position: refs/heads/master@{#16492}

webrtc/modules/video_coding/timing.h

diff --git a/webrtc/modules/video_coding/timing.h b/webrtc/modules/video_coding/timing.h
index 429c282..e7d2b1f 100644
--- a/webrtc/modules/video_coding/timing.h
+++ b/webrtc/modules/video_coding/timing.h
@@ -94,13 +94,13 @@
 
   // Return current timing information. Returns true if the first frame has been
   // decoded, false otherwise.
-  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;
+  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 };