Chromium Code Reviews

Side by Side Diff: webrtc/modules/audio_coding/main/test/TestRedFec.cc

Issue 1336923002: Remove the preprocessor symbol WEBRTC_CODEC_PCM16 (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 64 matching lines...)
75 myCodecParam.channels = 1; 75 myCodecParam.channels = 1;
76 } 76 }
77 EXPECT_EQ(0, _acmB->RegisterReceiveCodec(myCodecParam)); 77 EXPECT_EQ(0, _acmB->RegisterReceiveCodec(myCodecParam));
78 } 78 }
79 79
80 // Create and connect the channel 80 // Create and connect the channel
81 _channelA2B = new Channel; 81 _channelA2B = new Channel;
82 _acmA->RegisterTransportCallback(_channelA2B); 82 _acmA->RegisterTransportCallback(_channelA2B);
83 _channelA2B->RegisterReceiverACM(_acmB.get()); 83 _channelA2B->RegisterReceiverACM(_acmB.get());
84 84
85 #ifndef WEBRTC_CODEC_PCM16
86 EXPECT_TRUE(false) << "PCM16 needs to be activated to run this test\n");
87 return;
88 #endif
89 EXPECT_EQ(0, RegisterSendCodec('A', kNameL16, 8000)); 85 EXPECT_EQ(0, RegisterSendCodec('A', kNameL16, 8000));
90 EXPECT_EQ(0, RegisterSendCodec('A', kNameCN, 8000)); 86 EXPECT_EQ(0, RegisterSendCodec('A', kNameCN, 8000));
91 EXPECT_EQ(0, RegisterSendCodec('A', kNameRED)); 87 EXPECT_EQ(0, RegisterSendCodec('A', kNameRED));
92 EXPECT_EQ(0, SetVAD(true, true, VADAggr)); 88 EXPECT_EQ(0, SetVAD(true, true, VADAggr));
93 EXPECT_EQ(0, _acmA->SetREDStatus(true)); 89 EXPECT_EQ(0, _acmA->SetREDStatus(true));
94 EXPECT_TRUE(_acmA->REDStatus()); 90 EXPECT_TRUE(_acmA->REDStatus());
95 91
96 OpenOutFile(_testCntr); 92 OpenOutFile(_testCntr);
97 Run(); 93 Run();
98 _outFileB.Close(); 94 _outFileB.Close();
(...skipping 366 matching lines...)
465 std::string file_name; 461 std::string file_name;
466 std::stringstream file_stream; 462 std::stringstream file_stream;
467 file_stream << webrtc::test::OutputPath(); 463 file_stream << webrtc::test::OutputPath();
468 file_stream << "TestRedFec_outFile_"; 464 file_stream << "TestRedFec_outFile_";
469 file_stream << test_number << ".pcm"; 465 file_stream << test_number << ".pcm";
470 file_name = file_stream.str(); 466 file_name = file_stream.str();
471 _outFileB.Open(file_name, 16000, "wb"); 467 _outFileB.Open(file_name, 16000, "wb");
472 } 468 }
473 469
474 } // namespace webrtc 470 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/test/TestAllCodecs.cc ('k') | webrtc/modules/audio_coding/main/test/TestStereo.h » ('j') | no next file with comments »

Powered by Google App Engine