Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: Source/modules/webaudio/OfflineAudioContext.cpp

Issue 1140723003: Implement suspend() and resume() for OfflineAudioContext (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added UseCounter Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/webaudio/OfflineAudioContext.cpp
diff --git a/Source/modules/webaudio/OfflineAudioContext.cpp b/Source/modules/webaudio/OfflineAudioContext.cpp
index d3488419e947e373d50f13cb105be0fb0604d178..bd2952e88dc364e9c88deede165dba64102be0b3 100644
--- a/Source/modules/webaudio/OfflineAudioContext.cpp
+++ b/Source/modules/webaudio/OfflineAudioContext.cpp
@@ -31,7 +31,11 @@
#include "core/dom/Document.h"
#include "core/dom/ExceptionCode.h"
#include "core/dom/ExecutionContext.h"
+#include "modules/webaudio/OfflineAudioCompletionEvent.h"
+#include "modules/webaudio/OfflineAudioDestinationNode.h"
+#include "platform/ThreadSafeFunctional.h"
#include "platform/audio/AudioUtilities.h"
+#include "public/platform/Platform.h"
namespace blink {
@@ -92,6 +96,8 @@ OfflineAudioContext* OfflineAudioContext::create(ExecutionContext* context, unsi
OfflineAudioContext::OfflineAudioContext(Document* document, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
: AudioContext(document, numberOfChannels, numberOfFrames, sampleRate)
+ , m_isRenderingStarted(false)
+ , m_totalRenderFrames(numberOfFrames)
{
}
@@ -99,8 +105,117 @@ OfflineAudioContext::~OfflineAudioContext()
{
}
+// FIXME: What should be done to trace members in OfflineAudioContext?
+// DEFINE_TRACE(OfflineAudioContext)
+// {
+// visitor->trace(m_scheduledSuspends);
+// visitor->trace(m_completeResolver);
+// }
+
+OfflineAudioContext::ScheduledSuspendContainer::ScheduledSuspendContainer(
+ size_t suspendFrame, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
+ : m_suspendFrame(suspendFrame)
+ , m_resolver(resolver)
+ , m_isPending(false)
+{
+}
+
+OfflineAudioContext::ScheduledSuspendContainer::~ScheduledSuspendContainer()
+{
+}
+
+DEFINE_TRACE(OfflineAudioContext::ScheduledSuspendContainer)
+{
+ visitor->trace(m_resolver);
+}
+
+PassOwnPtr<OfflineAudioContext::ScheduledSuspendContainer>
+OfflineAudioContext::ScheduledSuspendContainer::create(
+ size_t suspendFrame, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
+{
+ return adoptPtr(new ScheduledSuspendContainer(suspendFrame, resolver));
+}
+
+bool OfflineAudioContext::ScheduledSuspendContainer::shouldSuspendAt(size_t whenFrame) const
+{
+ if (m_suspendFrame != whenFrame)
+ return false;
+
+ return true;
+}
+
+bool OfflineAudioContext::ScheduledSuspendContainer::isPending() const
+{
+ return m_isPending;
+}
+
+void OfflineAudioContext::ScheduledSuspendContainer::markAsPending()
+{
+ m_isPending = true;
+}
+
+bool OfflineAudioContext::shouldSuspendNow()
+{
+ ASSERT(!isMainThread());
+
+ // Suspend if necessary and mark the associated promise as pending. Note
+ // that duplicate entries in the suspend list are prohibited so it returns
+ // immediately when a valid suspend is found. This duplicate check is done
+ // by |suspendOfflineRendering|.
+ size_t nowFrame = currentSampleFrame();
+ for (unsigned index = 0; index < m_scheduledSuspends.size(); ++index) {
+ if (m_scheduledSuspends.at(index)->shouldSuspendAt(nowFrame)) {
+ m_scheduledSuspends.at(index)->markAsPending();
+ return true;
+ }
+ }
+
+ return false;
+}
+
+void OfflineAudioContext::resolvePendingSuspendPromises()
+{
+ ASSERT(!isMainThread());
+
+ // Resolve promises marked as 'pending'.
+ if (m_scheduledSuspends.size() > 0) {
+ Platform::current()->mainThread()->postTask(FROM_HERE,
+ threadSafeBind(&OfflineAudioContext::resolvePendingSuspendPromisesOnMainThread, this));
+ }
+}
+
+void OfflineAudioContext::fireCompletionEvent()
+{
+ ASSERT(isMainThread());
+ if (!isMainThread())
+ return;
+
+ // We set the state to closed here so that the oncomplete event handler sees
+ // that the context has been closed.
+ setContextState(Closed);
+
+ AudioBuffer* renderedBuffer = renderTarget().get();
+
+ ASSERT(renderedBuffer);
+ if (!renderedBuffer)
+ return;
+
+ // Avoid firing the event if the document has already gone away.
+ if (executionContext()) {
+ // Call the offline rendering completion event listener and resolve the
+ // promise too.
+ dispatchEvent(OfflineAudioCompletionEvent::create(renderedBuffer));
+ m_completeResolver->resolve(renderedBuffer);
+ }
+}
+
ScriptPromise OfflineAudioContext::startOfflineRendering(ScriptState* scriptState)
{
+ ASSERT(isMainThread());
+
+ // FIXME: This check causes crash on oac-detached-no-crash.html
+ // ASSERT(m_destinationNode);
Raymond Toy 2015/06/15 20:42:14 Does this still crash? If not, remove these lines.
+
// Calling close() on an OfflineAudioContext is not supported/allowed,
// but it might well have been stopped by its execution context.
if (isContextClosed()) {
@@ -111,7 +226,7 @@ ScriptPromise OfflineAudioContext::startOfflineRendering(ScriptState* scriptStat
"cannot call startRendering on an OfflineAudioContext in a stopped state."));
}
- if (m_offlineResolver) {
+ if (m_completeResolver) {
// Can't call startRendering more than once. Return a rejected promise now.
return ScriptPromise::rejectWithDOMException(
scriptState,
@@ -120,9 +235,141 @@ ScriptPromise OfflineAudioContext::startOfflineRendering(ScriptState* scriptStat
"cannot call startRendering more than once"));
}
- m_offlineResolver = ScriptPromiseResolver::create(scriptState);
- startRendering();
- return m_offlineResolver->promise();
+ m_completeResolver = ScriptPromiseResolver::create(scriptState);
+
+ // If the context is not in the suspended state, reject the promise.
+ if (contextState() != AudioContextState::Suspended) {
+ return ScriptPromise::rejectWithDOMException(
+ scriptState,
+ DOMException::create(
+ InvalidStateError,
+ "cannot startRendering when an OfflineAudioContext is not in a suspended state"));
+ }
+
+ // Start rendering and return the promise.
+ m_isRenderingStarted = true;
+ setContextState(Running);
+ destination()->audioDestinationHandler().startRendering();
+ return m_completeResolver->promise();
+}
+
+ScriptPromise OfflineAudioContext::suspendOfflineRendering(ScriptState* scriptState, double when)
+{
+ ASSERT(isMainThread());
+
+ // The specified suspend time is negative, reject the promise.
+ if (when < 0) {
+ return ScriptPromise::rejectWithDOMException(
+ scriptState,
+ DOMException::create(
+ InvalidStateError,
+ "negative suspend time is not allowed"));
+ }
+
+ // Quantize the suspend time to the rendering block boundary.
+ size_t quantizedFrame = destination()->audioDestinationHandler().quantizeTimeToRenderQuantum(when);
+
+ // The specified suspend time is in the past, reject the promise.
+ if (quantizedFrame < currentSampleFrame()) {
+ return ScriptPromise::rejectWithDOMException(
+ scriptState,
+ DOMException::create(
+ InvalidStateError,
+ "cannot schedule a suspend at " + String::number(when) +
+ " which is in the past"));
Raymond Toy 2015/06/15 20:42:13 Perhaps this is more helpful in debugging if we al
hongchan 2015/06/15 21:44:20 Done.
+ }
+
+ // The suspend time should be earlier than the total render frame. If the
+ // requested suspension time is equal to the total render frame, the promise
+ // will be rejected.
+ if (m_totalRenderFrames <= quantizedFrame) {
+ return ScriptPromise::rejectWithDOMException(
+ scriptState,
+ DOMException::create(
+ InvalidStateError,
+ "cannot schedule a suspend at " + String::number(when) +
+ " seconds which is greater than or equal to the total render duration of " +
+ String::number(m_totalRenderFrames / sampleRate())));
Raymond Toy 2015/06/15 20:42:13 I wonder if this would be clearer if we used frame
hongchan 2015/06/15 21:44:20 Done.
+ }
+
+ // If there is a duplicate suspension at the same quantize frame, reject the
+ // promise.
+ for (unsigned index = 0; index < m_scheduledSuspends.size(); ++index) {
+ if (m_scheduledSuspends.at(index)->shouldSuspendAt(quantizedFrame)) {
+ return ScriptPromise::rejectWithDOMException(
+ scriptState,
+ DOMException::create(
+ InvalidStateError,
+ "cannot schedule more than one suspend at " + String::number(when) +
+ " seconds whose quantized frame is " + String::number(quantizedFrame)));
+ }
+ }
+
+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+ ScriptPromise promise = resolver->promise();
+ m_scheduledSuspends.append(ScheduledSuspendContainer::create(quantizedFrame, resolver));
+
+ return promise;
+}
+
+ScriptPromise OfflineAudioContext::resumeOfflineRendering(ScriptState* scriptState)
+{
+ ASSERT(isMainThread());
+
+ AutoLocker locker(this);
+
+ // If the context is not in a suspended state, reject the promise.
+ if (contextState() != AudioContextState::Suspended) {
+ return ScriptPromise::rejectWithDOMException(
+ scriptState,
+ DOMException::create(
+ InvalidStateError,
+ "cannot resume a context that is not suspended"));
+ }
+
+ // If the rendering has not started, reject the promise.
+ if (!m_isRenderingStarted) {
+ return ScriptPromise::rejectWithDOMException(
+ scriptState,
+ DOMException::create(
+ InvalidStateError,
+ "cannot resume a context that has not started"));
+ }
+
+ // If the context is suspended, resume rendering by calling startRendering()
+ // and set the state to "Running." Note that resuming is possible only after
+ // the rendering started.
+ setContextState(Running);
+
+ destination()->audioDestinationHandler().startRendering();
+
+ RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
+ ScriptPromise promise = resolver->promise();
+
+ // Resolve the promise immediately.
+ resolver->resolve();
+
+ return promise;
+}
+
+void OfflineAudioContext::resolvePendingSuspendPromisesOnMainThread()
+{
+ ASSERT(isMainThread());
+ AutoLocker locker(this);
+
+ // Suspend the context first. This will fire onstatechange event.
+ setContextState(Suspended);
+
+ // FIXME: is removing elements efficient? What if there are 10K suspends?
+ // Resolve any pending suspend and remove it from the list.
+ for (unsigned index = 0; index < m_scheduledSuspends.size();) {
+ if (m_scheduledSuspends.at(index)->isPending()) {
+ m_scheduledSuspends.at(index)->resolver()->resolve();
+ m_scheduledSuspends.remove(index);
+ } else {
+ ++index;
+ }
+ }
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698