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

Unified Diff: webrtc/modules/audio_coding/main/acm2/acm_dump.cc

Issue 1219333003: Targets should not depend on protobuf when enable_protobuf=0. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Do not define AcmDump::ParseAcmDump Created 5 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 | « no previous file | webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/main/acm2/acm_dump.cc
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_dump.cc b/webrtc/modules/audio_coding/main/acm2/acm_dump.cc
index 3fc055723aa0a9fbdf0126807ba10cab9e99ed65..9c624d97b67eb728c6f54729ee8a37e6359f2631 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_dump.cc
+++ b/webrtc/modules/audio_coding/main/acm2/acm_dump.cc
@@ -18,12 +18,14 @@
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#ifdef RTC_AUDIOCODING_DEBUG_DUMP
// Files generated at build-time by the protobuf compiler.
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
#include "external/webrtc/webrtc/modules/audio_coding/dump.pb.h"
#else
#include "webrtc/audio_coding/dump.pb.h"
#endif
+#endif
namespace webrtc {
@@ -213,13 +215,6 @@ void AcmDumpImpl::AddRecentEvent(const ACMDumpEvent& event) {
}
}
-#endif // RTC_AUDIOCODING_DEBUG_DUMP
-
-// AcmDump member functions.
-rtc::scoped_ptr<AcmDump> AcmDump::Create() {
- return rtc::scoped_ptr<AcmDump>(new AcmDumpImpl());
-}
-
bool AcmDump::ParseAcmDump(const std::string& file_name,
hlundin-webrtc 2015/07/03 15:13:26 AcmDump::ParseAcmDump() no longer has an implement
ACMDumpEventStream* result) {
char tmp_buffer[1024];
@@ -236,4 +231,10 @@ bool AcmDump::ParseAcmDump(const std::string& file_name,
return result->ParseFromString(dump_buffer);
}
+#endif // RTC_AUDIOCODING_DEBUG_DUMP
+
+// AcmDump member functions.
+rtc::scoped_ptr<AcmDump> AcmDump::Create() {
+ return rtc::scoped_ptr<AcmDump>(new AcmDumpImpl());
+}
} // namespace webrtc
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698