Reland of Use RtxReceiveStream.

webrtc/video/video_quality_test.cc

Index: webrtc/video/video_quality_test.cc
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc
index 11e060566be9b574b5ab8ea9b59bb141292da0f0..6294184f2a95a3c6438eccb2de39cc007d9bc859 100644
--- a/webrtc/video/video_quality_test.cc
+++ b/webrtc/video/video_quality_test.cc
@@ -1555,6 +1555,9 @@ void VideoQualityTest::SetupVideo(Transport* send_transport,
             video_send_config_.rtp.ulpfec.ulpfec_payload_type;
         it->rtp.ulpfec.red_rtx_payload_type =
             video_send_config_.rtp.ulpfec.red_rtx_payload_type;
+        it->rtp.rtx_associated_payload_types[video_send_config_.rtp.ulpfec
+                                                 .red_rtx_payload_type] =
+            video_send_config_.rtp.ulpfec.red_payload_type;
       }
     } else {
       video_receive_configs_[params_.ss.selected_stream]
@@ -1566,6 +1569,10 @@ void VideoQualityTest::SetupVideo(Transport* send_transport,
       video_receive_configs_[params_.ss.selected_stream]
           .rtp.ulpfec.red_rtx_payload_type =
           video_send_config_.rtp.ulpfec.red_rtx_payload_type;
+      video_receive_configs_[params_.ss.selected_stream]
+          .rtp.rtx_associated_payload_types[video_send_config_.rtp.ulpfec
+                                                .red_rtx_payload_type] =
+          video_send_config_.rtp.ulpfec.red_payload_type;
     }
   }
 }