| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 _idISAC16kHz = codecCntr; | 87 _idISAC16kHz = codecCntr; |
| 88 } | 88 } |
| 89 if (!STR_CASE_CMP(codecParam.plname, "ISAC") | 89 if (!STR_CASE_CMP(codecParam.plname, "ISAC") |
| 90 && codecParam.plfreq == 32000) { | 90 && codecParam.plfreq == 32000) { |
| 91 memcpy(&_paramISAC32kHz, &codecParam, sizeof(CodecInst)); | 91 memcpy(&_paramISAC32kHz, &codecParam, sizeof(CodecInst)); |
| 92 _idISAC32kHz = codecCntr; | 92 _idISAC32kHz = codecCntr; |
| 93 } | 93 } |
| 94 } | 94 } |
| 95 | 95 |
| 96 // Register both iSAC-wb & iSAC-swb in both sides as receiver codecs. | 96 // Register both iSAC-wb & iSAC-swb in both sides as receiver codecs. |
| 97 EXPECT_EQ(0, _acmA->RegisterReceiveCodec(_paramISAC16kHz)); | 97 EXPECT_EQ(true, _acmA->RegisterReceiveCodec(_paramISAC16kHz.pltype, |
| 98 EXPECT_EQ(0, _acmA->RegisterReceiveCodec(_paramISAC32kHz)); | 98 CodecInstToSdp(_paramISAC16kHz))); |
| 99 EXPECT_EQ(0, _acmB->RegisterReceiveCodec(_paramISAC16kHz)); | 99 EXPECT_EQ(true, _acmA->RegisterReceiveCodec(_paramISAC32kHz.pltype, |
| 100 EXPECT_EQ(0, _acmB->RegisterReceiveCodec(_paramISAC32kHz)); | 100 CodecInstToSdp(_paramISAC32kHz))); |
| 101 EXPECT_EQ(true, _acmB->RegisterReceiveCodec(_paramISAC16kHz.pltype, |
| 102 CodecInstToSdp(_paramISAC16kHz))); |
| 103 EXPECT_EQ(true, _acmB->RegisterReceiveCodec(_paramISAC32kHz.pltype, |
| 104 CodecInstToSdp(_paramISAC32kHz))); |
| 101 | 105 |
| 102 //--- Set A-to-B channel | 106 //--- Set A-to-B channel |
| 103 _channel_A2B.reset(new Channel); | 107 _channel_A2B.reset(new Channel); |
| 104 EXPECT_EQ(0, _acmA->RegisterTransportCallback(_channel_A2B.get())); | 108 EXPECT_EQ(0, _acmA->RegisterTransportCallback(_channel_A2B.get())); |
| 105 _channel_A2B->RegisterReceiverACM(_acmB.get()); | 109 _channel_A2B->RegisterReceiverACM(_acmB.get()); |
| 106 | 110 |
| 107 //--- Set B-to-A channel | 111 //--- Set B-to-A channel |
| 108 _channel_B2A.reset(new Channel); | 112 _channel_B2A.reset(new Channel); |
| 109 EXPECT_EQ(0, _acmB->RegisterTransportCallback(_channel_B2A.get())); | 113 EXPECT_EQ(0, _acmB->RegisterTransportCallback(_channel_B2A.get())); |
| 110 _channel_B2A->RegisterReceiverACM(_acmA.get()); | 114 _channel_B2A->RegisterReceiverACM(_acmA.get()); |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 numSendCodecChanged++; | 340 numSendCodecChanged++; |
| 337 } | 341 } |
| 338 } | 342 } |
| 339 _outFileA.Close(); | 343 _outFileA.Close(); |
| 340 _outFileB.Close(); | 344 _outFileB.Close(); |
| 341 _inFileA.Close(); | 345 _inFileA.Close(); |
| 342 _inFileB.Close(); | 346 _inFileB.Close(); |
| 343 } | 347 } |
| 344 | 348 |
| 345 } // namespace webrtc | 349 } // namespace webrtc |
| OLD | NEW |