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

Side by Side Diff: webrtc/voice_engine/channel.h

Issue 1340283002: Added support for logging the SSRC corresponding to AudioPlayout events. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added missing include and changed CHECK_EQ to RTC_CHECK_EQ. 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
« no previous file with comments | « webrtc/video/rtc_event_log_unittest.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 int64_t GetRTT(bool allow_associate_channel) const; 481 int64_t GetRTT(bool allow_associate_channel) const;
482 482
483 CriticalSectionWrapper& _fileCritSect; 483 CriticalSectionWrapper& _fileCritSect;
484 CriticalSectionWrapper& _callbackCritSect; 484 CriticalSectionWrapper& _callbackCritSect;
485 CriticalSectionWrapper& volume_settings_critsect_; 485 CriticalSectionWrapper& volume_settings_critsect_;
486 uint32_t _instanceId; 486 uint32_t _instanceId;
487 int32_t _channelId; 487 int32_t _channelId;
488 488
489 ChannelState channel_state_; 489 ChannelState channel_state_;
490 490
491 RtcEventLog* const event_log_;
492
491 rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_; 493 rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_;
492 rtc::scoped_ptr<RTPPayloadRegistry> rtp_payload_registry_; 494 rtc::scoped_ptr<RTPPayloadRegistry> rtp_payload_registry_;
493 rtc::scoped_ptr<ReceiveStatistics> rtp_receive_statistics_; 495 rtc::scoped_ptr<ReceiveStatistics> rtp_receive_statistics_;
494 rtc::scoped_ptr<StatisticsProxy> statistics_proxy_; 496 rtc::scoped_ptr<StatisticsProxy> statistics_proxy_;
495 rtc::scoped_ptr<RtpReceiver> rtp_receiver_; 497 rtc::scoped_ptr<RtpReceiver> rtp_receiver_;
496 TelephoneEventHandler* telephone_event_handler_; 498 TelephoneEventHandler* telephone_event_handler_;
497 rtc::scoped_ptr<RtpRtcp> _rtpRtcpModule; 499 rtc::scoped_ptr<RtpRtcp> _rtpRtcpModule;
498 rtc::scoped_ptr<AudioCodingModule> audio_coding_; 500 rtc::scoped_ptr<AudioCodingModule> audio_coding_;
499 AudioLevel _outputAudioLevel; 501 AudioLevel _outputAudioLevel;
500 bool _externalTransport; 502 bool _externalTransport;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 rtc::scoped_ptr<NetworkPredictor> network_predictor_; 585 rtc::scoped_ptr<NetworkPredictor> network_predictor_;
584 // An associated send channel. 586 // An associated send channel.
585 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_; 587 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_;
586 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_); 588 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_);
587 }; 589 };
588 590
589 } // namespace voe 591 } // namespace voe
590 } // namespace webrtc 592 } // namespace webrtc
591 593
592 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 594 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/video/rtc_event_log_unittest.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698