webrtc/modules/audio_coding/acm2/acm_receiver.cc - Issue 2969653002: Update includes for webrtc/{base => rtc_base} rename (1/3)

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

Issue 2969653002: Update includes for webrtc/{base => rtc_base} rename (1/3) (Closed)

Patch Set: Rebased onto 89c4a7e57d524b13fbe0c823a83a4c10c2e63bd0 Created 3 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:

Index: webrtc/modules/audio_coding/acm2/acm_receiver.cc

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

index 8be08a20971af05887b8ea6116cb76e883dc72ca..2e0d8bc7c994069d042eef6a5d42272d19f04559 100644

--- a/webrtc/modules/audio_coding/acm2/acm_receiver.cc

+++ b/webrtc/modules/audio_coding/acm2/acm_receiver.cc

@@ -16,17 +16,17 @@

#include <vector>

#include "webrtc/api/audio_codecs/audio_decoder.h"

-#include "webrtc/base/checks.h"

-#include "webrtc/base/format_macros.h"

-#include "webrtc/base/logging.h"

-#include "webrtc/base/safe_conversions.h"

#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"

#include "webrtc/common_types.h"

#include "webrtc/modules/audio_coding/acm2/acm_resampler.h"

#include "webrtc/modules/audio_coding/acm2/call_statistics.h"

+#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"

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

+#include "webrtc/rtc_base/checks.h"

+#include "webrtc/rtc_base/format_macros.h"

+#include "webrtc/rtc_base/logging.h"

+#include "webrtc/rtc_base/safe_conversions.h"

#include "webrtc/system_wrappers/include/clock.h"

-#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"

namespace webrtc {