admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly enable RED over RTX in rampup tests.

Browse Source 
Also remove unused |rtx_ssrc_map_| member.

BUG=chromium:665923

Review-Url: https://codereview.webrtc.org/2508973002
Cr-Commit-Position: refs/heads/master@{#15127}
This commit is contained in:
brandtr 2016-11-17 04:18:37 -08:00 committed by Commit bot
parent afaef8bbeb
commit fbfb536ee9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/call/rampup_tests.cc
View File

@ -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_) {

1
webrtc/call/rampup_tests.h
View File

@ -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_;
};