Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/sender/fake_software_video_encoder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/sender/fake_software_video_encoder.h"
 
 #include <stddef.h>
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "media/base/video_frame.h"
 #include "media/cast/common/rtp_time.h"
 #include "media/cast/constants.h"
 
 #ifndef OFFICIAL_BUILD
 
 namespace media {
 namespace cast {
 
 FakeSoftwareVideoEncoder::FakeSoftwareVideoEncoder(
-    const VideoSenderConfig& video_config)
+    const FrameSenderConfig& video_config)
     : video_config_(video_config),
       next_frame_is_key_(true),
       frame_id_(FrameId::first()),
       frame_size_(0) {}
 
 FakeSoftwareVideoEncoder::~FakeSoftwareVideoEncoder() {}
 
 void FakeSoftwareVideoEncoder::Initialize() {}
 
 void FakeSoftwareVideoEncoder::Encode(
@@ skipping 33 matching lines @@
   if (encoded_frame->dependency == EncodedFrame::KEY) {
     encoded_frame->deadline_utilization = 1.0;
     encoded_frame->lossy_utilization = 6.0;
   } else {
     encoded_frame->deadline_utilization = 0.8;
     encoded_frame->lossy_utilization = 0.8;
   }
 }
 
 void FakeSoftwareVideoEncoder::UpdateRates(uint32_t new_bitrate) {
+  DCHECK_GT(video_config_.max_frame_rate, 0);

[miu, 2016/06/30 21:59:43]

Seems that this could be in the ctor (to just check once).

[xjz, 2016/07/01 23:52:09]

Done.

   frame_size_ = new_bitrate / video_config_.max_frame_rate / 8;
 }
 
 void FakeSoftwareVideoEncoder::GenerateKeyFrame() {
   next_frame_is_key_ = true;
 }
 
 }  // namespace cast
 }  // namespace media
 
 #endif