summaryrefslogtreecommitdiff
path: root/libavfilter/vf_deshake.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2018-03-16 19:54:03 +0100
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2018-03-20 01:09:23 +0100
commitcbbefc05b1b894fd858ba4da983cbf713f4f4421 (patch)
treed82ebf88088fe98c3695a5d82d13f07622a99707 /libavfilter/vf_deshake.c
parent1c49365c62f417a9e7ed764ac4dd940a2ce8b08d (diff)
lavfi/deshake: Check alignment before calling asm init function.
Do this for every frame to make sure dynamic filters do not cause crashes. Fixes ticket #7078.
Diffstat (limited to 'libavfilter/vf_deshake.c')
-rw-r--r--libavfilter/vf_deshake.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c
index fb4eb355b8..55ce5e18a1 100644
--- a/libavfilter/vf_deshake.c
+++ b/libavfilter/vf_deshake.c
@@ -342,10 +342,6 @@ static av_cold int init(AVFilterContext *ctx)
{
DeshakeContext *deshake = ctx->priv;
- deshake->sad = av_pixelutils_get_sad_fn(4, 4, 1, deshake); // 16x16, 2nd source unaligned
- if (!deshake->sad)
- return AVERROR(EINVAL);
-
deshake->refcount = 20; // XXX: add to options?
deshake->blocksize /= 2;
deshake->blocksize = av_clip(deshake->blocksize, 4, 128);
@@ -424,6 +420,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
const int chroma_width = AV_CEIL_RSHIFT(link->w, desc->log2_chroma_w);
const int chroma_height = AV_CEIL_RSHIFT(link->h, desc->log2_chroma_h);
+ int aligned;
out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out) {
@@ -432,6 +429,11 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
}
av_frame_copy_props(out, in);
+ aligned = !((intptr_t)in->data[0] & 15 | in->linesize[0] & 15);
+ deshake->sad = av_pixelutils_get_sad_fn(4, 4, aligned, deshake); // 16x16, 2nd source unaligned
+ if (!deshake->sad)
+ return AVERROR(EINVAL);
+
if (deshake->cx < 0 || deshake->cy < 0 || deshake->cw < 0 || deshake->ch < 0) {
// Find the most likely global motion for the current frame
find_motion(deshake, (deshake->ref == NULL) ? in->data[0] : deshake->ref->data[0], in->data[0], link->w, link->h, in->linesize[0], &t);