Conversational Speech tool, WavReaderAdaptor and unit test

webrtc/modules/audio_processing/test/conversational_speech/wavreader_adaptor.h

 /*
  *  Copyright (c) 2017 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_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ADAPTOR_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ADAPTOR_H_
 
 #include "webrtc/modules/audio_processing/test/conversational_speech/wavreader_interface.h"
 
 #include <cstddef>
 #include <string>
 
+#include "webrtc/common_audio/wav_file.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 namespace test {
 namespace conversational_speech {
 
 class WavReaderAdaptor : public WavReaderInterface {
  public:
   explicit WavReaderAdaptor(const std::string& filepath);
   ~WavReaderAdaptor() override;
 
   size_t ReadFloatSamples(size_t num_samples, float* samples) override;
   size_t ReadInt16Samples(size_t num_samples, int16_t* samples) override;

[kwiberg-webrtc, 2017/03/28 17:52:45]

Not this CL's fault, but the arguments here really should have been ArrayViews.

[AleBzk, 2017/03/29 08:56:45]

Done.

 
   int sample_rate() const override;
   size_t num_channels() const override;
   size_t num_samples() const override;
+ private:
+  WavReader wav_reader_;

[kwiberg-webrtc, 2017/03/28 17:52:45]

When you add this private member variable, you have to #include wav_file.h,
which is visible to anyone who #includes this file.

If you're open to moving code around a bit, I'd suggest moving this entire class
definition to the .cc file, and keeping just one thing in this header:

  std::unique_ptr<WavReaderInterface> CreateWavReaderAdaptor(const std::string&
filepath);

As an added bonus, everything in the .cc file (except for the definition of that
function) can then be in an anonymous namespace.

[AleBzk, 2017/03/29 08:56:45]

Done.

 };
 
 }  // namespace conversational_speech
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_WAVREADER_ADAPTOR_H_