From bcd204df9ad7cb00a5650837b0b66faa7636384e Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Fri, 3 May 2013 09:24:04 +0100 Subject: [PATCH] Backed out changeset ad407adf94f2 (bug 867174) and friends for causing permaorange mochitest-2 on Android, disabling tests without using android.json and/or conflicting with the backouts on three CLOSED TREEs --- content/media/webaudio/AudioBufferSourceNode.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/media/webaudio/AudioBufferSourceNode.cpp b/content/media/webaudio/AudioBufferSourceNode.cpp index 6ea8d68e475..05f6e58eca2 100644 --- a/content/media/webaudio/AudioBufferSourceNode.cpp +++ b/content/media/webaudio/AudioBufferSourceNode.cpp @@ -304,7 +304,7 @@ public: mSampleRate == IdealAudioRate()); } - void UpdateSampleRateIfNeeded(AudioNodeStream* aStream, uint32_t aChannels) + void UpdateSampleRateIfNeeded(AudioNodeStream* aStream) { if (mPlaybackRateTimeline.HasSimpleValue()) { mPlaybackRate = mPlaybackRateTimeline.GetValue(); @@ -319,7 +319,7 @@ public: uint32_t currentOutSampleRate, currentInSampleRate; if (ShouldResample()) { - SpeexResamplerState* resampler = Resampler(aChannels); + SpeexResamplerState* resampler = Resampler(mChannels); speex_resampler_get_rate(resampler, ¤tInSampleRate, ¤tOutSampleRate); uint32_t finalSampleRate = ComputeFinalOutSampleRate(); if (currentOutSampleRate != finalSampleRate) { @@ -345,7 +345,7 @@ public: // WebKit treats the playbackRate as a k-rate parameter in their code, // despite the spec saying that it should be an a-rate parameter. We treat // it as k-rate. Spec bug: https://www.w3.org/Bugs/Public/show_bug.cgi?id=21592 - UpdateSampleRateIfNeeded(aStream, channels); + UpdateSampleRateIfNeeded(aStream); uint32_t written = 0; TrackTicks currentPosition = GetPosition(aStream);