webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.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/audio_network_adaptor/controller_manager.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h ('k') | webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc

diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc

index 67bc89990cdd3b323f284b20dbfaf8b2aef5b905..bfbb7ea571538d7ce4a88bfc8f21ce339be5d964 100644

--- a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc

+++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc

@@ -13,8 +13,6 @@

#include <cmath>

#include <utility>

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

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

#include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h"

#include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h"

#include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h"

@@ -23,6 +21,8 @@

#include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h"

#include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h"

#include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"

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

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

#if WEBRTC_ENABLE_PROTOBUF

RTC_PUSH_IGNORING_WUNDEF()