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