webrtc/modules/audio_coding/neteq/neteq_impl.cc - 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.cc

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.cc

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

index b8e8c71d3411a3a14f72589897786f078505edce..15eb51b72ca89972927e5bb093d290549edd2821 100644

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

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

@@ -35,7 +35,7 @@

#include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"

#include "webrtc/modules/audio_coding/neteq/expand.h"

#include "webrtc/modules/audio_coding/neteq/merge.h"

-#include "webrtc/modules/audio_coding/neteq/nack.h"

+#include "webrtc/modules/audio_coding/neteq/nack_tracker.h"

#include "webrtc/modules/audio_coding/neteq/normal.h"

#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"

#include "webrtc/modules/audio_coding/neteq/packet.h"

@@ -476,7 +476,7 @@ void NetEqImpl::EnableNack(size_t max_nack_list_size) {

rtc::CritScope lock(&crit_sect_);

if (!nack_enabled_) {

const int kNackThresholdPackets = 2;

- nack_.reset(Nack::Create(kNackThresholdPackets));

+ nack_.reset(NackTracker::Create(kNackThresholdPackets));

nack_enabled_ = true;

nack_->UpdateSampleRate(fs_hz_);

}

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