Now run EndToEndTest with the WebRTC-NewVideoJitterBuffer experiment.

webrtc/modules/video_coding/frame_buffer2.h

Index: webrtc/modules/video_coding/frame_buffer2.h
diff --git a/webrtc/modules/video_coding/frame_buffer2.h b/webrtc/modules/video_coding/frame_buffer2.h
index 8f726d0d869dee1856bb6d2e924c0c6b534ddde2..5f03129b10dae6f3cad0ee97d247bc3d41bfbbd0 100644
--- a/webrtc/modules/video_coding/frame_buffer2.h
+++ b/webrtc/modules/video_coding/frame_buffer2.h
@@ -41,6 +41,8 @@ class FrameBuffer {
               VCMJitterEstimator* jitter_estimator,
               VCMTiming* timing);
 
+  ~FrameBuffer();

[sprang_webrtc, 2016/11/21 16:49:14]

I'd prefer a virtual dtor

[philipel, 2016/11/22 14:56:23]

Why?

[sprang_webrtc, 2016/11/28 13:40:44]

Usually good practice, just in case someone subclasses this and has scoped_ptr
to it. Can get strangeness deluxe without it and should incur minimal overhead.

+
   // Insert a frame into the frame buffer. Returns the picture id
   // of the last continuous frame or -1 if there is no continuous frame.
   int InsertFrame(std::unique_ptr<FrameObject> frame);
@@ -137,6 +139,8 @@ class FrameBuffer {
                                         FrameMap::iterator info)
       EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
+  void UpdateHistograms() const;
+
   FrameMap frames_ GUARDED_BY(crit_);
 
   rtc::CriticalSection crit_;
@@ -151,6 +155,8 @@ class FrameBuffer {
   int num_frames_buffered_ GUARDED_BY(crit_);
   bool stopped_ GUARDED_BY(crit_);
   VCMVideoProtection protection_mode_ GUARDED_BY(crit_);
+  int num_total_frames_ GUARDED_BY(crit_);
+  int num_key_frames_ GUARDED_BY(crit_);
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBuffer);
 };