zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NetEq: Rename Nack to NackTracker to avoid name collisions in GN

Browse Source 
BUG=webrtc:5949
NOTRY=True
R=kjellander@webrtc.org

Review-Url: https://codereview.webrtc.org/2045243002
Cr-Commit-Position: refs/heads/master@{#13069}
This commit is contained in:
henrik.lundin
2016-06-08 06:43:41 -07:00
committed by Commit bot
parent bbe423312d
commit 919518613f
8 changed files with 75 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_coding/neteq/neteq_impl.h
View File

@ -42,7 +42,7 @@ class DtmfBuffer;
class DtmfToneGenerator;
class Expand;
class Merge;
class Nack;
class NackTracker;
class Normal;
class PacketBuffer;
class PayloadSplitter;
@ -405,7 +405,7 @@ class NetEqImpl : public webrtc::NetEq {
const BackgroundNoiseMode background_noise_mode_ GUARDED_BY(crit_sect_);
NetEqPlayoutMode playout_mode_ GUARDED_BY(crit_sect_);
bool enable_fast_accelerate_ GUARDED_BY(crit_sect_);
std::unique_ptr<Nack> nack_ GUARDED_BY(crit_sect_);
std::unique_ptr<NackTracker> nack_ GUARDED_BY(crit_sect_);
bool nack_enabled_ GUARDED_BY(crit_sect_);
const bool enable_muted_state_ GUARDED_BY(crit_sect_);
AudioFrame::VADActivity last_vad_activity_ GUARDED_BY(crit_sect_) =