Reland of Make RTX pt/apt reconfigurable by calling WebRtcVideoChannel2::SetRecvParameters.

webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc

 /*
  *  Copyright (c) 2016 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 109 matching lines @@
   if (config.rtp.rtcp_mode == RtcpMode::kCompound) {
     EXPECT_EQ(rtclog::VideoReceiveConfig::RTCP_COMPOUND,
               receiver_config.rtcp_mode());
   } else {
     EXPECT_EQ(rtclog::VideoReceiveConfig::RTCP_REDUCEDSIZE,
               receiver_config.rtcp_mode());
   }
   ASSERT_TRUE(receiver_config.has_remb());
   EXPECT_EQ(config.rtp.remb, receiver_config.remb());
   // Check RTX map.
-  ASSERT_EQ(static_cast<int>(config.rtp.rtx.size()),
+  ASSERT_EQ(static_cast<int>(config.rtp.rtx_payload_types.size()),
             receiver_config.rtx_map_size());
   for (const rtclog::RtxMap& rtx_map : receiver_config.rtx_map()) {
     ASSERT_TRUE(rtx_map.has_payload_type());
     ASSERT_TRUE(rtx_map.has_config());
-    EXPECT_EQ(1u, config.rtp.rtx.count(rtx_map.payload_type()));
+    EXPECT_EQ(1u, config.rtp.rtx_payload_types.count(rtx_map.payload_type()));
     const rtclog::RtxConfig& rtx_config = rtx_map.config();
-    const VideoReceiveStream::Config::Rtp::Rtx& rtx =
-        config.rtp.rtx.at(rtx_map.payload_type());
     ASSERT_TRUE(rtx_config.has_rtx_ssrc());
     ASSERT_TRUE(rtx_config.has_rtx_payload_type());
-    EXPECT_EQ(rtx.ssrc, rtx_config.rtx_ssrc());
-    EXPECT_EQ(rtx.payload_type, rtx_config.rtx_payload_type());
+    EXPECT_EQ(config.rtp.rtx_ssrc, rtx_config.rtx_ssrc());
+    EXPECT_EQ(config.rtp.rtx_payload_types.at(rtx_map.payload_type()),
+              rtx_config.rtx_payload_type());
   }
   // Check header extensions.
   ASSERT_EQ(static_cast<int>(config.rtp.extensions.size()),
             receiver_config.header_extensions_size());
   for (int i = 0; i < receiver_config.header_extensions_size(); i++) {
     ASSERT_TRUE(receiver_config.header_extensions(i).has_name());
     ASSERT_TRUE(receiver_config.header_extensions(i).has_id());
     const std::string& name = receiver_config.header_extensions(i).name();
     int id = receiver_config.header_extensions(i).id();
     EXPECT_EQ(config.rtp.extensions[i].id, id);
@@ skipping 13 matching lines @@
 
   // Check consistency of the parser.
   VideoReceiveStream::Config parsed_config(nullptr);
   parsed_log.GetVideoReceiveConfig(index, &parsed_config);
   EXPECT_EQ(config.rtp.remote_ssrc, parsed_config.rtp.remote_ssrc);
   EXPECT_EQ(config.rtp.local_ssrc, parsed_config.rtp.local_ssrc);
   // Check RTCP settings.
   EXPECT_EQ(config.rtp.rtcp_mode, parsed_config.rtp.rtcp_mode);
   EXPECT_EQ(config.rtp.remb, parsed_config.rtp.remb);
   // Check RTX map.
-  EXPECT_EQ(config.rtp.rtx.size(), parsed_config.rtp.rtx.size());
-  for (const auto& kv : config.rtp.rtx) {
-    auto parsed_kv = parsed_config.rtp.rtx.find(kv.first);
+  EXPECT_EQ(config.rtp.rtx_ssrc, parsed_config.rtp.rtx_ssrc);
+  EXPECT_EQ(config.rtp.rtx_payload_types.size(),
+            parsed_config.rtp.rtx_payload_types.size());
+  for (const auto& kv : config.rtp.rtx_payload_types) {
+    auto parsed_kv = parsed_config.rtp.rtx_payload_types.find(kv.first);
     EXPECT_EQ(kv.first, parsed_kv->first);
-    EXPECT_EQ(kv.second.ssrc, parsed_kv->second.ssrc);
-    EXPECT_EQ(kv.second.payload_type, parsed_kv->second.payload_type);
+    EXPECT_EQ(kv.second, parsed_kv->second);
   }
   // Check header extensions.
   EXPECT_EQ(config.rtp.extensions.size(), parsed_config.rtp.extensions.size());
   for (size_t i = 0; i < parsed_config.rtp.extensions.size(); i++) {
     EXPECT_EQ(config.rtp.extensions[i].uri,
               parsed_config.rtp.extensions[i].uri);
     EXPECT_EQ(config.rtp.extensions[i].id, parsed_config.rtp.extensions[i].id);
   }
   // Check decoders.
   EXPECT_EQ(config.decoders.size(), parsed_config.decoders.size());
@@ skipping 294 matching lines @@
 
 void RtcEventLogTestHelper::VerifyLogEndEvent(
     const ParsedRtcEventLog& parsed_log,
     size_t index) {
   const rtclog::Event& event = parsed_log.events_[index];
   ASSERT_TRUE(IsValidBasicEvent(event));
   EXPECT_EQ(rtclog::Event::LOG_END, event.type());
 }
 
 }  // namespace webrtc