From patchwork Wed Jun 12 10:50:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13510 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 637CD449148 for ; Wed, 12 Jun 2019 13:50:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B176689D39; Wed, 12 Jun 2019 13:50:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37123680518 for ; Wed, 12 Jun 2019 13:50:45 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id a186so9441108pfa.5 for ; Wed, 12 Jun 2019 03:50:45 -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 :mime-version:content-transfer-encoding; bh=2zCzm3eUysxzS7m3eZMYOQsEsxzVW9wJ3xbNesmG/uo=; b=NJANk5WljEfFL6EI0GJwGqF10mj5mIf3IwaZihDJdC0Zelh7j8uaRnDIlmFEfH8dbH 4Qel5/gmNmGdOJW82HTV1FuAWYCijY4fazX9PadTikbkgrk7DG3uunt7ErsG24Jmsu62 scLZwzTKCmK/wNK6s9P/TDRW7XxXJBsXMKEZCfp86kbb3yS3FmZyiKaZuD1F5JHJA8VH cIlKwsM6X+QuBu8HujNe7BvQRQP4eq8f/q5dd9Fop1m+qTQnfu/7YHnGPp8diOsm9u38 TpXZv2pi0iboxG0teEr0Qabolb3fKOZtTb2Ei5lflcqpI2NDkO/ugFU6MFbjKhkL3/Pd 0FMQ== 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:mime-version:content-transfer-encoding; bh=2zCzm3eUysxzS7m3eZMYOQsEsxzVW9wJ3xbNesmG/uo=; b=XPdF4Jr/pv+mQOBglNbAYCgNUe5GvpngOZjq3rNkjO5F0BYyne9ICbCOtFOMPUROsF qdbRZyniVn161iutK37bfhND8OxQ5iRlkx5A0Yvj6EIpA/weh1Itu0TkrMw1TTGodwRq 1K0mzyBFSyyH+b5VCTKsDw8+8KZQQ3Mkd7W76J0gyxIk7I/cNbpNFq24mnk3EFadHU4Y NLqzV2D2ZZMqYkGRU1S7bQjSHCC2hEpljP46PNf6SmwMHG9fGU62G14ondaIVJfKBY4f 9hPheTCIBxCicgoo4QyZGrKeJRy3fUgECbBOPcANuMIPLOoLYXHoOc2kdFtc2so+czVC +8KA== X-Gm-Message-State: APjAAAWj3zV/j8ndVPyc3iLLsUh+ODh+YaQta1ipZZW/av+G0OpAK5R5 n+sH40meTF9Xdy1DNrEfw5eBLwLkKNg= X-Google-Smtp-Source: APXvYqw+D++sFv0SoLs0xTzWURYc4dSzNPZdnN/Kyye6lurVKX1bmAt/voWxeMEM+WW/HSOYxa3hVg== X-Received: by 2002:a63:e54d:: with SMTP id z13mr24544500pgj.132.1560336642891; Wed, 12 Jun 2019 03:50:42 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id f3sm4490231pjo.31.2019.06.12.03.50.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jun 2019 03:50:42 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2019 18:50:18 +0800 Message-Id: <20190612105018.43545-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190611053844.21321-3-lance.lmwang@gmail.com> References: <20190611053844.21321-3-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4] libavfilter/vf_cover_rect: support for cover image with more pixel format and different width and height 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- doc/filters.texi | 6 ++-- libavfilter/vf_cover_rect.c | 56 +++++++++++++++++++++++++++---------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index ec1c7c7591..4594a61c13 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10166,7 +10166,7 @@ Specifies the rectangle in which to search. @itemize @item -Generate a representative palette of a given video using @command{ffmpeg}: +Cover a rectangular object by the supplied image of a given video using @command{ffmpeg}: @example ffmpeg -i file.ts -vf find_rect=newref.pgm,cover_rect=cover.jpg:mode=cover new.mkv @end example @@ -10180,7 +10180,7 @@ It accepts the following options: @table @option @item cover -Filepath of the optional cover image, needs to be in yuv420. +Filepath of the optional cover image. @item mode Set covering mode. @@ -10200,7 +10200,7 @@ Default value is @var{blur}. @itemize @item -Generate a representative palette of a given video using @command{ffmpeg}: +Cover a rectangular object by the supplied image of a given video using @command{ffmpeg}: @example ffmpeg -i file.ts -vf find_rect=newref.pgm,cover_rect=cover.jpg:mode=cover new.mkv @end example diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c index 898debf09d..36c650dd21 100644 --- a/libavfilter/vf_cover_rect.c +++ b/libavfilter/vf_cover_rect.c @@ -28,6 +28,7 @@ #include "internal.h" #include "lavfutils.h" +#include "lswsutils.h" enum mode { MODE_COVER, @@ -40,6 +41,7 @@ typedef struct CoverContext { int mode; char *cover_filename; AVFrame *cover_frame; + AVFrame *match_frame; int width, height; } CoverContext; @@ -71,21 +73,21 @@ static int config_input(AVFilterLink *inlink) return 0; } -static void cover_rect(CoverContext *cover, AVFrame *in, int offx, int offy) +static void cover_rect(AVFrame *cover_frame, AVFrame *in, int offx, int offy) { int x, y, p; for (p = 0; p < 3; p++) { uint8_t *data = in->data[p] + (offx>>!!p) + (offy>>!!p) * in->linesize[p]; - const uint8_t *src = cover->cover_frame->data[p]; - int w = AV_CEIL_RSHIFT(cover->cover_frame->width , !!p); - int h = AV_CEIL_RSHIFT(cover->cover_frame->height, !!p); + const uint8_t *src = cover_frame->data[p]; + int w = AV_CEIL_RSHIFT(cover_frame->width , !!p); + int h = AV_CEIL_RSHIFT(cover_frame->height, !!p); for (y = 0; y < h; y++) { for (x = 0; x < w; x++) { data[x] = src[x]; } data += in->linesize[p]; - src += cover->cover_frame->linesize[p]; + src += cover_frame->linesize[p]; } } } @@ -138,7 +140,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) CoverContext *cover = ctx->priv; AVDictionaryEntry *ex, *ey, *ew, *eh; int x = -1, y = -1, w = -1, h = -1; + enum AVPixelFormat in_format; char *xendptr = NULL, *yendptr = NULL, *wendptr = NULL, *hendptr = NULL; + AVFrame *cover_frame = NULL; + int ret; ex = av_dict_get(in->metadata, "lavfi.rect.x", NULL, AV_DICT_MATCH_CASE); ey = av_dict_get(in->metadata, "lavfi.rect.y", NULL, AV_DICT_MATCH_CASE); @@ -167,14 +172,34 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } w = FFMIN(w, in->width - x); h = FFMIN(h, in->height - y); + in_format = in->format; if (w > in->width || h > in->height || w <= 0 || h <= 0) return AVERROR(EINVAL); - if (cover->cover_frame) { - if (w != cover->cover_frame->width || h != cover->cover_frame->height) - return AVERROR(EINVAL); - } + if (w != cover->cover_frame->width || h != cover->cover_frame->height || + in_format != cover->cover_frame->format) { + if (!cover->match_frame || (w != cover->match_frame->width || h != cover->match_frame->height + || in_format != cover->match_frame->format)) { + if (cover->match_frame) + av_freep(&cover->match_frame->data[0]); + else if (!(cover->match_frame = av_frame_alloc())) + return AVERROR(ENOMEM); + + if ((ret = ff_scale_image(cover->match_frame->data, cover->match_frame->linesize, + w, h, in_format, cover->cover_frame->data, cover->cover_frame->linesize, + cover->cover_frame->width, cover->cover_frame->height, + cover->cover_frame->format, ctx)) < 0) + return AVERROR(ENOMEM); + + cover->match_frame->width = w; + cover->match_frame->height = h; + cover->match_frame->format = in_format; + } + + cover_frame = cover->match_frame; + } else + cover_frame = cover->cover_frame; cover->width = w; cover->height = h; @@ -187,8 +212,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (cover->mode == MODE_BLUR) { blur (cover, in, x, y); } else { - cover_rect(cover, in, x, y); + cover_rect(cover_frame, in, x, y); + } + return ff_filter_frame(ctx->outputs[0], in); } @@ -199,6 +226,10 @@ static av_cold void uninit(AVFilterContext *ctx) if (cover->cover_frame) av_freep(&cover->cover_frame->data[0]); av_frame_free(&cover->cover_frame); + + if (cover->match_frame) + av_freep(&cover->match_frame->data[0]); + av_frame_free(&cover->match_frame); } static av_cold int init(AVFilterContext *ctx) @@ -220,11 +251,6 @@ static av_cold int init(AVFilterContext *ctx) &cover->cover_frame->width, &cover->cover_frame->height, &cover->cover_frame->format, cover->cover_filename, ctx)) < 0) return ret; - - if (cover->cover_frame->format != AV_PIX_FMT_YUV420P && cover->cover_frame->format != AV_PIX_FMT_YUVJ420P) { - av_log(ctx, AV_LOG_ERROR, "cover image is not a YUV420 image\n"); - return AVERROR(EINVAL); - } } return 0;