Let ViEEncoder handle resolution changes.

webrtc/media/engine/fakewebrtccall.cc

 /*
  *  Copyright (c) 2015 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 105 matching lines @@
 
 const webrtc::VideoSendStream::Config& FakeVideoSendStream::GetConfig() const {
   return config_;
 }
 
 const webrtc::VideoEncoderConfig& FakeVideoSendStream::GetEncoderConfig()
     const {
   return encoder_config_;
 }
 
-std::vector<webrtc::VideoStream> FakeVideoSendStream::GetVideoStreams() {
-  return encoder_config_.streams;
+const std::vector<webrtc::VideoStream>& FakeVideoSendStream::GetVideoStreams()
+    const {
+  return video_streams_;
 }
 
 bool FakeVideoSendStream::IsSending() const {
   return sending_;
 }
 
 bool FakeVideoSendStream::GetVp8Settings(
     webrtc::VideoCodecVP8* settings) const {
   if (!codec_settings_set_) {
     return false;
@@ skipping 25 matching lines @@
   return last_frame_.height();
 }
 
 int64_t FakeVideoSendStream::GetLastTimestamp() const {
   RTC_DCHECK(last_frame_.ntp_time_ms() == 0);
   return last_frame_.render_time_ms();
 }
 
 void FakeVideoSendStream::OnFrame(const webrtc::VideoFrame& frame) {
   ++num_swapped_frames_;
+  if (frame.width() != last_frame_.width() ||
+      frame.height() != last_frame_.height() ||
+      frame.rotation() != last_frame_.rotation()) {
+    video_streams_ =
+        encoder_config_.encoder_stream_factory->CreateEncoderStreams(
+            frame.width(), frame.height(), encoder_config_);
+  }
   last_frame_.ShallowCopy(frame);
 }
 
 void FakeVideoSendStream::SetStats(
     const webrtc::VideoSendStream::Stats& stats) {
   stats_ = stats;
 }
 
 webrtc::VideoSendStream::Stats FakeVideoSendStream::GetStats() {
   return stats_;
 }
 
 void FakeVideoSendStream::ReconfigureVideoEncoder(
     webrtc::VideoEncoderConfig config) {
+  video_streams_ = config.encoder_stream_factory->CreateEncoderStreams(
+      last_frame_.width(), last_frame_.height(), config);
+  encoder_config_ = std::move(config);
+  codec_settings_set_ = config.encoder_specific_settings != NULL;

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

nit: nullptr

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

Done.

+  ++num_encoder_reconfigurations_;
   if (config.encoder_specific_settings != NULL) {
     if (config_.encoder_settings.payload_name == "VP8") {
       vpx_settings_.vp8 = *reinterpret_cast<const webrtc::VideoCodecVP8*>(
                               config.encoder_specific_settings);
-      if (!config.streams.empty()) {
+      if (!video_streams_.empty()) {
         vpx_settings_.vp8.numberOfTemporalLayers = static_cast<unsigned char>(
-            config.streams.back().temporal_layer_thresholds_bps.size() + 1);
+            video_streams_.back().temporal_layer_thresholds_bps.size() + 1);
       }
     } else if (config_.encoder_settings.payload_name == "VP9") {
       vpx_settings_.vp9 = *reinterpret_cast<const webrtc::VideoCodecVP9*>(
-                              config.encoder_specific_settings);
-      if (!config.streams.empty()) {
+          config.encoder_specific_settings);
+      if (!video_streams_.empty()) {
         vpx_settings_.vp9.numberOfTemporalLayers = static_cast<unsigned char>(
-            config.streams.back().temporal_layer_thresholds_bps.size() + 1);
+            video_streams_.back().temporal_layer_thresholds_bps.size() + 1);
       }
     } else {
       ADD_FAILURE() << "Unsupported encoder payload: "
                     << config_.encoder_settings.payload_name;
     }
   }
-  encoder_config_ = std::move(config);
-  codec_settings_set_ = config.encoder_specific_settings != NULL;
-  ++num_encoder_reconfigurations_;
 }
 
 void FakeVideoSendStream::Start() {
   sending_ = true;
 }
 
 void FakeVideoSendStream::Stop() {
   sending_ = false;
 }
 
@@ skipping 271 matching lines @@
 }
 
 bool FakeCall::StartEventLog(rtc::PlatformFile log_file,
                              int64_t max_size_bytes) {
   return false;
 }
 
 void FakeCall::StopEventLog() {}
 
 }  // namespace cricket