webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc - Issue 2747863003: Loosening the coupling between WebRTC and //third_party/protobuf

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 2747863003: Loosening the coupling between WebRTC and //third_party/protobuf (Closed)

Patch Set: Fixing the build when rtc_enable_protobuf if false Created 3 years, 9 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 1eb0857cd03d4da63dc39e3e13dbfacc97e82f77..5aea946a3984b12ac2236ff55df87d7b3584de60 100644

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

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

@@ -12,6 +12,7 @@

#include <cmath>

#include <utility>

+#include <string>

kjellander_webrtc 2017/03/15 12:02:30 Sort alphabetically.

mbonadei 2017/03/15 13:21:48 Done.

#include "webrtc/base/ignore_wundef.h"

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

@@ -157,7 +158,11 @@ ControllerManagerImpl::Config::Config(int min_reordering_time_ms,

ControllerManagerImpl::Config::~Config() = default;

std::unique_ptr<ControllerManager> ControllerManagerImpl::Create(

+#ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP

+ const ProtoString& config_string,

+#else

const std::string& config_string,

+#endif

size_t num_encoder_channels,

rtc::ArrayView<const int> encoder_frame_lengths_ms,

int min_encoder_bitrate_bps,