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

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

Issue 2565353002: Wire-up audio BWE with overhead. (Closed)
Patch Set: Response to comments. 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
« no previous file with comments | « no previous file | 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 class Channel 138 class Channel
139 : public RtpData, 139 : public RtpData,
140 public RtpFeedback, 140 public RtpFeedback,
141 public FileCallback, // receiving notification from file player & 141 public FileCallback, // receiving notification from file player &
142 // recorder 142 // recorder
143 public Transport, 143 public Transport,
144 public AudioPacketizationCallback, // receive encoded packets from the 144 public AudioPacketizationCallback, // receive encoded packets from the
145 // ACM 145 // ACM
146 public ACMVADCallback, // receive voice activity from the ACM 146 public ACMVADCallback, // receive voice activity from the ACM
147 public MixerParticipant // supplies output mixer with audio frames 147 public MixerParticipant, // supplies output mixer with audio frames
148 { 148 public OverheadObserver {
149 public: 149 public:
150 friend class VoERtcpObserver; 150 friend class VoERtcpObserver;
151 151
152 enum { KNumSocketThreads = 1 }; 152 enum { KNumSocketThreads = 1 };
153 enum { KNumberOfSocketBuffers = 8 }; 153 enum { KNumberOfSocketBuffers = 8 };
154 virtual ~Channel(); 154 virtual ~Channel();
155 static int32_t CreateChannel( 155 static int32_t CreateChannel(
156 Channel*& channel, 156 Channel*& channel,
157 int32_t channelId, 157 int32_t channelId,
158 uint32_t instanceId, 158 uint32_t instanceId,
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 void set_associate_send_channel(const ChannelOwner& channel); 410 void set_associate_send_channel(const ChannelOwner& channel);
411 // Disassociate a send channel if it was associated. 411 // Disassociate a send channel if it was associated.
412 void DisassociateSendChannel(int channel_id); 412 void DisassociateSendChannel(int channel_id);
413 413
414 // Set a RtcEventLog logging object. 414 // Set a RtcEventLog logging object.
415 void SetRtcEventLog(RtcEventLog* event_log); 415 void SetRtcEventLog(RtcEventLog* event_log);
416 416
417 void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats); 417 void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats);
418 void SetTransportOverhead(int transport_overhead_per_packet); 418 void SetTransportOverhead(int transport_overhead_per_packet);
419 419
420 // From OverheadObserver in the RTP/RTCP module
stefan-webrtc 2016/12/14 11:44:20 End with "."
421 void OnOverheadChanged(size_t overhead_bytes_per_packet) override;
422
420 protected: 423 protected:
421 void OnIncomingFractionLoss(int fraction_lost); 424 void OnIncomingFractionLoss(int fraction_lost);
422 425
423 private: 426 private:
424 bool ReceivePacket(const uint8_t* packet, 427 bool ReceivePacket(const uint8_t* packet,
425 size_t packet_length, 428 size_t packet_length,
426 const RTPHeader& header, 429 const RTPHeader& header,
427 bool in_order); 430 bool in_order);
428 bool HandleRtxPacket(const uint8_t* packet, 431 bool HandleRtxPacket(const uint8_t* packet,
429 size_t packet_length, 432 size_t packet_length,
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 551 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
549 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 552 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
550 553
551 SmoothingFilterImpl bitrate_smoother_; 554 SmoothingFilterImpl bitrate_smoother_;
552 }; 555 };
553 556
554 } // namespace voe 557 } // namespace voe
555 } // namespace webrtc 558 } // namespace webrtc
556 559
557 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 560 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698