<!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][15585] </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=15585">15585</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-11-20 17:46:45 -0600 (Fri, 20 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: do not add delay when a sleep() or play() are executed by a script after answer() and before sending audio. <a href="http://jira.freeswitch.org/browse/MODSKYPIAX-29">MODSKYPIAX-29</a> <a href="http://jira.freeswitch.org/browse/MODSKYPIAX-58">MODSKYPIAX-58</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (15584 => 15585)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-11-20 23:12:07 UTC (rev 15584)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-11-20 23:46:45 UTC (rev 15585)
</span><span class="lines">@@ -745,16 +745,21 @@
</span><span class="cx"> #else /* WIN32 */
</span><span class="cx"> //sent = write(tech_pvt->audiopipe_cli[1], frame->data, sent);
</span><span class="cx"> #endif /* WIN32 */
</span><del>- while(tech_pvt->flag_audio_cli == 1){
- switch_sleep(100); //1 millisec
- //NOTICA("write \n", SKYPIAX_P_LOG);
- }
- //WARNINGA("write \n", SKYPIAX_P_LOG);
</del><ins>+ //FIXME while(tech_pvt->flag_audio_cli == 1){
+ //FIXME switch_sleep(100); //1 millisec
+ //NOTICA("write now is 1\n", SKYPIAX_P_LOG);
+ //FIXME }
+ //WARNINGA("write is now 0\n", SKYPIAX_P_LOG);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> //memcpy(tech_pvt->audiobuf_cli, frame->data, frame->datalen);
</span><ins>+ if(tech_pvt->flag_audio_cli == 1){
+ switch_sleep(1000); //1 millisec
+ }
+ if(tech_pvt->flag_audio_cli == 0){
</ins><span class="cx"> memcpy(tech_pvt->audiobuf_cli, frame->data, frame->datalen);
</span><span class="cx"> tech_pvt->flag_audio_cli = 1;
</span><ins>+ }
</ins><span class="cx"> //NOTICA("write \n", SKYPIAX_P_LOG);
</span><span class="cx">
</span><span class="cx"> if (sent != frame->datalen && sent != -1) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (15584 => 15585)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-11-20 23:12:07 UTC (rev 15584)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-11-20 23:46:45 UTC (rev 15585)
</span><span class="lines">@@ -38,7 +38,10 @@
</span><span class="cx"> #else
</span><span class="cx"> unsigned short start_port = 6001;
</span><span class="cx"> #endif //WIN32
</span><ins>+ int sockbufsize=0;
+ unsigned int size = sizeof(int);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> memset(&my_addr, 0, sizeof(my_addr));
</span><span class="cx"> my_addr.sin_family = AF_INET;
</span><span class="cx"> my_addr.sin_addr.s_addr = htonl(0x7f000001); /* use the localhost */
</span><span class="lines">@@ -52,6 +55,7 @@
</span><span class="cx"> start_port = *which_port;
</span><span class="cx">
</span><span class="cx"> my_addr.sin_port = htons(start_port);
</span><ins>+ //fcntl(s, F_SETFL, O_NONBLOCK);
</ins><span class="cx"> //tech_pvt->tcp_cli_port = start_port;
</span><span class="cx"> *which_port = start_port;
</span><span class="cx"> while (bind(s, (struct sockaddr *) &my_addr, sizeof(struct sockaddr)) < 0) {
</span><span class="lines">@@ -73,6 +77,39 @@
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("SUCCESS! *which_port=%d, tech_pvt->tcp_cli_port=%d, tech_pvt->tcp_srv_port=%d\n", SKYPIAX_P_LOG, *which_port, tech_pvt->tcp_cli_port,
</span><span class="cx"> tech_pvt->tcp_srv_port);
</span><ins>+
+ sockbufsize=0;
+ size = sizeof(int);
+ getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&sockbufsize, &size);
+ DEBUGA_SKYPE("1 SO_RCVBUF is %d, size is %d\n", SKYPIAX_P_LOG, sockbufsize, size);
+ sockbufsize=0;
+ size = sizeof(int);
+ getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&sockbufsize, &size);
+ DEBUGA_SKYPE("1 SO_SNDBUF is %d, size is %d\n", SKYPIAX_P_LOG, sockbufsize, size);
+
+
+
+ sockbufsize=SAMPLES_PER_FRAME * 8;
+ size = sizeof(int);
+ setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&sockbufsize, size);
+
+ sockbufsize=0;
+ size = sizeof(int);
+ getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&sockbufsize, &size);
+ DEBUGA_SKYPE("2 SO_RCVBUF is %d, size is %d\n", SKYPIAX_P_LOG, sockbufsize, size);
+
+ sockbufsize=SAMPLES_PER_FRAME * 8;
+ size = sizeof(int);
+ setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&sockbufsize, size);
+
+
+ sockbufsize=0;
+ size = sizeof(int);
+ getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&sockbufsize, &size);
+ DEBUGA_SKYPE("2 SO_SNDBUF is %d, size is %d\n", SKYPIAX_P_LOG, sockbufsize, size);
+
+
+
</ins><span class="cx"> return s;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -680,6 +717,8 @@
</span><span class="cx"> unsigned int kill_cli_size;
</span><span class="cx"> short kill_cli_buff[SAMPLES_PER_FRAME];
</span><span class="cx"> short totalbuf[SAMPLES_PER_FRAME];
</span><ins>+ int sockbufsize=0;
+ unsigned int size = sizeof(int);
</ins><span class="cx">
</span><span class="cx"> s = skypiax_socket_create_and_bind(tech_pvt, &tech_pvt->tcp_srv_port);
</span><span class="cx"> if (s < 0) {
</span><span class="lines">@@ -719,6 +758,17 @@
</span><span class="cx">
</span><span class="cx"> while (s > 0 && (fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) {
</span><span class="cx"> DEBUGA_SKYPE("ACCEPTED here I send you %d\n", SKYPIAX_P_LOG, tech_pvt->tcp_srv_port);
</span><ins>+
+ sockbufsize=0;
+ size = sizeof(int);
+ getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&sockbufsize, &size);
+ DEBUGA_SKYPE("3 SO_RCVBUF is %d, size is %d\n", SKYPIAX_P_LOG, sockbufsize, size);
+ sockbufsize=0;
+ size = sizeof(int);
+ getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&sockbufsize, &size);
+ DEBUGA_SKYPE("3 SO_SNDBUF is %d, size is %d\n", SKYPIAX_P_LOG, sockbufsize, size);
+
+
</ins><span class="cx"> if (!(running && tech_pvt->running))
</span><span class="cx"> break;
</span><span class="cx"> while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN
</span><span class="lines">@@ -787,16 +837,21 @@
</span><span class="cx"> }
</span><span class="cx"> /* send the complete frame through the pipe to our code waiting for incoming audio */
</span><span class="cx"> //howmany = skypiax_pipe_write(tech_pvt->audiopipe_srv[1], totalbuf, SAMPLES_PER_FRAME * sizeof(short));
</span><del>- while(tech_pvt->flag_audio_srv == 1){
- switch_sleep(100); //1 millisec
- //NOTICA("write \n", SKYPIAX_P_LOG);
- }
- //WARNINGA("read \n", SKYPIAX_P_LOG);
</del><ins>+ //FIXME while(tech_pvt->flag_audio_srv == 1){
+ //FIXME switch_sleep(100); //1 millisec
+ //NOTICA("read now is 1\n", SKYPIAX_P_LOG);
+ //FIXME }
+ //WARNINGA("read is now 0\n", SKYPIAX_P_LOG);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> howmany = SAMPLES_PER_FRAME * sizeof(short);
</span><ins>+ if(tech_pvt->flag_audio_srv == 1){
+ switch_sleep(1000); //1 millisec
+ }
+ if(tech_pvt->flag_audio_srv == 0){
</ins><span class="cx"> memcpy(tech_pvt->audiobuf_srv, totalbuf, SAMPLES_PER_FRAME * sizeof(short));
</span><span class="cx"> tech_pvt->flag_audio_srv = 1;
</span><ins>+ }
</ins><span class="cx"> //NOTICA("read \n", SKYPIAX_P_LOG);
</span><span class="cx"> if (howmany != SAMPLES_PER_FRAME * sizeof(short)) {
</span><span class="cx"> ERRORA("howmany is %d, but was expected to be %d\n", SKYPIAX_P_LOG,
</span><span class="lines">@@ -870,6 +925,8 @@
</span><span class="cx"> #else
</span><span class="cx"> unsigned int sin_size;
</span><span class="cx"> #endif /* WIN32 */
</span><ins>+ int sockbufsize=0;
+ unsigned int size = sizeof(int);
</ins><span class="cx">
</span><span class="cx"> s = skypiax_socket_create_and_bind(tech_pvt, &tech_pvt->tcp_cli_port);
</span><span class="cx"> if (s < 0) {
</span><span class="lines">@@ -912,6 +969,18 @@
</span><span class="cx">
</span><span class="cx"> while (s > 0 && (fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) {
</span><span class="cx"> DEBUGA_SKYPE("ACCEPTED here you send me %d\n", SKYPIAX_P_LOG, tech_pvt->tcp_cli_port);
</span><ins>+
+ sockbufsize=0;
+ size = sizeof(int);
+ getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&sockbufsize, &size);
+ DEBUGA_SKYPE("4 SO_RCVBUF is %d, size is %d\n", SKYPIAX_P_LOG, sockbufsize, size);
+ sockbufsize=0;
+ size = sizeof(int);
+ getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&sockbufsize, &size);
+ DEBUGA_SKYPE("4 SO_SNDBUF is %d, size is %d\n", SKYPIAX_P_LOG, sockbufsize, size);
+
+
+
</ins><span class="cx"> #ifndef WIN32
</span><span class="cx"> fcntl(tech_pvt->audiopipe_cli[0], F_SETFL, O_NONBLOCK);
</span><span class="cx"> fcntl(tech_pvt->audiopipe_cli[1], F_SETFL, O_NONBLOCK);
</span><span class="lines">@@ -949,12 +1018,12 @@
</span><span class="cx"> fdselect = fd;
</span><span class="cx"> FD_SET(fdselect, &fs);
</span><span class="cx">
</span><del>- //XXX rt = select(fdselect + 1, NULL, &fs, NULL, &to);
</del><ins>+ //FIXME rt = select(fdselect + 1, NULL, &fs, NULL, &to);
</ins><span class="cx"> while(tech_pvt->flag_audio_cli == 0){
</span><span class="cx"> skypiax_sleep(100); //1 millisec
</span><del>- //NOTICA("write \n", SKYPIAX_P_LOG);
- }
- //ERRORA("write \n", SKYPIAX_P_LOG);
</del><ins>+ //WARNINGA("write now is 0\n", SKYPIAX_P_LOG);
+ }
+ //ERRORA("write is now 1\n", SKYPIAX_P_LOG);
</ins><span class="cx">
</span><span class="cx"> rt = 1;
</span><span class="cx">
</span><span class="lines">@@ -1058,9 +1127,9 @@
</span><span class="cx">
</span><span class="cx"> while(tech_pvt->flag_audio_srv == 0){
</span><span class="cx"> skypiax_sleep(100); //1 millisec
</span><del>- //NOTICA("read \n", SKYPIAX_P_LOG);
</del><ins>+ //WARNINGA("read now is 0\n", SKYPIAX_P_LOG);
</ins><span class="cx"> }
</span><del>- //ERRORA("read \n", SKYPIAX_P_LOG);
</del><ins>+ //ERRORA("read is now 1\n", SKYPIAX_P_LOG);
</ins><span class="cx"> //samples = skypiax_pipe_read(tech_pvt->audiopipe_srv[0], tech_pvt->read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
</span><span class="cx"> samples = SAMPLES_PER_FRAME * sizeof(short);
</span><span class="cx"> memcpy(tech_pvt->read_frame.data, tech_pvt->audiobuf_srv, SAMPLES_PER_FRAME * sizeof(short));
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>