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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
292 bool first_10ms_data_ GUARDED_BY(acm_crit_sect_); | 292 bool first_10ms_data_ GUARDED_BY(acm_crit_sect_); |
293 | 293 |
294 bool first_frame_ GUARDED_BY(acm_crit_sect_); | 294 bool first_frame_ GUARDED_BY(acm_crit_sect_); |
295 uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_); | 295 uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_); |
296 uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_); | 296 uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_); |
297 | 297 |
298 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_; | 298 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_; |
299 AudioPacketizationCallback* packetization_callback_ | 299 AudioPacketizationCallback* packetization_callback_ |
300 GUARDED_BY(callback_crit_sect_); | 300 GUARDED_BY(callback_crit_sect_); |
301 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); | 301 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); |
| 302 |
| 303 RtcEventLog* const event_log_; |
302 }; | 304 }; |
303 | 305 |
304 } // namespace acm2 | 306 } // namespace acm2 |
305 | 307 |
306 class AudioCodingImpl : public AudioCoding { | 308 class AudioCodingImpl : public AudioCoding { |
307 public: | 309 public: |
308 AudioCodingImpl(const Config& config); | 310 AudioCodingImpl(const Config& config); |
309 ~AudioCodingImpl() override; | 311 ~AudioCodingImpl() override; |
310 | 312 |
311 bool RegisterSendCodec(AudioEncoder* send_codec) override; | 313 bool RegisterSendCodec(AudioEncoder* send_codec) override; |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 int playout_frequency_hz_; | 373 int playout_frequency_hz_; |
372 // TODO(henrik.lundin): All members below this line are temporary and should | 374 // TODO(henrik.lundin): All members below this line are temporary and should |
373 // be removed after refactoring is completed. | 375 // be removed after refactoring is completed. |
374 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; | 376 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; |
375 CodecInst current_send_codec_; | 377 CodecInst current_send_codec_; |
376 }; | 378 }; |
377 | 379 |
378 } // namespace webrtc | 380 } // namespace webrtc |
379 | 381 |
380 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ | 382 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
OLD | NEW |