Changeset 176311 in webkit

Timestamp:

Nov 18, 2014, 11:49:29 PM (12 years ago)

Author:

Philippe Normand

Message:

start/stop method for AudioBufferSourceNodes and OscillatorNodes can take no args
​https://bugs.webkit.org/show_bug.cgi?id=138739

Reviewed by Darin Adler.

Source/WebCore:

The patch is inspired by the following Blink revision by
<Raymond Toy>:
<​https://src.chromium.org/viewvc/blink?view=rev&revision=160845>

Test: webaudio/dom-exceptions.html

• Modules/webaudio/AudioBufferSourceNode.cpp:

(WebCore::AudioBufferSourceNode::start):
(WebCore::AudioBufferSourceNode::startPlaying):
(WebCore::AudioBufferSourceNode::noteGrainOn):
(WebCore::AudioBufferSourceNode::startGrain): Deleted.

• Modules/webaudio/AudioBufferSourceNode.h:
• Modules/webaudio/AudioBufferSourceNode.idl:
• Modules/webaudio/AudioScheduledSourceNode.cpp:

(WebCore::AudioScheduledSourceNode::start):
(WebCore::AudioScheduledSourceNode::stop):

• Modules/webaudio/AudioScheduledSourceNode.h:
• Modules/webaudio/OscillatorNode.idl:

LayoutTests:

• webaudio/dom-exceptions-expected.txt: Added.
• webaudio/dom-exceptions.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp (modified) (3 diffs)
• Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h (modified) (2 diffs)
• Source/WebCore/Modules/webaudio/AudioBufferSourceNode.idl (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp (modified) (3 diffs)
• Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h (modified) (1 diff)
• Source/WebCore/Modules/webaudio/OscillatorNode.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-11-18  Philippe Normand  <pnormand@igalia.com>
+
+        start/stop method for AudioBufferSourceNodes and OscillatorNodes can take no args
+        https://bugs.webkit.org/show_bug.cgi?id=138739
+
+        Reviewed by Darin Adler.
+
+        * webaudio/dom-exceptions-expected.txt: Added.
+        * webaudio/dom-exceptions.html: Added.
+
 2014-11-18  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-18  Philippe Normand  <pnormand@igalia.com>
+
+        start/stop method for AudioBufferSourceNodes and OscillatorNodes can take no args
+        https://bugs.webkit.org/show_bug.cgi?id=138739
+
+        Reviewed by Darin Adler.
+
+        The patch is inspired by the following Blink revision by
+        <rtoy@google.com>:
+        <https://src.chromium.org/viewvc/blink?view=rev&revision=160845>
+
+        Test: webaudio/dom-exceptions.html
+
+        * Modules/webaudio/AudioBufferSourceNode.cpp:
+        (WebCore::AudioBufferSourceNode::start):
+        (WebCore::AudioBufferSourceNode::startPlaying):
+        (WebCore::AudioBufferSourceNode::noteGrainOn):
+        (WebCore::AudioBufferSourceNode::startGrain): Deleted.
+        * Modules/webaudio/AudioBufferSourceNode.h:
+        * Modules/webaudio/AudioBufferSourceNode.idl:
+        * Modules/webaudio/AudioScheduledSourceNode.cpp:
+        (WebCore::AudioScheduledSourceNode::start):
+        (WebCore::AudioScheduledSourceNode::stop):
+        * Modules/webaudio/AudioScheduledSourceNode.h:
+        * Modules/webaudio/OscillatorNode.idl:
+
 2014-11-18  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp

@@ -371 +371 @@
 }
 
-void AudioBufferSourceNode::startGrain(double when, double grainOffset, ExceptionCode& ec)
-{
-    // Duration of 0 has special value, meaning calculate based on the entire buffer's duration.
-    startGrain(when, grainOffset, 0, ec);
-}
-
-void AudioBufferSourceNode::startGrain(double when, double grainOffset, double grainDuration, ExceptionCode& ec)
+void AudioBufferSourceNode::start(ExceptionCode& ec)
+{
+    startPlaying(Entire, 0, 0, buffer() ? buffer()->duration() : 0, ec);
+}
+
+void AudioBufferSourceNode::start(double when, ExceptionCode& ec)
+{
+    startPlaying(Entire, when, 0, buffer() ? buffer()->duration() : 0, ec);
+}
+
+void AudioBufferSourceNode::start(double when, double grainOffset, ExceptionCode& ec)
+{
+    startPlaying(Partial, when, grainOffset, 0, ec);
+}
+
+void AudioBufferSourceNode::start(double when, double grainOffset, double grainDuration, ExceptionCode& ec)
+{
+    startPlaying(Partial, when, grainOffset, grainDuration, ec);
+}
+
+void AudioBufferSourceNode::startPlaying(BufferPlaybackMode playbackMode, double when, double grainOffset, double grainDuration, ExceptionCode& ec)
 {
     ASSERT(isMainThread());
@@ -389 +403 @@
     }
 
+    if (!std::isfinite(when) || (when < 0)) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
+
+    if (!std::isfinite(grainOffset) || (grainOffset < 0)) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
+
+    if (!std::isfinite(grainDuration) || (grainDuration < 0)) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
+
     if (!buffer())
         return;
