Changeset 73174 in webkit

Timestamp:

Dec 2, 2010 11:48:39 AM (13 years ago)

Author:

crogers@google.com

Message:

2010-12-02 Chris Rogers <​crogers@google.com>

Reviewed by Kenneth Russell.

AudioContext needs createBuffer() method from ArrayBuffer
​https://bugs.webkit.org/show_bug.cgi?id=50343

No new tests since audio API is not yet implemented.

• webaudio/AudioContext.cpp: (WebCore::AudioContext::createBuffer):
• webaudio/AudioContext.h:
• webaudio/AudioContext.idl:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• webaudio/AudioContext.cpp (modified) (4 diffs)
• webaudio/AudioContext.h (modified) (4 diffs)
• webaudio/AudioContext.idl (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-02  Chris Rogers  <crogers@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        AudioContext needs createBuffer() method from ArrayBuffer
+        https://bugs.webkit.org/show_bug.cgi?id=50343
+
+        No new tests since audio API is not yet implemented.
+
+        * webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::createBuffer):
+        * webaudio/AudioContext.h:
+        * webaudio/AudioContext.idl:
+
 2010-12-02  Noel Gordon  <noel.gordon@gmail.com>
 

trunk/WebCore/webaudio/AudioContext.cpp

@@ -29 +29 @@
 #include "AudioContext.h"
 
+#include "ArrayBuffer.h"
 #include "AudioBuffer.h"
 #include "AudioBufferSourceNode.h"
@@ -38 +39 @@
 #include "AudioNodeOutput.h"
 #include "AudioPannerNode.h"
-#include "CachedAudio.h"
 #include "ConvolverNode.h"
 #include "DelayNode.h"
@@ -60 +60 @@
 
 namespace WebCore {
-
-PassRefPtr<CachedAudio> AudioContext::createAudioRequest(const String &url, bool mixToMono)
-{
-    lazyInitialize();
-
-    // Convert relative URL to absolute
-    KURL completedURL = document()->completeURL(url);
-    String completedURLString = completedURL.string();
-
-    RefPtr<CachedAudio> cachedAudio = CachedAudio::create(completedURLString, this, document(), sampleRate(), mixToMono);
-    CachedAudio* c = cachedAudio.get();
-
-    m_cachedAudioReferences.append(c);
-
-    return cachedAudio;
-}
 
 PassRefPtr<AudioContext> AudioContext::create(Document* document)
@@ -202 +186 @@
 }
 
+PassRefPtr<AudioBuffer> AudioContext::createBuffer(ArrayBuffer* arrayBuffer, bool mixToMono)
+{
+    ASSERT(arrayBuffer);
+    if (!arrayBuffer)
+        return 0;
+    
+    return AudioBuffer::createFromAudioFileData(arrayBuffer->data(), arrayBuffer->byteLength(), mixToMono, sampleRate());
+}
+
 PassRefPtr<AudioBufferSourceNode> AudioContext::createBufferSource()
 {

trunk/WebCore/webaudio/AudioContext.h

@@ -41 +41 @@
 namespace WebCore {
 
+class ArrayBuffer;
 class AudioBuffer;
 class AudioBufferSourceNode;
@@ -48 +49 @@
 class AudioPannerNode;
 class AudioListener;
-class CachedAudio;
 class DelayNode;
 class Document;
@@ -82 +82 @@
 
     PassRefPtr<AudioBuffer> createBuffer(unsigned numberOfChannels, size_t numberOfFrames, double sampleRate);
-
-    PassRefPtr<CachedAudio> createAudioRequest(const String &url, bool mixToMono);
+    PassRefPtr<AudioBuffer> createBuffer(ArrayBuffer* arrayBuffer, bool mixToMono);
 
     // Keep track of this buffer so we can release memory after the context is shut down...
@@ -222 +221 @@
     Vector<AudioNode*> m_nodesToDelete;
 
-    Vector<RefPtr<CachedAudio> > m_cachedAudioReferences;
-    
     // Only accessed when the graph lock is held.
     HashSet<AudioNodeInput*> m_dirtyAudioNodeInputs;

trunk/WebCore/webaudio/AudioContext.idl

@@ -43 +43 @@
 
         AudioBuffer createBuffer(in unsigned long numberOfChannels, in unsigned long numberOfFrames, in float sampleRate);
+        AudioBuffer createBuffer(in ArrayBuffer buffer, in boolean mixToMono);
 
         // Source
@@ -60 +61 @@
         AudioChannelSplitter createChannelSplitter();
         AudioChannelMerger createChannelMerger();
-
-        // FIXME: Temporary - to be replaced with XHR.
-        CachedAudio createAudioRequest(in DOMString url, in boolean mixToMono);
     };
 }