1 files changed, 2 insertions, 34 deletions
diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index fc8712e5..4ff81a18 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -29,40 +29,6 @@ FakeEncoder::FakeEncoder(Clock* clock)
 
 FakeEncoder::~FakeEncoder() {}
 
-void FakeEncoder::SetCodecSettings(VideoCodec* codec,
-                                   size_t num_streams) {
-  assert(num_streams > 0);
-  assert(num_streams <= kMaxSimulcastStreams);
-
-  static const SimulcastStream stream_settings[] = {
-      {320, 180, 0, 150, 150, 50, codec->qpMax},
-      {640, 360, 0, 500, 500, 150, codec->qpMax},
-      {1280, 720, 0, 1200, 1200, 600, codec->qpMax}};
-  // Add more streams to the settings above with reasonable values if required.
-  assert(num_streams <= sizeof(stream_settings) / sizeof(stream_settings[0]));
-
-  codec->numberOfSimulcastStreams = static_cast<unsigned char>(num_streams);
-
-  unsigned int sum_of_max_bitrates = 0;
-  for (size_t i = 0; i < num_streams; ++i) {
-    codec->simulcastStream[i] = stream_settings[i];
-    sum_of_max_bitrates += stream_settings[i].maxBitrate;
-  }
-
-  size_t last_stream = num_streams - 1;
-  codec->width = stream_settings[last_stream].width;
-  codec->height = stream_settings[last_stream].height;
-  // Start with the average for the middle stream's max/min settings.
-  codec->startBitrate = (stream_settings[last_stream / 2].maxBitrate +
-                         stream_settings[last_stream / 2].minBitrate) /
-                        2;
-  codec->minBitrate = stream_settings[0].minBitrate;
-  codec->maxBitrate = sum_of_max_bitrates;
-
-  codec->codecType = kVideoCodecGeneric;
-  strcpy(codec->plName, "FAKE");
-}
-
 void FakeEncoder::SetMaxBitrate(int max_kbps) {
   assert(max_kbps >= -1);  // max_kbps == -1 disables it.
   max_target_bitrate_kbps_ = max_kbps;
@@ -99,6 +65,7 @@ int32_t FakeEncoder::Encode(
     bits_available = max_bits;
   last_encode_time_ms_ = time_now_ms;
 
+  assert(config_.numberOfSimulcastStreams > 0);
   for (int i = 0; i < config_.numberOfSimulcastStreams; ++i) {
     CodecSpecificInfo specifics;
     memset(&specifics, 0, sizeof(specifics));
@@ -124,6 +91,7 @@ int32_t FakeEncoder::Encode(
       encoded._length = 0;
       encoded._frameType = kSkipFrame;
     }
+    assert(callback_ != NULL);
     if (callback_->Encoded(encoded, &specifics, NULL) != 0)
       return -1;