Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc

Issue 1362943004: ACM: Removing runtime APIs related to playout mode (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. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_coding/main/test/APITest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
diff --git a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
index 8b75c7b6d54a5715ed55658331ed89a57fb628b7..00853aead7018144d7c330efbe7bee5bcfdff9a3 100644
--- a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
+++ b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
@@ -32,10 +32,16 @@ namespace webrtc {
TwoWayCommunication::TwoWayCommunication(int testMode)
: _acmA(AudioCodingModule::Create(1)),
- _acmB(AudioCodingModule::Create(2)),
_acmRefA(AudioCodingModule::Create(3)),
- _acmRefB(AudioCodingModule::Create(4)),
- _testMode(testMode) {}
+ _testMode(testMode) {
+ AudioCodingModule::Config config;
+ // The clicks will be more obvious in FAX mode. TODO(henrik.lundin) Really?
+ config.neteq_config.playout_mode = kPlayoutFax;
+ config.id = 2;
+ _acmB.reset(AudioCodingModule::Create(config));
+ config.id = 4;
+ _acmRefB.reset(AudioCodingModule::Create(config));
+}
TwoWayCommunication::~TwoWayCommunication() {
delete _channel_A2B;
@@ -159,11 +165,6 @@ void TwoWayCommunication::SetUp() {
_channelRef_B2A = new Channel;
_acmRefB->RegisterTransportCallback(_channelRef_B2A);
_channelRef_B2A->RegisterReceiverACM(_acmRefA.get());
-
- // The clicks will be more obvious when we
- // are in FAX mode.
- EXPECT_EQ(_acmB->SetPlayoutMode(fax), 0);
- EXPECT_EQ(_acmRefB->SetPlayoutMode(fax), 0);
}
void TwoWayCommunication::SetUpAutotest() {
@@ -233,11 +234,6 @@ void TwoWayCommunication::SetUpAutotest() {
_channelRef_B2A = new Channel;
_acmRefB->RegisterTransportCallback(_channelRef_B2A);
_channelRef_B2A->RegisterReceiverACM(_acmRefA.get());
-
- // The clicks will be more obvious when we
- // are in FAX mode.
- EXPECT_EQ(0, _acmB->SetPlayoutMode(fax));
- EXPECT_EQ(0, _acmRefB->SetPlayoutMode(fax));
}
void TwoWayCommunication::Perform() {
« no previous file with comments | « webrtc/modules/audio_coding/main/test/APITest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698