提交 10c4eb8e authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Mike Jerris

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

上级 2e1c4d68
...@@ -132,10 +132,12 @@ switch_status_t conference_record_action(conference_obj_t *conference, char *pat ...@@ -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;
} }
......
...@@ -1753,7 +1753,8 @@ void conference_video_check_recording(conference_obj_t *conference, mcu_canvas_t ...@@ -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);
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论