kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 16:58:35 +00:00
Code Issues Projects Releases Wiki Activity

FS-9704: [mod_av] Seeking video files with mod_av after it reaches the end does not work fix regression

Browse Source
This commit is contained in:
Anthony Minessale 2017-03-15 18:03:53 -05:00
parent 2e71cfd536
commit 7d7383e69e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_av/avformat.c
View File

@ -2122,9 +2122,13 @@ static switch_status_t av_file_close(switch_file_handle_t *handle)
av_file_write(handle, NULL, NULL);
}
if (context->file_read_thread_running && context->file_read_thread) {
if (context->file_read_thread_running) {
context->file_read_thread_running = 0;
}
if (context->file_read_thread) {
switch_thread_join(&status, context->file_read_thread);
context->file_read_thread = NULL;
}
if (context->eh.video_queue) {
@ -2163,6 +2167,12 @@ static switch_status_t av_file_seek(switch_file_handle_t *handle, unsigned int *
if (!context->file_read_thread_running) {
switch_threadattr_t *thd_attr = NULL;
if (context->file_read_thread) {
switch_status_t status;
switch_thread_join(&status, context->file_read_thread);
context->file_read_thread = NULL;
}
switch_threadattr_create(&thd_attr, handle->memory_pool);
switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
switch_thread_create(&context->file_read_thread, thd_attr, file_read_thread_run, context, handle->memory_pool);