virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vf_frei0r: set align to 1 for frei0r frames

Browse Source 
The frei0r API requires linesize to be width * 4.
Since the align property of ff_default_get_video_buffer2
specifies line alignment, not buffer alignment, the
previous value of 16 breaks this requirement for frames
whose width is a multiple of 8, but not a multiple of 16
as it adds extra padding to ensure line aligment.

Fix Trac ticket #9873
This commit is contained in:
Brendan Hack 2022-08-24 18:44:39 +10:00 committed by Paul B Mahol
parent 17987b371b
commit 01b9abd771
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_frei0r.c
View File

@ -359,14 +359,17 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{ {
Frei0rContext *s = inlink->dst->priv; Frei0rContext *s = inlink->dst->priv;
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
AVFrame *out = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16); /* align parameter is the line alignment, not the buffer alignment.
* frei0r expects line size to be width*4 so we want an align of 1
* to ensure lines aren't padded out. */
AVFrame *out = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 1);
if (!out) if (!out)
goto fail; goto fail;
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
if (in->linesize[0] != out->linesize[0]) { if (in->linesize[0] != out->linesize[0]) {
AVFrame *in2 = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16); AVFrame *in2 = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 1);
if (!in2) if (!in2)
goto fail; goto fail;
av_frame_copy(in2, in); av_frame_copy(in2, in);
@ -481,7 +484,7 @@ static int source_config_props(AVFilterLink *outlink)
static int source_request_frame(AVFilterLink *outlink) static int source_request_frame(AVFilterLink *outlink)
{ {
Frei0rContext *s = outlink->src->priv; Frei0rContext *s = outlink->src->priv;
AVFrame *frame = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16); AVFrame *frame = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 1);
if (!frame) if (!frame)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);