Index: webrtc/modules/audio_coding/main/test/iSACTest.cc |
diff --git a/webrtc/modules/audio_coding/main/test/iSACTest.cc b/webrtc/modules/audio_coding/main/test/iSACTest.cc |
index cc41e3bc1b640a0ffa8cdb7dd0e5502c26d5bd6c..bd796d1ce70ae275feeb9a8e471567d4bfa2f553 100644 |
--- a/webrtc/modules/audio_coding/main/test/iSACTest.cc |
+++ b/webrtc/modules/audio_coding/main/test/iSACTest.cc |
@@ -35,8 +35,6 @@ namespace webrtc { |
void SetISACConfigDefault(ACMTestISACConfig& isacConfig) { |
isacConfig.currentRateBitPerSec = 0; |
isacConfig.currentFrameSizeMsec = 0; |
- isacConfig.maxRateBitPerSec = 0; |
- isacConfig.maxPayloadSizeByte = 0; |
isacConfig.encodingMode = -1; |
isacConfig.initRateBitPerSec = 0; |
isacConfig.initFrameSizeInMsec = 0; |
@@ -67,15 +65,6 @@ int16_t SetISAConfig(ACMTestISACConfig& isacConfig, AudioCodingModule* acm, |
} |
} |
- if (isacConfig.maxRateBitPerSec > 0) { |
- // Set max rate. |
- EXPECT_EQ(0, acm->SetISACMaxRate(isacConfig.maxRateBitPerSec)); |
- } |
- if (isacConfig.maxPayloadSizeByte > 0) { |
- // Set max payload size. |
- EXPECT_EQ(0, acm->SetISACMaxPayloadSize(isacConfig.maxPayloadSizeByte)); |
- } |
- |
return 0; |
} |
@@ -193,39 +182,6 @@ void ISACTest::Perform() { |
testNr++; |
EncodeDecode(testNr, wbISACConfig, swbISACConfig); |
- int user_input; |
- if ((_testMode == 0) || (_testMode == 1)) { |
- swbISACConfig.maxPayloadSizeByte = static_cast<uint16_t>(200); |
- wbISACConfig.maxPayloadSizeByte = static_cast<uint16_t>(200); |
- } else { |
- printf("Enter the max payload-size for side A: "); |
- CHECK_ERROR(scanf("%d", &user_input)); |
- swbISACConfig.maxPayloadSizeByte = (uint16_t) user_input; |
- printf("Enter the max payload-size for side B: "); |
- CHECK_ERROR(scanf("%d", &user_input)); |
- wbISACConfig.maxPayloadSizeByte = (uint16_t) user_input; |
- } |
- testNr++; |
- EncodeDecode(testNr, wbISACConfig, swbISACConfig); |
- |
- SetISACConfigDefault(wbISACConfig); |
- SetISACConfigDefault(swbISACConfig); |
- |
- if ((_testMode == 0) || (_testMode == 1)) { |
- swbISACConfig.maxRateBitPerSec = static_cast<uint32_t>(48000); |
- wbISACConfig.maxRateBitPerSec = static_cast<uint32_t>(48000); |
- } else { |
- printf("Enter the max rate for side A: "); |
- CHECK_ERROR(scanf("%d", &user_input)); |
- swbISACConfig.maxRateBitPerSec = (uint32_t) user_input; |
- printf("Enter the max rate for side B: "); |
- CHECK_ERROR(scanf("%d", &user_input)); |
- wbISACConfig.maxRateBitPerSec = (uint32_t) user_input; |
- } |
- |
- testNr++; |
- EncodeDecode(testNr, wbISACConfig, swbISACConfig); |
- |
testNr++; |
if (_testMode == 0) { |
SwitchingSamplingRate(testNr, 4); |