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

FS-10269: [mod_conference] conference recording pause doesn't work correctly for video -- partial

This commit is contained in:
Anthony Minessale 2017-04-27 17:57:26 -05:00 committed by Mike Jerris
parent 2e1c4d68eb
commit 10c4eb8e8e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_conference/conference_record.c
View File

@ -132,10 +132,12 @@ switch_status_t conference_record_action(conference_obj_t *conference, char *pat
break; break;
case REC_ACTION_PAUSE: case REC_ACTION_PAUSE:
conference_utils_member_set_flag_locked(member, MFLAG_PAUSE_RECORDING); conference_utils_member_set_flag_locked(member, MFLAG_PAUSE_RECORDING);
switch_set_flag((&member->rec->fh), SWITCH_FILE_PAUSE);
count = 1; count = 1;
break; break;
case REC_ACTION_RESUME: case REC_ACTION_RESUME:
conference_utils_member_clear_flag_locked(member, MFLAG_PAUSE_RECORDING); conference_utils_member_clear_flag_locked(member, MFLAG_PAUSE_RECORDING);
switch_clear_flag((&member->rec->fh), SWITCH_FILE_PAUSE);
count = 1; count = 1;
break; break;
} }

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

@ -1753,7 +1753,8 @@ void conference_video_check_recording(conference_obj_t *conference, mcu_canvas_t
continue; continue;
} }
if (switch_test_flag((&imember->rec->fh), SWITCH_FILE_OPEN) && switch_core_file_has_video(&imember->rec->fh, SWITCH_TRUE)) { if (switch_test_flag((&imember->rec->fh), SWITCH_FILE_OPEN) && !switch_test_flag((&imember->rec->fh), SWITCH_FILE_PAUSE) &&
switch_core_file_has_video(&imember->rec->fh, SWITCH_TRUE)) {
switch_core_file_write_video(&imember->rec->fh, frame); switch_core_file_write_video(&imember->rec->fh, frame);
} }
} }