Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1257718 look for new events as time advances r=padenot

Browse Source 
|bailout| is reset for each aTime, so that the appropriate events for that
time can be found.

The |eventIndex| loop is adjusted so that, when it is re-entered, it keeps
the current set of events if they are appropriate (instead of advancing
every time it is entered).

|previous| and |next| are now advanced even when passing the last event,
removing the special case when past all events.

MozReview-Commit-ID: 8ZSIzKKGQbd

--HG--
extra : rebase_source : bfc899287abaf12d5cdbfbc1b22d6626ab2299dd
This commit is contained in:
Karl Tomlinson 2016-06-21 17:01:18 +12:00
parent 34706466dd
commit 5d244c17fc
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dom/media/webaudio/AudioEventTimeline.cpp
View File

@ -151,8 +151,6 @@ AudioEventTimeline::GetValuesAtTimeHelper(TimeType aTime, float* aBuffer,
size_t eventIndex = 0;
const AudioTimelineEvent* previous = nullptr;
const AudioTimelineEvent* next = nullptr;
bool bailOut = false;
// Let's remove old events except the last one: we need it to calculate some curves.
while (mEvents.Length() > 1 &&
@ -161,18 +159,31 @@ AudioEventTimeline::GetValuesAtTimeHelper(TimeType aTime, float* aBuffer,
}
for (size_t bufferIndex = 0; bufferIndex < aSize; ++bufferIndex, ++aTime) {
for (; !bailOut && eventIndex < mEvents.Length(); ++eventIndex) {
bool bailOut = false;
const AudioTimelineEvent* next;
for (; ; ++eventIndex) {
if (eventIndex >= mEvents.Length()) {
next = nullptr;
break;
}
next = &mEvents[eventIndex];
if (aTime < TimeOf(*next)) {
bailOut = true;
break;
}
#ifdef DEBUG
const AudioTimelineEvent* current = &mEvents[eventIndex];
MOZ_ASSERT(current->mType == AudioTimelineEvent::SetValueAtTime ||
current->mType == AudioTimelineEvent::SetTarget ||
current->mType == AudioTimelineEvent::LinearRamp ||
current->mType == AudioTimelineEvent::ExponentialRamp ||
current->mType == AudioTimelineEvent::SetValueCurve);
MOZ_ASSERT(next->mType == AudioTimelineEvent::SetValueAtTime ||
next->mType == AudioTimelineEvent::SetTarget ||
next->mType == AudioTimelineEvent::LinearRamp ||
next->mType == AudioTimelineEvent::ExponentialRamp ||
next->mType == AudioTimelineEvent::SetValueCurve);
#endif
if (TimesEqual(aTime, TimeOf(mEvents[eventIndex]))) {
if (TimesEqual(aTime, TimeOf(*next))) {
mLastComputedValue = mComputedValue;
// Find the last event with the same time
while (eventIndex < mEvents.Length() - 1 &&
@ -183,10 +194,6 @@ AudioEventTimeline::GetValuesAtTimeHelper(TimeType aTime, float* aBuffer,
}
previous = next;
next = &mEvents[eventIndex];
if (aTime < TimeOf(mEvents[eventIndex])) {
bailOut = true;
}
}
if (!bailOut && eventIndex < mEvents.Length()) {
@ -217,12 +224,7 @@ AudioEventTimeline::GetValuesAtTimeHelper(TimeType aTime, float* aBuffer,
continue;
}
// Handle the case where the time is past all of the events
if (!bailOut) {
aBuffer[bufferIndex] = GetValuesAtTimeHelperInternal(aTime, next, nullptr);
} else {
aBuffer[bufferIndex] = GetValuesAtTimeHelperInternal(aTime, previous, next);
}
aBuffer[bufferIndex] = GetValuesAtTimeHelperInternal(aTime, previous, next);
}
}
template void