kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-3869 --resolve

This commit is contained in:
Anthony Minessale 2012-02-02 18:47:04 -06:00
parent a72fb34f92
commit ee3e450425
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1257,15 +1257,17 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr
} }
session = conference->floor_holder->session; session = conference->floor_holder->session;
switch_core_session_read_lock(session);
switch_mutex_unlock(conference->mutex); if ((status = switch_core_session_read_lock(session)) == SWITCH_STATUS_SUCCESS) {
if (!switch_channel_ready(switch_core_session_get_channel(session))) { switch_mutex_unlock(conference->mutex);
status = SWITCH_STATUS_FALSE; if (!switch_channel_ready(switch_core_session_get_channel(session))) {
} else { status = SWITCH_STATUS_FALSE;
status = switch_core_session_read_video_frame(session, &vid_frame, SWITCH_IO_FLAG_NONE, 0); } else {
status = switch_core_session_read_video_frame(session, &vid_frame, SWITCH_IO_FLAG_NONE, 0);
}
switch_mutex_lock(conference->mutex);
switch_core_session_rwunlock(session);
} }
switch_mutex_lock(conference->mutex);
switch_core_session_rwunlock(session);
if (!SWITCH_READ_ACCEPTABLE(status)) { if (!SWITCH_READ_ACCEPTABLE(status)) {
yield = 100000; yield = 100000;