webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.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/codecs/opus/audio_encoder_opus.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:

Index: webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h

diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h

index c756acf4b59e2500d1d08e877deaf3cee20f4a8f..15ded47a9113a2391ac45feb3160edbfc376e14f 100644

--- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h

+++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h

@@ -18,7 +18,6 @@

#include "webrtc/base/constructormagic.h"

#include "webrtc/base/optional.h"

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

#include "webrtc/common_audio/smoothing_filter.h"

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

#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"

@@ -157,7 +156,7 @@

void ApplyAudioNetworkAdaptor();

std::unique_ptr<AudioNetworkAdaptor> DefaultAudioNetworkAdaptorCreator(

- const ProtoString& config_string,

+ const std::string& config_string,

RtcEventLog* event_log,

const Clock* clock) const;