Implement WebMediaPlayerClientImpl::audioSourceProvider() and interface into chromium

https://bugs.webkit.org/show_bug.cgi?id=66441

Reviewed by Darin Fisher.

* public/WebAudioSourceProvider.h: Added.
(WebKit::WebAudioSourceProvider::~WebAudioSourceProvider):
* public/WebMediaPlayer.h:
(WebKit::WebMediaPlayer::audioSourceProvider):
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::audioSourceProvider):
(WebKit::WebMediaPlayerClientImpl::AudioSourceProviderImpl::provideInput):
* src/WebMediaPlayerClientImpl.h:
(WebKit::WebMediaPlayerClientImpl::AudioSourceProviderImpl::AudioSourceProviderImpl):
(WebKit::WebMediaPlayerClientImpl::AudioSourceProviderImpl::~AudioSourceProviderImpl):
(WebKit::WebMediaPlayerClientImpl::AudioSourceProviderImpl::initialize):


git-svn-id: svn://svn.chromium.org/blink/trunk@93367 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebKit/chromium/ChangeLog

+2011-08-18  Chris Rogers  <crogers@google.com>
+
+        Implement WebMediaPlayerClientImpl::audioSourceProvider() and interface into chromium
+        https://bugs.webkit.org/show_bug.cgi?id=66441
+
+        Reviewed by Darin Fisher.
+
+        * public/WebAudioSourceProvider.h: Added.
+        (WebKit::WebAudioSourceProvider::~WebAudioSourceProvider):
+        * public/WebMediaPlayer.h:
+        (WebKit::WebMediaPlayer::audioSourceProvider):
+        * src/WebMediaPlayerClientImpl.cpp:
+        (WebKit::WebMediaPlayerClientImpl::audioSourceProvider):
+        (WebKit::WebMediaPlayerClientImpl::AudioSourceProviderImpl::provideInput):
+        * src/WebMediaPlayerClientImpl.h:
+        (WebKit::WebMediaPlayerClientImpl::AudioSourceProviderImpl::AudioSourceProviderImpl):
+        (WebKit::WebMediaPlayerClientImpl::AudioSourceProviderImpl::~AudioSourceProviderImpl):
+        (WebKit::WebMediaPlayerClientImpl::AudioSourceProviderImpl::initialize):
+
 2011-08-18  Sailesh Agrawal  <sail@chromium.org>
 
         Chromium Mac: Show scrollbar when doing search

third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h

+/*
+ * Copyright (C) 2011, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1.  Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebAudioSourceProvider_h
+#define WebAudioSourceProvider_h
+
+#include "WebVector.h"
+
+namespace WebKit {
+
+// Abstract interface for a pull-model client.
+class WebAudioSourceProvider {
+public:
+    virtual void provideInput(const WebVector<float*>& audioData, size_t numberOfFrames) = 0;
+    virtual ~WebAudioSourceProvider() { }
+};
+
+} // WebKit
+
+#endif // WebAudioSourceProvider_h

third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h

@@ -37,6 +37,7 @@
 
 namespace WebKit {
 
+class WebAudioSourceProvider;
 class WebMediaPlayerClient;
 class WebURL;
 struct WebRect;
@@ -153,6 +154,8 @@ public:
     // It should always be called after getCurrentFrame(). Frame passed to this
     // method should no longer be referenced after the call is made.
     virtual void putCurrentFrame(WebVideoFrame*) { }
+
+    virtual WebAudioSourceProvider* audioSourceProvider() { return 0; }
 };
 
 } // namespace WebKit

third_party/WebKit/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

@@ -24,6 +24,7 @@
 
 #include "VideoFrameChromium.h"
 #include "VideoFrameChromiumImpl.h"
+#include "WebAudioSourceProvider.h"
 #include "WebCanvas.h"
 #include "WebCString.h"
 #include "WebFrameClient.h"
@@ -520,6 +521,16 @@ unsigned WebMediaPlayerClientImpl::videoDecodedByteCount() const
     return 0;
 }
 
+WebCore::AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider()
+{
+    if (m_webMediaPlayer.get()) {
+        // Wrap the WebAudioSourceProvider in the form of WebCore::AudioSourceProvider.
+        m_audioSourceProvider.initialize(m_webMediaPlayer->audioSourceProvider());
+        return &m_audioSourceProvider;
+    }
+    return 0;
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 bool WebMediaPlayerClientImpl::supportsAcceleratedRendering() const
 {
@@ -620,6 +631,27 @@ WebMediaPlayerClientImpl::WebMediaPlayerClientImpl()
 {
 }
 
+void WebMediaPlayerClientImpl::AudioSourceProviderImpl::provideInput(WebCore::AudioBus* bus, size_t framesToProcess)
+{
+    ASSERT(bus);
+    if (!bus)
+        return;
+
+    ASSERT(m_webAudioSourceProvider);
+    if (!m_webAudioSourceProvider) {
+        bus->zero();
+        return;
+    }
+
+    // Wrap the AudioBus channel data using WebVector.
+    size_t n = bus->numberOfChannels();
+    WebVector<float*> webAudioData(n);
+    for (size_t i = 0; i < n; ++i)
+        webAudioData[i] = bus->channel(i)->data();
+
+    m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess);
+}
+
 } // namespace WebKit
 
 #endif  // ENABLE(VIDEO)

third_party/WebKit/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h

@@ -33,6 +33,7 @@
 
 #if ENABLE(VIDEO)
 
+#include "AudioSourceProvider.h"
 #include "MediaPlayerPrivate.h"
 #include "VideoFrameChromium.h"
 #include "VideoFrameProvider.h"
@@ -42,6 +43,7 @@
 
 namespace WebKit {
 
+class WebAudioSourceProvider;
 class WebMediaElement;
 class WebMediaPlayer;
 
@@ -122,6 +124,8 @@ public:
     virtual unsigned droppedFrameCount() const;
     virtual unsigned audioDecodedByteCount() const;
     virtual unsigned videoDecodedByteCount() const;
+    virtual WebCore::AudioSourceProvider* audioSourceProvider();
+
 #if USE(ACCELERATED_COMPOSITING)
     virtual bool supportsAcceleratedRendering() const;
 
@@ -153,6 +157,26 @@ private:
     bool m_supportsAcceleratedCompositing;
 #endif
     static bool m_isEnabled;
+
+    // AudioSourceProviderImpl wraps a WebAudioSourceProvider.
+
+    class AudioSourceProviderImpl : public WebCore::AudioSourceProvider {
+    public:
+        AudioSourceProviderImpl()
+            : m_webAudioSourceProvider(0)
+        {
+        }
+
+        virtual ~AudioSourceProviderImpl() { }
+
+        virtual void provideInput(WebCore::AudioBus*, size_t framesToProcess);
+        void initialize(WebAudioSourceProvider* provider) { m_webAudioSourceProvider = provider; }
+
+    private:
+        WebAudioSourceProvider* m_webAudioSourceProvider;
+    };
+
+    AudioSourceProviderImpl m_audioSourceProvider;
 };
 
 } // namespace WebKit