[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [58459] branches/audio/WebCore/audio
From: crogers () google ! com
Date: 2010-04-29 0:51:31
Message-ID: 20100429005131.9F855482C98A () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[58459] branches/audio/WebCore/audio</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/58459">58459</a></dd> \
<dt>Author</dt> <dd>crogers@google.com</dd> <dt>Date</dt> <dd>2010-04-28 17:51:30 \
-0700 (Wed, 28 Apr 2010)</dd> </dl>
<h3>Log Message</h3>
<pre>More compile fixes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesaudioWebCoreaudioAudioEffectcpp">branches/audio/WebCore/audio/AudioEffect.cpp</a></li>
<li><a href="#branchesaudioWebCoreaudioBiquadFiltercpp">branches/audio/WebCore/audio/BiquadFilter.cpp</a></li>
<li><a href="#branchesaudioWebCoreaudioHRTFPannercpp">branches/audio/WebCore/audio/HRTFPanner.cpp</a></li>
<li><a href="#branchesaudioWebCoreaudioHRTFPannerh">branches/audio/WebCore/audio/HRTFPanner.h</a></li>
<li><a href="#branchesaudioWebCoreaudioSinWavecpp">branches/audio/WebCore/audio/SinWave.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesaudioWebCoreaudioAudioEffectcpp"></a>
<div class="modfile"><h4>Modified: branches/audio/WebCore/audio/AudioEffect.cpp \
(58458 => 58459)</h4> <pre class="diff"><span>
<span class="info">--- branches/audio/WebCore/audio/AudioEffect.cpp 2010-04-29 \
00:51:24 UTC (rev 58458)
+++ branches/audio/WebCore/audio/AudioEffect.cpp 2010-04-29 00:51:30 UTC (rev 58459)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH \
DAMAGE. </span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include "config.h"
</ins><span class="cx"> #include "AudioEffect.h"
</span><span class="cx"> #include "AudioBus.h"
</span><span class="cx">
</span></span></pre></div>
<a id="branchesaudioWebCoreaudioBiquadFiltercpp"></a>
<div class="modfile"><h4>Modified: branches/audio/WebCore/audio/BiquadFilter.cpp \
(58458 => 58459)</h4> <pre class="diff"><span>
<span class="info">--- branches/audio/WebCore/audio/BiquadFilter.cpp 2010-04-29 \
00:51:24 UTC (rev 58458)
+++ branches/audio/WebCore/audio/BiquadFilter.cpp 2010-04-29 00:51:30 UTC (rev 58459)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH \
DAMAGE. </span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include "config.h"
</ins><span class="cx"> #include "BiquadFilter.h"
</span><span class="cx"> #include "AudioBus.h"
</span><span class="cx">
</span><span class="lines">@@ -38,7 +39,7 @@
</span><span class="cx"> , m_lastResonance(0.0)
</span><span class="cx"> , m_reset(true)
</span><span class="cx"> {
</span><del>- effect->setParam1(m_lastCutoff);
</del><ins>+ effect->setParam1(float(m_lastCutoff));
</ins><span class="cx"> // For now, default to lopass filter initially
</span><span class="cx"> m_biquad.setLowpassParams(m_lastCutoff, \
m_lastResonance); </span><span class="cx"> }
</span></span></pre></div>
<a id="branchesaudioWebCoreaudioHRTFPannercpp"></a>
<div class="modfile"><h4>Modified: branches/audio/WebCore/audio/HRTFPanner.cpp (58458 \
=> 58459)</h4> <pre class="diff"><span>
<span class="info">--- branches/audio/WebCore/audio/HRTFPanner.cpp 2010-04-29 \
00:51:24 UTC (rev 58458)
+++ branches/audio/WebCore/audio/HRTFPanner.cpp 2010-04-29 00:51:30 UTC (rev 58459)
</span><span class="lines">@@ -74,8 +74,8 @@
</span><span class="cx"> bool Exists(const char* name) { return (find(name) != \
end()); } </span><span class="cx"> };
</span><span class="cx">
</span><del>-// FIXME : this should NOT be a global...
-HRTFSubjectMap subjectMap;
</del><ins>+// FIXME : this should NOT be a global and is a memory leak!...
+HRTFSubjectMap* subjectMap = 0;
</ins><span class="cx">
</span><span class="cx"> HRTFDatabase* HRTFPanner::s_hrtfDatabase = 0;
</span><span class="cx">
</span><span class="lines">@@ -145,6 +145,8 @@
</span><span class="cx"> tempFrame.doInverseFFT(response);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if WRITE_COMPOSITE_HRIR_FILES
+
</ins><span class="cx"> static void writeHRIRFile(const char* filePath, double \
fileSampleRate, HRTFKernel* kernelL, HRTFKernel* kernelR) </span><span class="cx"> {
</span><span class="cx"> size_t fftSize = kernelL->fftSize();
</span><span class="lines">@@ -167,6 +169,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // WRITE_COMPOSITE_HRIR_FILES
+
</ins><span class="cx"> // interpolate with x: 0 -> 1
</span><span class="cx"> PassRefPtr<HRTFKernel> \
HRTFElevationSlice::createInterpolatedKernel(HRTFKernel* kernel1, HRTFKernel* \
kernel2, double x) </span><span class="cx"> {
</span><span class="lines">@@ -529,14 +533,16 @@
</span><span class="cx">
</span><span class="cx"> HRTFDatabase* HRTFDatabase::createForSubject(const char* \
subjectName, double sampleRate) </span><span class="cx"> {
</span><del>- if (subjectMap.Exists(subjectName)) {
- HRTFDatabase* hrtfDatabase = subjectMap[subjectName];
</del><ins>+ if (!subjectMap)
+ subjectMap = new HRTFSubjectMap();
+ if (subjectMap->Exists(subjectName)) {
+ HRTFDatabase* hrtfDatabase = (*subjectMap)[subjectName];
</ins><span class="cx"> return hrtfDatabase;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRTFDatabase* hrtfDatabase = new \
HRTFDatabase(subjectName, sampleRate); </span><span class="cx">
</span><del>- subjectMap[subjectName] = hrtfDatabase;
</del><ins>+ (*subjectMap)[subjectName] = hrtfDatabase;
</ins><span class="cx">
</span><span class="cx"> return hrtfDatabase;
</span><span class="cx"> }
</span><span class="lines">@@ -578,7 +584,8 @@
</span><span class="cx"> {
</span><span class="cx"> delete s_hrtfDatabase;
</span><span class="cx"> s_hrtfDatabase = 0;
</span><del>- subjectMap.clear();
</del><ins>+ if (subjectMap)
+ subjectMap->clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool wrapDistance(int i, int j, int length)
</span></span></pre></div>
<a id="branchesaudioWebCoreaudioHRTFPannerh"></a>
<div class="modfile"><h4>Modified: branches/audio/WebCore/audio/HRTFPanner.h (58458 \
=> 58459)</h4> <pre class="diff"><span>
<span class="info">--- branches/audio/WebCore/audio/HRTFPanner.h 2010-04-29 00:51:24 \
UTC (rev 58458)
+++ branches/audio/WebCore/audio/HRTFPanner.h 2010-04-29 00:51:30 UTC (rev 58459)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> double sampleRate() const { return m_sampleRate; }
</span><span class="cx"> double elevation() const { return m_elevation; } // in \
positive degrees </span><span class="cx">
</span><del>- void writeHRIRFiles(const char* subjectName);
</del><ins>+ // void writeHRIRFiles(const char* subjectName);
</ins><span class="cx">
</span><span class="cx"> HRTFKernelList* m_kernelsL;
</span><span class="cx"> HRTFKernelList* m_kernelsR;
</span></span></pre></div>
<a id="branchesaudioWebCoreaudioSinWavecpp"></a>
<div class="modfile"><h4>Modified: branches/audio/WebCore/audio/SinWave.cpp (58458 => \
58459)</h4> <pre class="diff"><span>
<span class="info">--- branches/audio/WebCore/audio/SinWave.cpp 2010-04-29 00:51:24 \
UTC (rev 58458)
+++ branches/audio/WebCore/audio/SinWave.cpp 2010-04-29 00:51:30 UTC (rev 58459)
</span><span class="lines">@@ -50,11 +50,11 @@
</span><span class="cx"> {
</span><span class="cx"> while (nframes--)
</span><span class="cx"> {
</span><del>- float sample = sin(m_phase);
</del><ins>+ double sample = sin(m_phase);
</ins><span class="cx"> m_phase += m_phaseIncr;
</span><span class="cx"> if (m_phase > 2.0*M_PI) m_phase -= 2.0*M_PI;
</span><span class="cx">
</span><del>- *destP++ = sample;
</del><ins>+ *destP++ = float(sample);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic