| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 |
| 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_ |
| 12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_ | 12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_ |
| 13 | 13 |
| 14 #include <string> |
| 15 |
| 14 #include "webrtc/base/constructormagic.h" | 16 #include "webrtc/base/constructormagic.h" |
| 15 #include "webrtc/base/scoped_ptr.h" | 17 #include "webrtc/base/scoped_ptr.h" |
| 16 #include "webrtc/system_wrappers/include/clock.h" | 18 #include "webrtc/system_wrappers/include/clock.h" |
| 17 | 19 |
| 18 namespace webrtc { | 20 namespace webrtc { |
| 19 class AudioCodingModule; | 21 class AudioCodingModule; |
| 20 class AudioDecoder; | 22 class AudioDecoder; |
| 21 struct CodecInst; | 23 struct CodecInst; |
| 22 | 24 |
| 23 namespace test { | 25 namespace test { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 41 // Registers the codecs with default parameters from ACM. | 43 // Registers the codecs with default parameters from ACM. |
| 42 void RegisterDefaultCodecs(); | 44 void RegisterDefaultCodecs(); |
| 43 | 45 |
| 44 // Registers codecs with payload types matching the pre-encoded NetEq test | 46 // Registers codecs with payload types matching the pre-encoded NetEq test |
| 45 // files. | 47 // files. |
| 46 void RegisterNetEqTestCodecs(); | 48 void RegisterNetEqTestCodecs(); |
| 47 | 49 |
| 48 int RegisterExternalReceiveCodec(int rtp_payload_type, | 50 int RegisterExternalReceiveCodec(int rtp_payload_type, |
| 49 AudioDecoder* external_decoder, | 51 AudioDecoder* external_decoder, |
| 50 int sample_rate_hz, | 52 int sample_rate_hz, |
| 51 int num_channels); | 53 int num_channels, |
| 54 const std::string& name); |
| 52 | 55 |
| 53 // Runs the test and returns true if successful. | 56 // Runs the test and returns true if successful. |
| 54 void Run(); | 57 void Run(); |
| 55 | 58 |
| 56 protected: | 59 protected: |
| 57 // Method is called after each block of output audio is received from ACM. | 60 // Method is called after each block of output audio is received from ACM. |
| 58 virtual void AfterGetAudio() {} | 61 virtual void AfterGetAudio() {} |
| 59 | 62 |
| 60 SimulatedClock clock_; | 63 SimulatedClock clock_; |
| 61 rtc::scoped_ptr<AudioCodingModule> acm_; | 64 rtc::scoped_ptr<AudioCodingModule> acm_; |
| (...skipping 23 matching lines...) Expand all Loading... |
| 85 | 88 |
| 86 const int output_freq_hz_1_; | 89 const int output_freq_hz_1_; |
| 87 const int output_freq_hz_2_; | 90 const int output_freq_hz_2_; |
| 88 const int toggle_period_ms_; | 91 const int toggle_period_ms_; |
| 89 int64_t last_toggle_time_ms_; | 92 int64_t last_toggle_time_ms_; |
| 90 }; | 93 }; |
| 91 | 94 |
| 92 } // namespace test | 95 } // namespace test |
| 93 } // namespace webrtc | 96 } // namespace webrtc |
| 94 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_ | 97 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVE_TEST_OLDAPI_H_ |
| OLD | NEW |