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

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

Issue 2530383002: Reland "Update rtt on audio only calls". (Closed)
Patch Set: Fix for memory access error in ModuleRtpRtcpImpl::Process. Created 4 years 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 class VoiceEngineObserver; 60 class VoiceEngineObserver;
61 61
62 struct CallStatistics; 62 struct CallStatistics;
63 struct ReportBlock; 63 struct ReportBlock;
64 struct SenderInfo; 64 struct SenderInfo;
65 65
66 namespace voe { 66 namespace voe {
67 67
68 class OutputMixer; 68 class OutputMixer;
69 class RtcEventLogProxy; 69 class RtcEventLogProxy;
70 class RtcpRttStatsProxy;
70 class RtpPacketSenderProxy; 71 class RtpPacketSenderProxy;
71 class Statistics; 72 class Statistics;
72 class StatisticsProxy; 73 class StatisticsProxy;
73 class TransportFeedbackProxy; 74 class TransportFeedbackProxy;
74 class TransmitMixer; 75 class TransmitMixer;
75 class TransportSequenceNumberProxy; 76 class TransportSequenceNumberProxy;
76 class VoERtcpObserver; 77 class VoERtcpObserver;
77 78
78 // Helper class to simplify locking scheme for members that are accessed from 79 // Helper class to simplify locking scheme for members that are accessed from
79 // multiple threads. 80 // multiple threads.
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 406
406 // Associate to a send channel. 407 // Associate to a send channel.
407 // Used for obtaining RTT for a receive-only channel. 408 // Used for obtaining RTT for a receive-only channel.
408 void set_associate_send_channel(const ChannelOwner& channel); 409 void set_associate_send_channel(const ChannelOwner& channel);
409 // Disassociate a send channel if it was associated. 410 // Disassociate a send channel if it was associated.
410 void DisassociateSendChannel(int channel_id); 411 void DisassociateSendChannel(int channel_id);
411 412
412 // Set a RtcEventLog logging object. 413 // Set a RtcEventLog logging object.
413 void SetRtcEventLog(RtcEventLog* event_log); 414 void SetRtcEventLog(RtcEventLog* event_log);
414 415
416 void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats);
415 void SetTransportOverhead(int transport_overhead_per_packet); 417 void SetTransportOverhead(int transport_overhead_per_packet);
416 418
417 protected: 419 protected:
418 void OnIncomingFractionLoss(int fraction_lost); 420 void OnIncomingFractionLoss(int fraction_lost);
419 421
420 private: 422 private:
421 bool ReceivePacket(const uint8_t* packet, 423 bool ReceivePacket(const uint8_t* packet,
422 size_t packet_length, 424 size_t packet_length,
423 const RTPHeader& header, 425 const RTPHeader& header,
424 bool in_order); 426 bool in_order);
(...skipping 17 matching lines...) Expand all
442 444
443 rtc::CriticalSection _fileCritSect; 445 rtc::CriticalSection _fileCritSect;
444 rtc::CriticalSection _callbackCritSect; 446 rtc::CriticalSection _callbackCritSect;
445 rtc::CriticalSection volume_settings_critsect_; 447 rtc::CriticalSection volume_settings_critsect_;
446 uint32_t _instanceId; 448 uint32_t _instanceId;
447 int32_t _channelId; 449 int32_t _channelId;
448 450
449 ChannelState channel_state_; 451 ChannelState channel_state_;
450 452
451 std::unique_ptr<voe::RtcEventLogProxy> event_log_proxy_; 453 std::unique_ptr<voe::RtcEventLogProxy> event_log_proxy_;
454 std::unique_ptr<voe::RtcpRttStatsProxy> rtcp_rtt_stats_proxy_;
452 455
453 std::unique_ptr<RtpHeaderParser> rtp_header_parser_; 456 std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
454 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_; 457 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;
455 std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_; 458 std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
456 std::unique_ptr<StatisticsProxy> statistics_proxy_; 459 std::unique_ptr<StatisticsProxy> statistics_proxy_;
457 std::unique_ptr<RtpReceiver> rtp_receiver_; 460 std::unique_ptr<RtpReceiver> rtp_receiver_;
458 TelephoneEventHandler* telephone_event_handler_; 461 TelephoneEventHandler* telephone_event_handler_;
459 std::unique_ptr<RtpRtcp> _rtpRtcpModule; 462 std::unique_ptr<RtpRtcp> _rtpRtcpModule;
460 std::unique_ptr<AudioCodingModule> audio_coding_; 463 std::unique_ptr<AudioCodingModule> audio_coding_;
461 acm2::CodecManager codec_manager_; 464 acm2::CodecManager codec_manager_;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 545 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
543 546
544 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 547 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
545 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 548 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
546 }; 549 };
547 550
548 } // namespace voe 551 } // namespace voe
549 } // namespace webrtc 552 } // namespace webrtc
550 553
551 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 554 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698