<!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][16642] </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=16642">16642</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-02-15 04:34:55 -0600 (Mon, 15 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: let the audio threads die at each call end</pre>
<h3>Modified Paths</h3>
<ul>
<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_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (16641 => 16642)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-15 07:21:08 UTC (rev 16641)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-15 10:34:55 UTC (rev 16642)
</span><span class="lines">@@ -933,13 +933,16 @@
</span><span class="cx"> skypiax_sleep(2000);
</span><span class="cx"> DEBUGA_SKYPE("Skype incoming audio GONE\n", SKYPIAX_P_LOG);
</span><span class="cx"> skypiax_close_socket(fd);
</span><ins>+ break;
</ins><span class="cx"> }
</span><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("incoming audio server (I am it) EXITING\n", SKYPIAX_P_LOG);
</span><span class="cx"> skypiax_close_socket(s);
</span><span class="cx"> s = -1;
</span><ins>+ tech_pvt->tcp_srv_thread = NULL;
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -978,11 +981,11 @@
</span><span class="cx">
</span><span class="cx"> sin_size = sizeof(remote_addr);
</span><span class="cx">
</span><del>- /****************************/
</del><ins>+ /****************************/
</ins><span class="cx"> while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN
</span><del>- && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
- || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
- || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
</del><ins>+ && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
+ || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
+ || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
</ins><span class="cx">
</span><span class="cx"> unsigned int fdselectgio;
</span><span class="cx"> int rtgio;
</span><span class="lines">@@ -1001,7 +1004,7 @@
</span><span class="cx">
</span><span class="cx"> if (rtgio) {
</span><span class="cx">
</span><del>- /****************************/
</del><ins>+ /****************************/
</ins><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><span class="lines">@@ -1025,9 +1028,9 @@
</span><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><del>- && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
- || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
- || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
</del><ins>+ && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
+ || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
+ || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
</ins><span class="cx"> unsigned int fdselect;
</span><span class="cx"> int rt;
</span><span class="cx"> fd_set fs;
</span><span class="lines">@@ -1043,13 +1046,13 @@
</span><span class="cx"> to.tv_usec = 120000; //120msec
</span><span class="cx"> to.tv_sec = 0;
</span><span class="cx"> #if defined(WIN32) && !defined(__CYGWIN__)
</span><del>-/* on win32 we cannot select from the apr "pipe", so we select on socket writability */
</del><ins>+ /* on win32 we cannot select from the apr "pipe", so we select on socket writability */
</ins><span class="cx"> fdselect = fd;
</span><span class="cx"> FD_SET(fdselect, &fs);
</span><span class="cx">
</span><span class="cx"> //rt = select(fdselect + 1, NULL, &fs, NULL, &to);
</span><span class="cx"> #else
</span><del>-/* on *unix and cygwin we select from the real pipe */
</del><ins>+ /* on *unix and cygwin we select from the real pipe */
</ins><span class="cx"> //XXX fdselect = tech_pvt->audiopipe_cli[0];
</span><span class="cx"> //XXX FD_SET(fdselect, &fs);
</span><span class="cx">
</span><span class="lines">@@ -1093,68 +1096,64 @@
</span><span class="cx"> rt = 1;
</span><span class="cx">
</span><span class="cx"> if (rt > 0) {
</span><del>- int counter;
</del><span class="cx">
</span><span class="cx"> /* until we drained the pipe to empty */
</span><del>- //for (counter = 0; counter < 10; counter++) {
- for (counter = 0; counter < 1; counter++) {
- /* read from the pipe the audio frame we are supposed to send out */
- //got = skypiax_pipe_read(tech_pvt->audiopipe_cli[0], cli_in, SAMPLES_PER_FRAME * sizeof(short));
</del><ins>+ /* read from the pipe the audio frame we are supposed to send out */
+ //got = skypiax_pipe_read(tech_pvt->audiopipe_cli[0], cli_in, SAMPLES_PER_FRAME * sizeof(short));
</ins><span class="cx">
</span><span class="cx">
</span><del>- got = SAMPLES_PER_FRAME * sizeof(short);
- memcpy(cli_in, tech_pvt->audiobuf_cli, SAMPLES_PER_FRAME * sizeof(short));
- tech_pvt->flag_audio_cli = 0;
</del><ins>+ got = SAMPLES_PER_FRAME * sizeof(short);
+ memcpy(cli_in, tech_pvt->audiobuf_cli, SAMPLES_PER_FRAME * sizeof(short));
+ tech_pvt->flag_audio_cli = 0;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>- if (got == -1)
- break;
</del><ins>+ if (got == -1)
+ break;
</ins><span class="cx">
</span><del>- if (got != SAMPLES_PER_FRAME * sizeof(short)) {
- WARNINGA("got is %d, but was expected to be %d\n", SKYPIAX_P_LOG, got, (int) (SAMPLES_PER_FRAME * sizeof(short)));
- }
</del><ins>+ if (got != SAMPLES_PER_FRAME * sizeof(short)) {
+ WARNINGA("got is %d, but was expected to be %d\n", SKYPIAX_P_LOG, got, (int) (SAMPLES_PER_FRAME * sizeof(short)));
+ }
</ins><span class="cx">
</span><del>- if (got == SAMPLES_PER_FRAME * sizeof(short)) {
- if (samplerate_skypiax == 8000) {
</del><ins>+ if (got == SAMPLES_PER_FRAME * sizeof(short)) {
+ if (samplerate_skypiax == 8000) {
</ins><span class="cx">
</span><del>- /* we're upsampling from 8khz to 16khz, cli_out will contain two times each sample from cli_in */
- a = 0;
- for (i = 0; i < got / sizeof(short); i++) {
- cli_out[a] = cli_in[i];
- a++;
- cli_out[a] = cli_in[i];
- a++;
- }
- got = got * 2;
- } else if (samplerate_skypiax == 16000) {
- /* we're NOT upsampling, cli_out will contain just ALL samples from cli_in */
- for (i = 0; i < got / sizeof(short); i++) {
- cli_out[i] = cli_in[i];
- }
- } else {
- ERRORA("SAMPLERATE_SKYPIAX can only be 8000 or 16000\n", SKYPIAX_P_LOG);
</del><ins>+ /* we're upsampling from 8khz to 16khz, cli_out will contain two times each sample from cli_in */
+ a = 0;
+ for (i = 0; i < got / sizeof(short); i++) {
+ cli_out[a] = cli_in[i];
+ a++;
+ cli_out[a] = cli_in[i];
+ a++;
</ins><span class="cx"> }
</span><ins>+ got = got * 2;
+ } else if (samplerate_skypiax == 16000) {
+ /* we're NOT upsampling, cli_out will contain just ALL samples from cli_in */
+ for (i = 0; i < got / sizeof(short); i++) {
+ cli_out[i] = cli_in[i];
+ }
+ } else {
+ ERRORA("SAMPLERATE_SKYPIAX can only be 8000 or 16000\n", SKYPIAX_P_LOG);
+ }
</ins><span class="cx">
</span><del>- /* send the 16khz frame to the Skype client waiting for incoming audio to be sent to the remote party */
- if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
- len = send(fd, (char *) cli_out, got, 0);
- //skypiax_sleep(5000); //5 msec
</del><ins>+ /* send the 16khz frame to the Skype client waiting for incoming audio to be sent to the remote party */
+ if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
+ len = send(fd, (char *) cli_out, got, 0);
+ //skypiax_sleep(5000); //5 msec
</ins><span class="cx">
</span><del>- if (len == -1) {
- break;
- } else if (len != got) {
- ERRORA("len=%d\n", SKYPIAX_P_LOG, len);
- skypiax_sleep(1000);
- break;
- }
</del><ins>+ if (len == -1) {
+ break;
+ } else if (len != got) {
+ ERRORA("len=%d\n", SKYPIAX_P_LOG, len);
+ skypiax_sleep(1000);
+ break;
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>- } else {
</del><ins>+ } else {
</ins><span class="cx">
</span><del>- WARNINGA("got is %d, but was expected to be %d\n", SKYPIAX_P_LOG, got, (int) (SAMPLES_PER_FRAME * sizeof(short)));
- }
</del><ins>+ WARNINGA("got is %d, but was expected to be %d\n", SKYPIAX_P_LOG, got, (int) (SAMPLES_PER_FRAME * sizeof(short)));
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (rt)
</span><span class="lines">@@ -1176,13 +1175,16 @@
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("Skype outbound audio GONE\n", SKYPIAX_P_LOG);
</span><span class="cx"> skypiax_close_socket(fd);
</span><ins>+ break;
</ins><span class="cx"> }
</span><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("outbound audio server (I am it) EXITING\n", SKYPIAX_P_LOG);
</span><span class="cx"> skypiax_close_socket(s);
</span><span class="cx"> s = -1;
</span><ins>+ tech_pvt->tcp_cli_thread = NULL;
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>