wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 834929 - Part 1: Store the default/min/max values on the AudioParam itself; r=roc

Browse Source
This commit is contained in:
Ehsan Akhgari 2013-01-25 14:26:31 -05:00
parent c4a6494005
commit cd11a234ad
4 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
content/media/webaudio/AudioEventTimeline.h
View File

@ -77,17 +77,9 @@ private:
};
public:
AudioEventTimeline(float aDefaultValue,
float aMinValue,
float aMaxValue)
explicit AudioEventTimeline(float aDefaultValue)
: mValue(aDefaultValue)
, mDefaultValue(aDefaultValue)
, mMinValue(aMinValue)
, mMaxValue(aMaxValue)
{
MOZ_ASSERT(aDefaultValue >= aMinValue);
MOZ_ASSERT(aDefaultValue <= aMaxValue);
MOZ_ASSERT(aMinValue < aMaxValue);
}
float Value() const
@ -110,21 +102,6 @@ public:
return 0;
}
float MinValue() const
{
return mMinValue;
}
float MaxValue() const
{
return mMaxValue;
}
float DefaultValue() const
{
return mDefaultValue;
}
void SetValueAtTime(float aValue, double aStartTime, ErrorResult& aRv)
{
InsertEvent(Event(Event::SetValue, aStartTime, aValue), aRv);
@ -377,9 +354,6 @@ private:
// being a bottleneck.
nsTArray<Event> mEvents;
float mValue;
const float mDefaultValue;
const float mMinValue;
const float mMaxValue;
};
}

8
content/media/webaudio/AudioParam.cpp
View File

@ -22,9 +22,15 @@ AudioParam::AudioParam(AudioContext* aContext,
float aDefaultValue,
float aMinValue,
float aMaxValue)
: AudioParamTimeline(aDefaultValue, aMinValue, aMaxValue)
: AudioParamTimeline(aDefaultValue)
, mContext(aContext)
, mDefaultValue(aDefaultValue)
, mMinValue(aMinValue)
, mMaxValue(aMaxValue)
{
MOZ_ASSERT(aDefaultValue >= aMinValue);
MOZ_ASSERT(aDefaultValue <= aMaxValue);
MOZ_ASSERT(aMinValue < aMaxValue);
SetIsDOMBinding();
}

18
content/media/webaudio/AudioParam.h
View File

@ -108,8 +108,26 @@ public:
aStartTime, aDuration, aRv);
}
float MinValue() const
{
return mMinValue;
}
float MaxValue() const
{
return mMaxValue;
}
float DefaultValue() const
{
return mDefaultValue;
}
private:
nsRefPtr<AudioContext> mContext;
const float mDefaultValue;
const float mMinValue;
const float mMaxValue;
};
}

32
content/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
View File

@ -97,10 +97,8 @@ typedef AudioEventTimeline<FloatArrayMock, ErrorResultMock> Timeline;
void TestSpecExample()
{
// First, run the basic tests
Timeline timeline(10.0f, .1f, 20.0f);
is(timeline.DefaultValue(), 10.0f, "Correct default value returned");
is(timeline.MinValue(), .1f, "Correct min value returned");
is(timeline.MaxValue(), 20.0f, "Correct max value returned");
Timeline timeline(10.0f);
is(timeline.Value(), 10.0f, "Correct default value returned");
ErrorResultMock rv;
@ -152,7 +150,7 @@ void TestInvalidEvents()
MOZ_STATIC_ASSERT(numeric_limits<float>::has_quiet_NaN, "Platform must have a quiet NaN");
const float NaN = numeric_limits<float>::quiet_NaN();
const float Infinity = numeric_limits<float>::infinity();
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -191,7 +189,7 @@ void TestInvalidEvents()
void TestEventReplacement()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -210,7 +208,7 @@ void TestEventReplacement()
void TestEventRemoval()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -229,7 +227,7 @@ void TestEventRemoval()
void TestBeforeFirstEvent()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -239,7 +237,7 @@ void TestBeforeFirstEvent()
void TestAfterLastValueEvent()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -249,7 +247,7 @@ void TestAfterLastValueEvent()
void TestAfterLastTargetValueEvent()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -259,7 +257,7 @@ void TestAfterLastTargetValueEvent()
void TestAfterLastTargetValueEventWithValueSet()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -270,7 +268,7 @@ void TestAfterLastTargetValueEventWithValueSet()
void TestValue()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -286,7 +284,7 @@ void TestValue()
void TestLinearRampAtZero()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -296,7 +294,7 @@ void TestLinearRampAtZero()
void TestExponentialRampAtZero()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -306,7 +304,7 @@ void TestExponentialRampAtZero()
void TestLinearRampAtSameTime()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -317,7 +315,7 @@ void TestLinearRampAtSameTime()
void TestExponentialRampAtSameTime()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;
@ -328,7 +326,7 @@ void TestExponentialRampAtSameTime()
void TestSetTargetZeroTimeConstant()
{
Timeline timeline(10.0f, .1f, 20.0f);
Timeline timeline(10.0f);
ErrorResultMock rv;