make the core pre_answer channels when they hit an app that requires media and they...

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

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 0284dc482d28cfe8b385ddbb3ba7722896d73100..a49d2c5032ebd9d6c03ca21732452251900eaef9 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -473,6 +473,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(_In_ switch_channe
 
 #define switch_channel_stop_broadcast(_channel)        if (switch_channel_test_flag(_channel, CF_BROADCAST)) switch_channel_set_flag(_channel, CF_BREAK | CF_STOP_BROADCAST)
 
+#define switch_channel_media_ready(_channel) ((switch_channel_test_flag(_channel, CF_ANSWERED) || switch_channel_test_flag(_channel, CF_EARLY_MEDIA)) && !switch_channel_test_flag(_channel, CF_BYPASS_MEDIA))
+
 /** @} */
 
 SWITCH_END_EXTERN_C

diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 4e8d1d0cfab4da87808044904ba8832a098edd61..660538f121e496b53568b25d0d85d61fcda4e738 100644 (file)
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -156,8 +156,12 @@ static void switch_core_standard_on_execute(switch_core_session_t *session)
                if (switch_channel_test_flag(session->channel, CF_BYPASS_MEDIA) && !switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA)) {
                        switch_ivr_media(session->uuid_str, SMF_NONE);
                        nomedia++;
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application %s Requires media!\n",
-                                                         extension->current_application->application_name);
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application %s Requires media on channel %s!\n",
+                                                         extension->current_application->application_name, switch_channel_get_name(session->channel));
+               } else if (!switch_channel_media_ready(session->channel)) {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application %s Requires media! pre_answering channel %s\n",
+                                                         extension->current_application->application_name, switch_channel_get_name(session->channel));
+                       switch_channel_pre_answer(session->channel);
                }
 
                if ((expanded =