<!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][15551] </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=15551">15551</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-19 10:56:19 -0600 (Thu, 19 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add more mutexes to video thread</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 (15550 => 15551)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-11-19 16:42:49 UTC (rev 15550)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-11-19 16:56:19 UTC (rev 15551)
</span><span class="lines">@@ -856,37 +856,49 @@
</span><span class="cx"> static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thread, void *obj)
</span><span class="cx"> {
</span><span class="cx"> conference_obj_t *conference = (conference_obj_t *) obj;
</span><del>- conference_member_t *imember, *last_member = NULL;
</del><ins>+ conference_member_t *imember;
</ins><span class="cx"> switch_frame_t *vid_frame;
</span><span class="cx"> switch_status_t status;
</span><span class="cx"> int has_vid = 1, req_iframe = 0;
</span><ins>+ int yield = 0;
+ uint32_t last_member = 0;
+ switch_core_session_t *session;
</ins><span class="cx">
</span><span class="cx"> conference->video_running = 1;
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread started for conference %s\n", conference->name);
</span><span class="cx">
</span><span class="cx"> while (has_vid && conference->video_running == 1 && globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) {
</span><ins>+ if (yield) {
+ switch_yield(yield);
+ yield = 0;
+ }
+
+ switch_mutex_lock(conference->member_mutex);
+
</ins><span class="cx"> if (!conference->floor_holder) {
</span><del>- switch_yield(100000);
- continue;
</del><ins>+ yield = 100000;
+ goto do_continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_test_flag(switch_core_session_get_channel(conference->floor_holder->session), CF_VIDEO)) {
</span><span class="cx"> switch_cond_next();
</span><del>- continue;
</del><ins>+ goto do_continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- status = switch_core_session_read_video_frame(conference->floor_holder->session, &vid_frame, SWITCH_IO_FLAG_NONE, 0);
- if (!SWITCH_READ_ACCEPTABLE(status)) {
</del><ins>+ session = conference->floor_holder->session;
+ switch_core_session_read_lock(session);
+ switch_mutex_unlock(conference->member_mutex);
+ status = switch_core_session_read_video_frame(session, &vid_frame, SWITCH_IO_FLAG_NONE, 0);
+ switch_mutex_lock(conference->member_mutex);
+ switch_core_session_rwunlock(session);
+
+ if (!SWITCH_READ_ACCEPTABLE(status) || !conference->floor_holder || switch_test_flag(vid_frame, SFF_CNG)) {
</ins><span class="cx"> conference->floor_holder = NULL;
</span><span class="cx"> req_iframe = 0;
</span><del>- continue;
</del><ins>+ goto do_continue;
</ins><span class="cx"> }
</span><del>-
- if (switch_test_flag(vid_frame, SFF_CNG)) {
- continue;
- }
-
- if (conference->floor_holder != last_member) {
</del><ins>+
+ if (conference->floor_holder->id != last_member) {
</ins><span class="cx"> int iframe = 0;
</span><span class="cx"> #if 0
</span><span class="cx"> switch_core_session_message_t msg = { 0 };
</span><span class="lines">@@ -914,15 +926,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!iframe) {
</span><del>- continue;
</del><ins>+ goto do_continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- req_iframe = 0;
</del><ins>+ req_iframe = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- last_member = conference->floor_holder;
</del><ins>+ last_member = conference->floor_holder->id;
</ins><span class="cx">
</span><del>- switch_mutex_lock(conference->member_mutex);
</del><ins>+
</ins><span class="cx"> has_vid = 0;
</span><span class="cx"> for (imember = conference->members; imember; imember = imember->next) {
</span><span class="cx"> if (switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
</span><span class="lines">@@ -930,9 +942,12 @@
</span><span class="cx"> switch_core_session_write_video_frame(imember->session, vid_frame, SWITCH_IO_FLAG_NONE, 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ do_continue:
+
</ins><span class="cx"> switch_mutex_unlock(conference->member_mutex);
</span><del>-
</del><span class="cx"> }
</span><ins>+
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread ending for conference %s\n", conference->name);
</span><span class="cx"> conference->video_running = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>