From patchwork Mon Jul 11 08:54:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 36733 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1229935pzb; Mon, 11 Jul 2022 01:54:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vi/Jf4rKoFAkKVXcXi3SPHOrbMz6b3wQvSDCPUX1CEK0LnlkDO7QkvzH/J36pKgiu7Xfd2 X-Received: by 2002:a05:6402:1941:b0:435:5972:7811 with SMTP id f1-20020a056402194100b0043559727811mr23081562edz.234.1657529658807; Mon, 11 Jul 2022 01:54:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657529658; cv=none; d=google.com; s=arc-20160816; b=VNgpHzWQgU5PMZ8+EM1S35FJi3mPZ9swgl3VoLeHWjBekzDaGvUIP5JHl+eDo32LBR 3A/60XRbTkRodIZoQDKsCWM/BtS5sQOz1MVm2KwlXcTlTBrwhU2fc3pAZKtuRVACy3uB ORpcI01aal1aL60LvUPeAU/Sc69Sctt/+QLNxo4rGYE4L5zOWHjyRmAavhRguN3tZvZr aCBa593yFLidHzEXk8cDYQ4mPK8VDJ/KsZ3v2GNtVhPeyDLIYq6K7WM+P/OIJR6tPkX7 culG23PkcL4vWKpEk59edzahpQdPlPOgffDa//Qr/x3niamFZyIjBuIfklKxNRVs/XP4 Rf4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:from:references:to:content-language:mime-version:date :message-id:dkim-signature:delivered-to; bh=onkH71X74oiY6MQkY3sru6+8gQz+bfKsyeTGhqRmqqg=; b=hwg8Nkw5dI1rnUpfoW6u5ZIuYpZhNq3Q1WM7WXj6Bj8CCqFFTPQ+u/jNWsZudcKUkM n8cHDpVy4BI+ClQt0+5Rwaxv0IqZQ9wMdDjNZENspYy8DjdNAjIC0SleK82QDph/dGLh tB+F9lae9BI1PPx3yCj/nIQj6Gn7zcKOpJwmcngZ+KHB/PoAAK5uB6XcC6SaTYwVZ1cW hUsKtHUaMR7XETUMQHcl7f+kEVJSPIcr3vWDPMf8CDaHtgCx6dIUuA164X1nc5xWvlTv dVMvFb/gMEXFuenvmuOoNChc28nxymLpH5Oio4FZJnN+x1RwDXwHi1L8mLpBn4+Gn4yL yyxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b=3r5cD8zf; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mail.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o8-20020a170906974800b00711fc1fb3cfsi10828842ejy.399.2022.07.11.01.54.18; Mon, 11 Jul 2022 01:54:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b=3r5cD8zf; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mail.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E84C68B746; Mon, 11 Jul 2022 11:54:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout02.mail.de (shout02.mail.de [62.201.172.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE6A868B5CB for ; Mon, 11 Jul 2022 11:54:09 +0300 (EEST) Received: from postfix03.mail.de (postfix03.bt.mail.de [10.0.121.127]) by shout02.mail.de (Postfix) with ESMTP id 6975DA0D23 for ; Mon, 11 Jul 2022 10:54:09 +0200 (CEST) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix03.mail.de (Postfix) with ESMTP id 4E37980101 for ; Mon, 11 Jul 2022 10:54:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1657529649; bh=gw3SxAPLi099ga6smz0iN4pRsANR+TB7Wn1vWapIkEk=; h=Message-ID:Date:Subject:To:From:From:To:CC:Subject:Reply-To; b=3r5cD8zfKrEjiXjm1OClmeQe0MRfM+/bAwNugayLw0z+6my0EnYpx3qW87Br53sLp 9YOAIMJCFqTdTL/HeBiDJOkIeqvEaCgb36i6yTusaWhOfIErTtP8ys4snoo2wAnlRp DfbhmFKGlyLhUHHuTCnsvrZub4L+ERNq97dUnr0NniYh9Tb+LjJ44dUKUWUDZMpx2K YJWPZPkhrP/MDjKkt3W/sJpl9FBWJlRe7AQs2NQd71wtcZXSt5eVAdwbSPWaIOIofm SaoHhpuhiplrxqmBezzngt8cWk8GedYnQ1UysVgwjCeU+0j61eemi0sWrvTSSL6NVd joxaMrG7taXgA== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id 16D5FC0032 for ; Mon, 11 Jul 2022 10:54:09 +0200 (CEST) Message-ID: Date: Mon, 11 Jul 2022 10:54:08 +0200 MIME-Version: 1.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <9bb7f1eb-b927-f2bc-7b4a-292f46ef1a9e@mail.de> From: Thilo Borgmann In-Reply-To: <9bb7f1eb-b927-f2bc-7b4a-292f46ef1a9e@mail.de> X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 29355 X-purgate-ID: 154282::1657529649-000016C9-3C1FCDC3/0/0 Subject: [FFmpeg-devel] [PATCH v2 2/2] lavfi/cropdetect: Add new mode to detect crop-area based on motion vectors and edges X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: l74Yq0BT5+fp $subject -Thilo From ccc2b5ab29c4ca00c0a59af318fc865d37832377 Mon Sep 17 00:00:00 2001 From: Thilo Borgmann Date: Mon, 11 Jul 2022 10:48:53 +0200 Subject: [PATCH v2 2/2] lavfi/cropdetect: Add new mode to detect crop-area based on motion vectors and edges This filter allows crop detection even if the video is embedded in non-black areas. --- doc/filters.texi | 42 +++- libavfilter/vf_cropdetect.c | 211 ++++++++++++++++++++- tests/fate/filter-video.mak | 8 +- tests/ref/fate/filter-metadata-cropdetect1 | 9 + tests/ref/fate/filter-metadata-cropdetect2 | 9 + 5 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 tests/ref/fate/filter-metadata-cropdetect1 create mode 100644 tests/ref/fate/filter-metadata-cropdetect2 diff --git a/doc/filters.texi b/doc/filters.texi index d65e83d4d0..bd2d2429d7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10075,7 +10075,7 @@ Auto-detect the crop size. It calculates the necessary cropping parameters and prints the recommended parameters via the logging system. The detected dimensions -correspond to the non-black area of the input video. +correspond to the non-black or video area of the input video according to @var{mode}. It accepts the following parameters: @@ -10106,8 +10106,48 @@ detect the current optimal crop area. Default value is 0. This can be useful when channel logos distort the video area. 0 indicates 'never reset', and returns the largest area encountered during playback. + +@item mv_threshold +Set motion in pixel units as threshold for motion detection. It defaults to 8. + +@item low +@item high +Set low and high threshold values used by the Canny thresholding +algorithm. + +The high threshold selects the "strong" edge pixels, which are then +connected through 8-connectivity with the "weak" edge pixels selected +by the low threshold. + +@var{low} and @var{high} threshold values must be chosen in the range +[0,1], and @var{low} should be lesser or equal to @var{high}. + +Default value for @var{low} is @code{5/255}, and default value for @var{high} +is @code{15/255}. @end table +@subsection Examples + +@itemize +@item +Find video area surrounded by black borders: +@example +ffmpeg -i file.mp4 -vf cropdetect,metadata=mode=print -f null - +@end example + +@item +Find an embedded video area, generate motion vectors beforehand: +@example +ffmpeg -i file.mp4 -vf mestimate,cropdetect=mode=mvedges,metadata=mode=print -f null - +@end example + +@item +Find an embedded video area, use motion vectors from decoder: +@example +ffmpeg -flags2 +export_mvs -i file.mp4 -vf cropdetect=mode=mvedges,metadata=mode=print -f null - +@end example +@end itemize + @anchor{cue} @section cue diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index b887b9ecb1..68313064bd 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -26,11 +26,14 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/opt.h" +#include "libavutil/motion_vector.h" +#include "libavutil/qsort.h" #include "avfilter.h" #include "formats.h" #include "internal.h" #include "video.h" +#include "edge_common.h" typedef struct CropDetectContext { const AVClass *class; @@ -42,6 +45,16 @@ typedef struct CropDetectContext { int frame_nb; int max_pixsteps[4]; int max_outliers; + int mode; + int window_size; + int mv_threshold; + float low, high; + uint8_t low_u8, high_u8; + uint8_t *filterbuf; + uint8_t *tmpbuf; + uint16_t *gradients; + char *directions; + int *bboxes[4]; } CropDetectContext; static const enum AVPixelFormat pix_fmts[] = { @@ -61,6 +74,17 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_NONE }; +enum CropMode { + MODE_BLACK, + MODE_MV_EDGES, + MODE_NB +}; + +static int comp(const int *a,const int *b) +{ + return FFDIFFSIGN(*a, *b); +} + static int checkline(void *ctx, const unsigned char *src, int stride, int len, int bpp) { int total = 0; @@ -116,11 +140,43 @@ static int checkline(void *ctx, const unsigned char *src, int stride, int len, i return total; } +static int checkline_edge(void *ctx, const unsigned char *src, int stride, int len, int bpp) +{ + const uint16_t *src16 = (const uint16_t *)src; + + switch (bpp) { + case 1: + while (--len >= 0) { + if(src[0]) return 0; + src += stride; + } + break; + case 2: + stride >>= 1; + while (--len >= 0) { + if(src16[0]) return 0; + src16 += stride; + } + break; + case 3: + case 4: + while (--len >= 0) { + if(src[0] || src[1] || src[2]) return 0; + src += stride; + } + break; + } + + return 1; +} + static av_cold int init(AVFilterContext *ctx) { CropDetectContext *s = ctx->priv; s->frame_nb = -1 * s->skip; + s->low_u8 = s->low * 255. + .5; + s->high_u8 = s->high * 255. + .5; av_log(ctx, AV_LOG_VERBOSE, "limit:%f round:%d skip:%d reset_count:%d\n", s->limit, s->round, s->skip, s->reset_count); @@ -128,11 +184,27 @@ static av_cold int init(AVFilterContext *ctx) return 0; } +static av_cold void uninit(AVFilterContext *ctx) +{ + CropDetectContext *s = ctx->priv; + + av_freep(&s->tmpbuf); + av_freep(&s->filterbuf); + av_freep(&s->gradients); + av_freep(&s->directions); + av_freep(&s->bboxes[0]); + av_freep(&s->bboxes[1]); + av_freep(&s->bboxes[2]); + av_freep(&s->bboxes[3]); +} + static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; CropDetectContext *s = ctx->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + const int bufsize = inlink->w * inlink->h; + int bpp; av_image_fill_max_pixsteps(s->max_pixsteps, NULL, desc); @@ -144,6 +216,21 @@ static int config_input(AVFilterLink *inlink) s->x2 = 0; s->y2 = 0; + bpp = s->max_pixsteps[0]; + s->window_size = FFMAX(s->reset_count, 15); + s->tmpbuf = av_malloc(bufsize); + s->filterbuf = av_malloc(bufsize * s->max_pixsteps[0]); + s->gradients = av_calloc(bufsize, sizeof(*s->gradients)); + s->directions = av_malloc(bufsize); + s->bboxes[0] = av_malloc(s->window_size * sizeof(*s->bboxes[0])); + s->bboxes[1] = av_malloc(s->window_size * sizeof(*s->bboxes[1])); + s->bboxes[2] = av_malloc(s->window_size * sizeof(*s->bboxes[2])); + s->bboxes[3] = av_malloc(s->window_size * sizeof(*s->bboxes[3])); + + if (!s->tmpbuf || !s->filterbuf || !s->gradients || !s->directions || + !s->bboxes[0] || !s->bboxes[1] || !s->bboxes[2] || !s->bboxes[3]) + return AVERROR(ENOMEM); + return 0; } @@ -155,11 +242,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVFilterContext *ctx = inlink->dst; CropDetectContext *s = ctx->priv; int bpp = s->max_pixsteps[0]; - int w, h, x, y, shrink_by; + int w, h, x, y, shrink_by, i; AVDictionary **metadata; int outliers, last_y; int limit = lrint(s->limit); + const int inw = inlink->w; + const int inh = inlink->h; + uint8_t *tmpbuf = s->tmpbuf; + uint8_t *filterbuf = s->filterbuf; + uint16_t *gradients = s->gradients; + int8_t *directions = s->directions; + const AVFrameSideData *sd = NULL; + int scan_w, scan_h, bboff; + + void (*sobel)(int w, int h, uint16_t *dst, int dst_linesize, + int8_t *dir, int dir_linesize, + const uint8_t *src, int src_linesize, int src_stride) = (bpp == 2) ? &ff_sobel16 : &ff_sobel; + void (*gaussian_blur)(int w, int h, + uint8_t *dst, int dst_linesize, + const uint8_t *src, int src_linesize, int src_stride) = (bpp == 2) ? &ff_gaussian_blur16 : &ff_gaussian_blur; + + // ignore first s->skip frames if (++s->frame_nb > 0) { metadata = &frame->metadata; @@ -185,11 +289,109 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) last_y = y INC;\ } + if (s->mode == MODE_BLACK) { FIND(s->y1, 0, y < s->y1, +1, frame->linesize[0], bpp, frame->width); FIND(s->y2, frame->height - 1, y > FFMAX(s->y2, s->y1), -1, frame->linesize[0], bpp, frame->width); FIND(s->x1, 0, y < s->x1, +1, bpp, frame->linesize[0], frame->height); FIND(s->x2, frame->width - 1, y > FFMAX(s->x2, s->x1), -1, bpp, frame->linesize[0], frame->height); + } else { // MODE_MV_EDGES + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS); + s->x1 = 0; + s->y1 = 0; + s->x2 = inw - 1; + s->y2 = inh - 1; + + if (!sd) { + av_log(ctx, AV_LOG_WARNING, "Cannot detect: no motion vectors available"); + } else { + // gaussian filter to reduce noise + gaussian_blur(inw, inh, + filterbuf, inw*bpp, + frame->data[0], frame->linesize[0], bpp); + + // compute the 16-bits gradients and directions for the next step + sobel(inw, inh, gradients, inw, directions, inw, filterbuf, inw*bpp, bpp); + + // non_maximum_suppression() will actually keep & clip what's necessary and + // ignore the rest, so we need a clean output buffer + memset(tmpbuf, 0, inw * inh); + ff_non_maximum_suppression(inw, inh, tmpbuf, inw, directions, inw, gradients, inw); + + + // keep high values, or low values surrounded by high values + ff_double_threshold(s->low_u8, s->high_u8, inw, inh, + tmpbuf, inw, tmpbuf, inw); + + // scan all MVs and store bounding box + s->x1 = inw - 1; + s->y1 = inh - 1; + s->x2 = 0; + s->y2 = 0; + for (i = 0; i < sd->size / sizeof(AVMotionVector); i++) { + const AVMotionVector *mv = (const AVMotionVector*)sd->data + i; + const int mx = mv->dst_x - mv->src_x; + const int my = mv->dst_y - mv->src_y; + + if (mv->dst_x >= 0 && mv->dst_x < inw && + mv->dst_y >= 0 && mv->dst_y < inh && + mv->src_x >= 0 && mv->src_x < inw && + mv->src_y >= 0 && mv->src_y < inh && + mx * mx + my * my >= s->mv_threshold * s->mv_threshold) { + s->x1 = mv->dst_x < s->x1 ? mv->dst_x : s->x1; + s->y1 = mv->dst_y < s->y1 ? mv->dst_y : s->y1; + s->x2 = mv->dst_x > s->x2 ? mv->dst_x : s->x2; + s->y2 = mv->dst_y > s->y2 ? mv->dst_y : s->y2; + } + } + + // assert x1x1 > s->x2) FFSWAP(int, s->x1, s->x2); + if (s->y1 > s->y2) FFSWAP(int, s->y1, s->y2); + + // scan outward looking for 0-edge-lines in edge image + scan_w = s->x2 - s->x1; + scan_h = s->y2 - s->y1; + +#define FIND_EDGE(DST, FROM, NOEND, INC, STEP0, STEP1, LEN) \ + for (last_y = y = FROM; NOEND; y = y INC) { \ + if (checkline_edge(ctx, tmpbuf + STEP0 * y, STEP1, LEN, bpp)) { \ + if (last_y INC == y) { \ + DST = y; \ + break; \ + } else \ + last_y = y; \ + } \ + } \ + if (!(NOEND)) { \ + DST = y -(INC); \ + } + FIND_EDGE(s->y1, s->y1, y >= 0, -1, inw, bpp, scan_w); + FIND_EDGE(s->y2, s->y2, y < inh, +1, inw, bpp, scan_w); + FIND_EDGE(s->x1, s->x1, y >= 0, -1, bpp, inw, scan_h); + FIND_EDGE(s->x2, s->x2, y < inw, +1, bpp, inw, scan_h); + + // queue bboxes + bboff = (s->frame_nb - 1) % s->window_size; + s->bboxes[0][bboff] = s->x1; + s->bboxes[1][bboff] = s->x2; + s->bboxes[2][bboff] = s->y1; + s->bboxes[3][bboff] = s->y2; + + // sort queue + bboff = FFMIN(s->frame_nb, s->window_size); + AV_QSORT(s->bboxes[0], bboff, int, comp); + AV_QSORT(s->bboxes[1], bboff, int, comp); + AV_QSORT(s->bboxes[2], bboff, int, comp); + AV_QSORT(s->bboxes[3], bboff, int, comp); + + // return median of window_size elems + s->x1 = s->bboxes[0][bboff/2]; + s->x2 = s->bboxes[1][bboff/2]; + s->y1 = s->bboxes[2][bboff/2]; + s->y2 = s->bboxes[3][bboff/2]; + } + } // round x and y (up), important for yuv colorspaces // make sure they stay rounded! @@ -243,6 +445,12 @@ static const AVOption cropdetect_options[] = { { "skip", "Number of initial frames to skip", OFFSET(skip), AV_OPT_TYPE_INT, { .i64 = 2 }, 0, INT_MAX, FLAGS }, { "reset_count", "Recalculate the crop area after this many frames",OFFSET(reset_count),AV_OPT_TYPE_INT,{ .i64 = 0 }, 0, INT_MAX, FLAGS }, { "max_outliers", "Threshold count of outliers", OFFSET(max_outliers),AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, + { "mode", "set mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=MODE_BLACK}, 0, MODE_NB-1, FLAGS, "mode" }, + { "black", "detect black pixels surrounding the video", 0, AV_OPT_TYPE_CONST, {.i64=MODE_BLACK}, INT_MIN, INT_MAX, FLAGS, "mode" }, + { "mvedges", "detect motion and edged surrounding the video", 0, AV_OPT_TYPE_CONST, {.i64=MODE_MV_EDGES}, INT_MIN, INT_MAX, FLAGS, "mode" }, + { "high", "Set high threshold for edge detection", OFFSET(high), AV_OPT_TYPE_FLOAT, {.dbl=25/255.}, 0, 1, FLAGS }, + { "low", "Set low threshold for edge detection", OFFSET(low), AV_OPT_TYPE_FLOAT, {.dbl=15/255.}, 0, 1, FLAGS }, + { "mv_threshold", "motion vector threshold when estimating video window size", OFFSET(mv_threshold), AV_OPT_TYPE_INT, {.i64=8}, 0, 100, FLAGS}, { NULL } }; @@ -270,6 +478,7 @@ const AVFilter ff_vf_cropdetect = { .priv_size = sizeof(CropDetectContext), .priv_class = &cropdetect_class, .init = init, + .uninit = uninit, FILTER_INPUTS(avfilter_vf_cropdetect_inputs), FILTER_OUTPUTS(avfilter_vf_cropdetect_outputs), FILTER_PIXFMTS_ARRAY(pix_fmts), diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index faed832cd4..372c70bba7 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -641,11 +641,17 @@ FATE_METADATA_FILTER-$(call ALLYES, $(SCDET_DEPS)) += fate-filter-metadata-scdet fate-filter-metadata-scdet: SRC = $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov fate-filter-metadata-scdet: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',scdet=s=1" -CROPDETECT_DEPS = LAVFI_INDEV FILE_PROTOCOL MOVIE_FILTER CROPDETECT_FILTER \ +CROPDETECT_DEPS = LAVFI_INDEV FILE_PROTOCOL MOVIE_FILTER MOVIE_FILTER MESTIMATE_FILTER CROPDETECT_FILTER \ SCALE_FILTER MOV_DEMUXER H264_DECODER FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect fate-filter-metadata-cropdetect: SRC = $(TARGET_SAMPLES)/filter/cropdetect.mp4 fate-filter-metadata-cropdetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',cropdetect=max_outliers=3" +FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect1 +fate-filter-metadata-cropdetect1: SRC = $(TARGET_SAMPLES)/filter/cropdetect1.mp4 +fate-filter-metadata-cropdetect1: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',mestimate,cropdetect=mode=mvedges,metadata=mode=print" +FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect2 +fate-filter-metadata-cropdetect2: SRC = $(TARGET_SAMPLES)/filter/cropdetect2.mp4 +fate-filter-metadata-cropdetect2: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',mestimate,cropdetect=mode=mvedges,metadata=mode=print" FREEZEDETECT_DEPS = LAVFI_INDEV MPTESTSRC_FILTER SCALE_FILTER FREEZEDETECT_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(FREEZEDETECT_DEPS)) += fate-filter-metadata-freezedetect diff --git a/tests/ref/fate/filter-metadata-cropdetect1 b/tests/ref/fate/filter-metadata-cropdetect1 new file mode 100644 index 0000000000..892373cc11 --- /dev/null +++ b/tests/ref/fate/filter-metadata-cropdetect1 @@ -0,0 +1,9 @@ +pts=0 +pts=1001 +pts=2002|tag:lavfi.cropdetect.x1=20|tag:lavfi.cropdetect.x2=851|tag:lavfi.cropdetect.y1=311|tag:lavfi.cropdetect.y2=601|tag:lavfi.cropdetect.w=832|tag:lavfi.cropdetect.h=288|tag:lavfi.cropdetect.x=20|tag:lavfi.cropdetect.y=314 +pts=3003|tag:lavfi.cropdetect.x1=20|tag:lavfi.cropdetect.x2=885|tag:lavfi.cropdetect.y1=311|tag:lavfi.cropdetect.y2=621|tag:lavfi.cropdetect.w=864|tag:lavfi.cropdetect.h=304|tag:lavfi.cropdetect.x=22|tag:lavfi.cropdetect.y=316 +pts=4004|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=885|tag:lavfi.cropdetect.y1=115|tag:lavfi.cropdetect.y2=621|tag:lavfi.cropdetect.w=880|tag:lavfi.cropdetect.h=496|tag:lavfi.cropdetect.x=4|tag:lavfi.cropdetect.y=122 +pts=5005|tag:lavfi.cropdetect.x1=20|tag:lavfi.cropdetect.x2=885|tag:lavfi.cropdetect.y1=311|tag:lavfi.cropdetect.y2=621|tag:lavfi.cropdetect.w=864|tag:lavfi.cropdetect.h=304|tag:lavfi.cropdetect.x=22|tag:lavfi.cropdetect.y=316 +pts=6006|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=885|tag:lavfi.cropdetect.y1=115|tag:lavfi.cropdetect.y2=621|tag:lavfi.cropdetect.w=880|tag:lavfi.cropdetect.h=496|tag:lavfi.cropdetect.x=4|tag:lavfi.cropdetect.y=122 +pts=7007|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=885|tag:lavfi.cropdetect.y1=115|tag:lavfi.cropdetect.y2=621|tag:lavfi.cropdetect.w=880|tag:lavfi.cropdetect.h=496|tag:lavfi.cropdetect.x=4|tag:lavfi.cropdetect.y=122 +pts=8008|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=885|tag:lavfi.cropdetect.y1=115|tag:lavfi.cropdetect.y2=621|tag:lavfi.cropdetect.w=880|tag:lavfi.cropdetect.h=496|tag:lavfi.cropdetect.x=4|tag:lavfi.cropdetect.y=122 diff --git a/tests/ref/fate/filter-metadata-cropdetect2 b/tests/ref/fate/filter-metadata-cropdetect2 new file mode 100644 index 0000000000..6b433d17cb --- /dev/null +++ b/tests/ref/fate/filter-metadata-cropdetect2 @@ -0,0 +1,9 @@ +pts=0 +pts=512 +pts=1024|tag:lavfi.cropdetect.x1=21|tag:lavfi.cropdetect.x2=817|tag:lavfi.cropdetect.y1=33|tag:lavfi.cropdetect.y2=465|tag:lavfi.cropdetect.w=784|tag:lavfi.cropdetect.h=432|tag:lavfi.cropdetect.x=28|tag:lavfi.cropdetect.y=34 +pts=1536|tag:lavfi.cropdetect.x1=21|tag:lavfi.cropdetect.x2=817|tag:lavfi.cropdetect.y1=33|tag:lavfi.cropdetect.y2=465|tag:lavfi.cropdetect.w=784|tag:lavfi.cropdetect.h=432|tag:lavfi.cropdetect.x=28|tag:lavfi.cropdetect.y=34 +pts=2048|tag:lavfi.cropdetect.x1=21|tag:lavfi.cropdetect.x2=817|tag:lavfi.cropdetect.y1=29|tag:lavfi.cropdetect.y2=465|tag:lavfi.cropdetect.w=784|tag:lavfi.cropdetect.h=432|tag:lavfi.cropdetect.x=28|tag:lavfi.cropdetect.y=32 +pts=2560|tag:lavfi.cropdetect.x1=21|tag:lavfi.cropdetect.x2=817|tag:lavfi.cropdetect.y1=29|tag:lavfi.cropdetect.y2=465|tag:lavfi.cropdetect.w=784|tag:lavfi.cropdetect.h=432|tag:lavfi.cropdetect.x=28|tag:lavfi.cropdetect.y=32 +pts=3072|tag:lavfi.cropdetect.x1=21|tag:lavfi.cropdetect.x2=817|tag:lavfi.cropdetect.y1=29|tag:lavfi.cropdetect.y2=465|tag:lavfi.cropdetect.w=784|tag:lavfi.cropdetect.h=432|tag:lavfi.cropdetect.x=28|tag:lavfi.cropdetect.y=32 +pts=3584|tag:lavfi.cropdetect.x1=21|tag:lavfi.cropdetect.x2=817|tag:lavfi.cropdetect.y1=29|tag:lavfi.cropdetect.y2=465|tag:lavfi.cropdetect.w=784|tag:lavfi.cropdetect.h=432|tag:lavfi.cropdetect.x=28|tag:lavfi.cropdetect.y=32 +pts=4096|tag:lavfi.cropdetect.x1=21|tag:lavfi.cropdetect.x2=817|tag:lavfi.cropdetect.y1=29|tag:lavfi.cropdetect.y2=465|tag:lavfi.cropdetect.w=784|tag:lavfi.cropdetect.h=432|tag:lavfi.cropdetect.x=28|tag:lavfi.cropdetect.y=32