update

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

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 9e46800448443f2465085bd4f65efe55a11e8b92..f8eebcf348a49c4413ad3ea278a755d18e96502a 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -259,7 +259,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_play_file(switch_core_session *session,
        uint32_t interval = 0, samples = 0;
        uint32_t len = 0, ilen = 0;
        switch_size_t olen = 0;
-       switch_frame write_frame;
+       switch_frame write_frame = {0};
        switch_timer timer;
        switch_core_thread_session thread_session;
        switch_codec codec;
@@ -433,6 +433,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_play_file(switch_core_session *session,
 #endif
                
                for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) {
+
                        if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
                                switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Bad Write\n");
                                done = 1;
@@ -456,7 +457,6 @@ SWITCH_DECLARE(switch_status) switch_ivr_play_file(switch_core_session *session,
 
        switch_console_printf(SWITCH_CHANNEL_CONSOLE, "done playing file\n");
        switch_core_file_close(fh);
-
        switch_core_codec_destroy(&codec);
 
        if (timer_name) {
@@ -488,7 +488,7 @@ SWITCH_DECLARE(switch_status) switch_ivr_speak_text(switch_core_session *session
        uint32_t samples = 0;
        uint32_t len = 0;
        switch_size_t ilen = 0;
-       switch_frame write_frame;
+       switch_frame write_frame = {0};
        switch_timer timer;
        switch_core_thread_session thread_session;
        switch_codec codec;
@@ -761,6 +761,8 @@ static void *audio_bridge_thread(switch_thread *thread, void *obj)
 
                /* read audio from 1 channel and write it to the other */
                if (switch_core_session_read_frame(session_a, &read_frame, -1, stream_id) == SWITCH_STATUS_SUCCESS && read_frame->datalen) {
+
+
                        if (switch_core_session_write_frame(session_b, read_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
                                switch_console_printf(SWITCH_CHANNEL_CONSOLE, "write: %s Bad Frame....[%u] Bubye!\n", switch_channel_get_name(chan_b), read_frame->datalen);
                                data->running = -1;

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index c4fe85ccd4c5e07ca3bf046061150cf065fa4b18..d2973bd10251ad8bcc29c923dcb57bb7fc269d03 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -458,7 +458,8 @@ static int rtp_common_read(switch_rtp *rtp_session, void *data, int *payload_typ
 {
        switch_size_t bytes;
        switch_status status;
-       
+
+
        for(;;) {
                bytes = sizeof(rtp_msg_t);      
                status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *)&rtp_session->recv_msg, &bytes);
@@ -541,7 +542,7 @@ SWITCH_DECLARE(int) switch_rtp_zerocopy_read(switch_rtp *rtp_session, void **dat
 static int rtp_common_write(switch_rtp *rtp_session, void *data, uint32_t datalen, uint8_t payload)
 {
        switch_size_t bytes;
-       
+
        if (rtp_session->packet_size > datalen && (payload == rtp_session->payload)) {
                if (!rtp_session->packet_buffer) {
                        if (switch_buffer_create(rtp_session->pool, &rtp_session->packet_buffer, rtp_session->packet_size * 2) != SWITCH_STATUS_SUCCESS) {