commit 0ad0de6ef00a50a193da3238d4d0e9feef8d46a2
author sprang <sprang@webrtc.org> Wed Jan 11 13:01:32 2017
committer Commit bot <commit-bot@chromium.org> Wed Jan 11 13:01:32 2017
tree 5c4453ae36069685ede5756345145eb0580542cd
parent bb377517cdccf2d6f4d00a11a20827dc459d326b

Rename incoming_framerate_ to capture_framerate_ in screenshare_layers.

Avoids confusion about the meaning of "incoming".

BUG=webrtc:6897

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

webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc

diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc
index e99deed..feb8da9 100644
--- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc
@@ -155,8 +155,7 @@
 
   int64_t ts_diff;
   if (last_timestamp_ == -1) {
-    ts_diff =
-        kOneSecond90Khz / incoming_framerate_.value_or(*target_framerate_);
+    ts_diff = kOneSecond90Khz / capture_framerate_.value_or(*target_framerate_);
   } else {
     ts_diff = unwrapped_timestamp - last_timestamp_;
   }
@@ -175,18 +174,18 @@
     // First OnRatesUpdated() is called during construction, with the configured
     // targets as parameters.
     target_framerate_.emplace(framerate);
-    incoming_framerate_ = target_framerate_;
+    capture_framerate_ = target_framerate_;
     bitrate_updated_ = true;
   } else {
     bitrate_updated_ =
         bitrate_kbps != static_cast<int>(layers_[0].target_rate_kbps_) ||
         max_bitrate_kbps != static_cast<int>(layers_[1].target_rate_kbps_) ||
-        (incoming_framerate_ &&
-         framerate != static_cast<int>(*incoming_framerate_));
+        (capture_framerate_ &&
+         framerate != static_cast<int>(*capture_framerate_));
     if (framerate < 0) {
-      incoming_framerate_.reset();
+      capture_framerate_.reset();
     } else {
-      incoming_framerate_.emplace(framerate);
+      capture_framerate_.emplace(framerate);
     }
   }
 
@@ -327,9 +326,9 @@
       layers_[1].enhanced_max_qp = min_qp_ + (((max_qp_ - min_qp_) * 85) / 100);
     }
 
-    if (incoming_framerate_) {
+    if (capture_framerate_) {
       int avg_frame_size =
-          (target_bitrate_kbps * 1000) / (8 * *incoming_framerate_);
+          (target_bitrate_kbps * 1000) / (8 * *capture_framerate_);
       max_debt_bytes_ = 4 * avg_frame_size;
     }
 

webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h

diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h
index c718060..de7665c 100644
--- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h
+++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h
@@ -79,7 +79,7 @@
   // Configured max framerate.
   rtc::Optional<uint32_t> target_framerate_;
   // Incoming framerate from capturer.
-  rtc::Optional<uint32_t> incoming_framerate_;
+  rtc::Optional<uint32_t> capture_framerate_;
   // Tracks what framerate we actually encode, and drops frames on overshoot.
   RateStatistics encode_framerate_;
   bool bitrate_updated_;