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

Unified Diff: webrtc/modules/audio_processing/logging/apm_data_dumper.h

Issue 1877713002: Replaced the data logging functionality in the AEC with a generic logging functionality (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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/logging/apm_data_dumper.h
diff --git a/webrtc/modules/audio_processing/logging/apm_data_dumper.h b/webrtc/modules/audio_processing/logging/apm_data_dumper.h
new file mode 100644
index 0000000000000000000000000000000000000000..b53fee5b216487679924304875893062ae63f334
--- /dev/null
+++ b/webrtc/modules/audio_processing/logging/apm_data_dumper.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_
+#define WEBRTC_MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_
+
+#include <map>
+#include <string>
+
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/array_view.h"
hlundin-webrtc 2016/04/11 11:58:29 Order of includes.
peah-webrtc 2016/04/12 21:46:39 Done.
+#include "webrtc/common_audio/wav_file.h"
+
+namespace webrtc {
+
+// Class that handles dumping of variables into files.
+class ApmDataDumper {
+ public:
+ // Constructor that takes an instance index that may
+ // be used to distinguish data dumped from different
+ // instances of the code.
+ explicit ApmDataDumper(int instance_index)
+ : instance_index_(instance_index) {}
+ ~ApmDataDumper();
+
+ // (Re)Initializes the data dumping such that new versions
+ // of all files being dumped to are created.
+ void Initialize();
kwiberg-webrtc 2016/04/11 10:43:37 The name of this function suggests that it has to
hlundin-webrtc 2016/04/11 11:58:29 Acknowledged.
peah-webrtc 2016/04/12 21:46:39 Done.
peah-webrtc 2016/04/12 21:46:39 Good point! Did not think of that. I modified this
+
+ // Methods for performing dumping of data of various types into
+ // various formats.
+ void DumpRaw(const std::string& name, int v_length, float* v);
+ void DumpRaw(const std::string& name, rtc::ArrayView<const float> v);
+ void DumpWav(const std::string& name,
+ int v_length,
+ float* v,
+ int sample_rate_hz);
+ void DumpWav(const std::string& name,
+ rtc::ArrayView<const float> v,
+ int sample_rate_hz);
kwiberg-webrtc 2016/04/11 10:43:37 By making these methods not inline, you'll prevent
peah-webrtc 2016/04/12 21:46:39 Good point! Done.
+
+ private:
kwiberg-webrtc 2016/04/11 10:43:37 Consider #ifdeffing the members away too.
peah-webrtc 2016/04/12 21:46:39 Done.
+ const int instance_index_;
+ int reinit_counter_ = -1;
+ std::map<std::string, FILE*> raw_files_;
+ std::map<std::string, rtc_WavWriter*> wav_files_;
+
+ FILE* GetRawFile(const std::string& name);
kwiberg-webrtc 2016/04/11 10:43:37 You don't include anything that provides FILE exce
hlundin-webrtc 2016/04/11 11:58:29 Forward declare?
peah-webrtc 2016/04/12 21:46:39 Good find!
peah-webrtc 2016/04/12 21:46:39 I'm not sure what you mean with this.
hlundin-webrtc 2016/04/25 11:29:59 What I think I meant was that since your previous
+ rtc_WavWriter* GetWavFile(const std::string& name, int sample_rate_hz);
kwiberg-webrtc 2016/04/11 10:43:37 It looks like you're using the C API for the wav w
peah-webrtc 2016/04/12 21:46:39 Good point! Done.
+
+ RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ApmDataDumper);
+};
+
+} // namespace webrtc
+
+#endif // WEBRTC_MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_

Powered by Google App Engine
This is Rietveld 408576698