Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1010)

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h

Issue 1267683002: Hooked up RtcEventLog. It lives in Voice Engine and pointers are propagated to ACM and Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 bool first_10ms_data_ GUARDED_BY(acm_crit_sect_); 290 bool first_10ms_data_ GUARDED_BY(acm_crit_sect_);
291 291
292 bool first_frame_ GUARDED_BY(acm_crit_sect_); 292 bool first_frame_ GUARDED_BY(acm_crit_sect_);
293 uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_); 293 uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_);
294 uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_); 294 uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_);
295 295
296 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_; 296 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_;
297 AudioPacketizationCallback* packetization_callback_ 297 AudioPacketizationCallback* packetization_callback_
298 GUARDED_BY(callback_crit_sect_); 298 GUARDED_BY(callback_crit_sect_);
299 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); 299 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_);
300
301 RtcEventLog* const event_log_;
300 }; 302 };
301 303
302 } // namespace acm2 304 } // namespace acm2
303 305
304 class AudioCodingImpl : public AudioCoding { 306 class AudioCodingImpl : public AudioCoding {
305 public: 307 public:
306 AudioCodingImpl(const Config& config); 308 AudioCodingImpl(const Config& config);
307 ~AudioCodingImpl() override; 309 ~AudioCodingImpl() override;
308 310
309 bool RegisterSendCodec(AudioEncoder* send_codec) override; 311 bool RegisterSendCodec(AudioEncoder* send_codec) override;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 int playout_frequency_hz_; 371 int playout_frequency_hz_;
370 // TODO(henrik.lundin): All members below this line are temporary and should 372 // TODO(henrik.lundin): All members below this line are temporary and should
371 // be removed after refactoring is completed. 373 // be removed after refactoring is completed.
372 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; 374 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_;
373 CodecInst current_send_codec_; 375 CodecInst current_send_codec_;
374 }; 376 };
375 377
376 } // namespace webrtc 378 } // namespace webrtc
377 379
378 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 380 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698