[FFmpeg-cvslog] avfilter/vf_frei0r: Copy to frame allocated according to frei0r requirements
Michael Niedermayer
git at videolan.org
Sun Oct 9 23:06:00 EEST 2022
ffmpeg | branch: release/4.2 | Michael Niedermayer <michael at niedermayer.cc> | Mon Apr 11 13:49:05 2022 +0200| [54c4f1e32b6d1c124146aba2afc5d8fd9208fb16] | committer: Michael Niedermayer
avfilter/vf_frei0r: Copy to frame allocated according to frei0r requirements
Fixes: issues with non trivial linesize
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit d353909e773ba8a8201fa13d6c35251351dd567a)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54c4f1e32b6d1c124146aba2afc5d8fd9208fb16
---
libavfilter/vf_frei0r.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 5d38405999..8595324ec5 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -353,14 +353,20 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{
Frei0rContext *s = inlink->dst->priv;
AVFilterLink *outlink = inlink->dst->outputs[0];
- AVFrame *out;
+ AVFrame *out = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16);
+ if (!out)
+ goto fail;
- out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
- if (!out) {
+ av_frame_copy_props(out, in);
+
+ if (in->linesize[0] != out->linesize[0]) {
+ AVFrame *in2 = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16);
+ if (!in2)
+ goto fail;
+ av_frame_copy(in2, in);
av_frame_free(&in);
- return AVERROR(ENOMEM);
+ in = in2;
}
- av_frame_copy_props(out, in);
s->update(s->instance, in->pts * av_q2d(inlink->time_base) * 1000,
(const uint32_t *)in->data[0],
@@ -369,6 +375,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_frame_free(&in);
return ff_filter_frame(outlink, out);
+fail:
+ av_frame_free(&in);
+ av_frame_free(&out);
+ return AVERROR(ENOMEM);
}
#define OFFSET(x) offsetof(Frei0rContext, x)
@@ -451,7 +461,7 @@ static int source_config_props(AVFilterLink *outlink)
static int source_request_frame(AVFilterLink *outlink)
{
Frei0rContext *s = outlink->src->priv;
- AVFrame *frame = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+ AVFrame *frame = ff_default_get_video_buffer2(outlink, outlink->w, outlink->h, 16);
if (!frame)
return AVERROR(ENOMEM);
More information about the ffmpeg-cvslog
mailing list