<!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>[162944] trunk/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/162944">162944</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-01-28 10:22:07 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Use explicit, rather than canonical, AudioFormatFlags and types.
https://bugs.webkit.org/show_bug.cgi?id=127781
Reviewed by Eric Carlson.
Since every mac platform uses Float32 audio samples, use these types explicitly
rather than the implicit, canonical AudioSampleType type. Once we're using Float32
explicity, we can also use the explicit kAudioFormatFlagsNativeFloatPacked flag
rather than the canonical version.
* platform/audio/mac/AudioDestinationMac.cpp:
(WebCore::AudioDestinationMac::configure):
* platform/audio/mac/AudioFileReaderMac.cpp:
(WebCore::AudioFileReader::createBus):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioDestinationMaccpp">trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioFileReaderMaccpp">trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162943 => 162944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-28 18:18:47 UTC (rev 162943)
+++ trunk/Source/WebCore/ChangeLog 2014-01-28 18:22:07 UTC (rev 162944)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-28 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Use explicit, rather than canonical, AudioFormatFlags and types.
+ https://bugs.webkit.org/show_bug.cgi?id=127781
+
+ Reviewed by Eric Carlson.
+
+ Since every mac platform uses Float32 audio samples, use these types explicitly
+ rather than the implicit, canonical AudioSampleType type. Once we're using Float32
+ explicity, we can also use the explicit kAudioFormatFlagsNativeFloatPacked flag
+ rather than the canonical version.
+
+ * platform/audio/mac/AudioDestinationMac.cpp:
+ (WebCore::AudioDestinationMac::configure):
+ * platform/audio/mac/AudioFileReaderMac.cpp:
+ (WebCore::AudioFileReader::createBus):
+
</ins><span class="cx"> 2014-01-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose SQL database creation and modification times
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioDestinationMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp (162943 => 162944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp 2014-01-28 18:18:47 UTC (rev 162943)
+++ trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp 2014-01-28 18:22:07 UTC (rev 162944)
</span><span class="lines">@@ -124,19 +124,16 @@
</span><span class="cx"> OSStatus result = AudioUnitSetProperty(m_outputUnit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Global, 0, &input, sizeof(input));
</span><span class="cx"> ASSERT(!result);
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> // Set stream format
</span><span class="cx"> AudioStreamBasicDescription streamFormat;
</span><span class="cx"> streamFormat.mSampleRate = m_sampleRate;
</span><span class="cx"> streamFormat.mFormatID = kAudioFormatLinearPCM;
</span><del>- streamFormat.mFormatFlags = kAudioFormatFlagsCanonical | kAudioFormatFlagIsNonInterleaved;
- streamFormat.mBitsPerChannel = 8 * sizeof(AudioSampleType);
</del><ins>+ streamFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked | kAudioFormatFlagIsNonInterleaved;
+ streamFormat.mBitsPerChannel = 8 * sizeof(Float32);
</ins><span class="cx"> streamFormat.mChannelsPerFrame = 2;
</span><span class="cx"> streamFormat.mFramesPerPacket = 1;
</span><del>- streamFormat.mBytesPerPacket = sizeof(AudioSampleType);
- streamFormat.mBytesPerFrame = sizeof(AudioSampleType);
-#pragma clang diagnostic pop
</del><ins>+ streamFormat.mBytesPerPacket = sizeof(Float32);
+ streamFormat.mBytesPerFrame = sizeof(Float32);
</ins><span class="cx">
</span><span class="cx"> result = AudioUnitSetProperty(m_outputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, (void*)&streamFormat, sizeof(AudioStreamBasicDescription));
</span><span class="cx"> ASSERT(!result);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioFileReaderMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp (162943 => 162944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp 2014-01-28 18:18:47 UTC (rev 162943)
+++ trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp 2014-01-28 18:22:07 UTC (rev 162944)
</span><span class="lines">@@ -157,17 +157,14 @@
</span><span class="cx"> // Client format will be linear PCM (canonical), and potentially change sample-rate.
</span><span class="cx"> m_clientDataFormat = m_fileDataFormat;
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> m_clientDataFormat.mFormatID = kAudioFormatLinearPCM;
</span><del>- m_clientDataFormat.mFormatFlags = kAudioFormatFlagsCanonical;
- m_clientDataFormat.mBitsPerChannel = 8 * sizeof(AudioSampleType);
</del><ins>+ m_clientDataFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked;
+ m_clientDataFormat.mBitsPerChannel = 8 * sizeof(Float32);
</ins><span class="cx"> m_clientDataFormat.mChannelsPerFrame = numberOfChannels;
</span><span class="cx"> m_clientDataFormat.mFramesPerPacket = 1;
</span><del>- m_clientDataFormat.mBytesPerPacket = sizeof(AudioSampleType);
- m_clientDataFormat.mBytesPerFrame = sizeof(AudioSampleType);
</del><ins>+ m_clientDataFormat.mBytesPerPacket = sizeof(Float32);
+ m_clientDataFormat.mBytesPerFrame = sizeof(Float32);
</ins><span class="cx"> m_clientDataFormat.mFormatFlags |= kAudioFormatFlagIsNonInterleaved;
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> if (sampleRate)
</span><span class="cx"> m_clientDataFormat.mSampleRate = sampleRate;
</span></span></pre>
</div>
</div>
</body>
</html>