nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1573541 - Fix assertion failure in PannerNode.h; r=karlt

Browse source 
This removes the call to SetThreeDPointParameter which is no longer necessary
now that we're using AudioParams for position and orientation. Doing the
conversion can cause an assertion failure when the AudioParams have a scheduled
future value.

Differential Revision: https://phabricator.services.mozilla.com/D42023

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Dan Minor 2019-08-15 21:17:36 +00:00
parent 08f34bc7d6
commit e6817b0e4d
7 changed files with 0 additions and 55 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
dom/media/webaudio/AudioListener.h
View file

@ -74,9 +74,6 @@ class AudioListener final : public nsWrapperCache {
~AudioListener() = default;
void SendThreeDPointParameterToStream(uint32_t aIndex,
const ThreeDPoint& aValue);
private:
RefPtr<AudioContext> mContext;
RefPtr<AudioListenerEngine> mEngine;

6
dom/media/webaudio/AudioNode.cpp
View file

@ -283,12 +283,6 @@ void AudioNode::SendInt32ParameterToStream(uint32_t aIndex, int32_t aValue) {
mStream->SetInt32Parameter(aIndex, aValue);
}
void AudioNode::SendThreeDPointParameterToStream(uint32_t aIndex,
const ThreeDPoint& aValue) {
MOZ_ASSERT(mStream, "How come we don't have a stream here?");
mStream->SetThreeDPointParameter(aIndex, aValue);
}
void AudioNode::SendChannelMixingParametersToStream() {
if (mStream) {
mStream->SetChannelMixingParameters(mChannelCount, mChannelCountMode,

2
dom/media/webaudio/AudioNode.h
View file

@ -236,8 +236,6 @@ class AudioNode : public DOMEventTargetHelper, public nsSupportsWeakReference {
// Helpers for sending different value types to streams
void SendDoubleParameterToStream(uint32_t aIndex, double aValue);
void SendInt32ParameterToStream(uint32_t aIndex, int32_t aValue);
void SendThreeDPointParameterToStream(uint32_t aIndex,
const ThreeDPoint& aValue);
void SendChannelMixingParametersToStream();
private:

4
dom/media/webaudio/AudioNodeEngine.h
View file

@ -271,10 +271,6 @@ class AudioNodeEngine {
dom::AudioTimelineEvent& aValue) {
NS_ERROR("Invalid RecvTimelineEvent index");
}
virtual void SetThreeDPointParameter(uint32_t aIndex,
const dom::ThreeDPoint& aValue) {
NS_ERROR("Invalid SetThreeDPointParameter index");
}
virtual void SetBuffer(AudioChunk&& aBuffer) {
NS_ERROR("SetBuffer called on engine that doesn't support it");
}

18
dom/media/webaudio/AudioNodeStream.cpp
View file

@ -205,24 +205,6 @@ void AudioNodeStream::SendTimelineEvent(uint32_t aIndex,
GraphImpl()->AppendMessage(MakeUnique<Message>(this, aIndex, aEvent));
}
void AudioNodeStream::SetThreeDPointParameter(uint32_t aIndex,
const ThreeDPoint& aValue) {
class Message final : public ControlMessage {
public:
Message(AudioNodeStream* aStream, uint32_t aIndex,
const ThreeDPoint& aValue)
: ControlMessage(aStream), mValue(aValue), mIndex(aIndex) {}
void Run() override {
static_cast<AudioNodeStream*>(mStream)->Engine()->SetThreeDPointParameter(
mIndex, mValue);
}
ThreeDPoint mValue;
uint32_t mIndex;
};
GraphImpl()->AppendMessage(MakeUnique<Message>(this, aIndex, aValue));
}
void AudioNodeStream::SetBuffer(AudioChunk&& aBuffer) {
class Message final : public ControlMessage {
public:

17
dom/media/webaudio/PannerNode.cpp
View file

@ -144,23 +144,6 @@ class PannerNodeEngine final : public AudioNodeEngine {
NS_ERROR("Bad PannerNodeEngine Int32Parameter");
}
}
void SetThreeDPointParameter(uint32_t aIndex,
const ThreeDPoint& aParam) override {
switch (aIndex) {
case PannerNode::POSITION:
mPositionX.SetValue(aParam.x);
mPositionY.SetValue(aParam.y);
mPositionZ.SetValue(aParam.z);
break;
case PannerNode::ORIENTATION:
mOrientationX.SetValue(aParam.x);
mOrientationY.SetValue(aParam.y);
mOrientationZ.SetValue(aParam.z);
break;
default:
NS_ERROR("Bad PannerNodeEngine ThreeDPointParameter");
}
}
void SetDoubleParameter(uint32_t aIndex, double aParam) override {
switch (aIndex) {
case PannerNode::REF_DISTANCE:

5
dom/media/webaudio/PannerNode.h
View file

@ -74,8 +74,6 @@ class PannerNode final : public AudioNode {
mPositionX->SetValue(aX);
mPositionY->SetValue(aY);
mPositionZ->SetValue(aZ);
SendThreeDPointParameterToStream(
POSITION, ConvertAudioParamTo3DP(mPositionX, mPositionY, mPositionZ));
}
void SetOrientation(double aX, double aY, double aZ) {
@ -87,9 +85,6 @@ class PannerNode final : public AudioNode {
mOrientationX->SetValue(aX);
mOrientationY->SetValue(aY);
mOrientationZ->SetValue(aZ);
SendThreeDPointParameterToStream(
ORIENTATION,
ConvertAudioParamTo3DP(mOrientationX, mOrientationY, mOrientationZ));
}
double RefDistance() const { return mRefDistance; }