generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix incorrect rtx config in full_stack tests.

Browse Source 
BUG=4326
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/40819006

Cr-Commit-Position: refs/heads/master@{#8455}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8455 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sprang@webrtc.org 2015-02-23 08:34:17 +00:00
parent 1467421646
commit 343096ac03
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/video/full_stack.cc
View File

@ -98,7 +98,7 @@ class VideoAnalyzer : public PacketReceiver,
uint32_t num_cores = CpuInfo::DetectNumberOfCores(); uint32_t num_cores = CpuInfo::DetectNumberOfCores();
assert(num_cores >= 1); assert(num_cores >= 1);
static const uint32_t kMinCoresLeft = 4; static const uint32_t kMinCoresLeft = 4;
static const uint32_t kMaxComparisonThreads = 12; static const uint32_t kMaxComparisonThreads = 8;
if (num_cores <= kMinCoresLeft) { if (num_cores <= kMinCoresLeft) {
num_cores = 1; num_cores = 1;
@ -520,7 +520,7 @@ void FullStackTest::RunTest(const FullStackTestParams& params) {
receive_configs_[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; receive_configs_[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
receive_configs_[0].rtp.rtx[kSendRtxPayloadType].ssrc = kSendRtxSsrcs[0]; receive_configs_[0].rtp.rtx[kSendRtxPayloadType].ssrc = kSendRtxSsrcs[0];
receive_configs_[0].rtp.rtx[kSendRtxPayloadType].payload_type = receive_configs_[0].rtp.rtx[kSendRtxPayloadType].payload_type =
kSendRtxSsrcs[0]; kSendRtxPayloadType;
CreateStreams(); CreateStreams();
analyzer.input_ = send_stream_->Input(); analyzer.input_ = send_stream_->Input();
@ -592,7 +592,7 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketLoss) {
RunTest(foreman_cif); RunTest(foreman_cif);
} }
TEST_F(FullStackTest, DISABLED_ForemanCifPlr5) { TEST_F(FullStackTest, ForemanCifPlr5) {
FullStackTestParams foreman_cif = {"foreman_cif_delay_50_0_plr_5", FullStackTestParams foreman_cif = {"foreman_cif_delay_50_0_plr_5",
{"foreman_cif", 352, 288, 30}, {"foreman_cif", 352, 288, 30},
false, false,