webrtc/modules/audio_coding/neteq/neteq_impl.h - Issue 2045243002: NetEq: Rename Nack to NackTracker to avoid name collisions in GN

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/neteq/neteq_impl.h

Issue 2045243002: NetEq: Rename Nack to NackTracker to avoid name collisions in GN (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

Index: webrtc/modules/audio_coding/neteq/neteq_impl.h

diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h

index 58b705b408f81ac292dbd0f11bed36dcc1e942f5..2b10f97e4775f887b20a19a0071a0e9412d132c4 100644

--- a/webrtc/modules/audio_coding/neteq/neteq_impl.h

+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h

@@ -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_) =

« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq.gypi ('k') | webrtc/modules/audio_coding/neteq/neteq_impl.cc » ('j') | no next file with comments »