Conversational Speech tool, MultiEndCall::CheckTiming() and tests

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

Index: webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h
diff --git a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h b/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h
index 3686d12dd7a359f63dc0ffaf697f1b10a38b1e92..8a61762b91da1b64184afe1444b2b3e355b5f436 100644
--- a/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h
+++ b/webrtc/modules/audio_processing/test/conversational_speech/mock_wavreader_factory.h
@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_FACTORY_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_CONVERSATIONAL_SPEECH_MOCK_WAVREADER_FACTORY_H_
 
+#include <map>
 #include <memory>
 #include <string>
 
@@ -20,19 +21,33 @@
 
 namespace webrtc {
 namespace test {
+
 namespace conversational_speech {
 
 class MockWavReaderFactory : public WavReaderAbstractFactory {
  public:
-  MockWavReaderFactory();
-  // TODO(alessiob): add ctor that gets map string->(sr, #samples, #channels).
+  struct Params{
+    int sample_rate;
+    size_t num_channels;
+    size_t num_samples;
+  };
+
+  MockWavReaderFactory(const Params& default_params,
+                       const std::map<std::string, const Params>&
+                          params = std::map<std::string, const Params>{});

[hlundin-webrtc, 2017/04/07 11:54:18]

Remove default arg and replace the extra ctor instead.

   ~MockWavReaderFactory();
 
-  // TODO(alessiob): use ON_CALL to return MockWavReader with desired params.
   MOCK_CONST_METHOD1(Create, std::unique_ptr<WavReaderInterface>(
       const std::string&));
 
-  // TODO(alessiob): add const ref to map (see ctor to add).
+ private:
+  // Creates a MockWavReader instance using the parameters in
+  // audiotrack_names_params_ if the entry corresponding to filepath exists,
+  // otherwise creates a MockWavReader instance using the default parameters.
+  std::unique_ptr<WavReaderInterface> CreateMock(const std::string& filepath);
+
+  const Params default_params_;
+  const std::map<std::string, const Params>& audiotrack_names_params_;
 };
 
 }  // namespace conversational_speech