mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-07-25 11:16:04 +00:00
FS-11057: [mod_conference] CPU race on personal canvas #resolve
This commit is contained in:
parent
8e362825de
commit
5272bbc83d
@ -2696,14 +2696,10 @@ void conference_video_pop_next_image(conference_member_t *member, switch_image_t
|
|||||||
switch_image_t *img = *imgP;
|
switch_image_t *img = *imgP;
|
||||||
int size = 0;
|
int size = 0;
|
||||||
void *pop;
|
void *pop;
|
||||||
int half;
|
|
||||||
//if (member->avatar_png_img && switch_channel_test_flag(member->channel, CF_VIDEO_READY) && conference_utils_member_test_flag(member, MFLAG_ACK_VIDEO)) {
|
//if (member->avatar_png_img && switch_channel_test_flag(member->channel, CF_VIDEO_READY) && conference_utils_member_test_flag(member, MFLAG_ACK_VIDEO)) {
|
||||||
// switch_img_free(&member->avatar_png_img);
|
// switch_img_free(&member->avatar_png_img);
|
||||||
//}
|
//}
|
||||||
|
|
||||||
if ((half = switch_queue_size(member->video_queue) / 2) < 1) {
|
|
||||||
half = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (switch_channel_test_flag(member->channel, CF_VIDEO_READY)) {
|
if (switch_channel_test_flag(member->channel, CF_VIDEO_READY)) {
|
||||||
do {
|
do {
|
||||||
@ -2716,7 +2712,7 @@ void conference_video_pop_next_image(conference_member_t *member, switch_image_t
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
size = switch_queue_size(member->video_queue);
|
size = switch_queue_size(member->video_queue);
|
||||||
} while(size > half);
|
} while(size > 1);
|
||||||
|
|
||||||
if (conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN) &&
|
if (conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN) &&
|
||||||
member->video_layer_id > -1 &&
|
member->video_layer_id > -1 &&
|
||||||
@ -3553,6 +3549,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
|
|||||||
last_key_time = now;
|
last_key_time = now;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch_core_timer_next(&canvas->timer);
|
||||||
|
|
||||||
switch_mutex_lock(conference->member_mutex);
|
switch_mutex_lock(conference->member_mutex);
|
||||||
|
|
||||||
for (imember = conference->members; imember; imember = imember->next) {
|
for (imember = conference->members; imember; imember = imember->next) {
|
||||||
@ -3698,8 +3696,6 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_core_timer_next(&canvas->timer);
|
|
||||||
|
|
||||||
for (omember = conference->members; omember; omember = omember->next) {
|
for (omember = conference->members; omember; omember = omember->next) {
|
||||||
mcu_layer_t *layer = NULL;
|
mcu_layer_t *layer = NULL;
|
||||||
switch_image_t *use_img = NULL;
|
switch_image_t *use_img = NULL;
|
||||||
|
@ -12383,6 +12383,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se
|
|||||||
|
|
||||||
case SWITCH_MESSAGE_INDICATE_HARD_MUTE:
|
case SWITCH_MESSAGE_INDICATE_HARD_MUTE:
|
||||||
if (a_engine->rtp_session) {
|
if (a_engine->rtp_session) {
|
||||||
|
a_engine->last_seq = 0;
|
||||||
|
|
||||||
if (session->bugs && msg->numeric_arg) {
|
if (session->bugs && msg->numeric_arg) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
|
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
|
||||||
"%s has a media bug, hard mute not allowed.\n", switch_channel_get_name(session->channel));
|
"%s has a media bug, hard mute not allowed.\n", switch_channel_get_name(session->channel));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user