Bug 1869043 rename MockCubebStream::InputSampleRate() SampleRate() r=…

…pehrsons Cubeb does not support different input and output rates. https://searchfox.org/mozilla-central/rev/43c40b22c776d098afb89d5237da3464a7545532/media/libcubeb/src/cubeb_wasapi.cpp#2598 Depends on D198227 Differential Revision: https://phabricator.services.mozilla.com/D198228 UltraBlame original commit: 734e2e027196a9d64120ebf11a01a1b03e494d43
marco-c · Jan 16, 2024 · a49525f · a49525f
1 parent f677e6e
commit a49525f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/dom/media/gtest/MockCubeb.cpp b/dom/media/gtest/MockCubeb.cpp
@@ -176,6 +176,7 @@ MockCubebStream::MockCubebStream(
   }
   if (aOutputStreamParams) {
     mOutputParams = *aOutputStreamParams;
+    MOZ_ASSERT(SampleRate() == mOutputParams.rate);
   }
 }
 
@@ -291,7 +292,7 @@ uint32_t MockCubebStream::OutputChannels() const {
   return mOutputParams.channels;
 }
 
-uint32_t MockCubebStream::InputSampleRate() const {
+uint32_t MockCubebStream::SampleRate() const {
   return mAudioGenerator.mSampleRate;
 }
 
@@ -417,7 +418,7 @@ KeepProcessing MockCubebStream::Process(long aNrFrames) {
 
 KeepProcessing MockCubebStream::Process10Ms() {
   MOZ_ASSERT(mRunningMode == RunningMode::Automatic);
-  uint32_t rate = mHasOutput ? mOutputParams.rate : mInputParams.rate;
+  uint32_t rate = SampleRate();
   const long nrFrames =
       static_cast<long>(static_cast<float>(rate * 10) * mDriftFactor) /
       PR_MSEC_PER_SEC;

diff --git a/dom/media/gtest/MockCubeb.h b/dom/media/gtest/MockCubeb.h
@@ -182,7 +182,7 @@ class MockCubebStream {
 
   uint32_t InputChannels() const;
   uint32_t OutputChannels() const;
-  uint32_t InputSampleRate() const;
+  uint32_t SampleRate() const;
   uint32_t InputFrequency() const;
 
   void SetDriftFactor(float aDriftFactor);

diff --git a/dom/media/gtest/TestAudioInputSource.cpp b/dom/media/gtest/TestAudioInputSource.cpp
@@ -69,7 +69,7 @@ TEST(TestAudioInputSource, StartAndStop)
     EXPECT_FALSE(stream->mHasOutput);
     EXPECT_EQ(stream->GetInputDeviceID(), deviceId);
     EXPECT_EQ(stream->InputChannels(), channels);
-    EXPECT_EQ(stream->InputSampleRate(), static_cast<uint32_t>(sourceRate));
+    EXPECT_EQ(stream->SampleRate(), static_cast<uint32_t>(sourceRate));
 
     Unused << WaitFor(stream->FramesProcessedEvent());
 
@@ -85,7 +85,7 @@ TEST(TestAudioInputSource, StartAndStop)
     EXPECT_FALSE(stream->mHasOutput);
     EXPECT_EQ(stream->GetInputDeviceID(), deviceId);
     EXPECT_EQ(stream->InputChannels(), channels);
-    EXPECT_EQ(stream->InputSampleRate(), static_cast<uint32_t>(sourceRate));
+    EXPECT_EQ(stream->SampleRate(), static_cast<uint32_t>(sourceRate));
 
     Unused << WaitFor(stream->FramesProcessedEvent());
 

diff --git a/dom/media/gtest/TestAudioTrackGraph.cpp b/dom/media/gtest/TestAudioTrackGraph.cpp
@@ -381,8 +381,7 @@ TEST(TestAudioTrackGraph, NonNativeInputTrackStartAndStop)
       EXPECT_FALSE(nonNativeStream->mHasOutput);
       EXPECT_EQ(nonNativeStream->GetInputDeviceID(), deviceId);
       EXPECT_EQ(nonNativeStream->InputChannels(), channels);
-      EXPECT_EQ(nonNativeStream->InputSampleRate(),
-                static_cast<uint32_t>(rate));
+      EXPECT_EQ(nonNativeStream->SampleRate(), static_cast<uint32_t>(rate));
 
 
       {
@@ -442,8 +441,7 @@ TEST(TestAudioTrackGraph, NonNativeInputTrackStartAndStop)
       EXPECT_FALSE(nonNativeStream->mHasOutput);
       EXPECT_EQ(nonNativeStream->GetInputDeviceID(), deviceId);
       EXPECT_EQ(nonNativeStream->InputChannels(), channels);
-      EXPECT_EQ(nonNativeStream->InputSampleRate(),
-                static_cast<uint32_t>(rate));
+      EXPECT_EQ(nonNativeStream->SampleRate(), static_cast<uint32_t>(rate));
 
       Unused << WaitFor(nonNativeStream->FramesProcessedEvent());
 
@@ -512,7 +510,7 @@ TEST(TestAudioTrackGraph, NonNativeInputTrackErrorCallback)
     EXPECT_FALSE(nonNativeStream->mHasOutput);
     EXPECT_EQ(nonNativeStream->GetInputDeviceID(), deviceId);
     EXPECT_EQ(nonNativeStream->InputChannels(), channels);
-    EXPECT_EQ(nonNativeStream->InputSampleRate(), static_cast<uint32_t>(rate));
+    EXPECT_EQ(nonNativeStream->SampleRate(), static_cast<uint32_t>(rate));
 
 
     Unused << WaitFor(nonNativeStream->FramesProcessedEvent());
@@ -1294,7 +1292,7 @@ TEST(TestAudioTrackGraph, AudioProcessingTrack)
     processingTrack->Destroy();
   });
 
-  uint32_t inputRate = stream->InputSampleRate();
+  uint32_t inputRate = stream->SampleRate();
   uint32_t inputFrequency = stream->InputFrequency();
   uint64_t preSilenceSamples;
   uint32_t estimatedFreq;
@@ -1434,7 +1432,7 @@ TEST(TestAudioTrackGraph, ReConnectDeviceInput)
     processingTrack->Destroy();
   });
 
-  uint32_t inputRate = stream->InputSampleRate();
+  uint32_t inputRate = stream->SampleRate();
   uint32_t inputFrequency = stream->InputFrequency();
   uint64_t preSilenceSamples;
   uint32_t estimatedFreq;

diff --git a/dom/media/gtest/TestDeviceInputTrack.cpp b/dom/media/gtest/TestDeviceInputTrack.cpp
@@ -283,7 +283,7 @@ TEST_F(TestDeviceInputTrack, StartAndStop) {
     EXPECT_FALSE(stream->mHasOutput);
     EXPECT_EQ(stream->GetInputDeviceID(), deviceId);
     EXPECT_EQ(stream->InputChannels(), channels);
-    EXPECT_EQ(stream->InputSampleRate(), static_cast<uint32_t>(rate));
+    EXPECT_EQ(stream->SampleRate(), static_cast<uint32_t>(rate));
     EXPECT_EQ(track->NumberOfChannels(), channels);
     EXPECT_EQ(track->DevicePreference(), AudioInputType::Voice);
 
@@ -323,7 +323,7 @@ TEST_F(TestDeviceInputTrack, StartAndStop) {
     EXPECT_FALSE(stream->mHasOutput);
     EXPECT_EQ(stream->GetInputDeviceID(), deviceId);
     EXPECT_EQ(stream->InputChannels(), channels);
-    EXPECT_EQ(stream->InputSampleRate(), static_cast<uint32_t>(rate));
+    EXPECT_EQ(stream->SampleRate(), static_cast<uint32_t>(rate));
 
 
     Unused << WaitFor(stream->FramesProcessedEvent());
@@ -399,7 +399,7 @@ TEST_F(TestDeviceInputTrack, NonNativeInputTrackData) {
   EXPECT_FALSE(stream->mHasOutput);
   EXPECT_EQ(stream->GetInputDeviceID(), deviceId);
   EXPECT_EQ(stream->InputChannels(), channels);
-  EXPECT_EQ(stream->InputSampleRate(), static_cast<uint32_t>(rate));
+  EXPECT_EQ(stream->SampleRate(), static_cast<uint32_t>(rate));
 
 
   Unused << WaitFor(stream->FramesProcessedEvent());
@@ -475,7 +475,7 @@ TEST_F(TestDeviceInputTrack, NonNativeDeviceChangedCallback) {
   EXPECT_FALSE(stream->mHasOutput);
   EXPECT_EQ(stream->GetInputDeviceID(), deviceId);
   EXPECT_EQ(stream->InputChannels(), channels);
-  EXPECT_EQ(stream->InputSampleRate(), static_cast<uint32_t>(rate));
+  EXPECT_EQ(stream->SampleRate(), static_cast<uint32_t>(rate));
 
 
   Unused << WaitFor(stream->FramesProcessedEvent());
@@ -535,7 +535,7 @@ TEST_F(TestDeviceInputTrack, NonNativeErrorCallback) {
   EXPECT_FALSE(stream->mHasOutput);
   EXPECT_EQ(stream->GetInputDeviceID(), deviceId);
   EXPECT_EQ(stream->InputChannels(), channels);
-  EXPECT_EQ(stream->InputSampleRate(), static_cast<uint32_t>(rate));
+  EXPECT_EQ(stream->SampleRate(), static_cast<uint32_t>(rate));
 
 
   Unused << WaitFor(stream->FramesProcessedEvent());