kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 01:02:12 +00:00
Code Issues Projects Releases Wiki Activity

FS-10454: [mod_av] Regression in video file seek #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2017-06-30 11:28:49 -05:00
parent aec11b0948
commit 8be0a2c1c4
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1570,9 +1570,18 @@ static void *SWITCH_THREAD_FUNC file_read_thread_run(switch_thread_t *thread, vo
context->seek_ts = -2; context->seek_ts = -2;
if (context->has_video) { if (context->has_video) {
void *pop;
context->video_st.next_pts = 0; context->video_st.next_pts = 0;
context->video_start_time = 0; context->video_start_time = 0;
avcodec_flush_buffers(context->video_st.st->codec); avcodec_flush_buffers(context->video_st.st->codec);
while(switch_queue_trypop(context->eh.video_queue, &pop) == SWITCH_STATUS_SUCCESS) {
switch_image_t *img;
if (!pop) break;
img = (switch_image_t *) pop;
switch_img_free(&img);
}
} }
} }
@ -2427,7 +2436,7 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (context->read_paused) { if (context->read_paused || context->seek_ts == -2) {
int sanity = 10; int sanity = 10;
if (context->seek_ts == -2) { // just seeked, try read a new img if (context->seek_ts == -2) { // just seeked, try read a new img
@ -2596,8 +2605,13 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f
} }
context->vid_ready = 1; context->vid_ready = 1;
} }
if ((flags & SVR_BLOCK)) {
if (!frame->img) context->closed = 1; if (!frame->img) context->closed = 1;
return frame->img ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; return frame->img ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
} else {
return frame->img ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_BREAK;
}
} }
#endif #endif