commit e21be1db4c04d35f90a86ca2376862e58f026602
author philipel <philipel@webrtc.org> Mon Sep 25 06:37:12 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Mon Sep 25 13:37:12 2017 +0000
tree 79a4fa0877850fc537dad77bd400ba6bf3f93565
parent b0573bca16574fce918d47eada81fd5b7bc33f04

Reland of Fix the video buffer size should take rtt into consideration (patchset #2 id:160001 of https://codereview.chromium.org/3002033002/ )

Reason for revert:
Fixes has landed.

Original issue's description:
> Revert of Fix the video buffer size should take rtt into consideration (patchset #3 id:40001 of https://codereview.chromium.org/2980413002/ )
>
> Reason for revert:
> We are not certain this is the behavior we want.
>
> Original issue's description:
> > Fix the video buffer size should take rtt into consideration
> >
> > BUG=webrtc:8010
> >
> > Review-Url: https://codereview.webrtc.org/2980413002
> > Cr-Commit-Position: refs/heads/master@{#19285}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/f1e08d0b5848d32fd31c5b6e4e570115c32b7ce5
>
> TBR=sprang@webrtc.org,gustavogb@gmail.com
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:8010
>
> Review-Url: https://codereview.webrtc.org/3002033002
> Cr-Commit-Position: refs/heads/master@{#19442}
> Committed: https://chromium.googlesource.com/external/webrtc/+/bdbc8895f3a630a4fe28d4661d8e71877ecaf14d

TBR=sprang@webrtc.org,gustavogb@gmail.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:8010

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

modules/video_coding/frame_buffer2.cc

diff --git a/modules/video_coding/frame_buffer2.cc b/modules/video_coding/frame_buffer2.cc
index 50c3763..b4bb002 100644
--- a/modules/video_coding/frame_buffer2.cc
+++ b/modules/video_coding/frame_buffer2.cc
@@ -147,6 +147,8 @@
         float rtt_mult = protection_mode_ == kProtectionNackFEC ? 0.0 : 1.0;
         timing_->SetJitterDelay(jitter_estimator_->GetJitterEstimate(rtt_mult));
         timing_->UpdateCurrentDelay(frame->RenderTime(), now_ms);
+      } else {
+        jitter_estimator_->FrameNacked();
       }
 
       // Gracefully handle bad RTP timestamps and render time issues.
@@ -247,6 +249,11 @@
   new_continuous_frame_event_.Set();
 }
 
+void FrameBuffer::UpdateRtt(int64_t rtt_ms) {
+  rtc::CritScope lock(&crit_);
+  jitter_estimator_->UpdateRtt(rtt_ms);
+}
+
 bool FrameBuffer::ValidReferences(const FrameObject& frame) const {
   if (frame.picture_id < 0)
     return false;

modules/video_coding/frame_buffer2.h

diff --git a/modules/video_coding/frame_buffer2.h b/modules/video_coding/frame_buffer2.h
index 32eba8a..e502666 100644
--- a/modules/video_coding/frame_buffer2.h
+++ b/modules/video_coding/frame_buffer2.h
@@ -74,6 +74,9 @@
   // return immediately.
   void Stop();
 
+  // Updates the RTT for jitter buffer estimation.
+  void UpdateRtt(int64_t rtt_ms);
+
  private:
   struct FrameKey {
     FrameKey() : picture_id(-1), spatial_layer(0) {}