Bug 1014393 - Move AudioGenerator to its own files so it can be used in more media gtests. r=pehrsons

Differential Revision: https://phabricator.services.mozilla.com/D35389

--HG--
extra : moz-landing-system : lando

dom/media/gtest/AudioGenerator.cpp

@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include "AudioGenerator.h"
+
+#include "AudioSegment.h"
+
+using namespace mozilla;
+
+AudioGenerator::AudioGenerator(int32_t aChannels, int32_t aSampleRate)
+    : mGenerator(aSampleRate, 1000), mChannels(aChannels) {}
+
+void AudioGenerator::Generate(AudioSegment& aSegment, const int32_t& aSamples) {
+  RefPtr<SharedBuffer> buffer =
+      SharedBuffer::Create(aSamples * sizeof(int16_t));
+  int16_t* dest = static_cast<int16_t*>(buffer->Data());
+  mGenerator.generate(dest, aSamples);
+  AutoTArray<const int16_t*, 1> channels;
+  for (int32_t i = 0; i < mChannels; i++) {
+    channels.AppendElement(dest);
+  }
+  aSegment.AppendFrames(buffer.forget(), channels, aSamples,
+                        PRINCIPAL_HANDLE_NONE);
+}

dom/media/gtest/AudioGenerator.h

@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#ifndef DOM_MEDIA_GTEST_AUDIO_GENERATOR_H_
+#define DOM_MEDIA_GTEST_AUDIO_GENERATOR_H_
+
+#include "prtime.h"
+#include "SineWaveGenerator.h"
+
+namespace mozilla {
+class AudioSegment;
+}
+
+class AudioGenerator {
+ public:
+  AudioGenerator(int32_t aChannels, int32_t aSampleRate);
+  void Generate(mozilla::AudioSegment& aSegment, const int32_t& aSamples);
+
+ private:
+  mozilla::SineWaveGenerator mGenerator;
+  const int32_t mChannels;
+};
+
+#endif  // DOM_MEDIA_GTEST_AUDIO_GENERATOR_H_

dom/media/gtest/TestAudioTrackEncoder.cpp

@@ -5,33 +5,11 @@
 
 #include "gtest/gtest.h"
 #include "OpusTrackEncoder.h"
-#include "SineWaveGenerator.h"
+
+#include "AudioGenerator.h"
 
 using namespace mozilla;
 
-class AudioGenerator {
- public:
-  AudioGenerator(int32_t aChannels, int32_t aSampleRate)
-      : mGenerator(aSampleRate, 1000), mChannels(aChannels) {}
-
-  void Generate(AudioSegment& aSegment, const int32_t& aSamples) {
-    RefPtr<SharedBuffer> buffer =
-        SharedBuffer::Create(aSamples * sizeof(int16_t));
-    int16_t* dest = static_cast<int16_t*>(buffer->Data());
-    mGenerator.generate(dest, aSamples);
-    AutoTArray<const int16_t*, 1> channels;
-    for (int32_t i = 0; i < mChannels; i++) {
-      channels.AppendElement(dest);
-    }
-    aSegment.AppendFrames(buffer.forget(), channels, aSamples,
-                          PRINCIPAL_HANDLE_NONE);
-  }
-
- private:
-  SineWaveGenerator mGenerator;
-  const int32_t mChannels;
-};
-
 class TestOpusTrackEncoder : public OpusTrackEncoder {
  public:
   TestOpusTrackEncoder() : OpusTrackEncoder(90000) {}

dom/media/gtest/moz.build

@@ -14,6 +14,7 @@ LOCAL_INCLUDES += [
 ]
 
 UNIFIED_SOURCES += [
+    'AudioGenerator.cpp',
     'MockMediaResource.cpp',
     'TestAudioBuffers.cpp',
     'TestAudioCallbackDriver.cpp',