webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h - Issue 2786363002: Revert of 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.h

Issue 2786363002: Revert of Loosening the coupling between WebRTC and //third_party/protobuf (Closed)

Patch Set: 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/BUILD.gn ('k') | webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.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.h

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

index 0124cc2fcc59f5d5bd5e0073922af4f0c95e721e..155b74913ee9e635c74cb07cdd0da7d92381fff6 100644

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

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

@@ -16,7 +16,6 @@

#include <vector>

#include "webrtc/base/constructormagic.h"

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

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

namespace webrtc {

@@ -50,7 +49,7 @@

};

static std::unique_ptr<ControllerManager> Create(

- const ProtoString& config_string,

+ const std::string& config_string,

size_t num_encoder_channels,

rtc::ArrayView<const int> encoder_frame_lengths_ms,

int min_encoder_bitrate_bps,

« no previous file with comments | « webrtc/modules/audio_coding/BUILD.gn ('k') | webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc » ('j') | no next file with comments »