highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_zscale: realign output buffer if needed

Browse Source 
Output buffer alignment might be different to ZIMG_ALIGNMENT or it may not be
aligned at all if a downstream filter (e.g. vf_pad) intentionally misaligns it.

Or maybe we should unconditionally always allocate output with
av_frame_get_buffer() instead of ff_get_video_buffer()?

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2022-03-14 20:34:00 +01:00
parent d5722d578e
commit ea887ef876
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/vf_zscale.c
View File

@@ -632,7 +632,7 @@ static int graphs_build(AVFrame *in, AVFrame *out, const AVPixFmtDescriptor *des
return 0; return 0;
} }
static int realign_frame(const AVPixFmtDescriptor *desc, AVFrame **frame) static int realign_frame(const AVPixFmtDescriptor *desc, AVFrame **frame, int needs_copy)
{ {
AVFrame *aligned = NULL; AVFrame *aligned = NULL;
int ret = 0, plane, planes; int ret = 0, plane, planes;
@@ -654,10 +654,10 @@ static int realign_frame(const AVPixFmtDescriptor *desc, AVFrame **frame)
if ((ret = av_frame_get_buffer(aligned, ZIMG_ALIGNMENT)) < 0) if ((ret = av_frame_get_buffer(aligned, ZIMG_ALIGNMENT)) < 0)
goto fail; goto fail;
if ((ret = av_frame_copy(aligned, *frame)) < 0) if (needs_copy && (ret = av_frame_copy(aligned, *frame)) < 0)
goto fail; goto fail;
if ((ret = av_frame_copy_props(aligned, *frame)) < 0) if (needs_copy && (ret = av_frame_copy_props(aligned, *frame)) < 0)
goto fail; goto fail;
av_frame_free(frame); av_frame_free(frame);
@@ -786,9 +786,12 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
goto fail; goto fail;
} }
if ((ret = realign_frame(odesc, &out, 0)) < 0)
goto fail;
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
if ((ret = realign_frame(desc, &in)) < 0) if ((ret = realign_frame(desc, &in, 1)) < 0)
goto fail; goto fail;
snprintf(buf, sizeof(buf)-1, "%d", outlink->w); snprintf(buf, sizeof(buf)-1, "%d", outlink->w);