From patchwork Thu Jan 23 12:40:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Deibel X-Patchwork-Id: 17484 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1F56944BAAD for ; Thu, 23 Jan 2020 15:46:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EEF2C68B3E7; Thu, 23 Jan 2020 15:46:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F167868B0E6 for ; Thu, 23 Jan 2020 15:46:13 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id q10so3105661wrm.11 for ; Thu, 23 Jan 2020 05:46:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qLIpa8kQJrMBuv+3hoghYg+Fy616DzGlt4oU84dJQss=; b=ZvOM2mkgbsfYWgZL/JKDo+5gbCg5AM4sL8V9JVFznX8UjcRZZOQo3/pQ3g6xUNYFsy 6019VSf1JfmcsHd1xv7kUt4stUjXA2tnbw/BgRM6QLOCf+bVgjH7aAKGpuEpg/AF/zaq aXsBpe2mCAXLe1lh8Q5e5AEVXkF6/HtJQxG26FSaFh5hHNltPlBjZoAeBMmlSMpkRDo5 vYEmRdzHZ2jpQ26yjZlRIneOlfEG9AHZJVVM6azpWCv3ZLvvBSCuhBCenQl9IU8siDnP /nooWk9U2K1irmt7+vBlh6oafvkdc7vswg4efQwWWuIzUahrc/3DsXhy9nc0VqfEoz5a TGrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qLIpa8kQJrMBuv+3hoghYg+Fy616DzGlt4oU84dJQss=; b=r4umy+iD/p6hsKflWE6giyTq95Cl0TYIYnr7HocQwOPP2zBiVwXZAYSNskX6z75qD+ mc0jo6RnVZ6gVgLqoYhyydhXaZq5h7MXJPLExrSa/x682Kz/08piO04eJHPBfwJ5kLD1 Rx2GN/AcU9qqBGNZCHAhlSyYTwDKUC4gAPebkb5Re78fg/u0tWvt432uId2c2o0KbY4W byN0pqTUmmU7k3LI21UIXQKnBF0drKfCrMT99tQPXEhQ4u09WxerCug8L1GmkkPeUNGx 2fgwBZdxGGUglQ9Q6y6oApaY3jOZY0ve2b1LedRBEsND6/gQdFROT4IJX/608LV2ICIZ 8/hw== X-Gm-Message-State: APjAAAU0KCbVL/xv7aiuaqZbBCKX/Rb6qJ7iADEypyDuDsvrtZmXK3K/ bXfF2gVfr2zHL/Q5lxBURsnqp+46K1I= X-Google-Smtp-Source: APXvYqz+rGhlS0sz5mcheNRCWJeaHYyMEAchNo9Y3QshWT+XJZs75pqrSQ8lzft7ynO1XidjfFTiIA== X-Received: by 2002:a5d:6551:: with SMTP id z17mr17559746wrv.269.1579783297862; Thu, 23 Jan 2020 04:41:37 -0800 (PST) Received: from lars.fritz.box (b2b-37-24-22-101.unitymedia.biz. [37.24.22.101]) by smtp.gmail.com with ESMTPSA id l15sm2720300wrv.39.2020.01.23.04.41.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 04:41:37 -0800 (PST) From: Robert Deibel To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jan 2020 13:40:55 +0100 Message-Id: <20200123124055.7834-1-deibel.robert@googlemail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_zoompan: fix shaking when zooming X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Robert Deibel Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fix shaking of image when zoom is applied by the zoompan filter. Resolves ticket https://trac.ffmpeg.org/ticket/4298 --- libavfilter/vf_zoompan.c | 81 ++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 24 deletions(-) diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c index 59c9b19ec8..ac8d69dac7 100644 --- a/libavfilter/vf_zoompan.c +++ b/libavfilter/vf_zoompan.c @@ -150,16 +150,29 @@ static int config_output(AVFilterLink *outlink) return 0; } +/** + * Scales n to be a multiple of grid_size and divisible by two but minimally 2 * grid_size. + * + * Used to scale the width and height of a frame to fit with the subsampling grid. + * @param n The number to be scaled. + * @param grid_size the size of the grid. + * @return The scaled number divisible by 2, minimally 2 * grid_size + */ +static int scale_to_grid(int n, uint8_t grid_size){ + return (((n + (1 << grid_size) * 2) & ~((1 << grid_size) - 1)) + 1) & ~1; +} + static int output_single_frame(AVFilterContext *ctx, AVFrame *in, double *var_values, int i, double *zoom, double *dx, double *dy) { ZPContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; int64_t pts = s->frame_count; - int k, x, y, w, h, ret = 0; + int k, x, y, crop_x, crop_y, w, h, crop_w, crop_h, overscaled_w, overscaled_h, ret = 0; uint8_t *input[4]; int px[4], py[4]; AVFrame *out; + double dw, dh, dx_scaled, dy_scaled; var_values[VAR_PX] = s->x; var_values[VAR_PY] = s->y; @@ -173,32 +186,38 @@ static int output_single_frame(AVFilterContext *ctx, AVFrame *in, double *var_va *zoom = av_clipd(*zoom, 1, 10); var_values[VAR_ZOOM] = *zoom; - w = in->width * (1.0 / *zoom); - h = in->height * (1.0 / *zoom); - *dx = av_expr_eval(s->x_expr, var_values, NULL); + w = dw = (double) in->width * (1.0 / *zoom); + h = dh = (double) in->height * (1.0 / *zoom); + crop_w = scale_to_grid(w, s->desc->log2_chroma_w); + crop_h = scale_to_grid(h, s->desc->log2_chroma_h); + overscaled_w = outlink->w + (crop_w - dw) * *zoom; + overscaled_h = outlink->h + (crop_h - dh) * *zoom; - x = *dx = av_clipd(*dx, 0, FFMAX(in->width - w, 0)); - var_values[VAR_X] = *dx; - x &= ~((1 << s->desc->log2_chroma_w) - 1); + *dx = av_expr_eval(s->x_expr, var_values, NULL); + crop_x = ceil(av_clipd(*dx - (((double) crop_w - w) / 2.0), 0, FFMAX(in->width - crop_w, 0))); + var_values[VAR_X] = *dx = av_clipd(*dx, 0, FFMAX(in->width - w, 0)); + crop_x &= ~((1 << s->desc->log2_chroma_w) - 1); *dy = av_expr_eval(s->y_expr, var_values, NULL); + crop_y = ceil(av_clipd(*dy - (((double) crop_h - h)/ 2.0), 0, FFMAX(in->height - crop_h, 0))); + var_values[VAR_Y] = *dy = av_clipd(*dy, 0, FFMAX(in->height - h, 0)); + crop_y &= ~((1 << s->desc->log2_chroma_h) - 1); - y = *dy = av_clipd(*dy, 0, FFMAX(in->height - h, 0)); - var_values[VAR_Y] = *dy; - y &= ~((1 << s->desc->log2_chroma_h) - 1); - - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + out = ff_get_video_buffer(outlink, overscaled_w, overscaled_h); if (!out) { ret = AVERROR(ENOMEM); return ret; } - px[1] = px[2] = AV_CEIL_RSHIFT(x, s->desc->log2_chroma_w); - px[0] = px[3] = x; + px[1] = px[2] = AV_CEIL_RSHIFT(crop_x, s->desc->log2_chroma_w); + px[0] = px[3] = crop_x; - py[1] = py[2] = AV_CEIL_RSHIFT(y, s->desc->log2_chroma_h); - py[0] = py[3] = y; + py[1] = py[2] = AV_CEIL_RSHIFT(crop_y, s->desc->log2_chroma_h); + py[0] = py[3] = crop_y; + + for (k = 0; k<4; k++) + input[k] = in->data[k] + py[k] * in->linesize[k] + px[k]; s->sws = sws_alloc_context(); if (!s->sws) { @@ -206,21 +225,35 @@ static int output_single_frame(AVFilterContext *ctx, AVFrame *in, double *var_va goto error; } - for (k = 0; in->data[k]; k++) - input[k] = in->data[k] + py[k] * in->linesize[k] + px[k]; - - av_opt_set_int(s->sws, "srcw", w, 0); - av_opt_set_int(s->sws, "srch", h, 0); + av_opt_set_int(s->sws, "srcw", crop_w, 0); + av_opt_set_int(s->sws, "srch", crop_h, 0); av_opt_set_int(s->sws, "src_format", in->format, 0); - av_opt_set_int(s->sws, "dstw", outlink->w, 0); - av_opt_set_int(s->sws, "dsth", outlink->h, 0); + av_opt_set_int(s->sws, "dstw", overscaled_w, 0); + av_opt_set_int(s->sws, "dsth", overscaled_h, 0); av_opt_set_int(s->sws, "dst_format", outlink->format, 0); av_opt_set_int(s->sws, "sws_flags", SWS_BICUBIC, 0); if ((ret = sws_init_context(s->sws, NULL, NULL)) < 0) goto error; - sws_scale(s->sws, (const uint8_t *const *)&input, in->linesize, 0, h, out->data, out->linesize); + sws_scale(s->sws, (const uint8_t *const *)&input, in->linesize, 0, crop_h, out->data, out->linesize); + + dx_scaled = ((crop_w - dw) * *zoom) / (((double) crop_w - dw) / (*dx - (double) crop_x)); + x = ceil(av_clipd(dx_scaled, 0, FFMAX(overscaled_w - outlink->w, 0))); + x &= ~((1 << s->desc->log2_chroma_w) - 1); + + dy_scaled = ((crop_h - dh) * *zoom) / (((double) crop_h - dh) / (*dx - (double) crop_y)); + y = ceil(av_clipd(dy_scaled, 0, FFMAX(overscaled_h - outlink->h, 0))); + y &= ~((1 << s->desc->log2_chroma_h) - 1); + + px[1] = px[2] = AV_CEIL_RSHIFT(x, s->desc->log2_chroma_w); + px[0] = px[3] = x; + + py[1] = py[2] = AV_CEIL_RSHIFT(y, s->desc->log2_chroma_h); + py[0] = py[3] = y; + + for (k = 0; k<4; k++) + out->data[k] = out->data[k] + py[k] * out->linesize[k] + px[k]; out->pts = pts; s->frame_count++;