Fix incorrect rtx config in full_stack tests.
BUG=4326
R=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/40819006
Cr-Original-Commit-Position: refs/heads/master@{#8455}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 343096ac03bfb0e1cadbcead29ce925522c12d5b
diff --git a/video/full_stack.cc b/video/full_stack.cc
index 06bd023..815c088 100644
--- a/video/full_stack.cc
+++ b/video/full_stack.cc
@@ -98,7 +98,7 @@
uint32_t num_cores = CpuInfo::DetectNumberOfCores();
assert(num_cores >= 1);
static const uint32_t kMinCoresLeft = 4;
- static const uint32_t kMaxComparisonThreads = 12;
+ static const uint32_t kMaxComparisonThreads = 8;
if (num_cores <= kMinCoresLeft) {
num_cores = 1;
@@ -520,7 +520,7 @@
receive_configs_[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
receive_configs_[0].rtp.rtx[kSendRtxPayloadType].ssrc = kSendRtxSsrcs[0];
receive_configs_[0].rtp.rtx[kSendRtxPayloadType].payload_type =
- kSendRtxSsrcs[0];
+ kSendRtxPayloadType;
CreateStreams();
analyzer.input_ = send_stream_->Input();
@@ -592,7 +592,7 @@
RunTest(foreman_cif);
}
-TEST_F(FullStackTest, DISABLED_ForemanCifPlr5) {
+TEST_F(FullStackTest, ForemanCifPlr5) {
FullStackTestParams foreman_cif = {"foreman_cif_delay_50_0_plr_5",
{"foreman_cif", 352, 288, 30},
false,
