FS-7500: don't wait for video ready from inside video thread that sets that flag

This commit is contained in:
Anthony Minessale authored and Michael Jerris committed 2015-05-28 12:47:11 -05:00
1 parent 24254bb1fd
commit fdcfcaece9
4 files changed
+32 -10

No files matched your search

+3 -1
View File
@@ -1831,7 +1831,9 @@ SWITCH_DECLARE(void) switch_channel_set_flag_value(switch_channel_t *channel, sw
}
if (flag == CF_VIDEO_DECODED_READ) {
switch_channel_wait_for_flag(channel, CF_VIDEO_READY, SWITCH_TRUE, 10000, NULL);
if (!switch_core_session_in_video_thread(channel->session)) {
switch_channel_wait_for_flag(channel, CF_VIDEO_READY, SWITCH_TRUE, 10000, NULL);
}
}
}