commit fbfb536ee94dcebfc2f80ccfea1bbab2b1a4cd69
author brandtr <brandtr@webrtc.org> Thu Nov 17 12:18:37 2016
committer Commit bot <commit-bot@chromium.org> Thu Nov 17 12:18:42 2016
tree 3f1ed547f5ecc4bf060b0256746cca8f04b657ac
parent afaef8bbebb8aecd32b3b7c5e47d60fd5526a126

Explicitly enable RED over RTX in rampup tests.

Also remove unused |rtx_ssrc_map_| member.

BUG=chromium:665923

Review-Url: https://codereview.webrtc.org/2508973002
Cr-Commit-Position: refs/heads/master@{#15127}

webrtc/call/rampup_tests.cc

diff --git a/webrtc/call/rampup_tests.cc b/webrtc/call/rampup_tests.cc
index 3cdcc99..61176b1 100644
--- a/webrtc/call/rampup_tests.cc
+++ b/webrtc/call/rampup_tests.cc
@@ -57,10 +57,6 @@
                      this,
                      "BitrateStatsPollingThread") {
   EXPECT_LE(num_audio_streams_, 1u);
-  if (rtx_) {
-    for (size_t i = 0; i < video_ssrcs_.size(); ++i)
-      rtx_ssrc_map_[video_rtx_ssrcs_[i]] = video_ssrcs_[i];
-  }
 }
 
 RampUpTester::~RampUpTester() {
@@ -172,6 +168,10 @@
     send_config->rtp.ulpfec.ulpfec_payload_type =
         test::CallTest::kUlpfecPayloadType;
     send_config->rtp.ulpfec.red_payload_type = test::CallTest::kRedPayloadType;
+    if (rtx_) {
+      send_config->rtp.ulpfec.red_rtx_payload_type =
+          test::CallTest::kRtxRedPayloadType;
+    }
   }
 
   size_t i = 0;
@@ -188,6 +188,10 @@
           send_config->rtp.ulpfec.red_payload_type;
       recv_config.rtp.ulpfec.ulpfec_payload_type =
           send_config->rtp.ulpfec.ulpfec_payload_type;
+      if (rtx_) {
+        recv_config.rtp.ulpfec.red_rtx_payload_type =
+            send_config->rtp.ulpfec.red_rtx_payload_type;
+      }
     }
 
     if (rtx_) {

webrtc/call/rampup_tests.h

diff --git a/webrtc/call/rampup_tests.h b/webrtc/call/rampup_tests.h
index da1ca74..dcf7706 100644
--- a/webrtc/call/rampup_tests.h
+++ b/webrtc/call/rampup_tests.h
@@ -100,7 +100,6 @@
   std::vector<uint32_t> video_ssrcs_;
   std::vector<uint32_t> video_rtx_ssrcs_;
   std::vector<uint32_t> audio_ssrcs_;
-  SsrcMap rtx_ssrc_map_;
 
   rtc::PlatformThread poller_thread_;
 };