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

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

Issue 2415943002: Revert of Add RtcpRttStats to AudioStream (Closed)
Patch Set: Created 4 years, 2 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/test/mock_voe_channel_proxy.h ('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 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;
71 class RtpPacketSenderProxy; 70 class RtpPacketSenderProxy;
72 class Statistics; 71 class Statistics;
73 class StatisticsProxy; 72 class StatisticsProxy;
74 class TransportFeedbackProxy; 73 class TransportFeedbackProxy;
75 class TransmitMixer; 74 class TransmitMixer;
76 class TransportSequenceNumberProxy; 75 class TransportSequenceNumberProxy;
77 class VoERtcpObserver; 76 class VoERtcpObserver;
78 77
79 // Helper class to simplify locking scheme for members that are accessed from 78 // Helper class to simplify locking scheme for members that are accessed from
80 // multiple threads. 79 // multiple threads.
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 rtc::CritScope lock(&assoc_send_channel_lock_); 410 rtc::CritScope lock(&assoc_send_channel_lock_);
412 associate_send_channel_ = channel; 411 associate_send_channel_ = channel;
413 } 412 }
414 413
415 // Disassociate a send channel if it was associated. 414 // Disassociate a send channel if it was associated.
416 void DisassociateSendChannel(int channel_id); 415 void DisassociateSendChannel(int channel_id);
417 416
418 // Set a RtcEventLog logging object. 417 // Set a RtcEventLog logging object.
419 void SetRtcEventLog(RtcEventLog* event_log); 418 void SetRtcEventLog(RtcEventLog* event_log);
420 419
421 void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats);
422
423 protected: 420 protected:
424 void OnIncomingFractionLoss(int fraction_lost); 421 void OnIncomingFractionLoss(int fraction_lost);
425 422
426 private: 423 private:
427 bool ReceivePacket(const uint8_t* packet, 424 bool ReceivePacket(const uint8_t* packet,
428 size_t packet_length, 425 size_t packet_length,
429 const RTPHeader& header, 426 const RTPHeader& header,
430 bool in_order); 427 bool in_order);
431 bool HandleRtxPacket(const uint8_t* packet, 428 bool HandleRtxPacket(const uint8_t* packet,
432 size_t packet_length, 429 size_t packet_length,
(...skipping 15 matching lines...) Expand all
448 445
449 rtc::CriticalSection _fileCritSect; 446 rtc::CriticalSection _fileCritSect;
450 rtc::CriticalSection _callbackCritSect; 447 rtc::CriticalSection _callbackCritSect;
451 rtc::CriticalSection volume_settings_critsect_; 448 rtc::CriticalSection volume_settings_critsect_;
452 uint32_t _instanceId; 449 uint32_t _instanceId;
453 int32_t _channelId; 450 int32_t _channelId;
454 451
455 ChannelState channel_state_; 452 ChannelState channel_state_;
456 453
457 std::unique_ptr<voe::RtcEventLogProxy> event_log_proxy_; 454 std::unique_ptr<voe::RtcEventLogProxy> event_log_proxy_;
458 std::unique_ptr<voe::RtcpRttStatsProxy> rtcp_rtt_stats_proxy_;
459 455
460 std::unique_ptr<RtpHeaderParser> rtp_header_parser_; 456 std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
461 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_; 457 std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;
462 std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_; 458 std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
463 std::unique_ptr<StatisticsProxy> statistics_proxy_; 459 std::unique_ptr<StatisticsProxy> statistics_proxy_;
464 std::unique_ptr<RtpReceiver> rtp_receiver_; 460 std::unique_ptr<RtpReceiver> rtp_receiver_;
465 TelephoneEventHandler* telephone_event_handler_; 461 TelephoneEventHandler* telephone_event_handler_;
466 std::unique_ptr<RtpRtcp> _rtpRtcpModule; 462 std::unique_ptr<RtpRtcp> _rtpRtcpModule;
467 std::unique_ptr<AudioCodingModule> audio_coding_; 463 std::unique_ptr<AudioCodingModule> audio_coding_;
468 acm2::CodecManager codec_manager_; 464 acm2::CodecManager codec_manager_;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 546 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
551 547
552 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 548 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
553 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 549 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
554 }; 550 };
555 551
556 } // namespace voe 552 } // namespace voe
557 } // namespace webrtc 553 } // namespace webrtc
558 554
559 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 555 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/test/mock_voe_channel_proxy.h ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698