FS-3812 --resolve

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index acc7722637eca66bb75bdec39259b3a7f8ef8988..7630af165d78acbf3c5a5821e782e31582700c02 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -1205,6 +1205,7 @@ typedef enum {
        CF_ZOMBIE_EXEC,
        CF_INTERCEPT,
        CF_INTERCEPTED,
+       CF_VIDEO_REFRESH_REQ,
        /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
        /* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */
        CF_FLAG_MAX

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 003ad6b116a77d1457e938557f8286fdbd1e5aee..63b9e96d0a82b5220a3a97583bce16f629adfbce 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1168,20 +1168,30 @@ static void *SWITCH_THREAD_FUNC conference_video_bridge_thread_run(switch_thread
        switch_status_t status;
        switch_frame_t *read_frame;
        conference_obj_t *conference = vh->member_a->conference;
+       switch_core_session_message_t msg = { 0 };
        
        switch_thread_rwlock_rdlock(conference->rwlock);
        switch_thread_rwlock_rdlock(vh->member_a->rwlock);
        switch_thread_rwlock_rdlock(vh->member_b->rwlock);
        
-       
+
        /* Acquire locks for both sessions so the helper object and member structures don't get destroyed before we exit */
        switch_core_session_read_lock(session_a);
        switch_core_session_read_lock(session_b);
        
+       /* Tell the channel to request a fresh vid frame */
+       msg.from = __FILE__;
+       msg.message_id = SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ;
+
        vh->up = 1;
        while (vh->up == 1 && switch_test_flag(vh->member_a, MFLAG_RUNNING) && switch_test_flag(vh->member_b, MFLAG_RUNNING) &&
                   switch_channel_ready(channel_a) && switch_channel_ready(channel_b))  {
 
+               if (switch_channel_test_flag(channel_a, CF_VIDEO_REFRESH_REQ)) {
+                       switch_core_session_receive_message(session_b, &msg);
+                       switch_channel_clear_flag(channel_a, CF_VIDEO_REFRESH_REQ);
+               }
+
                status = switch_core_session_read_video_frame(session_a, &read_frame, SWITCH_IO_FLAG_NONE, 0);
                if (!SWITCH_READ_ACCEPTABLE(status)) {
                        break;
@@ -1216,14 +1226,20 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr
        conference_member_t *imember;
        switch_frame_t *vid_frame;
        switch_status_t status;
-       int has_vid = 1;// req_iframe = 0;
+       int has_vid = 1, want_refresh = 0;
        int yield = 0;
        uint32_t last_member = 0;
        switch_core_session_t *session;
+       switch_channel_t *channel;
+       switch_core_session_message_t msg = { 0 };
 
        conference->video_running = 1;
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video thread started for conference %s\n", conference->name);
 
+       /* Tell the channel to request a fresh vid frame */
+       msg.from = __FILE__;
+       msg.message_id = SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ;
+
        while (has_vid && conference->video_running == 1 && globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) {
                if (yield) {
                        switch_yield(yield);
@@ -1242,6 +1258,7 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr
                        goto do_continue;
                }
 
+               channel = NULL;
                session = conference->floor_holder->session;
                switch_core_session_read_lock(session);
                switch_mutex_unlock(conference->member_mutex);
@@ -1251,25 +1268,15 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr
 
                if (!SWITCH_READ_ACCEPTABLE(status) || !conference->floor_holder || switch_test_flag(vid_frame, SFF_CNG)) {
                        conference->floor_holder = NULL;
-                       //req_iframe = 0;
                        goto do_continue;
                }
 
+               channel = switch_core_session_get_channel(session);
+               
                if (conference->floor_holder->id != last_member) {
                        int iframe = 0;
-#if 0
-                       switch_core_session_message_t msg = { 0 };
 
 
-                       if (!req_iframe) {
-                               /* Tell the channel to request a fresh vid frame */
-                               msg.from = __FILE__;
-                               msg.message_id = SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ;
-                               switch_core_session_receive_message(conference->floor_holder->session, &msg);
-                               req_iframe = 1;
-                       }
-#endif
-
                        if (vid_frame->codec->implementation->ianacode == 34) { /* h.263 */
                                //iframe = (*((int16_t *) vid_frame->data) >> 12 == 6);
                                iframe = 1;
@@ -1289,8 +1296,6 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr
                        if (!iframe) {
                                goto do_continue;
                        }
-
-                       //req_iframe = 0;
                }
 
                last_member = conference->floor_holder->id;
@@ -1298,15 +1303,36 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr
                switch_mutex_unlock(conference->member_mutex);
                switch_mutex_lock(conference->member_mutex);
                has_vid = 0;
+               want_refresh = 0;
+
                for (imember = conference->members; imember; imember = imember->next) {
-                       if (imember->session && switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
+                       switch_channel_t *ichannel = switch_core_session_get_channel(imember->session);
+
+                       if (switch_channel_test_flag(ichannel, CF_VIDEO_REFRESH_REQ)) {
+                               want_refresh++;
+                               switch_channel_clear_flag(ichannel, CF_VIDEO_REFRESH_REQ);
+                       }
+
+                       if (imember->session && switch_channel_test_flag(ichannel, CF_VIDEO)) {
                                has_vid++;
+                               if (switch_channel_test_flag(channel, CF_VIDEO_REFRESH_REQ)) {
+                                       switch_core_session_receive_message(imember->session, &msg);
+                               }
                                switch_core_session_write_video_frame(imember->session, vid_frame, SWITCH_IO_FLAG_NONE, 0);
                        }
                }
+               
+               if (switch_channel_test_flag(channel, CF_VIDEO_REFRESH_REQ)) {
+                       switch_channel_clear_flag(channel, CF_VIDEO_REFRESH_REQ);
+               }
 
-         do_continue:
+               if (want_refresh) {
+                       switch_core_session_receive_message(session, &msg);
+                       want_refresh = 0;
+               }
 
+       do_continue:
+               
                switch_mutex_unlock(conference->member_mutex);
        }
 
@@ -1379,8 +1405,10 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
                        total++;
                        imember->read = 0;
 
-                       if (imember->session) {
-                               if (switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
+                       if (switch_test_flag(imember, MFLAG_RUNNING) && imember->session) {
+                               switch_channel_t *channel = switch_core_session_get_channel(imember->session);
+
+                               if (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_VIDEO)) {
                                        members_with_video++;
                                        
                                        if (switch_test_flag(imember, MFLAG_VIDEO_BRIDGE)) {
@@ -1468,7 +1496,16 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
                                }
                        }
 
-                       if (conference->vh[0].up != 1 && conference->vh[1].up != 1 && video_bridge_members[0] && video_bridge_members[1]){
+                       if (conference->vh[0].up == 0 && 
+                               conference->vh[1].up == 0 && 
+                               video_bridge_members[0] && 
+                               video_bridge_members[1] &&
+                               switch_test_flag(video_bridge_members[0], MFLAG_RUNNING) && 
+                               switch_test_flag(video_bridge_members[1], MFLAG_RUNNING) && 
+                               switch_channel_ready(switch_core_session_get_channel(video_bridge_members[0]->session)) &&
+                               switch_channel_ready(switch_core_session_get_channel(video_bridge_members[1]->session)) 
+                               ) {
+                               
                                launch_conference_video_bridge_thread(video_bridge_members[0], video_bridge_members[1]);
                        }
                }

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 12d3cf1ba4f9d90f0152fdf3c6132441e46e18bb..6eca708de91351a3e6a717d61a7cd6d26304ac44 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -7137,11 +7137,11 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
                        if (!strncasecmp(sip->sip_content_type->c_type, "application", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "media_control+xml")) {
                                switch_core_session_t *other_session;
                                
+                               switch_channel_set_flag(channel, CF_VIDEO_REFRESH_REQ);
+
                                if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
                                        sofia_glue_build_vid_refresh_message(other_session, sip->sip_payload->pl_data);
                                        switch_core_session_rwunlock(other_session);
-                               } else {
-                                       sofia_glue_build_vid_refresh_message(session, sip->sip_payload->pl_data);
                                }
 
                        } else if (!strncasecmp(sip->sip_content_type->c_type, "application", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "dtmf-relay")) {