commit a45102f7b4a8df1e56d1c42a15d30576614a7551
author philipel <philipel@webrtc.org> Wed Feb 22 13:30:39 2017
committer Commit bot <commit-bot@chromium.org> Wed Feb 22 13:30:39 2017
tree c95b4ad9b1418ae976d93e49f43a600a5cc64e38
parent 5650a7d1c41a264a0da15c3bb17d2c14335fcc27

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

Reason for revert:
Fix here: https://codereview.chromium.org/2708593003

Original issue's description:
> 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}
> Committed: https://chromium.googlesource.com/external/webrtc/+/e525d6aba634b8442a0b9c247a89a6060d225ca3

TBR=nisse@webrtc.org,stefan@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:5514

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

webrtc/modules/video_coding/timing.h

diff --git a/webrtc/modules/video_coding/timing.h b/webrtc/modules/video_coding/timing.h
index e7d2b1f..429c282 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.
-  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 };