Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(672)

Unified Diff: webrtc/modules/audio_processing/audio_processing_impl.h

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
Index: webrtc/modules/audio_processing/audio_processing_impl.h
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h
index 01b640fcfc0f36332790765fd530f267690cfc9a..111127e3c8b6a2876b2f75a0d9bf74ef7cf9fc7d 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.h
+++ b/webrtc/modules/audio_processing/audio_processing_impl.h
@@ -13,7 +13,6 @@
#include <list>
#include <memory>
-#include <string>
#include <vector>
#include "webrtc/base/criticalsection.h"
@@ -29,7 +28,8 @@
#include "webrtc/system_wrappers/include/file_wrapper.h"
#ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
-// Files generated at build-time by the protobuf compiler.
+#include "webrtc/base/protobuf_utils.h"
+// *.pb.h files are generated at build-time by the protobuf compiler.
RTC_PUSH_IGNORING_WUNDEF()
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
@@ -200,10 +200,10 @@ class AudioProcessingImpl : public AudioProcessing {
ApmDebugDumpThreadState();
~ApmDebugDumpThreadState();
std::unique_ptr<audioproc::Event> event_msg; // Protobuf message.
- std::string event_str; // Memory for protobuf serialization.
+ ProtoString event_str; // Memory for protobuf serialization.
// Serialized string of last saved APM configuration.
- std::string last_serialized_config;
+ ProtoString last_serialized_config;
};
struct ApmDebugDumpState {

Powered by Google App Engine
This is Rietveld 408576698