[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[crogers at google.com]

The following commit has been merged in the debian/experimental branch:
commit 919fc31a3a8b0d97c921816b2bd5e2f3984af7e4
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 01:06:34 2010 +0000

    2010-12-21  Chris Rogers  <crogers at google.com>
    
            Reviewed by Kenneth Russell.
    
            Add AudioBusChromium for decoding audio file data
            https://bugs.webkit.org/show_bug.cgi?id=51430
    
            No new tests since audio API is not yet implemented.
    
            * platform/audio/chromium: Added.
            * platform/audio/chromium/AudioBusChromium.cpp: Added.
            (WebCore::createBusFromInMemoryAudioFile):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74439 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 52734b2..2c958ae 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Kenneth Russell.
 
+        Add AudioBusChromium for decoding audio file data
+        https://bugs.webkit.org/show_bug.cgi?id=51430
+
+        No new tests since audio API is not yet implemented.
+
+        * platform/audio/chromium: Added.
+        * platform/audio/chromium/AudioBusChromium.cpp: Added.
+        (WebCore::createBusFromInMemoryAudioFile):
+
+2010-12-21  Chris Rogers  <crogers at google.com>
+
+        Reviewed by Kenneth Russell.
+
         Add web audio spatialization resource files
         https://bugs.webkit.org/show_bug.cgi?id=50998
 
diff --git a/WebCore/platform/audio/chromium/AudioBusChromium.cpp b/WebCore/platform/audio/chromium/AudioBusChromium.cpp
new file mode 100644
index 0000000..a93703d
--- /dev/null
+++ b/WebCore/platform/audio/chromium/AudioBusChromium.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2010, 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.
+ */
+
+#include "config.h"
+
+#if ENABLE(WEB_AUDIO)
+
+#include "AudioBus.h"
+
+#include "AudioFileReader.h"
+#include "ChromiumBridge.h"
+#include <wtf/PassOwnPtr.h>
+
+namespace WebCore {
+
+// We will use this version of loadPlatformResource() once the resources are checked into Chromium.
+
+// PassOwnPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, double sampleRate)
+// {
+//     return ChromiumBridge::loadPlatformAudioResource(name, sampleRate);
+// }
+
+PassOwnPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dataSize, bool mixToMono, double sampleRate)
+{
+    OwnPtr<AudioBus> audioBus = ChromiumBridge::decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
+    if (audioBus->numberOfChannels() == 2 && mixToMono) {
+        OwnPtr<AudioBus> monoAudioBus = adoptPtr(new AudioBus(1, audioBus->length()));
+
+        // FIXME: AudioBus::copyFrom() should be able to do a downmix to mono.
+        // for now simply copy the left channel.
+        monoAudioBus->channel(0)->copyFrom(audioBus->channel(0));
+        return monoAudioBus.release();
+    }
+    
+    return audioBus.release();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)

-- 
WebKit Debian packaging