<!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>[Freeswitch-trunk][15422] </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">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15422">15422</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-11-10 20:43:55 -0600 (Tue, 10 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre> ROUND 1... FIGHT... <a href="http://jira.freeswitch.org/browse/MODENDP-264">MODENDP-264</a> </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsportaudiosrccommonpa_ditherc">freeswitch/trunk/libs/portaudio/src/common/pa_dither.c</a></li>
<li><a href="#freeswitchtrunklibsportaudiosrccommonpa_ditherh">freeswitch/trunk/libs/portaudio/src/common/pa_dither.h</a></li>
<li><a href="#freeswitchtrunklibsportaudiosrchostapicoreaudiopa_mac_corec">freeswitch/trunk/libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsportaudiosrccommonpa_ditherc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/portaudio/src/common/pa_dither.c (15421 => 15422)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/portaudio/src/common/pa_dither.c 2009-11-11 02:19:44 UTC (rev 15421)
+++ freeswitch/trunk/libs/portaudio/src/common/pa_dither.c 2009-11-11 02:43:55 UTC (rev 15422)
</span><span class="lines">@@ -42,10 +42,15 @@
</span><span class="cx"> @brief Functions for generating dither noise
</span><span class="cx"> */
</span><span class="cx">
</span><del>-
</del><ins>+#include "pa_types.h"
</ins><span class="cx"> #include "pa_dither.h"
</span><del>-#include "pa_types.h"
</del><span class="cx">
</span><ins>+
+/* Note that the linear congruential algorithm requires 32 bit integers
+ * because it uses arithmetic overflow. So use PaUint32 instead of
+ * unsigned long so it will work on 64 bit systems.
+ */
+
</ins><span class="cx"> #define PA_DITHER_BITS_ (15)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -57,9 +62,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-signed long PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *state )
</del><ins>+PaInt32 PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *state )
</ins><span class="cx"> {
</span><del>- signed long current, highPass;
</del><ins>+ PaInt32 current, highPass;
</ins><span class="cx">
</span><span class="cx"> /* Generate two random numbers. */
</span><span class="cx"> state->randSeed1 = (state->randSeed1 * 196314165) + 907633515;
</span><span class="lines">@@ -69,9 +74,10 @@
</span><span class="cx"> * Shift before adding to prevent overflow which would skew the distribution.
</span><span class="cx"> * Also shift an extra bit for the high pass filter.
</span><span class="cx"> */
</span><del>-#define DITHER_SHIFT_ ((SIZEOF_LONG*8 - PA_DITHER_BITS_) + 1)
- current = (((signed long)state->randSeed1)>>DITHER_SHIFT_) +
- (((signed long)state->randSeed2)>>DITHER_SHIFT_);
</del><ins>+#define DITHER_SHIFT_ ((sizeof(PaInt32)*8 - PA_DITHER_BITS_) + 1)
+
+ current = (((PaInt32)state->randSeed1)>>DITHER_SHIFT_) +
+ (((PaInt32)state->randSeed2)>>DITHER_SHIFT_);
</ins><span class="cx">
</span><span class="cx"> /* High pass filter to reduce audibility. */
</span><span class="cx"> highPass = current - state->previous;
</span><span class="lines">@@ -86,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> float PaUtil_GenerateFloatTriangularDither( PaUtilTriangularDitherGenerator *state )
</span><span class="cx"> {
</span><del>- signed long current, highPass;
</del><ins>+ PaInt32 current, highPass;
</ins><span class="cx">
</span><span class="cx"> /* Generate two random numbers. */
</span><span class="cx"> state->randSeed1 = (state->randSeed1 * 196314165) + 907633515;
</span><span class="lines">@@ -96,9 +102,8 @@
</span><span class="cx"> * Shift before adding to prevent overflow which would skew the distribution.
</span><span class="cx"> * Also shift an extra bit for the high pass filter.
</span><span class="cx"> */
</span><del>-#define DITHER_SHIFT_ ((SIZEOF_LONG*8 - PA_DITHER_BITS_) + 1)
- current = (((signed long)state->randSeed1)>>DITHER_SHIFT_) +
- (((signed long)state->randSeed2)>>DITHER_SHIFT_);
</del><ins>+ current = (((PaInt32)state->randSeed1)>>DITHER_SHIFT_) +
+ (((PaInt32)state->randSeed2)>>DITHER_SHIFT_);
</ins><span class="cx">
</span><span class="cx"> /* High pass filter to reduce audibility. */
</span><span class="cx"> highPass = current - state->previous;
</span></span></pre></div>
<a id="freeswitchtrunklibsportaudiosrccommonpa_ditherh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/portaudio/src/common/pa_dither.h (15421 => 15422)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/portaudio/src/common/pa_dither.h 2009-11-11 02:19:44 UTC (rev 15421)
+++ freeswitch/trunk/libs/portaudio/src/common/pa_dither.h 2009-11-11 02:43:55 UTC (rev 15422)
</span><span class="lines">@@ -44,18 +44,24 @@
</span><span class="cx"> @brief Functions for generating dither noise
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include "pa_types.h"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C"
</span><span class="cx"> {
</span><span class="cx"> #endif /* __cplusplus */
</span><span class="cx">
</span><ins>+/* Note that the linear congruential algorithm requires 32 bit integers
+ * because it uses arithmetic overflow. So use PaUint32 instead of
+ * unsigned long so it will work on 64 bit systems.
+ */
</ins><span class="cx">
</span><span class="cx"> /** @brief State needed to generate a dither signal */
</span><span class="cx"> typedef struct PaUtilTriangularDitherGenerator{
</span><del>- unsigned long previous;
- unsigned long randSeed1;
- unsigned long randSeed2;
</del><ins>+ PaUint32 previous;
+ PaUint32 randSeed1;
+ PaUint32 randSeed2;
</ins><span class="cx"> } PaUtilTriangularDitherGenerator;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -73,9 +79,9 @@
</span><span class="cx"> signed short out = (signed short)(((in>>1) + dither) >> 15);
</span><span class="cx"> </pre>
</span><span class="cx"> @return
</span><del>- A signed long with a range of +32767 to -32768
</del><ins>+ A signed 32-bit integer with a range of +32767 to -32768
</ins><span class="cx"> */
</span><del>-signed long PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *ditherState );
</del><ins>+PaInt32 PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *ditherState );
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="freeswitchtrunklibsportaudiosrchostapicoreaudiopa_mac_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c (15421 => 15422)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c 2009-11-11 02:19:44 UTC (rev 15421)
+++ freeswitch/trunk/libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c 2009-11-11 02:43:55 UTC (rev 15422)
</span><span class="lines">@@ -1709,8 +1709,10 @@
</span><span class="cx"> PaUtilRingBuffer *rb = (PaUtilRingBuffer *) inUserData;
</span><span class="cx">
</span><span class="cx"> VVDBUG(("ringBufferIOProc()\n"));
</span><del>-
- assert( sizeof( UInt32 ) == sizeof( long ) );
</del><ins>+ /*
+ Removing this fixes it but no clue if it breaks other things. (bkw_)
+ assert( sizeof( UInt32 ) == sizeof( long ) );
+ */
</ins><span class="cx"> if( PaUtil_GetRingBufferReadAvailable( rb ) == 0 ) {
</span><span class="cx"> *outData = NULL;
</span><span class="cx"> *ioDataSize = 0;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>