<!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][14770] </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=14770">14770</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-04 14:50:37 -0500 (Fri, 04 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>declinatio mortuus obfirmo!</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec">freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (14769 => 14770)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-09-04 18:34:52 UTC (rev 14769)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-09-04 19:50:37 UTC (rev 14770)
</span><span class="lines">@@ -424,6 +424,9 @@
</span><span class="cx"> #define lock_member(_member) switch_mutex_lock(_member->write_mutex); switch_mutex_lock(_member->read_mutex)
</span><span class="cx"> #define unlock_member(_member) switch_mutex_unlock(_member->read_mutex); switch_mutex_unlock(_member->write_mutex)
</span><span class="cx">
</span><ins>+//#define lock_member(_member) switch_mutex_lock(_member->write_mutex)
+//#define unlock_member(_member) switch_mutex_unlock(_member->write_mutex)
+
</ins><span class="cx"> static switch_status_t conference_add_event_data(conference_obj_t *conference, switch_event_t *event)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1757,34 +1760,34 @@
</span><span class="cx"> switch_frame_t *read_frame = NULL;
</span><span class="cx"> uint32_t hangover = 40, hangunder = 15, hangover_hits = 0, hangunder_hits = 0, energy_level = 0, diff_level = 400;
</span><span class="cx"> switch_codec_implementation_t read_impl = {0};
</span><del>-
</del><ins>+ switch_core_session_t *session = member->session;
</ins><span class="cx"> switch_assert(member != NULL);
</span><span class="cx">
</span><span class="cx"> switch_clear_flag_locked(member, MFLAG_TALKING);
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(member->session);
</del><ins>+ channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><del>- switch_core_session_get_read_impl(member->session, &read_impl);
</del><ins>+ switch_core_session_get_read_impl(session, &read_impl);
</ins><span class="cx">
</span><span class="cx"> /* As long as we have a valid read, feed that data into an input buffer where the conference thread will take it
</span><span class="cx"> and mux it with any audio from other channels. */
</span><span class="cx">
</span><span class="cx"> while (switch_test_flag(member, MFLAG_RUNNING) && switch_channel_ready(channel)) {
</span><span class="cx">
</span><del>- switch_mutex_lock(member->read_mutex);
-
</del><span class="cx"> if (switch_channel_ready(channel) && switch_channel_test_app_flag(channel, CF_APP_TAGGED)) {
</span><span class="cx"> switch_yield(100000);
</span><del>- goto do_continue;
</del><ins>+ continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /* Read a frame. */
</span><del>- status = switch_core_session_read_frame(member->session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
</del><ins>+ status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
</ins><span class="cx">
</span><ins>+ switch_mutex_lock(member->read_mutex);
+
</ins><span class="cx"> /* end the loop, if appropriate */
</span><span class="cx"> if (!SWITCH_READ_ACCEPTABLE(status) || !switch_test_flag(member, MFLAG_RUNNING)) {
</span><del>- goto do_break;
</del><ins>+ switch_mutex_unlock(member->read_mutex);
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_test_flag(read_frame, SFF_CNG)) {
</span><span class="lines">@@ -1805,6 +1808,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> goto do_continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1947,7 +1951,8 @@
</span><span class="cx"> ok = switch_buffer_write(member->audio_buffer, data, datalen);
</span><span class="cx"> switch_mutex_unlock(member->audio_in_mutex);
</span><span class="cx"> if (!ok) {
</span><del>- goto do_break;
</del><ins>+ switch_mutex_unlock(member->read_mutex);
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1955,13 +1960,9 @@
</span><span class="cx"> do_continue:
</span><span class="cx">
</span><span class="cx"> switch_mutex_unlock(member->read_mutex);
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><del>- do_break:
</del><span class="cx">
</span><del>- switch_mutex_unlock(member->read_mutex);
-
</del><span class="cx"> switch_resample_destroy(&member->read_resampler);
</span><span class="cx"> switch_clear_flag_locked(member, MFLAG_ITHREAD);
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>