| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 200 | 200 | 
| 201     recv_config.rtp.remote_ssrc = video_ssrcs_[i]; | 201     recv_config.rtp.remote_ssrc = video_ssrcs_[i]; | 
| 202     recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms; | 202     recv_config.rtp.nack.rtp_history_ms = send_config->rtp.nack.rtp_history_ms; | 
| 203 | 203 | 
| 204     if (red_) { | 204     if (red_) { | 
| 205       recv_config.rtp.ulpfec.red_payload_type = | 205       recv_config.rtp.ulpfec.red_payload_type = | 
| 206           send_config->rtp.ulpfec.red_payload_type; | 206           send_config->rtp.ulpfec.red_payload_type; | 
| 207       recv_config.rtp.ulpfec.ulpfec_payload_type = | 207       recv_config.rtp.ulpfec.ulpfec_payload_type = | 
| 208           send_config->rtp.ulpfec.ulpfec_payload_type; | 208           send_config->rtp.ulpfec.ulpfec_payload_type; | 
| 209       if (rtx_) { | 209       if (rtx_) { | 
| 210         recv_config.rtp.ulpfec.red_rtx_payload_type = | 210         recv_config.rtp.rtx_associated_payload_types | 
| 211             send_config->rtp.ulpfec.red_rtx_payload_type; | 211             [send_config->rtp.ulpfec.red_rtx_payload_type] = | 
|  | 212             send_config->rtp.ulpfec.red_payload_type; | 
| 212       } | 213       } | 
| 213     } | 214     } | 
| 214 | 215 | 
| 215     if (rtx_) { | 216     if (rtx_) { | 
| 216       recv_config.rtp.rtx_ssrc = video_rtx_ssrcs_[i]; | 217       recv_config.rtp.rtx_ssrc = video_rtx_ssrcs_[i]; | 
| 217       recv_config.rtp | 218       recv_config.rtp | 
| 218           .rtx_associated_payload_types[send_config->rtp.rtx.payload_type] = | 219           .rtx_associated_payload_types[send_config->rtp.rtx.payload_type] = | 
| 219           send_config->encoder_settings.payload_type; | 220           send_config->encoder_settings.payload_type; | 
| 220     } | 221     } | 
| 221     ++i; | 222     ++i; | 
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 643   RunBaseTest(&test); | 644   RunBaseTest(&test); | 
| 644 } | 645 } | 
| 645 | 646 | 
| 646 TEST_F(RampUpTest, AudioTransportSequenceNumber) { | 647 TEST_F(RampUpTest, AudioTransportSequenceNumber) { | 
| 647   RampUpTester test(0, 1, 0, 300000, 10000, | 648   RampUpTester test(0, 1, 0, 300000, 10000, | 
| 648                     RtpExtension::kTransportSequenceNumberUri, false, false, | 649                     RtpExtension::kTransportSequenceNumberUri, false, false, | 
| 649                     false); | 650                     false); | 
| 650   RunBaseTest(&test); | 651   RunBaseTest(&test); | 
| 651 } | 652 } | 
| 652 }  // namespace webrtc | 653 }  // namespace webrtc | 
| OLD | NEW | 
|---|