webrtc/modules/audio_coding/main/acm2/acm_receiver.h - Issue 1410073006: ACM: Move NACK functionality inside NetEq

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/main/acm2/acm_receiver.h

Issue 1410073006: ACM: Move NACK functionality inside NetEq (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 2 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:

Index: webrtc/modules/audio_coding/main/acm2/acm_receiver.h

diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h

index 823bf78e15c333d52553a5d768c5c49c096097cf..4775b8c6d9443392354fbbc6eb0baebfc5d1e754 100644

--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h

+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h

@@ -35,8 +35,6 @@ class NetEq;

namespace acm2 {

-class Nack;

class AcmReceiver {

public:

struct Decoder {

@@ -321,8 +319,6 @@ class AcmReceiver {

// TODO(henrik.lundin) Stack-allocate in GetAudio instead?

rtc::scoped_ptr<int16_t[]> audio_buffer_ GUARDED_BY(crit_sect_);

rtc::scoped_ptr<int16_t[]> last_audio_buffer_ GUARDED_BY(crit_sect_);

- rtc::scoped_ptr<Nack> nack_ GUARDED_BY(crit_sect_);

- bool nack_enabled_ GUARDED_BY(crit_sect_);

CallStatistics call_stats_ GUARDED_BY(crit_sect_);

NetEq* neteq_;

// Decoders map is keyed by payload type