-        
-    // Do sanity checking of grain parameters versus buffer size.
-    double bufferDuration = buffer()->duration();
-
-    grainOffset = std::max(0.0, grainOffset);
-    grainOffset = std::min(bufferDuration, grainOffset);
-    m_grainOffset = grainOffset;
-
-    // Handle default/unspecified duration.
-    double maxDuration = bufferDuration - grainOffset;
-    if (!grainDuration)
-        grainDuration = maxDuration;
-
-    grainDuration = std::max(0.0, grainDuration);
-    grainDuration = std::min(maxDuration, grainDuration);
-    m_grainDuration = grainDuration;
-
-    m_isGrain = true;
+
+    m_isGrain = playbackMode == Partial;
+    if (m_isGrain) {
+        // Do sanity checking of grain parameters versus buffer size.
+        double bufferDuration = buffer()->duration();
+
+        m_grainOffset = std::min(bufferDuration, grainOffset);
+
+        double maxDuration = bufferDuration - m_grainOffset;
+        m_grainDuration = std::min(maxDuration, grainDuration);
+    } else {
+        m_grainOffset = 0.0;
+        m_grainDuration = DefaultGrainDuration;
+    }
+
     m_startTime = when;
     
@@ -423 +449 @@
 void AudioBufferSourceNode::noteGrainOn(double when, double grainOffset, double grainDuration, ExceptionCode& ec)
 {
-    startGrain(when, grainOffset, grainDuration, ec);
+    // Handle unspecified duration where 0 means the rest of the buffer.
+    if (!grainDuration)
+        grainDuration = buffer()->duration();
+    startPlaying(Partial, when, grainOffset, grainDuration, ec);
 }
 #endif

trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h

@@ -64 +64 @@
 
     // Play-state
-    void startGrain(double when, double grainOffset, ExceptionCode&);
-    void startGrain(double when, double grainOffset, double grainDuration, ExceptionCode&);
+    void start(ExceptionCode&);
+    void start(double when, ExceptionCode&);
+    void start(double when, double grainOffset, ExceptionCode&);
+    void start(double when, double grainOffset, double grainDuration, ExceptionCode&);
 
 #if ENABLE(LEGACY_WEB_AUDIO)
@@ -105 +107 @@
     virtual double tailTime() const override { return 0; }
     virtual double latencyTime() const override { return 0; }
+
+    enum BufferPlaybackMode {
+        Entire,
+        Partial
+    };
+
+    void startPlaying(BufferPlaybackMode, double when, double grainOffset, double grainDuration, ExceptionCode&);
 
     // Returns true on success.

trunk/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.idl

@@ -45 +45 @@
     attribute unrestricted double loopEnd;
 
-    [RaisesException] void start(unrestricted double when);
-    [ImplementedAs=startGrain, RaisesException] void start(unrestricted double when, unrestricted double grainOffset);
-    [ImplementedAs=startGrain, RaisesException] void start(unrestricted double when, unrestricted double grainOffset, unrestricted double grainDuration);
-    [RaisesException] void stop(unrestricted double when);
+    [RaisesException] void start(optional unrestricted double when, optional unrestricted double grainOffset, optional unrestricted double grainDuration);
+    [RaisesException] void stop(optional unrestricted double when);
 
     [Conditional=LEGACY_WEB_AUDIO] attribute boolean looping; // This is an alias for the .loop attribute for backwards compatibility.

trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp

@@ -138 +138 @@
 }
 
+void AudioScheduledSourceNode::start(ExceptionCode& ec)
+{
+    start(0, ec);
+}
+
 void AudioScheduledSourceNode::start(double when, ExceptionCode& ec)
 {
@@ -150 +155 @@
     }
 
+    if (!std::isfinite(when) || (when < 0)) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
+
     m_startTime = when;
     m_playbackState = SCHEDULED_STATE;
 }
 
+void AudioScheduledSourceNode::stop(ExceptionCode& ec)
+{
+    stop(0, ec);
+}
+
 void AudioScheduledSourceNode::stop(double when, ExceptionCode& ec)
 {
@@ -161 +176 @@
         return;
     }
-    
-    when = std::max<double>(0, when);
+
+    if (!std::isfinite(when) || (when < 0)) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
+
     m_endTime = when;
 }

trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h

@@ -59 +59 @@
 
     // Scheduling.
+    void start(ExceptionCode&);
+    void stop(ExceptionCode&);
     void start(double when, ExceptionCode&);
     void stop(double when, ExceptionCode&);

trunk/Source/WebCore/Modules/webaudio/OscillatorNode.idl

@@ -49 +49 @@
     readonly attribute AudioParam detune; // in Cents
 
-    [RaisesException] void start(unrestricted double when);
-    [RaisesException] void stop(unrestricted double when);
+    [RaisesException] void start(optional unrestricted double when);
+    [RaisesException] void stop(optional unrestricted double when);
 
     [Conditional=LEGACY_WEB_AUDIO, RaisesException] void noteOn(unrestricted double when);