<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192231] releases/WebKitGTK/webkit-2.10/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192231">192231</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-10 04:54:01 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191844">r191844</a> - [GStreamer][Mac] Fix WebAudio build
https://bugs.webkit.org/show_bug.cgi?id=150030
Patch by Philippe Normand <pnormand@igalia.com> on 2015-10-31
Reviewed by Darin Adler.
Wrap Accelerate.framework API calls around USE(ACCELERATE) ifdefs.
* platform/audio/Biquad.cpp:
(WebCore::Biquad::Biquad):
(WebCore::Biquad::process):
(WebCore::Biquad::reset):
* platform/audio/Biquad.h:
* platform/audio/DirectConvolver.cpp:
(WebCore::DirectConvolver::process):
* platform/audio/FFTFrame.h:
* platform/audio/VectorMath.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformaudioBiquadcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/Biquad.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformaudioBiquadh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/Biquad.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformaudioDirectConvolvercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/DirectConvolver.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformaudioFFTFrameh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/FFTFrame.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformaudioVectorMathcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/VectorMath.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192230 => 192231)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 12:04:10 UTC (rev 192230)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 12:54:01 UTC (rev 192231)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-10-31 Philippe Normand <pnormand@igalia.com>
+
+ [GStreamer][Mac] Fix WebAudio build
+ https://bugs.webkit.org/show_bug.cgi?id=150030
+
+ Reviewed by Darin Adler.
+
+ Wrap Accelerate.framework API calls around USE(ACCELERATE) ifdefs.
+
+ * platform/audio/Biquad.cpp:
+ (WebCore::Biquad::Biquad):
+ (WebCore::Biquad::process):
+ (WebCore::Biquad::reset):
+ * platform/audio/Biquad.h:
+ * platform/audio/DirectConvolver.cpp:
+ (WebCore::DirectConvolver::process):
+ * platform/audio/FFTFrame.h:
+ * platform/audio/VectorMath.cpp:
+
</ins><span class="cx"> 2015-10-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Very slow typing on pages with wheel event handlers on the body, and deep content
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformaudioBiquadcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/Biquad.cpp (192230 => 192231)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/Biquad.cpp 2015-11-10 12:04:10 UTC (rev 192230)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/Biquad.cpp 2015-11-10 12:54:01 UTC (rev 192231)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> // Work around a bug where VForce.h forward declares std::complex in a way that's incompatible with libc++ complex.
</span><span class="cx"> #define __VFORCE_H
</span><span class="cx"> #include <Accelerate/Accelerate.h>
</span><span class="lines">@@ -45,13 +45,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> const int kBufferSize = 1024;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Biquad::Biquad()
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> // Allocate two samples more for filter history
</span><span class="cx"> m_inputBuffer.allocate(kBufferSize + 2);
</span><span class="cx"> m_outputBuffer.allocate(kBufferSize + 2);
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> void Biquad::process(const float* sourceP, float* destP, size_t framesToProcess)
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> // Use vecLib if available
</span><span class="cx"> processFast(sourceP, destP, framesToProcess);
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx">
</span><span class="cx"> // Here we have optimized version using Accelerate.framework
</span><span class="cx">
</span><span class="lines">@@ -172,12 +172,12 @@
</span><span class="cx"> destP[1] = destP[framesToProcess - 1 + 2];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // OS(DARWIN)
</del><ins>+#endif // USE(ACCELERATE)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> void Biquad::reset()
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> // Two extra samples for filter history
</span><span class="cx"> double* inputP = m_inputBuffer.data();
</span><span class="cx"> inputP[0] = 0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformaudioBiquadh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/Biquad.h (192230 => 192231)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/Biquad.h 2015-11-10 12:04:10 UTC (rev 192230)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/Biquad.h 2015-11-10 12:54:01 UTC (rev 192231)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> double m_a1;
</span><span class="cx"> double m_a2;
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> void processFast(const float* sourceP, float* destP, size_t framesToProcess);
</span><span class="cx"> void processSliceFast(double* sourceP, double* destP, double* coefficientsP, size_t framesToProcess);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformaudioDirectConvolvercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/DirectConvolver.cpp (192230 => 192231)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/DirectConvolver.cpp 2015-11-10 12:04:10 UTC (rev 192230)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/DirectConvolver.cpp 2015-11-10 12:54:01 UTC (rev 192231)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> // Copy samples to 2nd half of input buffer.
</span><span class="cx"> memcpy(inputP, sourceP, sizeof(float) * framesToProcess);
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> #if defined(__ppc__) || defined(__i386__)
</span><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> }
</span><span class="cx"> destP[i++] = sum;
</span><span class="cx"> }
</span><del>-#endif // OS(DARWIN)
</del><ins>+#endif // USE(ACCELERATE)
</ins><span class="cx">
</span><span class="cx"> // Copy 2nd half of input buffer to 1st half.
</span><span class="cx"> memcpy(m_buffer.data(), inputP, sizeof(float) * framesToProcess);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformaudioFFTFrameh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/FFTFrame.h (192230 => 192231)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/FFTFrame.h 2015-11-10 12:04:10 UTC (rev 192230)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/FFTFrame.h 2015-11-10 12:54:01 UTC (rev 192231)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include "AudioArray.h"
</span><span class="cx">
</span><del>-#if OS(DARWIN)
-#include <Accelerate/Accelerate.h>
-#endif
-
</del><span class="cx"> #if USE(WEBAUDIO_GSTREAMER)
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> G_BEGIN_DECLS
</span><span class="lines">@@ -42,6 +38,10 @@
</span><span class="cx"> G_END_DECLS
</span><span class="cx"> #endif // USE(WEBAUDIO_GSTREAMER)
</span><span class="cx">
</span><ins>+#if USE(ACCELERATE)
+#include <Accelerate/Accelerate.h>
+#endif
+
</ins><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void interpolateFrequencyComponents(const FFTFrame& frame1, const FFTFrame& frame2, double x);
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> DSPSplitComplex& dspSplitComplex() { return m_frame; }
</span><span class="cx"> DSPSplitComplex dspSplitComplex() const { return m_frame; }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformaudioVectorMathcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/VectorMath.cpp (192230 => 192231)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/VectorMath.cpp 2015-11-10 12:04:10 UTC (rev 192230)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/VectorMath.cpp 2015-11-10 12:54:01 UTC (rev 192231)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "VectorMath.h"
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> #include <Accelerate/Accelerate.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> namespace VectorMath {
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(ACCELERATE)
</ins><span class="cx"> // On the Mac we use the highly optimized versions in Accelerate.framework
</span><span class="cx"> // In 32-bit mode (__ppc__ or __i386__) <Accelerate/Accelerate.h> includes <vecLib/vDSP_translate.h> which defines macros of the same name as
</span><span class="cx"> // our namespaced function names, so we must handle this case differently. Other architectures (64bit, ARM, etc.) do not include this header file.
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // OS(DARWIN)
</del><ins>+#endif // USE(ACCELERATE)
</ins><span class="cx">
</span><span class="cx"> } // namespace VectorMath
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>