提交 b3a042a3 authored 作者: Seven Du's avatar Seven Du 提交者: Anthony Minessale

FS-7513: trying to fix mutex

上级 9afd4971
...@@ -897,10 +897,13 @@ static void reset_layer(mcu_canvas_t *canvas, mcu_layer_t *layer) ...@@ -897,10 +897,13 @@ static void reset_layer(mcu_canvas_t *canvas, mcu_layer_t *layer)
static void scale_and_patch(conference_obj_t *conference, mcu_layer_t *layer) static void scale_and_patch(conference_obj_t *conference, mcu_layer_t *layer)
{ {
int ret; int ret;
switch_image_t *IMG = conference->canvas->img, *img = layer->cur_img; switch_image_t *IMG, *img;
switch_mutex_lock(conference->canvas->mutex); switch_mutex_lock(conference->canvas->mutex);
IMG = conference->canvas->img;
img = layer->cur_img;
if (layer->geometry.scale) { if (layer->geometry.scale) {
int img_w = 0, img_h = 0; int img_w = 0, img_h = 0;
double screen_aspect = 0, img_aspect = 0; double screen_aspect = 0, img_aspect = 0;
...@@ -1200,6 +1203,7 @@ static switch_status_t attach_video_layer(conference_member_t *member, int idx) ...@@ -1200,6 +1203,7 @@ static switch_status_t attach_video_layer(conference_member_t *member, int idx)
switch_color_set_rgb(&color, member->conference->video_layout_bgcolor); switch_color_set_rgb(&color, member->conference->video_layout_bgcolor);
switch_mutex_lock(member->conference->canvas->mutex);
switch_img_fill(member->conference->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &color); switch_img_fill(member->conference->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &color);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论