From patchwork Thu May 14 10:44:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19679 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 6A47F44990A for ; Thu, 14 May 2020 13:44:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BE1168974F; Thu, 14 May 2020 13:44:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1F58680C14 for ; Thu, 14 May 2020 13:44:24 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id q24so12287855pjd.1 for ; Thu, 14 May 2020 03:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y+h5cjWGPDY036t+VbWJEGfylXnILj7fEggpvq1wFio=; b=asz4+wFmbkzaimG9aEozxRSPwog2uTgyhw7MJZRY63nQ/J1ljFf5WvH2Xo4TlLvMN6 JU4afErxjwbWGpX1y4zJgpkCzHcSMhs0pnvqz0eXJSxQhcNc1Jf9oePP8zhox/hd5yCD eLB1JdaqkdvK/G+5J2+xmvietxjt/2NPARy07+6l3Eu1EwsHVgHyKjOI29cIzj+XjCkj thD7FebShJyZ23b83yzuoHEgyu/VLyS7tVWswAlEKn6ADhDyB6ztXZ7lYrInkVWGK8mP 3HA49bxI8lU4i7i2Gf0kcB59LlSOee4pjyyYuUGURcy1CHGd+heHy2fcZwN/4QVdh0gq Ceuw== 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:in-reply-to :references; bh=y+h5cjWGPDY036t+VbWJEGfylXnILj7fEggpvq1wFio=; b=SurQUBzE4BMTD9dwvZbzaHY2KY+OMDacpeRuSY+/NJ98Kg8IdZKnYFmUgaTUilQysE dOrAuLcJFLN1PHp6yJ/QQGgnz4m8VlJdg9rTrXJsq3OLtc4lA3vZN1REGouOfqZpi9Ao v39cLrCqN0YAAeiS1hMNEA5qTLsX16UjP2bGhLs39Sg59XyRNMfXuQarDjQsUJHWwfbk MIiolexGLRYa0xLnOYyMZuBc/og25oeAFW/6QSYomJPa5CDvx8Gj/LoT3wPDdZ4/LIpZ 8rzuaH/CZVc/1mSNezYxN6LEAEVTtRBUUKk9kYqHilfzKh/mUjasreeacQqgGsBifv3n ClFg== X-Gm-Message-State: AOAM531ad1Yw7Ps16xGHFE2X7NtqKCRGC2C80IqITdVQpILtZ7ljeQ3/ abYopMnAVsW3ekxU/u/gzNJt+Mma X-Google-Smtp-Source: ABdhPJyLf80KDVmBMLBYZrl7QTRnPaDZ+fuzAvI2JnevHe8lRTuxNIXHt72YagD5p3BtR6Kiej3N+A== X-Received: by 2002:a17:90b:3845:: with SMTP id nl5mr254625pjb.72.1589453062400; Thu, 14 May 2020 03:44:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bj6sm13227367pjb.47.2020.05.14.03.44.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2020 03:44:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 May 2020 18:44:10 +0800 Message-Id: <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20190929132515.4093-1-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 1/4] avfilter/vf_scdet: add filter to detect scene change 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Reviewed-by: Paul B Mahol Signed-off-by: Limin Wang --- rebase with master and update the version and Changelog Changelog | 1 + configure | 1 + doc/filters.texi | 35 ++++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_scdet.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 libavfilter/vf_scdet.c diff --git a/Changelog b/Changelog index b75d2b6..f56674f 100644 --- a/Changelog +++ b/Changelog @@ -66,6 +66,7 @@ version : - asubboost filter - Pro Pinball Series Soundbank demuxer - pcm_rechunk bitstream filter +- scdet filter version 4.2: diff --git a/configure b/configure index a45c0fb..34afdaa 100755 --- a/configure +++ b/configure @@ -3569,6 +3569,7 @@ sab_filter_deps="gpl swscale" scale2ref_filter_deps="swscale" scale_filter_deps="swscale" scale_qsv_filter_deps="libmfx" +scdet_filter_select="scene_sad" select_filter_select="scene_sad" sharpness_vaapi_filter_deps="vaapi" showcqt_filter_deps="avcodec avformat swscale" diff --git a/doc/filters.texi b/doc/filters.texi index d19fd34..a3e78b1 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16578,6 +16578,41 @@ Set the horizontal scrolling speed. Set the vertical scrolling speed. @end table +@anchor{scdet} +@section scdet + +Detect video scene change. + +This filter sets frame metadata with mafd between frame, the scene score, and +forward the frame to the next filter, so they can use these metadata to detect +scene change or others. + +In addition, this filter logs a message and sets frame metadata when it detects +a scene change by @option{threshold}. + +@code{lavfi.scd.mafd} metadata keys are set with mafd for every frame. + +@code{lavfi.scd.score} metadata keys are set with scene change score for every frame +to detect scene change. + +@code{lavfi.scd.time} metadata keys are set with current filtered frame time which +detect scene change with @option{threshold}. + +The filter accepts the following options: + +@table @option +@item threshold, t +Set the scene change detection threshold as a percentage of maximum change. Good +values are in the @code{[8.0, 14.0]} range. The range for @option{threshold} is +@code{[0., 100.]}. + +Default value is @code{10.}. + +@item sc_pass, s +Set the flag to pass scene change frames to the next filter. Default value is @code{0} +You can enable it if you want to get snapshot of scene change frames only. +@end table + @anchor{selectivecolor} @section selectivecolor diff --git a/libavfilter/Makefile b/libavfilter/Makefile index f982afe..b2086f6 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -376,6 +376,7 @@ OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_scale_qsv.o OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale_eval.o vaapi_vpp.o OBJS-$(CONFIG_SCALE_VULKAN_FILTER) += vf_scale_vulkan.o vulkan.o OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale_eval.o +OBJS-$(CONFIG_SCDET_FILTER) += vf_scdet.o OBJS-$(CONFIG_SCROLL_FILTER) += vf_scroll.o OBJS-$(CONFIG_SELECT_FILTER) += f_select.o OBJS-$(CONFIG_SELECTIVECOLOR_FILTER) += vf_selectivecolor.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 1b94501..8830c8d 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -358,6 +358,7 @@ extern AVFilter ff_vf_scale_qsv; extern AVFilter ff_vf_scale_vaapi; extern AVFilter ff_vf_scale_vulkan; extern AVFilter ff_vf_scale2ref; +extern AVFilter ff_vf_scdet; extern AVFilter ff_vf_scroll; extern AVFilter ff_vf_select; extern AVFilter ff_vf_selectivecolor; diff --git a/libavfilter/version.h b/libavfilter/version.h index c0d4966..8bb22c3 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 7 -#define LIBAVFILTER_VERSION_MINOR 80 +#define LIBAVFILTER_VERSION_MINOR 81 #define LIBAVFILTER_VERSION_MICRO 100 diff --git a/libavfilter/vf_scdet.c b/libavfilter/vf_scdet.c new file mode 100644 index 0000000..b91d91f --- /dev/null +++ b/libavfilter/vf_scdet.c @@ -0,0 +1,224 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * video scene change detection filter + */ + +#include "libavutil/avassert.h" +#include "libavutil/imgutils.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/timestamp.h" + +#include "avfilter.h" +#include "filters.h" +#include "scene_sad.h" + +typedef struct SCDetContext { + const AVClass *class; + + ptrdiff_t width[4]; + ptrdiff_t height[4]; + int nb_planes; + int bitdepth; + ff_scene_sad_fn sad; + double prev_mafd; + double scene_score; + AVFrame *prev_picref; + double threshold; + int sc_pass; +} SCDetContext; + +#define OFFSET(x) offsetof(SCDetContext, x) +#define V AV_OPT_FLAG_VIDEO_PARAM +#define F AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption scdet_options[] = { + { "threshold", "set scene change detect threshold", OFFSET(threshold), AV_OPT_TYPE_DOUBLE, {.dbl = 10.}, 0, 100., V|F }, + { "t", "set scene change detect threshold", OFFSET(threshold), AV_OPT_TYPE_DOUBLE, {.dbl = 10.}, 0, 100., V|F }, + { "sc_pass", "Set the flag to pass scene change frames", OFFSET(sc_pass), AV_OPT_TYPE_BOOL, {.dbl = 0 }, 0, 1, V|F }, + { "s", "Set the flag to pass scene change frames", OFFSET(sc_pass), AV_OPT_TYPE_BOOL, {.dbl = 0 }, 0, 1, V|F }, + {NULL} +}; + +AVFILTER_DEFINE_CLASS(scdet); + +static int query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, + AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, AV_PIX_FMT_GRAY8, + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, + AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P, + AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ440P, + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P12, + AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12, + AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12, + AV_PIX_FMT_NONE + }; + + AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); + if (!fmts_list) + return AVERROR(ENOMEM); + return ff_set_common_formats(ctx, fmts_list); +} + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + SCDetContext *s = ctx->priv; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int is_yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB) && + (desc->flags & AV_PIX_FMT_FLAG_PLANAR) && + desc->nb_components >= 3; + + s->bitdepth = desc->comp[0].depth; + s->nb_planes = is_yuv ? 1 : av_pix_fmt_count_planes(inlink->format); + + for (int plane = 0; plane < 4; plane++) { + ptrdiff_t line_size = av_image_get_linesize(inlink->format, inlink->w, plane); + s->width[plane] = line_size >> (s->bitdepth > 8); + s->height[plane] = inlink->h >> ((plane == 1 || plane == 2) ? desc->log2_chroma_h : 0); + } + + s->sad = ff_scene_sad_get_fn(s->bitdepth == 8 ? 8 : 16); + if (!s->sad) + return AVERROR(EINVAL); + + return 0; +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + SCDetContext *s = ctx->priv; + + av_frame_free(&s->prev_picref); +} + +static double get_scene_score(AVFilterContext *ctx, AVFrame *frame) +{ + double ret = 0; + SCDetContext *s = ctx->priv; + AVFrame *prev_picref = s->prev_picref; + + if (prev_picref && frame->height == prev_picref->height + && frame->width == prev_picref->width) { + uint64_t sad = 0; + double mafd, diff; + uint64_t count = 0; + + for (int plane = 0; plane < s->nb_planes; plane++) { + uint64_t plane_sad; + s->sad(prev_picref->data[plane], prev_picref->linesize[plane], + frame->data[plane], frame->linesize[plane], + s->width[plane], s->height[plane], &plane_sad); + sad += plane_sad; + count += s->width[plane] * s->height[plane]; + } + + emms_c(); + mafd = (double)sad * 100. / count / (1ULL << s->bitdepth); + diff = fabs(mafd - s->prev_mafd); + ret = av_clipf(FFMIN(mafd, diff), 0, 100.); + s->prev_mafd = mafd; + av_frame_free(&prev_picref); + } + s->prev_picref = av_frame_clone(frame); + return ret; +} + +static int set_meta(SCDetContext *s, AVFrame *frame, const char *key, const char *value) +{ + return av_dict_set(&frame->metadata, key, value, 0); +} + +static int activate(AVFilterContext *ctx) +{ + int ret; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + SCDetContext *s = ctx->priv; + AVFrame *frame; + + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + + ret = ff_inlink_consume_frame(inlink, &frame); + if (ret < 0) + return ret; + + if (frame) { + char buf[64]; + s->scene_score = get_scene_score(ctx, frame); + snprintf(buf, sizeof(buf), "%0.3f", s->prev_mafd); + set_meta(s, frame, "lavfi.scd.mafd", buf); + snprintf(buf, sizeof(buf), "%0.3f", s->scene_score); + set_meta(s, frame, "lavfi.scd.score", buf); + + if (s->scene_score > s->threshold) { + av_log(s, AV_LOG_INFO, "lavfi.scd.score: %.3f, lavfi.scd.time: %s\n", + s->scene_score, av_ts2timestr(frame->pts, &inlink->time_base)); + set_meta(s, frame, "lavfi.scd.time", + av_ts2timestr(frame->pts, &inlink->time_base)); + } + if (s->sc_pass) { + if (s->scene_score > s->threshold) + return ff_filter_frame(outlink, frame); + else { + av_frame_free(&frame); + } + } else + return ff_filter_frame(outlink, frame); + } + + FF_FILTER_FORWARD_STATUS(inlink, outlink); + FF_FILTER_FORWARD_WANTED(outlink, inlink); + + return FFERROR_NOT_READY; +} + +static const AVFilterPad scdet_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_input, + }, + { NULL } +}; + +static const AVFilterPad scdet_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +AVFilter ff_vf_scdet = { + .name = "scdet", + .description = NULL_IF_CONFIG_SMALL("Detect video scene change"), + .priv_size = sizeof(SCDetContext), + .priv_class = &scdet_class, + .uninit = uninit, + .query_formats = query_formats, + .inputs = scdet_inputs, + .outputs = scdet_outputs, + .activate = activate, +}; From patchwork Thu May 14 10:44:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19680 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 444A244990A for ; Thu, 14 May 2020 13:44:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3079C680658; Thu, 14 May 2020 13:44:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 067B6680647 for ; Thu, 14 May 2020 13:44:26 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id u35so1092676pgk.6 for ; Thu, 14 May 2020 03:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZkNOVDA+Ineacvz3h9YpJFk9mSJ/pTWIbFcDluLnM+8=; b=LubXM3NREYTdmzKtkxatVNF+5BjlB79McMBsN7TFJHa1KaAkAl9xGEiV8rHnr7z+JI zJORhdxduSL/eTSIITV26m/X58GhyPhCJENbGK00pILfNMA2+kUHp/1cqGCp17TeWHZZ JO38y7W/vxWRw0AToh90fzS7qpAHke7gWEdHLEMwQVuTXtWKNq6QomBwO4U5rYrSdj4G tNuLfWNcqCgPll5MFNFJmNrg/DkgUfSJCCXdkGN9no7uIiKa/2SCyxm9Z12Wobd/AnAR l6B0nmm9Kzcce1g/1Y6Twr7B2SGBKJ1xlFkf7yWWCDRxo8wKTctdxCcg5FAnPn4BrFwn zltw== 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:in-reply-to :references; bh=ZkNOVDA+Ineacvz3h9YpJFk9mSJ/pTWIbFcDluLnM+8=; b=Z7f+8uUmCci4PHJVXAW2Qg2IwLgf4m1eTiu0nfANSF1gPOZxbsfb6bb0rVSdPLdWg3 DwSOiWz20OfyrOC+QbwHqOoDzqZJR0RdDgVZb4w3K3UJDO60wro17APSM7QcMCEgKpYP mKN90PXVH0aYnAy8RvrQRvDUGS3ENp9m1YCAPrvhRc/go64BCF8A7o0eDe+wqE3MXERn gyzEdo/GH4DvGcI9fRUQ4N0ntHioEAK6UwgVl+8L1+bWaFYJuf5mg4PHWhtTKM9uoazN fEPmL2C3vDYD/aHdtdgus/FMiyCUujFn+2PWFzuQY9oOL5sOZqyI+xbPeuGzv3qw/T+0 +0sg== X-Gm-Message-State: AOAM53368/ncR1cQdaJYD3Tv+HivsZoGMpW2xdsdnoGFTr1w64jYbmdu sKGr6Bzy+hPRyYnvvZVZM0Ykwkx6 X-Google-Smtp-Source: ABdhPJy5FPJ4zL11FOQqj1Tfv4eLuGJvKhJUbOHL/zY9ecqpfxeUPZaoUxREABXdANLhJ63QA7umVw== X-Received: by 2002:a63:f447:: with SMTP id p7mr3431488pgk.111.1589453064105; Thu, 14 May 2020 03:44:24 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bj6sm13227367pjb.47.2020.05.14.03.44.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2020 03:44:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 May 2020 18:44:11 +0800 Message-Id: <1589453053-8013-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 2/4] avfilter/vf_framerate: if metadata lavfi.scd.mafd exists, we'll use it first 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Reviewed-by: Paul B Mahol Signed-off-by: Limin Wang --- libavfilter/vf_framerate.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c index 6c8d01c..8d16998 100644 --- a/libavfilter/vf_framerate.c +++ b/libavfilter/vf_framerate.c @@ -71,13 +71,20 @@ static double get_scene_score(AVFilterContext *ctx, AVFrame *crnt, AVFrame *next if (crnt->height == next->height && crnt->width == next->width) { + AVDictionaryEntry *e_mafd = NULL; uint64_t sad; - double mafd, diff; + double mafd = HUGE_VAL, diff; + char *tail = NULL; ff_dlog(ctx, "get_scene_score() process\n"); - s->sad(crnt->data[0], crnt->linesize[0], next->data[0], next->linesize[0], crnt->width, crnt->height, &sad); - emms_c(); - mafd = (double)sad * 100.0 / (crnt->width * crnt->height) / (1 << s->bitdepth); + e_mafd = av_dict_get(next->metadata, "lavfi.scd.mafd", NULL, AV_DICT_MATCH_CASE); + if (e_mafd) + mafd = strtod(e_mafd->value, &tail); + if (*tail || mafd == HUGE_VAL) { + s->sad(crnt->data[0], crnt->linesize[0], next->data[0], next->linesize[0], crnt->width, crnt->height, &sad); + emms_c(); + mafd = (double)sad * 100.0 / (crnt->width * crnt->height) / (1 << s->bitdepth); + } diff = fabs(mafd - s->prev_mafd); ret = av_clipf(FFMIN(mafd, diff), 0, 100.0); s->prev_mafd = mafd; From patchwork Thu May 14 10:44:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19681 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 5766444990A for ; Thu, 14 May 2020 13:44:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4035C689AE3; Thu, 14 May 2020 13:44:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD68F680658 for ; Thu, 14 May 2020 13:44:27 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id d184so1153957pfd.4 for ; Thu, 14 May 2020 03:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dyZBuwXWI14LxHUdTUly14317ddPHo3/xRghV6DImtM=; b=XaqOOV5nqwmxvflU2Sx9ysY6PJ8bFhnMndCLbMoaAdzFFiRRARUu8LfbDSReJNX2f8 UYaRzDJrfpUj8HlacHWW9ksLeSOQ3Rjd4442w8lG4Cr6j4hkBe9ZZK5ugW2nNtBeBnIa CSMvD8D7szIMwqdtbCSD3A0XTMjnMdmJpFRCMy55SD9k/H9bz6GAKFyWw26o0zkbTK3K 1bGjMDoaHfzkWEGMoUpL031f2ANiODbBoCrSkIOOLvLyKa6j6nczu6obvOkp5PHrr7ss UojjejodGFbOVxGrBQu1I0kiaroFTzIY0KUB7SYpSHebLnLhZkoDBbn+D6Xpvd/PwFIx Hdsw== 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:in-reply-to :references; bh=dyZBuwXWI14LxHUdTUly14317ddPHo3/xRghV6DImtM=; b=Q8kNGTo00BlF14dq3CRaOWuhemPfW4qI268VjD4ywwZVgSI7DvL/4+5gLcOSc0JPqp OHwK7v/IT2oQNWaTa9EEq2fbCE1jNgjFO47Us9TcyD0Qv2wVGqL6gDgBJFV8uSZJEqtv aH42XreurXICQXlEKSlOqAK1RnOGW8clm5KMPvXCyrV6gqJea+/APScud50EGkBSU3UY yPp5ZilP611elD+cb42dVR+Du+FKmgWPT1Mu2gj7t1njoodbnUUtUHaXF+BeMndYpCBp UavOvgb/1EPy88cdczpKr42+pXPeylushNg5e/TApOOBx00AOSi98drb0/SJgtb+voBV mm4g== X-Gm-Message-State: AOAM531Gsbkac7gBlsk2EziJ8CeAMCt3NEYK8d+Pf3If9yEnYvc1CpLj jMzaVVc5rj7MRQNpYVtyRNiBgREJ X-Google-Smtp-Source: ABdhPJzMQVjTGZ5F/5UgcUigcD5GXEuFAf1IzQDHehvlbcq4ioI4oykGdjr/dbf+NdpM9cCpTbYy3g== X-Received: by 2002:a63:5717:: with SMTP id l23mr3371839pgb.217.1589453065708; Thu, 14 May 2020 03:44:25 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bj6sm13227367pjb.47.2020.05.14.03.44.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2020 03:44:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 May 2020 18:44:12 +0800 Message-Id: <1589453053-8013-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 3/4] avfilter/vf_minterpolate: if metadata lavfi.scd.mafd exists, we'll use it first 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Reviewed-by: Paul B Mahol Signed-off-by: Limin Wang --- libavfilter/vf_minterpolate.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index b0bb238..db3d7d4 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -832,11 +832,19 @@ static int detect_scene_change(MIContext *mi_ctx) ptrdiff_t linesize2 = mi_ctx->frames[2].avf->linesize[0]; if (mi_ctx->scd_method == SCD_METHOD_FDIFF) { - double ret = 0, mafd, diff; + double ret = 0, mafd = HUGE_VAL, diff; uint64_t sad; - mi_ctx->sad(p1, linesize1, p2, linesize2, me_ctx->width, me_ctx->height, &sad); - emms_c(); - mafd = (double) sad / (me_ctx->height * me_ctx->width * 3); + AVDictionaryEntry *e_mafd = NULL; + char *tail = NULL; + + e_mafd = av_dict_get(mi_ctx->frames[2].avf->metadata, "lavfi.scd.mafd", NULL, AV_DICT_MATCH_CASE); + if (e_mafd) + mafd = strtod(e_mafd->value, &tail); + if (*tail || mafd == HUGE_VAL) { + mi_ctx->sad(p1, linesize1, p2, linesize2, me_ctx->width, me_ctx->height, &sad); + emms_c(); + mafd = (double) sad / (me_ctx->height * me_ctx->width * 3); + } diff = fabs(mafd - mi_ctx->prev_mafd); ret = av_clipf(FFMIN(mafd, diff), 0, 100.0); mi_ctx->prev_mafd = mafd; From patchwork Thu May 14 10:44:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19682 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 41D3444990A for ; Thu, 14 May 2020 13:44:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26CF868A43A; Thu, 14 May 2020 13:44:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 359BA689248 for ; Thu, 14 May 2020 13:44:29 +0300 (EEST) Received: by mail-pg1-f171.google.com with SMTP id r10so1090765pgv.8 for ; Thu, 14 May 2020 03:44:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r2GuT7atsp8o0F0EXK4jose+c/+pLoVpDvVSyfVVsxA=; b=VlncFAxfQcll+p8qhXrpaw+gyma1bcMxIY09ZwMduqc03mh6TRtDRIOYATNVmnNZF5 uN3uWjASuOZGsG/Pulm7lTxERmMGZJa378qh+YMyyjgNMglKAEXcIkJCoBOaO33H4WoQ v3s9iFDGebbSUi9AZQ4+goj5fqy30QpuvOOnWPVT0O3GjVMnuFDEI28bCO/g+SL1vu9/ 1JsMWS9IYh+M7F8SYzMMHolgeW5FrhV0wTdBK/CCKyntDDTVos0NoDTTonj1iUyF/Y/D W9uEVmcJv8eZKfHUNkW8DGJAKhjuulh+kum53O/wpYL/LFH4tKhOyFybBYV6XnuW3Me7 FvvQ== 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:in-reply-to :references; bh=r2GuT7atsp8o0F0EXK4jose+c/+pLoVpDvVSyfVVsxA=; b=EsJNoOC1V7wYErcz9L+2MeAGEzihuHlUbxF0vM5e6GZPTJTjEIt5oIbhT5Z/OzwwcT 1oU0vJSqj9bL9Vf+E46+Q0FR9+S8Wvzus52Ng/L5Rfutlmb45MW3cMHV+T1Yl1X1CO+S mgzRivp/68foq04lO0GT4sbVMNPIFvTh4Xxe69t99yaW98KCJV0VJdW/ba0W8MExUSLD k7guJL6UdGKpYP/C09gAp5Xf+1CRWkJ+FDgZH4k6yMQjSES3EZlbgd8w7ykpvDKIHfy9 ekMWzQwhhwc1a4up/N8wBujdnos8/Vg0pCt9vPw9znTksZco1JxGjHUCACqQRGR9M+V6 PjyA== X-Gm-Message-State: AOAM533wCRIwKO3qtmjUfncdYAw45MECKYkBuxelrYP+rqXsRDsywOiS uI8zZtIBA1Ml2wxs8NDBsYlUWlCZ X-Google-Smtp-Source: ABdhPJzvhtXg4c2KulmuY9HwwzuQtU6Ms9oi7Sw0NFKQRqoph21sgvVlcuajugMn/H7patNgs8AKnw== X-Received: by 2002:a63:145c:: with SMTP id 28mr3362081pgu.77.1589453067359; Thu, 14 May 2020 03:44:27 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bj6sm13227367pjb.47.2020.05.14.03.44.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2020 03:44:26 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 May 2020 18:44:13 +0800 Message-Id: <1589453053-8013-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> References: <20190929132515.4093-1-lance.lmwang@gmail.com> <1589453053-8013-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 4/4] fate: add scdet metadata test 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Reviewed-by: Paul B Mahol Signed-off-by: Limin Wang --- tests/fate/filter-video.mak | 6 ++++++ tests/ref/fate/filter-metadata-scdet | 11 +++++++++++ 2 files changed, 17 insertions(+) create mode 100644 tests/ref/fate/filter-metadata-scdet diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index a6df6f7..67c9383 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -768,6 +768,12 @@ FATE_METADATA_FILTER-$(call ALLYES, $(SCENEDETECT_DEPS)) += fate-filter-metadata fate-filter-metadata-scenedetect: SRC = $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov fate-filter-metadata-scenedetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',select=gt(scene\,.25)" +SCDET_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER SCDET_FILTER SCALE_FILTER \ + AVCODEC AVDEVICE MOV_DEMUXER SVQ3_DECODER ZLIB +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 = FFPROBE LAVFI_INDEV MOVIE_FILTER CROPDETECT_FILTER SCALE_FILTER \ AVCODEC AVDEVICE MOV_DEMUXER H264_DECODER FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect diff --git a/tests/ref/fate/filter-metadata-scdet b/tests/ref/fate/filter-metadata-scdet new file mode 100644 index 0000000..58090c2 --- /dev/null +++ b/tests/ref/fate/filter-metadata-scdet @@ -0,0 +1,11 @@ +pkt_pts=1620|tag:lavfi.scd.mafd=60.175|tag:lavfi.scd.score=59.252|tag:lavfi.scd.time=2.7 +pkt_pts=4140|tag:lavfi.scd.mafd=44.209|tag:lavfi.scd.score=36.070|tag:lavfi.scd.time=6.9 +pkt_pts=5800|tag:lavfi.scd.mafd=55.819|tag:lavfi.scd.score=55.819|tag:lavfi.scd.time=9.66667 +pkt_pts=6720|tag:lavfi.scd.mafd=22.505|tag:lavfi.scd.score=18.580|tag:lavfi.scd.time=11.2 +pkt_pts=8160|tag:lavfi.scd.mafd=49.444|tag:lavfi.scd.score=49.240|tag:lavfi.scd.time=13.6 +pkt_pts=9760|tag:lavfi.scd.mafd=51.801|tag:lavfi.scd.score=51.497|tag:lavfi.scd.time=16.2667 +pkt_pts=14080|tag:lavfi.scd.mafd=34.337|tag:lavfi.scd.score=34.165|tag:lavfi.scd.time=23.4667 +pkt_pts=15700|tag:lavfi.scd.mafd=58.315|tag:lavfi.scd.score=58.310|tag:lavfi.scd.time=26.1667 +pkt_pts=18500|tag:lavfi.scd.mafd=19.603|tag:lavfi.scd.score=16.504|tag:lavfi.scd.time=30.8333 +pkt_pts=20040|tag:lavfi.scd.mafd=19.060|tag:lavfi.scd.score=13.764|tag:lavfi.scd.time=33.4 +pkt_pts=21760|tag:lavfi.scd.mafd=64.551|tag:lavfi.scd.score=64.451|tag:lavfi.scd.time=36.2667