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

Side by Side Diff: webrtc/voice_engine/channel.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: Rebased to latest revision of webrtc to resolve patching conflict on try bots. Created 5 years, 4 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 namespace webrtc { 45 namespace webrtc {
46 46
47 class AudioDeviceModule; 47 class AudioDeviceModule;
48 class Config; 48 class Config;
49 class CriticalSectionWrapper; 49 class CriticalSectionWrapper;
50 class FileWrapper; 50 class FileWrapper;
51 class ProcessThread; 51 class ProcessThread;
52 class ReceiveStatistics; 52 class ReceiveStatistics;
53 class RemoteNtpTimeEstimator; 53 class RemoteNtpTimeEstimator;
54 class RtcEventLog;
54 class RTPPayloadRegistry; 55 class RTPPayloadRegistry;
55 class RtpReceiver; 56 class RtpReceiver;
56 class RTPReceiverAudio; 57 class RTPReceiverAudio;
57 class RtpRtcp; 58 class RtpRtcp;
58 class TelephoneEventHandler; 59 class TelephoneEventHandler;
59 class VoEMediaProcess; 60 class VoEMediaProcess;
60 class VoERTPObserver; 61 class VoERTPObserver;
61 class VoiceEngineObserver; 62 class VoiceEngineObserver;
62 63
63 struct CallStatistics; 64 struct CallStatistics;
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 // Used for obtaining RTT for a receive-only channel. 442 // Used for obtaining RTT for a receive-only channel.
442 void set_associate_send_channel(const ChannelOwner& channel) { 443 void set_associate_send_channel(const ChannelOwner& channel) {
443 assert(_channelId != channel.channel()->ChannelId()); 444 assert(_channelId != channel.channel()->ChannelId());
444 CriticalSectionScoped lock(assoc_send_channel_lock_.get()); 445 CriticalSectionScoped lock(assoc_send_channel_lock_.get());
445 associate_send_channel_ = channel; 446 associate_send_channel_ = channel;
446 } 447 }
447 448
448 // Disassociate a send channel if it was associated. 449 // Disassociate a send channel if it was associated.
449 void DisassociateSendChannel(int channel_id); 450 void DisassociateSendChannel(int channel_id);
450 451
452 // Set an RtcEventLog object to enable logging of debug events in the Audio
hlundin-webrtc 2015/08/04 09:14:47 Sets...
ivoc 2015/08/05 07:39:04 Done.
453 // Coding Module.
hlundin-webrtc 2015/08/04 09:14:47 Also, is nullptr a valid input value? Does that st
ivoc 2015/08/05 07:39:04 It is valid to set a nullptr to stop logging. Adde
454 void SetEventLog(RtcEventLog* event_log);
455
451 protected: 456 protected:
452 void OnIncomingFractionLoss(int fraction_lost); 457 void OnIncomingFractionLoss(int fraction_lost);
453 458
454 private: 459 private:
455 bool ReceivePacket(const uint8_t* packet, size_t packet_length, 460 bool ReceivePacket(const uint8_t* packet, size_t packet_length,
456 const RTPHeader& header, bool in_order); 461 const RTPHeader& header, bool in_order);
457 bool HandleRtxPacket(const uint8_t* packet, 462 bool HandleRtxPacket(const uint8_t* packet,
458 size_t packet_length, 463 size_t packet_length,
459 const RTPHeader& header); 464 const RTPHeader& header);
460 bool IsPacketInOrder(const RTPHeader& header) const; 465 bool IsPacketInOrder(const RTPHeader& header) const;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 rtc::scoped_ptr<NetworkPredictor> network_predictor_; 583 rtc::scoped_ptr<NetworkPredictor> network_predictor_;
579 // An associated send channel. 584 // An associated send channel.
580 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_; 585 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_;
581 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_); 586 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_);
582 }; 587 };
583 588
584 } // namespace voe 589 } // namespace voe
585 } // namespace webrtc 590 } // namespace webrtc
586 591
587 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 592 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698