Replaced the wav file dumping functionality in aec_core.c with the newly added corresponding macros

webrtc/modules/audio_processing/logging/aec_logging_file_handling.cc

+/*
+ *  Copyright (c) 2015 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.
+ */
+
+#include "webrtc/modules/audio_processing/logging/aec_logging_file_handling.h"
+
+#include <stdint.h>
+#include <stdio.h>
+
+#include "webrtc/base/basicdefs.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/stringutils.h"
+#include "webrtc/common_audio/wav_file.h"
+#include "webrtc/typedefs.h"
+
+#ifdef WEBRTC_AEC_DEBUG_DUMP
+extern "C" void WebRtcAec_ReopenWav(const char* name,

[kwiberg-webrtc, 2015/08/25 09:04:43]

You only need the 'extern "C"' in the declaration, not in the definition. See
e.g. https://isocpp.org/wiki/faq/mixing-c-and-cpp

[Andrew MacDonald, 2015/08/25 17:16:29]

Ah, interesting. I think we have this pattern elsewhere too.

[peah-webrtc, 2015/08/26 07:24:24]

Done.

[peah-webrtc, 2015/08/26 07:24:25]

Acknowledged.

[peah-webrtc, 2015/08/26 07:24:25]

Done.

+                                    int instance_index,
+                                    int process_rate,
+                                    int sample_rate,
+                                    rtc_WavWriter** wav_file) {
+  int written ATTRIBUTE_UNUSED;
+  char filename[64];

[kwiberg-webrtc, 2015/08/25 09:04:43]

Move declarations as far down as possible now that the code is C++. And see
below about ATTRIBUTE_UNUSED.

[peah-webrtc, 2015/08/26 07:24:25]

Done.

+  if (*wav_file) {
+    if (rtc_WavSampleRate(*wav_file) == sample_rate)
+      return;
+    rtc_WavClose(*wav_file);
+  }
+  written = rtc::sprintfn(filename, ARRAY_SIZE(filename), "%s%d-%d.wav", name,

[Andrew MacDonald, 2015/08/25 17:16:29]

sprintfn calls for a number of bytes in the second parameter. ARRAY_SIZE and
sizeof will give the same result for a char array, but sizeof is more
semantically correct.

[peah-webrtc, 2015/08/26 07:24:24]

Done.

+                     instance_index, process_rate);

[kwiberg-webrtc, 2015/08/25 09:04:43]

You appear to need to run clang-format.

[peah-webrtc, 2015/08/26 07:24:24]

Done.

+
+  // Ensure there was no buffer output error.
+  DCHECK(written >= 0);

[kwiberg-webrtc, 2015/08/25 09:04:43]

DCHECK_GE

[peah-webrtc, 2015/08/26 07:24:24]

Done.

+  // Ensure that the buffer size was sufficient.
+  DCHECK(static_cast<size_t>(written) < sizeof(filename));

[kwiberg-webrtc, 2015/08/25 09:04:43]

DCHECK_LT

[peah-webrtc, 2015/08/26 07:24:24]

Done.

+
+  *wav_file = rtc_WavOpen(filename, sample_rate, 1);
+}
+
+extern "C" void WebRtcAec_RawFileOpen(const char* name,
+                                      int instance_counter,

[the sun, 2015/08/25 08:32:35]

Is there a difference between instance_index (as used in _ReopenWav()) and
instance_counter?

[peah-webrtc, 2015/08/26 07:24:25]

Done.

[peah-webrtc, 2015/08/26 07:24:25]

Good point. No, there is not :-). I'll choose the instance_index for both of
them, because that is really what it is.

+                                      FILE** file) {
+  int written ATTRIBUTE_UNUSED;

[kwiberg-webrtc, 2015/08/25 09:04:43]

You shouldn't need the ATTRIBUTE_UNUSED. (DCHECK is written in an extra sneaky
way so that you won't have to worry. See
https://code.google.com/p/webrtc/source/detail?r=7869.)

Also, this is C++, so you can declare it at the point of first use.

[peah-webrtc, 2015/08/26 07:24:25]

Done.

+  char filename[64];
+
+  written = rtc::sprintfn(filename, ARRAY_SIZE(filename), "%s_%d.dat", name,
+                          instance_counter);
+
+  // Ensure there was no buffer output error.
+  DCHECK(written >= 0);
+  // Ensure that the buffer size was sufficient.
+  DCHECK(static_cast<size_t>(written) < sizeof(filename));
+
+  *file = fopen(filename, "wb");
+}
+
+#endif  // WEBRTC_AEC_DEBUG_DUMP