tweak

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10686 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 0ba7c1afd1a8bdb68f6455f7f7f62142b04052d6..ebe8970727a7b6c5a7caad49007f0aaea1b252e6 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1490,12 +1490,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                                silence = 400;
                                        }
                                        
-                                       if (silence) {
-                                               write_frame.datalen = write_frame.codec->implementation->decoded_bytes_per_packet;
-                                               switch_generate_sln_silence((int16_t *) write_frame.data, write_frame.datalen / 2, silence);
-                                       }
-                                       
                                        if ((ringback.fh || silence || ringback.audio_buffer) && write_frame.codec && write_frame.datalen) {
+                                               if (silence) {
+                                                       write_frame.datalen = write_frame.codec->implementation->decoded_bytes_per_packet;
+                                                       switch_generate_sln_silence((int16_t *) write_frame.data, write_frame.datalen / 2, silence);
+                                               }
+                                               
                                                if (switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
                                                        break;
                                                }
@@ -1704,11 +1704,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                        }
 
                        if (session) {
-                               switch_core_session_reset(session, SWITCH_FALSE);
+                               //switch_core_session_reset(session, SWITCH_FALSE);
                        }
 
                        if (write_codec.implementation) {
-                               switch_core_codec_destroy(&write_codec);
+                               //switch_core_codec_destroy(&write_codec);
                        }
 
                        for (i = 0; i < and_argc; i++) {

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 74fe5bcd639551953133f1744ed4024a0e9d21e5..f4441cf007e96a6c524fcdd7ad8d6e79a9885460 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1906,7 +1906,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
                        rtp_session->cn = 0;
                        m++;
                }
-               
+
                send_msg->header.m = m ? 1 : 0;
 
                memcpy(send_msg->body, data, datalen);