FS-3046 --resolve

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index b1c54c3df174d49e08adae0461d4772cea85e0bd..92eb97ef12614b66cfddb58a2d7bd6ff9ade85ef 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -750,34 +750,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session,
        unsigned char *abuf = NULL;
        switch_codec_implementation_t imp = { 0 };
 
-       if ((var = switch_channel_get_variable(channel, SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE)) && (sval = atoi(var))) {
-               switch_core_session_get_read_impl(session, &imp);
-
-               if (switch_core_codec_init(&codec,
-                                                                  "L16",
-                                                                  NULL,
-                                                                  imp.samples_per_second,
-                                                                  imp.microseconds_per_packet / 1000,
-                                                                  imp.number_of_channels,
-                                                                  SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
-                                                                  switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Error L16@%uhz %u channels %dms\n",
-                                                         imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
-                       return SWITCH_STATUS_FALSE;
-               }
-
-
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Codec Activated L16@%uhz %u channels %dms\n",
-                                                 imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
-
-               write_frame.codec = &codec;
-               switch_zmalloc(abuf, SWITCH_RECOMMENDED_BUFFER_SIZE);
-               write_frame.data = abuf;
-               write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
-               write_frame.datalen = imp.decoded_bytes_per_packet;
-               write_frame.samples = write_frame.datalen / sizeof(int16_t);
-       }
-
        if (switch_channel_test_flag(channel, CF_RECOVERED) && switch_channel_test_flag(channel, CF_CONTROLLED)) {
                switch_channel_clear_flag(channel, CF_CONTROLLED);
        }
@@ -821,6 +793,34 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session,
                        switch_core_session_get_read_impl(session, &read_impl);
                        rate = read_impl.actual_samples_per_second;
                        bpf = read_impl.decoded_bytes_per_packet;
+
+                       if ((var = switch_channel_get_variable(channel, SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE)) && (sval = atoi(var))) {
+                               switch_core_session_get_read_impl(session, &imp);
+
+                               if (switch_core_codec_init(&codec,
+                                                                  "L16",
+                                                                  NULL,
+                                                                  imp.samples_per_second,
+                                                                  imp.microseconds_per_packet / 1000,
+                                                                  imp.number_of_channels,
+                                                                  SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
+                                                                  switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Error L16@%uhz %u channels %dms\n",
+                                                                         imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
+                                       return SWITCH_STATUS_FALSE;
+                               }
+
+
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Codec Activated L16@%uhz %u channels %dms\n",
+                                                                 imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
+
+                               write_frame.codec = &codec;
+                               switch_zmalloc(abuf, SWITCH_RECOMMENDED_BUFFER_SIZE);
+                               write_frame.data = abuf;
+                               write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
+                               write_frame.datalen = imp.decoded_bytes_per_packet;
+                               write_frame.samples = write_frame.datalen / sizeof(int16_t);
+                       }
                }
 
                if (rate) {
@@ -845,7 +845,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session,
                        break;
                }
 
-               if (write_frame.data) {
+               if (rate && write_frame.data && sval) {
                        switch_generate_sln_silence((int16_t *) write_frame.data, write_frame.samples, sval);
                        switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0);
                }