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

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

This commit is contained in:
Anthony Minessale 2015-10-07 12:43:10 -05:00
parent 4845587be9
commit 545c63bb3f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod/applications/mod_conference/conference_file.c
View File

@ -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, "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) {
switch_event_merge(event, node->fh.params);
}

4
src/mod/applications/mod_conference/conference_video.c
View File

@ -1380,8 +1380,8 @@ void conference_video_canvas_set_fnode_layer(mcu_canvas_t *canvas, conference_fi
if (canvas->layout_floor_id > -1) {
idx = canvas->layout_floor_id;
xlayer = &canvas->layers[idx];
if (xlayer->fnode) {
if (xlayer->fnode && xlayer->fnode != fnode) {
idx = -1;
}
}