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

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

Issue 2355483003: Voe::Channel: Turned GetPlayoutFrequency into GetRtpTimestampRateHz. (Closed)
Patch Set: Created 4 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 | « no previous file | webrtc/voice_engine/channel.cc » ('j') | webrtc/voice_engine/channel.cc » ('J')
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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 int ResendPackets(const uint16_t* sequence_numbers, int length); 433 int ResendPackets(const uint16_t* sequence_numbers, int length);
434 int32_t MixOrReplaceAudioWithFile(int mixingFrequency); 434 int32_t MixOrReplaceAudioWithFile(int mixingFrequency);
435 int32_t MixAudioWithFile(AudioFrame& audioFrame, int mixingFrequency); 435 int32_t MixAudioWithFile(AudioFrame& audioFrame, int mixingFrequency);
436 void UpdatePlayoutTimestamp(bool rtcp); 436 void UpdatePlayoutTimestamp(bool rtcp);
437 void RegisterReceiveCodecsToRTPModule(); 437 void RegisterReceiveCodecsToRTPModule();
438 438
439 int SetSendRtpHeaderExtension(bool enable, 439 int SetSendRtpHeaderExtension(bool enable,
440 RTPExtensionType type, 440 RTPExtensionType type,
441 unsigned char id); 441 unsigned char id);
442 442
443 int32_t GetPlayoutFrequency() const; 443 int32_t GetPayloadFrequency() const;
kwiberg-webrtc 2016/09/20 15:34:54 Consider adding a comment that explains what this
ossu 2016/09/20 15:43:51 I don't know!
444 int64_t GetRTT(bool allow_associate_channel) const; 444 int64_t GetRTT(bool allow_associate_channel) const;
445 445
446 rtc::CriticalSection _fileCritSect; 446 rtc::CriticalSection _fileCritSect;
447 rtc::CriticalSection _callbackCritSect; 447 rtc::CriticalSection _callbackCritSect;
448 rtc::CriticalSection volume_settings_critsect_; 448 rtc::CriticalSection volume_settings_critsect_;
449 uint32_t _instanceId; 449 uint32_t _instanceId;
450 int32_t _channelId; 450 int32_t _channelId;
451 451
452 ChannelState channel_state_; 452 ChannelState channel_state_;
453 453
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 546 std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
547 547
548 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 548 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
549 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 549 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
550 }; 550 };
551 551
552 } // namespace voe 552 } // namespace voe
553 } // namespace webrtc 553 } // namespace webrtc
554 554
555 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 555 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.cc » ('j') | webrtc/voice_engine/channel.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698