Let ViEEncoder handle resolution changes.

webrtc/video/send_statistics_proxy.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 321 matching lines @@
       if (rtp_config.fec.red_payload_type != -1) {
         RTC_HISTOGRAMS_COUNTS_10000(kIndex,
                                     uma_prefix_ + "FecBitrateSentInKbps",
                                     static_cast<int>(rtp_rtx.fec.TotalBytes() *
                                                      8 / elapsed_sec / 1000));
       }
     }
   }
 }
 
-void SendStatisticsProxy::SetContentType(
-    VideoEncoderConfig::ContentType content_type) {
+// --TODO(perkj) test now!!!!
+void SendStatisticsProxy::OnEncoderReconfigured(
+    const VideoEncoderConfig& config,
+    const std::vector<VideoStream>& streams) {
+  int preferred_bitrate_bps = 0;
+  for (size_t i = 0; i < streams.size(); ++i) {
+    if (i == streams.size() - 1) {
+      preferred_bitrate_bps += streams[i].max_bitrate_bps;
+    } else {
+      preferred_bitrate_bps += streams[i].target_bitrate_bps;
+    }
+  }

[sprang_webrtc, 2016/09/22 13:06:16]

This seems a bit roundabout.. If "preferred" target bitrate is a concept we want
to propagate around, maybe we can put that calculation in a better place and
just propagate the value here. Why do it via stats? Do we want it as actual
stats or was it just a shortcut in order to propagate it up to
WebrtcVideoSendStream?

[perkj_webrtc, 2016/09/26 12:09:42]

This is a stat in WebrtcVideoSendStream and and it seems to be used by   at
least one wellknown product. So this moved the calculation from
WebrtcVideoSendStream::GetStats since it could no longer be calculated there.

I don't understand why preffered_bitrate != sum(stream.max_bitrate).

[sprang_webrtc, 2016/09/26 13:47:37]

As discussed offline, move to vie encoder and use rate allocator to calculate
the target value instead.

+
   rtc::CritScope lock(&crit_);
-  if (content_type_ != content_type) {
+  stats_.preffered_media_bitrate_bps = preferred_bitrate_bps;
+
+  if (content_type_ != config.content_type) {
     uma_container_->UpdateHistograms(rtp_config_, stats_);
-    uma_container_.reset(
-        new UmaSamplesContainer(GetUmaPrefix(content_type), stats_, clock_));
-    content_type_ = content_type;
+    uma_container_.reset(new UmaSamplesContainer(
+        GetUmaPrefix(config.content_type), stats_, clock_));
+    content_type_ = config.content_type;
   }
 }
 
 void SendStatisticsProxy::OnEncoderStatsUpdate(uint32_t framerate,
                                                uint32_t bitrate) {
   rtc::CritScope lock(&crit_);
   stats_.encode_frame_rate = framerate;
   stats_.media_bitrate_bps = bitrate;
 }
 
@@ skipping 281 matching lines @@
   return Fraction(min_required_samples, 1000.0f);
 }
 
 int SendStatisticsProxy::BoolSampleCounter::Fraction(
     int min_required_samples, float multiplier) const {
   if (num_samples < min_required_samples || num_samples == 0)
     return -1;
   return static_cast<int>((sum * multiplier / num_samples) + 0.5f);
 }
 }  // namespace webrtc