Remove PayloadRouter dependency from ViEEncoder

webrtc/video/payload_router_unittest.cc

Index: webrtc/video/payload_router_unittest.cc
diff --git a/webrtc/video/payload_router_unittest.cc b/webrtc/video/payload_router_unittest.cc
index 41e173bf5fb930669be163d0749ea2d39717aeb6..f29a8c2da98f392c392d93826978087dbab23cc0 100644
--- a/webrtc/video/payload_router_unittest.cc
+++ b/webrtc/video/payload_router_unittest.cc
@@ -27,6 +27,8 @@ namespace webrtc {
 TEST(PayloadRouterTest, SendOnOneModule) {
   MockRtpRtcp rtp;
   std::vector<RtpRtcp*> modules(1, &rtp);
+  VideoCodec codec;
+  codec.numberOfSimulcastStreams = 1;
 
   uint8_t payload = 'a';
   int8_t payload_type = 96;
@@ -38,7 +40,7 @@ TEST(PayloadRouterTest, SendOnOneModule) {
   encoded_image._length = 1;
 
   PayloadRouter payload_router(modules, payload_type);
-  payload_router.SetSendingRtpModules(modules.size());
+  payload_router.SetSendCodec(codec);
 
   EXPECT_CALL(rtp, SendOutgoingData(encoded_image._frameType, payload_type,
                                     encoded_image._timeStamp,
@@ -71,7 +73,8 @@ TEST(PayloadRouterTest, SendOnOneModule) {
       .Times(1);
   EXPECT_EQ(0, payload_router.Encoded(encoded_image, nullptr, nullptr));
 
-  payload_router.SetSendingRtpModules(0);
+  codec.numberOfSimulcastStreams = 0;
+  payload_router.SetSendCodec(codec);
   EXPECT_CALL(rtp, SendOutgoingData(encoded_image._frameType, payload_type,
                                     encoded_image._timeStamp,
                                     encoded_image.capture_time_ms_, &payload,
@@ -86,6 +89,8 @@ TEST(PayloadRouterTest, SendSimulcast) {
   std::vector<RtpRtcp*> modules;
   modules.push_back(&rtp_1);
   modules.push_back(&rtp_2);
+  VideoCodec codec;
+  codec.numberOfSimulcastStreams = 2;
 
   int8_t payload_type = 96;
   uint8_t payload = 'a';
@@ -97,7 +102,7 @@ TEST(PayloadRouterTest, SendSimulcast) {
   encoded_image._length = 1;
 
   PayloadRouter payload_router(modules, payload_type);
-  payload_router.SetSendingRtpModules(modules.size());
+  payload_router.SetSendCodec(codec);
 
   CodecSpecificInfo codec_info_1;
   memset(&codec_info_1, 0, sizeof(CodecSpecificInfo));
@@ -138,7 +143,8 @@ TEST(PayloadRouterTest, SendSimulcast) {
   EXPECT_EQ(-1, payload_router.Encoded(encoded_image, &codec_info_2, nullptr));
 
   // Invalid simulcast index.
-  payload_router.SetSendingRtpModules(1);
+  codec.numberOfSimulcastStreams = 1;
+  payload_router.SetSendCodec(codec);
   payload_router.set_active(true);
   EXPECT_CALL(rtp_1, SendOutgoingData(_, _, _, _, _, _, _, _))
       .Times(0);
@@ -160,7 +166,9 @@ TEST(PayloadRouterTest, MaxPayloadLength) {
   PayloadRouter payload_router(modules, 42);
 
   EXPECT_EQ(kDefaultMaxLength, PayloadRouter::DefaultMaxPayloadLength());
-  payload_router.SetSendingRtpModules(modules.size());
+  VideoCodec codec;
+  codec.numberOfSimulcastStreams = 2;
+  payload_router.SetSendCodec(codec);
 
   // Modules return a higher length than the default value.
   EXPECT_CALL(rtp_1, MaxDataPayloadLength())
@@ -189,23 +197,18 @@ TEST(PayloadRouterTest, SetTargetSendBitrates) {
   modules.push_back(&rtp_1);
   modules.push_back(&rtp_2);
   PayloadRouter payload_router(modules, 42);
-  payload_router.SetSendingRtpModules(modules.size());
+  VideoCodec codec;
+  codec.numberOfSimulcastStreams = 2;
+  codec.simulcastStream[0].maxBitrate = 10;
+  codec.simulcastStream[1].maxBitrate = 100;
+  payload_router.SetSendCodec(codec);
 
   const uint32_t bitrate_1 = 10000;
   const uint32_t bitrate_2 = 76543;
-  std::vector<uint32_t> bitrates(2, bitrate_1);
-  bitrates[1] = bitrate_2;
   EXPECT_CALL(rtp_1, SetTargetSendBitrate(bitrate_1))
       .Times(1);
   EXPECT_CALL(rtp_2, SetTargetSendBitrate(bitrate_2))
       .Times(1);
-  payload_router.SetTargetSendBitrates(bitrates);
-
-  bitrates.resize(1);
-  EXPECT_CALL(rtp_1, SetTargetSendBitrate(bitrate_1))
-      .Times(1);
-  EXPECT_CALL(rtp_2, SetTargetSendBitrate(bitrate_2))
-      .Times(0);
-  payload_router.SetTargetSendBitrates(bitrates);
+  payload_router.SetTargetSendBitrate(bitrate_1 + bitrate_2);
 }
 }  // namespace webrtc