summaryrefslogtreecommitdiff
path: root/dom/media
diff options
context:
space:
mode:
Diffstat (limited to 'dom/media')
-rw-r--r--dom/media/AudioStream.cpp7
-rw-r--r--dom/media/GraphDriver.cpp8
2 files changed, 0 insertions, 15 deletions
diff --git a/dom/media/AudioStream.cpp b/dom/media/AudioStream.cpp
index 4b1d82c37..77ed512ee 100644
--- a/dom/media/AudioStream.cpp
+++ b/dom/media/AudioStream.cpp
@@ -331,13 +331,6 @@ AudioStream::Init(uint32_t aNumChannels, uint32_t aRate,
cubeb_stream_params params;
params.rate = aRate;
params.channels = mOutChannels;
-#if defined(__ANDROID__)
- params.stream_type = CUBEB_STREAM_TYPE_MUSIC;
-
- if (params.stream_type == CUBEB_STREAM_TYPE_MAX) {
- return NS_ERROR_INVALID_ARG;
- }
-#endif
params.format = ToCubebFormat<AUDIO_OUTPUT_FORMAT>::value;
mAudioClock.Init(aRate);
diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index fe40c82e2..e8b71a231 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -630,15 +630,7 @@ AudioCallbackDriver::Init()
mSampleRate = output.rate = CubebUtils::PreferredSampleRate();
-#if defined(__ANDROID__)
- output.stream_type = CUBEB_STREAM_TYPE_MUSIC;
- if (output.stream_type == CUBEB_STREAM_TYPE_MAX) {
- NS_WARNING("Bad stream type");
- return;
- }
-#else
(void)mAudioChannel;
-#endif
output.channels = mGraphImpl->AudioChannelCount();
if (AUDIO_OUTPUT_FORMAT == AUDIO_FORMAT_S16) {