OLD | NEW |
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 _acmB.reset(AudioCodingModule::Create(config)); | 43 _acmB.reset(AudioCodingModule::Create(config)); |
44 config.id = 4; | 44 config.id = 4; |
45 _acmRefB.reset(AudioCodingModule::Create(config)); | 45 _acmRefB.reset(AudioCodingModule::Create(config)); |
46 } | 46 } |
47 | 47 |
48 TwoWayCommunication::~TwoWayCommunication() { | 48 TwoWayCommunication::~TwoWayCommunication() { |
49 delete _channel_A2B; | 49 delete _channel_A2B; |
50 delete _channel_B2A; | 50 delete _channel_B2A; |
51 delete _channelRef_A2B; | 51 delete _channelRef_A2B; |
52 delete _channelRef_B2A; | 52 delete _channelRef_B2A; |
| 53 #ifdef WEBRTC_DTMF_DETECTION |
| 54 if (_dtmfDetectorA != NULL) { |
| 55 delete _dtmfDetectorA; |
| 56 } |
| 57 if (_dtmfDetectorB != NULL) { |
| 58 delete _dtmfDetectorB; |
| 59 } |
| 60 #endif |
53 _inFileA.Close(); | 61 _inFileA.Close(); |
54 _inFileB.Close(); | 62 _inFileB.Close(); |
55 _outFileA.Close(); | 63 _outFileA.Close(); |
56 _outFileB.Close(); | 64 _outFileB.Close(); |
57 _outFileRefA.Close(); | 65 _outFileRefA.Close(); |
58 _outFileRefB.Close(); | 66 _outFileRefB.Close(); |
59 } | 67 } |
60 | 68 |
61 void TwoWayCommunication::ChooseCodec(uint8_t* codecID_A, | 69 void TwoWayCommunication::ChooseCodec(uint8_t* codecID_A, |
62 uint8_t* codecID_B) { | 70 uint8_t* codecID_B) { |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 if (((secPassed % 7) == 6) && (msecPassed == 0)) | 292 if (((secPassed % 7) == 6) && (msecPassed == 0)) |
285 EXPECT_EQ(0, _acmA->InitializeReceiver()); | 293 EXPECT_EQ(0, _acmA->InitializeReceiver()); |
286 // Re-register codec on side A. | 294 // Re-register codec on side A. |
287 if (((secPassed % 7) == 6) && (msecPassed >= 990)) { | 295 if (((secPassed % 7) == 6) && (msecPassed >= 990)) { |
288 EXPECT_EQ(0, _acmA->RegisterReceiveCodec(*codecInst_B)); | 296 EXPECT_EQ(0, _acmA->RegisterReceiveCodec(*codecInst_B)); |
289 } | 297 } |
290 } | 298 } |
291 } | 299 } |
292 | 300 |
293 } // namespace webrtc | 301 } // namespace webrtc |
OLD | NEW |