From fbfb536ee94dcebfc2f80ccfea1bbab2b1a4cd69 Mon Sep 17 00:00:00 2001
From: brandtr <brandtr@webrtc.org>
Date: Thu, 17 Nov 2016 04:18:37 -0800
Subject: [PATCH] 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 | 12 ++++++++----
 webrtc/call/rampup_tests.h  |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/webrtc/call/rampup_tests.cc b/webrtc/call/rampup_tests.cc
index 3cdcc991d2..61176b199f 100644
--- a/webrtc/call/rampup_tests.cc
+++ b/webrtc/call/rampup_tests.cc
@@ -57,10 +57,6 @@ RampUpTester::RampUpTester(size_t num_video_streams,
                      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 @@ void RampUpTester::ModifyVideoConfigs(
     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 @@ void RampUpTester::ModifyVideoConfigs(
           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_) {
diff --git a/webrtc/call/rampup_tests.h b/webrtc/call/rampup_tests.h
index da1ca745ba..dcf7706ed9 100644
--- a/webrtc/call/rampup_tests.h
+++ b/webrtc/call/rampup_tests.h
@@ -100,7 +100,6 @@ class RampUpTester : public test::EndToEndTest {
   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_;
 };