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 |
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
13 | 13 |
| 14 #include <string> |
14 #include <vector> | 15 #include <vector> |
15 | 16 |
16 #include "webrtc/base/buffer.h" | 17 #include "webrtc/base/buffer.h" |
17 #include "webrtc/base/scoped_ptr.h" | 18 #include "webrtc/base/scoped_ptr.h" |
18 #include "webrtc/base/thread_annotations.h" | 19 #include "webrtc/base/thread_annotations.h" |
19 #include "webrtc/common_types.h" | 20 #include "webrtc/common_types.h" |
20 #include "webrtc/engine_configurations.h" | 21 #include "webrtc/engine_configurations.h" |
21 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h" | 22 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h" |
22 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" | 23 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" |
23 #include "webrtc/modules/audio_coding/acm2/codec_manager.h" | 24 #include "webrtc/modules/audio_coding/acm2/codec_manager.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 // Get current playout frequency. | 117 // Get current playout frequency. |
117 int PlayoutFrequency() const override; | 118 int PlayoutFrequency() const override; |
118 | 119 |
119 // Register possible receive codecs, can be called multiple times, | 120 // Register possible receive codecs, can be called multiple times, |
120 // for codecs, CNG, DTMF, RED. | 121 // for codecs, CNG, DTMF, RED. |
121 int RegisterReceiveCodec(const CodecInst& receive_codec) override; | 122 int RegisterReceiveCodec(const CodecInst& receive_codec) override; |
122 | 123 |
123 int RegisterExternalReceiveCodec(int rtp_payload_type, | 124 int RegisterExternalReceiveCodec(int rtp_payload_type, |
124 AudioDecoder* external_decoder, | 125 AudioDecoder* external_decoder, |
125 int sample_rate_hz, | 126 int sample_rate_hz, |
126 int num_channels) override; | 127 int num_channels, |
| 128 const std::string& name) override; |
127 | 129 |
128 // Get current received codec. | 130 // Get current received codec. |
129 int ReceiveCodec(CodecInst* current_codec) const override; | 131 int ReceiveCodec(CodecInst* current_codec) const override; |
130 | 132 |
131 // Incoming packet from network parsed and ready for decode. | 133 // Incoming packet from network parsed and ready for decode. |
132 int IncomingPacket(const uint8_t* incoming_payload, | 134 int IncomingPacket(const uint8_t* incoming_payload, |
133 const size_t payload_length, | 135 const size_t payload_length, |
134 const WebRtcRTPHeader& rtp_info) override; | 136 const WebRtcRTPHeader& rtp_info) override; |
135 | 137 |
136 // Incoming payloads, without rtp-info, the rtp-info will be created in ACM. | 138 // Incoming payloads, without rtp-info, the rtp-info will be created in ACM. |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_; | 273 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_; |
272 AudioPacketizationCallback* packetization_callback_ | 274 AudioPacketizationCallback* packetization_callback_ |
273 GUARDED_BY(callback_crit_sect_); | 275 GUARDED_BY(callback_crit_sect_); |
274 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); | 276 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); |
275 }; | 277 }; |
276 | 278 |
277 } // namespace acm2 | 279 } // namespace acm2 |
278 } // namespace webrtc | 280 } // namespace webrtc |
279 | 281 |
280 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 282 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
OLD | NEW |