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

FS-11016: [mod_av] Looping a video file that has resize feature enabled can allow a non-resized frame to slip after file seek #resolve

This commit is contained in:
Anthony Minessale 2018-03-08 12:49:56 -06:00 committed by Muteesa Fred
parent 9fcbf5d1c0
commit 118c8ab0c2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2324,14 +2324,14 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f
context->last_img = (switch_image_t *)pop; context->last_img = (switch_image_t *)pop;
switch_img_copy(context->last_img, &frame->img); switch_img_copy(context->last_img, &frame->img);
context->vid_ready = 1; context->vid_ready = 1;
return SWITCH_STATUS_SUCCESS; goto resize_check;
} }
if (context->last_img) { // repeat the last img if (context->last_img) { // repeat the last img
switch_img_copy(context->last_img, &frame->img); switch_img_copy(context->last_img, &frame->img);
context->vid_ready = 1; context->vid_ready = 1;
context->seek_ts = -1; context->seek_ts = -1;
return SWITCH_STATUS_SUCCESS; goto resize_check;
} }
if ((flags & SVR_BLOCK) && sanity-- > 0) { if ((flags & SVR_BLOCK) && sanity-- > 0) {
@ -2346,7 +2346,7 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f
if ((flags & SVR_BLOCK)) switch_yield(100000); if ((flags & SVR_BLOCK)) switch_yield(100000);
switch_img_copy(context->last_img, &frame->img); switch_img_copy(context->last_img, &frame->img);
context->vid_ready = 1; context->vid_ready = 1;
return SWITCH_STATUS_SUCCESS; goto resize_check;
} }
if ((flags & SVR_BLOCK)) { if ((flags & SVR_BLOCK)) {
@ -2359,7 +2359,7 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f
context->last_img = (switch_image_t *)pop; context->last_img = (switch_image_t *)pop;
switch_img_copy(context->last_img, &frame->img); switch_img_copy(context->last_img, &frame->img);
context->vid_ready = 1; context->vid_ready = 1;
return SWITCH_STATUS_SUCCESS; goto resize_check;
} }
return SWITCH_STATUS_BREAK; return SWITCH_STATUS_BREAK;
@ -2475,6 +2475,8 @@ GCC_DIAG_ON(deprecated-declarations)
return SWITCH_STATUS_BREAK; return SWITCH_STATUS_BREAK;
} }
resize_check:
if (frame->img) { if (frame->img) {
if (frame->img && context->handle->mm.scale_w && context->handle->mm.scale_h) { if (frame->img && context->handle->mm.scale_w && context->handle->mm.scale_h) {
if (frame->img->d_w != context->handle->mm.scale_w || frame->img->d_h != context->handle->mm.scale_h) { if (frame->img->d_w != context->handle->mm.scale_w || frame->img->d_h != context->handle->mm.scale_h) {