Bug 1388229 - Remove B2G-only audio stream type handling. r=kamidphish

dom/media/AudioStream.cpp

@@ -331,8 +331,7 @@ int AudioStream::InvokeCubeb(Function aFunction, Args&&... aArgs)
 }
 
 nsresult
-AudioStream::Init(uint32_t aNumChannels, uint32_t aChannelMap, uint32_t aRate,
-                  const dom::AudioChannel aAudioChannel)
+AudioStream::Init(uint32_t aNumChannels, uint32_t aChannelMap, uint32_t aRate)
 {
   auto startTime = TimeStamp::Now();
 
@@ -346,11 +345,8 @@ AudioStream::Init(uint32_t aNumChannels, uint32_t aChannelMap, uint32_t aRate,
   params.rate = aRate;
   params.channels = mOutChannels;
   params.layout = CubebUtils::ConvertChannelMapToCubebLayout(aChannelMap);
-#if defined(__ANDROID__)
-  params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#endif
-
   params.format = ToCubebFormat<AUDIO_OUTPUT_FORMAT>::value;
+
   mAudioClock.Init(aRate);
 
   cubeb* cubebContext = CubebUtils::GetCubebContext();

dom/media/AudioStream.h

@@ -10,7 +10,6 @@
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsThreadUtils.h"
-#include "mozilla/dom/AudioChannelBinding.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/TimeStamp.h"
@@ -191,8 +190,7 @@ public:
   // channels (1 for mono, 2 for stereo, etc), aChannelMap is the indicator for
   // channel layout(mono, stereo, 5.1 or 7.1 ) and aRate is the sample rate
   // (22050Hz, 44100Hz, etc).
-  nsresult Init(uint32_t aNumChannels, uint32_t aChannelMap, uint32_t aRate,
-                const dom::AudioChannel aAudioStreamChannel);
+  nsresult Init(uint32_t aNumChannels, uint32_t aChannelMap, uint32_t aRate);
 
   // Closes the stream. All future use of the stream is an error.
   void Shutdown();

dom/media/CubebUtils.h

@@ -9,7 +9,6 @@
 
 #include "cubeb/cubeb.h"
 #include "mozilla/dom/AudioDeviceInfo.h"
-#include "mozilla/dom/AudioChannelBinding.h"
 #include "mozilla/Maybe.h"
 
 namespace mozilla {

dom/media/GraphDriver.cpp

@@ -627,12 +627,6 @@ AudioCallbackDriver::Init()
 
   mSampleRate = output.rate = CubebUtils::PreferredSampleRate();
 
-#if defined(__ANDROID__)
-  output.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-#else
-  (void)mAudioChannel;
-#endif
-
   output.channels = mGraphImpl->AudioChannelCount();
   if (AUDIO_OUTPUT_FORMAT == AUDIO_FORMAT_S16) {
     output.format = CUBEB_SAMPLE_S16NE;

dom/media/MediaDecoderStateMachine.cpp

@@ -2799,7 +2799,7 @@ MediaDecoderStateMachine::CreateAudioSink()
     AudioSink* audioSink = new AudioSink(
       self->mTaskQueue, self->mAudioQueue,
       self->GetMediaTime(),
-      self->Info().mAudio, self->mAudioChannel);
+      self->Info().mAudio);
 
     self->mAudibleListener = audioSink->AudibleEvent().Connect(
       self->mTaskQueue, self.get(),

dom/media/mediasink/AudioSink.cpp

@@ -34,11 +34,9 @@ static const int32_t LOW_AUDIO_USECS = 300000;
 AudioSink::AudioSink(AbstractThread* aThread,
                      MediaQueue<AudioData>& aAudioQueue,
                      const TimeUnit& aStartTime,
-                     const AudioInfo& aInfo,
-                     dom::AudioChannel aChannel)
+                     const AudioInfo& aInfo)
   : mStartTime(aStartTime)
   , mInfo(aInfo)
-  , mChannel(aChannel)
   , mPlaying(true)
   , mMonitor("AudioSink")
   , mWritten(0)
@@ -203,7 +201,7 @@ AudioSink::InitializeAudioStream(const PlaybackParams& aParams)
   // The layout map used here is already processed by mConverter with
   // mOutputChannels into SMPTE format, so there is no need to worry if
   // MediaPrefs::MonoAudio() or MediaPrefs::AudioSinkForceStereo() is applied.
-  nsresult rv = mAudioStream->Init(mOutputChannels, channelMap, mOutputRate, mChannel);
+  nsresult rv = mAudioStream->Init(mOutputChannels, channelMap, mOutputRate);
   if (NS_FAILED(rv)) {
     mAudioStream->Shutdown();
     mAudioStream = nullptr;

dom/media/mediasink/AudioSink.h

@@ -12,7 +12,6 @@
 #include "MediaInfo.h"
 #include "MediaSink.h"
 
-#include "mozilla/dom/AudioChannelBinding.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MozPromise.h"
@@ -33,8 +32,7 @@ public:
   AudioSink(AbstractThread* aThread,
             MediaQueue<AudioData>& aAudioQueue,
             const TimeUnit& aStartTime,
-            const AudioInfo& aInfo,
-            dom::AudioChannel aChannel);
+            const AudioInfo& aInfo);
 
   ~AudioSink();
 
@@ -92,8 +90,6 @@ private:
 
   const AudioInfo mInfo;
 
-  const dom::AudioChannel mChannel;
-
   // Used on the task queue of MDSM only.
   bool mPlaying;
 

dom/media/mediasink/AudioSinkWrapper.h

@@ -8,7 +8,6 @@
 #define AudioSinkWrapper_h_
 
 #include "mozilla/AbstractThread.h"
-#include "mozilla/dom/AudioChannelBinding.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
@@ -16,7 +15,6 @@
 #include "MediaSink.h"
 
 namespace mozilla {
-
 class MediaData;
 template <class T> class MediaQueue;