Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1583512 - Remove remaining references to doppler shift from AudioBufferSourceNode. r=karlt

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D46934

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Paul Adenot 2019-09-24 23:52:21 +00:00
parent 172c56e5ba
commit 7f8e465155
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/media/webaudio/AudioBufferSourceNode.cpp
View File

@ -55,7 +55,6 @@ class AudioBufferSourceNodeEngine final : public AudioNodeEngine {
mBufferSampleRate(0), mBufferSampleRate(0),
// mResamplerOutRate is initialized in UpdateResampler(). // mResamplerOutRate is initialized in UpdateResampler().
mChannels(0), mChannels(0),
mDopplerShift(1.0f),
mDestination(aDestination->Stream()), mDestination(aDestination->Stream()),
mPlaybackRateTimeline(1.0f), mPlaybackRateTimeline(1.0f),
mDetuneTimeline(0.0f), mDetuneTimeline(0.0f),
@ -102,9 +101,6 @@ class AudioBufferSourceNodeEngine final : public AudioNodeEngine {
// Round to nearest // Round to nearest
mBeginProcessing = mStart + 0.5; mBeginProcessing = mStart + 0.5;
break; break;
case AudioBufferSourceNode::DOPPLERSHIFT:
mDopplerShift = (aParam <= 0 || mozilla::IsNaN(aParam)) ? 1.0 : aParam;
break;
default: default:
NS_ERROR("Bad AudioBufferSourceNodeEngine double parameter."); NS_ERROR("Bad AudioBufferSourceNodeEngine double parameter.");
}; };
@ -441,10 +437,9 @@ class AudioBufferSourceNodeEngine final : public AudioNodeEngine {
int32_t ComputeFinalOutSampleRate(float aPlaybackRate, float aDetune) { int32_t ComputeFinalOutSampleRate(float aPlaybackRate, float aDetune) {
float computedPlaybackRate = aPlaybackRate * exp2(aDetune / 1200.f); float computedPlaybackRate = aPlaybackRate * exp2(aDetune / 1200.f);
// Make sure the playback rate and the doppler shift are something // Make sure the playback rate is something our resampler can work with.
// our resampler can work with.
int32_t rate = WebAudioUtils::TruncateFloatToInt<int32_t>( int32_t rate = WebAudioUtils::TruncateFloatToInt<int32_t>(
mSource->SampleRate() / (computedPlaybackRate * mDopplerShift)); mSource->SampleRate() / computedPlaybackRate);
return rate ? rate : mBufferSampleRate; return rate ? rate : mBufferSampleRate;
} }
@ -574,7 +569,6 @@ class AudioBufferSourceNodeEngine final : public AudioNodeEngine {
int32_t mBufferSampleRate; int32_t mBufferSampleRate;
int32_t mResamplerOutRate; int32_t mResamplerOutRate;
uint32_t mChannels; uint32_t mChannels;
float mDopplerShift;
RefPtr<AudioNodeStream> mDestination; RefPtr<AudioNodeStream> mDestination;
// mSource deletes the engine in its destructor. // mSource deletes the engine in its destructor.
@ -814,11 +808,6 @@ void AudioBufferSourceNode::NotifyMainThreadStreamFinished() {
MarkInactive(); MarkInactive();
} }
void AudioBufferSourceNode::SendDopplerShiftToStream(double aDopplerShift) {
MOZ_ASSERT(mStream, "Should have disconnected panner if no stream");
SendDoubleParameterToStream(DOPPLERSHIFT, aDopplerShift);
}
void AudioBufferSourceNode::SendLoopParametersToStream() { void AudioBufferSourceNode::SendLoopParametersToStream() {
if (!mStream) { if (!mStream) {
return; return;

5
dom/media/webaudio/AudioBufferSourceNode.h
View File

@ -69,8 +69,6 @@ class AudioBufferSourceNode final : public AudioScheduledSourceNode,
mLoopEnd = aEnd; mLoopEnd = aEnd;
SendLoopParametersToStream(); SendLoopParametersToStream();
} }
void SendDopplerShiftToStream(double aDopplerShift);
void NotifyMainThreadStreamFinished() override; void NotifyMainThreadStreamFinished() override;
const char* NodeType() const override { return "AudioBufferSourceNode"; } const char* NodeType() const override { return "AudioBufferSourceNode"; }
@ -101,8 +99,7 @@ class AudioBufferSourceNode final : public AudioScheduledSourceNode,
LOOPSTART, LOOPSTART,
LOOPEND, LOOPEND,
PLAYBACKRATE, PLAYBACKRATE,
DETUNE, DETUNE
DOPPLERSHIFT
}; };
void SendLoopParametersToStream(); void SendLoopParametersToStream();