<!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][16313] </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=16313">16313</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-14 15:02:11 -0600 (Thu, 14 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add bridge_early_media=true variable to hear early media from first channel with early media as ringback, this is 1 way audio</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (16312 => 16313)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2010-01-14 21:00:32 UTC (rev 16312)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2010-01-14 21:02:11 UTC (rev 16313)
</span><span class="lines">@@ -116,6 +116,7 @@
</span><span class="cx"> int continue_on_timeout;
</span><span class="cx"> int ringback_ok;
</span><span class="cx"> int sending_ringback;
</span><ins>+ int bridge_early_media;
</ins><span class="cx"> } originate_global_t;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -414,6 +415,11 @@
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(originate_status[i].peer_channel, CF_EARLY_MEDIA)) {
</span><span class="cx">
</span><ins>+ if (oglobals->ignore_early_media == 3 && oglobals->bridge_early_media == -1) {
+ oglobals->bridge_early_media = i;
+ oglobals->ringback_ok = 1;
+ }
+
</ins><span class="cx"> if (oglobals->sending_ringback == 1) {
</span><span class="cx"> send_ringback++;
</span><span class="cx"> pindex = (uint32_t) i;
</span><span class="lines">@@ -1018,10 +1024,6 @@
</span><span class="cx"> switch_codec_t *read_codec = NULL;
</span><span class="cx"> char *tmp_data = NULL;
</span><span class="cx">
</span><del>- if (!ringback_data) {
- switch_goto_status(SWITCH_STATUS_GENERR, end);
- }
-
</del><span class="cx"> if (!switch_channel_test_flag(caller_channel, CF_ANSWERED)
</span><span class="cx"> && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) {
</span><span class="cx"> if ((status = switch_channel_pre_answer(caller_channel)) != SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -1032,7 +1034,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (oglobals->session && (read_codec = switch_core_session_get_read_codec(oglobals->session))) {
</span><del>- if (switch_is_file_path(ringback_data)) {
</del><ins>+ if (ringback_data && switch_is_file_path(ringback_data)) {
</ins><span class="cx"> if (!(strrchr(ringback_data, '.') || strstr(ringback_data, SWITCH_URL_SEPARATOR))) {
</span><span class="cx"> ringback->asis++;
</span><span class="cx"> }
</span><span class="lines">@@ -1072,6 +1074,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> oglobals->gen_ringback = 1;
</span><ins>+
+ if (zstr(ringback_data)) {
+ switch_goto_status(SWITCH_STATUS_SUCCESS, end);
+ }
</ins><span class="cx">
</span><span class="cx"> if (switch_is_file_path(ringback_data)) {
</span><span class="cx"> char *ext;
</span><span class="lines">@@ -1579,6 +1585,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> oglobals.ringback_ok = 1;
</span><ins>+ oglobals.bridge_early_media = -1;
</ins><span class="cx">
</span><span class="cx"> if (session) {
</span><span class="cx"> const char *to_var;
</span><span class="lines">@@ -1772,6 +1779,8 @@
</span><span class="cx"> ok = 1;
</span><span class="cx"> } else if (!strcasecmp((char *) hi->name, "ignore_early_media")) {
</span><span class="cx"> ok = 1;
</span><ins>+ } else if (!strcasecmp((char *) hi->name, "bridge_early_media")) {
+ ok = 1;
</ins><span class="cx"> } else if (!strcasecmp((char *) hi->name, "originate_continue_on_timeout")) {
</span><span class="cx"> ok = 1;
</span><span class="cx"> } else if (!strcasecmp((char *) hi->name, "ignore_ring_ready")) {
</span><span class="lines">@@ -1872,6 +1881,13 @@
</span><span class="cx"> *oglobals.file = '\0';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((var_val = switch_event_get_header(var_event, "bridge_early_media"))) {
+ if (switch_true(var_val)) {
+ oglobals.early_ok = 0;
+ oglobals.ignore_early_media = 3;
+ }
+ }
+
</ins><span class="cx"> if ((var_val = switch_event_get_header(var_event, "ignore_early_media"))) {
</span><span class="cx"> if (switch_true(var_val)) {
</span><span class="cx"> oglobals.early_ok = 0;
</span><span class="lines">@@ -2560,8 +2576,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> read_frame = NULL;
</span><span class="cx"> }
</span><del>-
- if (oglobals.ringback_ok && (oglobals.ring_ready || oglobals.instant_ringback || oglobals.sending_ringback > 1)) {
</del><ins>+
+ if (oglobals.ringback_ok && (oglobals.ring_ready || oglobals.instant_ringback ||
+ oglobals.sending_ringback > 1 || oglobals.bridge_early_media > -1)) {
</ins><span class="cx"> if (oglobals.ringback_ok == 1) {
</span><span class="cx"> switch_status_t rst = setup_ringback(&oglobals, ringback_data, &ringback, &write_frame, &write_codec);
</span><span class="cx">
</span><span class="lines">@@ -2585,7 +2602,26 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ringback.fh) {
</del><ins>+ if (oglobals.bridge_early_media > -1) {
+ switch_channel_t *b_channel = originate_status[oglobals.bridge_early_media].peer_channel;
+ switch_core_session_t *b_session = originate_status[oglobals.bridge_early_media].peer_session;
+ switch_status_t b_status = SWITCH_STATUS_FALSE;
+ switch_frame_t *b_frame;
+
+ if (b_channel && b_session) {
+ b_status = switch_core_session_read_frame(b_session, &b_frame, SWITCH_IO_FLAG_NONE, 0);
+ }
+
+ if (!SWITCH_READ_ACCEPTABLE(status)) {
+ oglobals.bridge_early_media = -1;
+ } else {
+ if (switch_core_session_write_frame(oglobals.session, b_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
+ oglobals.bridge_early_media = -1;
+ }
+ continue;
+ }
+
+ } else if (ringback.fh) {
</ins><span class="cx"> switch_size_t mlen, olen;
</span><span class="cx"> unsigned int pos = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>