提交 545c63bb authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-8317 #resolve [Playing stacked video files sometimes makes the floor layer unusable]

上级 4845587b
...@@ -56,6 +56,11 @@ switch_status_t conference_file_close(conference_obj_t *conference, conference_f ...@@ -56,6 +56,11 @@ switch_status_t conference_file_close(conference_obj_t *conference, conference_f
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "milliseconds", "%ld", (long) node->fh.samples_in / (node->fh.native_rate / 1000)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "milliseconds", "%ld", (long) node->fh.samples_in / (node->fh.native_rate / 1000));
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "samples", "%ld", (long) node->fh.samples_in); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "samples", "%ld", (long) node->fh.samples_in);
if (node->layer_id && node->layer_id > -1) {
if (node->canvas_id < 0) node->canvas_id = 0;
conference_video_canvas_del_fnode_layer(conference, node);
}
if (node->fh.params) { if (node->fh.params) {
switch_event_merge(event, node->fh.params); switch_event_merge(event, node->fh.params);
} }
......
...@@ -1380,8 +1380,8 @@ void conference_video_canvas_set_fnode_layer(mcu_canvas_t *canvas, conference_fi ...@@ -1380,8 +1380,8 @@ void conference_video_canvas_set_fnode_layer(mcu_canvas_t *canvas, conference_fi
if (canvas->layout_floor_id > -1) { if (canvas->layout_floor_id > -1) {
idx = canvas->layout_floor_id; idx = canvas->layout_floor_id;
xlayer = &canvas->layers[idx]; xlayer = &canvas->layers[idx];
if (xlayer->fnode) { if (xlayer->fnode && xlayer->fnode != fnode) {
idx = -1; idx = -1;
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论