From patchwork Mon Mar 18 06:06:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 47155 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp823636pzb; Sun, 17 Mar 2024 23:06:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXsZNUT8ryzh+ftwIaO2GL0Zdbd5YUJQ78T5+Lm2khIjWZVmb5uVPB85Zl0B8IYaSs3l+fbBUWhLxHO1zrPl8AkFJM0X/dKa9ZhQQ== X-Google-Smtp-Source: AGHT+IE9Ify4Fl5aVfsCgunWyxm9RC37+GVmqzZ1oeteWiGpZBw3izA59Vd3R6sEWPH7i6LH689l X-Received: by 2002:a05:6402:2295:b0:568:8e22:4eff with SMTP id cw21-20020a056402229500b005688e224effmr5739715edb.37.1710741999007; Sun, 17 Mar 2024 23:06:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710741998; cv=none; d=google.com; s=arc-20160816; b=QpHRA1Sm83lA/tz84KcEDa+grj9MfHqLWRLXil1q8gqBT/c6AnZWx1S/oiM5A6GDQZ 4bTHlfzoo2sLB9/qCwkZfn2200k7QXnnkZ5QGHLIlZW+M45JgYzjLzxNaW9NnDrC7fva hiNhXXftGutTqiW6xHerSWe10qvV4QoGLqTtlkeBdZm4AIRjXXxXB259feaP4kc7s3Ec MeHtYdRThDAmri+pFpxbVphp4SjeM2ivahS1aS411DqHTm/KRR8bEjNBIA9m+ySMAuhH N1+uuhMdzg57awuII7xBXXAsB+4+PRq7cJWfsPT8FugOzHDHyXIJvpCBk6u3nNWz1YaG hh0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=QyAnQmAPzuT2N+9zdAAcRXak+NWH3qI2vN1iX0vjCGU=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=KI8A10UyeZh1fZhNTDoqfjtQZGYhnXlXfIF/B0+XrXVTttvWDJZ7dpVF82V8GdQIQ8 Jbh0DItVKcqIBzvYMYk9ALy69FmsKTXju4GEiSQ0h5wDKRqI7+hL8kj8AzkSBTnuucHt x8TXWIC7ZemLgR+XlZFniKy4ckUbfxxegEdVejPwLr2ZdswPHBEy5YPIMtteewZPbW0c g8HBxLl9vlGWmg2QGelBtDUTP/8wrzo6J9XlH7dJHjCfv9teQR/Sn2fnuCwhGDx/xCT0 fwoBj3yx2lTVi9j8Y9P1iFfVLDf9JslichcQrKZKJnUxMCjC7DaPIP1X0/mGAKU4DuDD BQtQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=eYcAbc8R; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g10-20020a056402090a00b00568b3ddf2f0si2792548edz.261.2024.03.17.23.06.38; Sun, 17 Mar 2024 23:06:38 -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=@intel.com header.s=Intel header.b=eYcAbc8R; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55F7F68CB57; Mon, 18 Mar 2024 08:06:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B49AD68CB57 for ; Mon, 18 Mar 2024 08:06:28 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710741994; x=1742277994; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=o7ZQ8a0CVMCseq1JHnkUtLSHLUF9pm7fM4qpu/vz/SE=; b=eYcAbc8RQ/BfDC4OWE0ja6AURsJc9PWa1ymXOWBJ2/MxUwKtDe/ODJ1k rpYetHEpXIA/Jg4nsMY2N7hG3DLOt3LTK6tTl5toD+c26uDUWxzybg36t EQapURkevI+1lU0r7dONqEDQpwGgR3aXpbTkE9iSBlk/nQEIeRsNCgbWk 6MLXOwNPrlCOc+Bdfj3Ts+vhUsB/ICrAVwCcyoEzRI3ROE9aj8Xl7hIVI SZkXu9KEH++OOQUaL6ds8b90sbvFiFFVxSNHPXOSv3tHqXMc1aP1FzlP9 CnzI509vhWrJap8MmS87QUb5HktAfobQijI6O3A3x2y30z2AIMzxUTt2Y A==; X-IronPort-AV: E=McAfee;i="6600,9927,11016"; a="5390544" X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="5390544" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 23:06:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="13302920" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 23:06:24 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 14:06:14 +0800 Message-Id: <20240318060616.3625377-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavfi: Add pad_vaapi filter 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Gp6YdqXdIBXg From: Haihao Xiang Signed-off-by: Haihao Xiang --- configure | 1 + doc/filters.texi | 77 ++++++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_pad_vaapi.c | 283 +++++++++++++++++++++++++++++++++++++ 5 files changed, 363 insertions(+) create mode 100644 libavfilter/vf_pad_vaapi.c diff --git a/configure b/configure index 2b4c4ec9a2..4f64f48b38 100755 --- a/configure +++ b/configure @@ -3890,6 +3890,7 @@ vstack_qsv_filter_deps="libmfx" vstack_qsv_filter_select="qsvvpp" xstack_qsv_filter_deps="libmfx" xstack_qsv_filter_select="qsvvpp" +pad_vaapi_filter_deps="vaapi_1" # examples avio_http_serve_files_deps="avformat avutil fork" diff --git a/doc/filters.texi b/doc/filters.texi index 913365671d..2bd1a5b9e7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -27941,6 +27941,83 @@ first input stream. For the syntax of this option, check the See @ref{xstack}. @end table +@section pad_vaapi + +Add paddings to the input image, and place the original input at the +provided @var{x}, @var{y} coordinates. + +It accepts the following options: + +@table @option +@item width, w +@item height, h +Specify an expression for the size of the output image with the +paddings added. If the value for @var{width} or @var{height} is 0, the +corresponding input size is used for the output. + +The @var{width} expression can reference the value set by the +@var{height} expression, and vice versa. + +The default value of @var{width} and @var{height} is 0. + +@item x +@item y +Specify the offsets to place the input image at within the padded area, +with respect to the top/left border of the output image. + +The @var{x} expression can reference the value set by the @var{y} +expression, and vice versa. + +The default value of @var{x} and @var{y} is 0. + +If @var{x} or @var{y} evaluate to a negative number, they'll be changed +so the input image is centered on the padded area. + +@item color +Specify the color of the padded area. For the syntax of this option, +check the @ref{color syntax,,"Color" section in the ffmpeg-utils +manual,ffmpeg-utils}. + +@item aspect +Pad to an aspect instead to a resolution. +@end table + +The value for the @var{width}, @var{height}, @var{x}, and @var{y} +options are expressions containing the following constants: + +@table @option +@item in_w +@item in_h +The input video width and height. + +@item iw +@item ih +These are the same as @var{in_w} and @var{in_h}. + +@item out_w +@item out_h +The output width and height (the size of the padded area), as +specified by the @var{width} and @var{height} expressions. + +@item ow +@item oh +These are the same as @var{out_w} and @var{out_h}. + +@item x +@item y +The x and y offsets as specified by the @var{x} and @var{y} +expressions, or NAN if not yet specified. + +@item a +same as @var{iw} / @var{ih} + +@item sar +input sample aspect ratio + +@item dar +input display aspect ratio, it is the same as (@var{iw} / @var{ih}) * @var{sar} +@end table + @c man end VAAPI VIDEO FILTERS @chapter Vulkan Video Filters diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 994d9773ba..babcc7b676 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -581,6 +581,7 @@ OBJS-$(CONFIG_XSTACK_VAAPI_FILTER) += vf_stack_vaapi.o framesync.o vaa OBJS-$(CONFIG_HSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o OBJS-$(CONFIG_VSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o OBJS-$(CONFIG_XSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o +OBJS-$(CONFIG_PAD_VAAPI_FILTER) += vf_pad_vaapi.o vaapi_vpp.o OBJS-$(CONFIG_ALLRGB_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_ALLYUV_FILTER) += vsrc_testsrc.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 149bf50997..1e024b3376 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -546,6 +546,7 @@ extern const AVFilter ff_vf_xstack_vaapi; extern const AVFilter ff_vf_hstack_qsv; extern const AVFilter ff_vf_vstack_qsv; extern const AVFilter ff_vf_xstack_qsv; +extern const AVFilter ff_vf_pad_vaapi; extern const AVFilter ff_vsrc_allrgb; extern const AVFilter ff_vsrc_allyuv; diff --git a/libavfilter/vf_pad_vaapi.c b/libavfilter/vf_pad_vaapi.c new file mode 100644 index 0000000000..98f6285222 --- /dev/null +++ b/libavfilter/vf_pad_vaapi.c @@ -0,0 +1,283 @@ +/* + * 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 + */ + +#include "libavutil/colorspace.h" +#include "libavutil/eval.h" +#include "libavutil/opt.h" + +#include "avfilter.h" +#include "internal.h" +#include "vaapi_vpp.h" +#include "video.h" + +static const char *const var_names[] = { + "in_w", "iw", + "in_h", "ih", + "out_w", "ow", + "out_h", "oh", + "x", + "y", + "a", + "sar", + "dar", + NULL +}; + +enum var_name { + VAR_IN_W, VAR_IW, + VAR_IN_H, VAR_IH, + VAR_OUT_W, VAR_OW, + VAR_OUT_H, VAR_OH, + VAR_X, + VAR_Y, + VAR_A, + VAR_SAR, + VAR_DAR, + VARS_NB +}; + +typedef struct PadVAAPIContext { + VAAPIVPPContext vpp_ctx; // must be the first field + VARectangle rect; + + char *w_expr; + char *h_expr; + char *x_expr; + char *y_expr; + AVRational aspect; + + int w, h; + int x, y; + uint8_t pad_rgba[4]; +} PadVAAPIContext; + +static int pad_vaapi_config_output(AVFilterLink *outlink) +{ + AVFilterContext *avctx = outlink->src; + AVFilterLink *inlink = avctx->inputs[0]; + PadVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx = avctx->priv; + AVRational adjusted_aspect = ctx->aspect; + double var_values[VARS_NB], res; + int err, ret; + char *expr; + + var_values[VAR_IN_W] = var_values[VAR_IW] = inlink->w; + var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; + var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; + var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN; + var_values[VAR_A] = (double) inlink->w / inlink->h; + var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? + (double) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1; + var_values[VAR_DAR] = var_values[VAR_A] * var_values[VAR_SAR]; + + av_expr_parse_and_eval(&res, (expr = ctx->w_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx); + ctx->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res; + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->h_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) + return ret; + ctx->h = var_values[VAR_OUT_H] = var_values[VAR_OH] = res; + if (!ctx->h) + var_values[VAR_OUT_H] = var_values[VAR_OH] = ctx->h = inlink->h; + + /* evaluate the width again, as it may depend on the evaluated output height */ + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->w_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) + return ret; + ctx->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res; + if (!ctx->w) + var_values[VAR_OUT_W] = var_values[VAR_OW] = ctx->w = inlink->w; + + if (adjusted_aspect.num && adjusted_aspect.den) { + adjusted_aspect = av_div_q(adjusted_aspect, inlink->sample_aspect_ratio); + if (ctx->h < av_rescale(ctx->w, adjusted_aspect.den, adjusted_aspect.num)) { + ctx->h = var_values[VAR_OUT_H] = var_values[VAR_OH] = av_rescale(ctx->w, adjusted_aspect.den, adjusted_aspect.num); + } else { + ctx->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = av_rescale(ctx->h, adjusted_aspect.num, adjusted_aspect.den); + } + } + + /* evaluate x and y */ + av_expr_parse_and_eval(&res, (expr = ctx->x_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx); + ctx->x = var_values[VAR_X] = res; + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->y_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) + return ret; + ctx->y = var_values[VAR_Y] = res; + /* evaluate x again, as it may depend on the evaluated y value */ + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->x_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) + return ret; + ctx->x = var_values[VAR_X] = res; + + if (ctx->x < 0 || ctx->x + inlink->w > ctx->w) + ctx->x = var_values[VAR_X] = (ctx->w - inlink->w) / 2; + if (ctx->y < 0 || ctx->y + inlink->h > ctx->h) + ctx->y = var_values[VAR_Y] = (ctx->h - inlink->h) / 2; + + /* sanity check params */ + if (ctx->w < inlink->w || ctx->h < inlink->h) { + av_log(ctx, AV_LOG_ERROR, "Padded dimensions cannot be smaller than input dimensions.\n"); + return AVERROR(EINVAL); + } + + if (ctx->w > avctx->inputs[0]->w) { + vpp_ctx->output_width = ctx->w; + } else { + vpp_ctx->output_width = avctx->inputs[0]->w; + } + + if (ctx->h > avctx->inputs[0]->h) { + vpp_ctx->output_height = ctx->h; + } else { + vpp_ctx->output_height = avctx->inputs[0]->h; + } + + if (ctx->x + avctx->inputs[0]->w > vpp_ctx->output_width || + ctx->y + avctx->inputs[0]->h > vpp_ctx->output_height) { + return AVERROR(EINVAL); + } + + err = ff_vaapi_vpp_config_output(outlink); + if (err < 0) + return err; + + return 0; +} + +static int pad_vaapi_filter_frame(AVFilterLink *link, AVFrame *input_frame) +{ + AVFilterContext *avctx = link->dst; + AVFilterLink *outlink = avctx->outputs[0]; + VAAPIVPPContext *vpp_ctx = avctx->priv; + PadVAAPIContext *pad_ctx = avctx->priv; + AVFrame *output_frame = NULL; + VAProcPipelineParameterBuffer params; + int err; + + if (!input_frame->hw_frames_ctx || + vpp_ctx->va_context == VA_INVALID_ID) { + err = AVERROR(EINVAL); + goto fail; + } + + output_frame = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!output_frame) { + err = AVERROR(ENOMEM); + goto fail; + } + + err = av_frame_copy_props(output_frame, input_frame); + if (err < 0) + goto fail; + + err = ff_vaapi_vpp_init_params(avctx, ¶ms, + input_frame, output_frame); + if (err < 0) + goto fail; + + pad_ctx->rect.x = pad_ctx->x; + pad_ctx->rect.y = pad_ctx->y; + pad_ctx->rect.width = link->w; + pad_ctx->rect.height = link->h; + params.output_region = &pad_ctx->rect; + + params.output_background_color = (pad_ctx->pad_rgba[3] << 24 | + pad_ctx->pad_rgba[0] << 16 | + pad_ctx->pad_rgba[1] << 8 | + pad_ctx->pad_rgba[2]); + + err = ff_vaapi_vpp_render_picture(avctx, ¶ms, output_frame); + if (err < 0) + goto fail; + + av_frame_free(&input_frame); + + return ff_filter_frame(outlink, output_frame); + +fail: + av_frame_free(&input_frame); + av_frame_free(&output_frame); + return err; +} + +static av_cold int pad_vaapi_init(AVFilterContext *avctx) +{ + VAAPIVPPContext *vpp_ctx = avctx->priv; + + ff_vaapi_vpp_ctx_init(avctx); + vpp_ctx->pipeline_uninit = ff_vaapi_vpp_pipeline_uninit; + vpp_ctx->output_format = AV_PIX_FMT_NONE; + + return 0; +} + +#define OFFSET(x) offsetof(PadVAAPIContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption pad_vaapi_options[] = { + { "width", "set the pad area width", OFFSET(w_expr), AV_OPT_TYPE_STRING, {.str = "iw"}, 0, 0, FLAGS }, + { "w", "set the pad area width", OFFSET(w_expr), AV_OPT_TYPE_STRING, {.str = "iw"}, 0, 0, FLAGS }, + { "height", "set the pad area height", OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, 0, 0, FLAGS }, + { "h", "set the pad area height", OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, 0, 0, FLAGS }, + { "x", "set the x offset for the input image position", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, 0, INT16_MAX, FLAGS }, + { "y", "set the y offset for the input image position", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, 0, INT16_MAX, FLAGS }, + { "color", "set the color of the padded area border", OFFSET(pad_rgba), AV_OPT_TYPE_COLOR, { .str = "black" }, 0, 0, FLAGS }, + { "aspect", "pad to fit an aspect instead of a resolution", OFFSET(aspect), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, INT16_MAX, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(pad_vaapi); + +static const AVFilterPad pad_vaapi_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = pad_vaapi_filter_frame, + .config_props = &ff_vaapi_vpp_config_input, + }, +}; + +static const AVFilterPad pad_vaapi_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = &pad_vaapi_config_output, + }, +}; + +const AVFilter ff_vf_pad_vaapi = { + .name = "pad_vaapi", + .description = NULL_IF_CONFIG_SMALL("Pad the input video."), + .priv_size = sizeof(PadVAAPIContext), + .priv_class = &pad_vaapi_class, + .init = &pad_vaapi_init, + .uninit = &ff_vaapi_vpp_ctx_uninit, + FILTER_INPUTS(pad_vaapi_inputs), + FILTER_OUTPUTS(pad_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, +}; From patchwork Mon Mar 18 06:06:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 47156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp823667pzb; Sun, 17 Mar 2024 23:06:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBInLF7VcZTKydhOL/yFh/04iiuGyLBIz8NgP//M1OQLAOV5QzFltW3E1U8YruoJ6vEFm31BiyvonGr6FoV908+lHkARYgjrG2Kg== X-Google-Smtp-Source: AGHT+IGxuxmEFIwYXEYOQIe7dj7JA5ZxVWx/cOM1y3yitLlWoQ3ZC2841L7J7YfjHscSXDPp/7J/ X-Received: by 2002:a05:6402:c09:b0:568:a65c:7aff with SMTP id co9-20020a0564020c0900b00568a65c7affmr4790119edb.4.1710742007525; Sun, 17 Mar 2024 23:06:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710742007; cv=none; d=google.com; s=arc-20160816; b=JZWROpoXqr8GYmEvuNktAsM5UZmuxRIyP6MatF1HvhgnOFV2OSgUc+VL7VbC2TMSi2 2CKcYmZymwNT3U2tz8qYEHMIOBRx4RLHhP8nv+PVhM7xL2FZUgWbF+yppbI0jpN9uhny utrHGZs514ozUlX0ZjpQYZy9ebiqMYSg69/AYQbTMalxi0f65M7jnbWoBy7IIGmrPhqV BpmH6hMjyo12xHsxAfi/WDlW6eMg6tpPxA2ZjTbXQDaOGqzFMeaOxhFFM6mHKE14RrvY pKmsk15alKuPxZNHa1o5JhyihXYSyb8RzNrY1+owcJDWKgC5rqjFiqIkTpXCQNJ53h1C 3lHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=qClKwNoj/NSbB3K/aTkZ7QHJg3DLNCH0mGtsiMAaHFc=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=OOJGEXa/t515LQEbpdVzRuYBkMffsDUvmuTJGFxkD5ZLyUWI7XIQ97I+lHPRDras4D Dw5wYNWqzPoRo+ShUTNRi3/DQy5NPp4nF2+zrhs4v4B1O+hnCdQOXOfPIevwNxmQLJmz 9iJSOAAmgxVCN4Pqfo7vcW8an8ASs9soSGFL1fI1PAmf0x3R2bUfHyHBqgsDANrNKOSB lztTJ7hYuUQ5RA0lap2zrhLAxe3ZhPEnkdmXPuF9SfHlE7laiFu6R+Vdm0DYukaxWtxe mGzCPBjrzTpXpxI46A3qR3Re5/h1CWXDgwIeXTofbh4hKlkwisOYk13FBOQph7BzEs8/ GwIQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ls66I2S8; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e12-20020a50a68c000000b0056871419d13si4077899edc.172.2024.03.17.23.06.47; Sun, 17 Mar 2024 23:06:47 -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=@intel.com header.s=Intel header.b=ls66I2S8; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57C2068D231; Mon, 18 Mar 2024 08:06:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5776568CB57 for ; Mon, 18 Mar 2024 08:06:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710741996; x=1742277996; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ztrBrgeCDKUZZmVWoGODYYTE6vfm1QfjHRSWsiN3vUg=; b=ls66I2S8gFWObslICAh4VYbf2tSNCFhks34ksQuCYoaBCj0Tm7CDCIDa cOiPfZvKsQU6ywPmllMMvbLaUdKikeo10inGSUbHiVOJsxgkt9RMS51+c JppZ9MGEyootA0pF3m6a1Dg4nGFg6IiYio7QNMnkVObk4oJi+QF9REZ9R /dlQn1icr5Z3HQOhxu4/zFVHgoUjmOHm7e9H8GVryLHeo8hG10dnsqJ+6 qVBTP31hQxH9fnDRjjYIpM5KnVyWbNqSzfpfSPpOK4IcMYFMNMnWZ8teK SZFSCY6Vh1JBg8fx3bEr6xAnKl0xGbaV1bx2u1VJZ0PyMRwhIGQFJsia/ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11016"; a="5390546" X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="5390546" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 23:06:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="13302931" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 23:06:26 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 14:06:15 +0800 Message-Id: <20240318060616.3625377-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240318060616.3625377-1-haihao.xiang@intel.com> References: <20240318060616.3625377-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavfi: Add drawbox_vaapi filter 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 16wFTo10n4NC From: Haihao Xiang Signed-off-by: Haihao Xiang --- configure | 1 + doc/filters.texi | 85 ++++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_drawbox_vaapi.c | 369 +++++++++++++++++++++++++++++++++ 5 files changed, 457 insertions(+) create mode 100644 libavfilter/vf_drawbox_vaapi.c diff --git a/configure b/configure index 4f64f48b38..3102689392 100755 --- a/configure +++ b/configure @@ -3891,6 +3891,7 @@ vstack_qsv_filter_select="qsvvpp" xstack_qsv_filter_deps="libmfx" xstack_qsv_filter_select="qsvvpp" pad_vaapi_filter_deps="vaapi_1" +drawbox_vaapi_filter_deps="vaapi_1" # examples avio_http_serve_files_deps="avformat avutil fork" diff --git a/doc/filters.texi b/doc/filters.texi index 2bd1a5b9e7..82bea77107 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -28018,6 +28018,91 @@ input sample aspect ratio input display aspect ratio, it is the same as (@var{iw} / @var{ih}) * @var{sar} @end table +@section drawbox_vaapi + +Draw a colored box on the input image. + +It accepts the following parameters: + +@table @option +@item x +@item y +The expressions which specify the top left corner coordinates of the box. It defaults to 0. + +@item width, w +@item height, h +The expressions which specify the width and height of the box; if 0 they are interpreted as +the input width and height. It defaults to 0. + +@item color, c +Specify the color of the box to write. For the general syntax of this option, +check the @ref{color syntax,,"Color" section in the ffmpeg-utils manual,ffmpeg-utils}. + +@item thickness, t +The expression which sets the thickness of the box edge. +A value of @code{fill} will create a filled box. Default value is @code{3}. + +See below for the list of accepted constants. + +@item replace +With value @code{1}, the pixels of the painted box will overwrite the video's color and alpha pixels. +Default is @code{0}, which composites the box onto the input video. +@end table + +The parameters for @var{x}, @var{y}, @var{w} and @var{h} and @var{t} are expressions containing the +following constants: + +@table @option +@item in_h, ih +@item in_w, iw +The input width and height. + +@item x +@item y +The x and y offset coordinates where the box is drawn. + +@item w +@item h +The width and height of the drawn box. + +@item t +The thickness of the drawn box. + +@end table + +@subsection Examples + +@itemize +@item +Draw a black box around the edge of the input image: +@example +drawbox +@end example + +@item +Draw a box with color red and an opacity of 50%: +@example +drawbox=10:20:200:60:red@@0.5 +@end example + +The previous example can be specified as: +@example +drawbox=x=10:y=20:w=200:h=60:color=red@@0.5 +@end example + +@item +Fill the box with pink color: +@example +drawbox=x=10:y=10:w=100:h=100:color=pink@@0.5:t=fill +@end example + +@item +Draw a 2-pixel red 2.40:1 mask: +@example +drawbox=x=-t:y=0.5*(ih-iw/2.4)-t:w=iw+t*2:h=iw/2.4+t*2:t=2:c=red +@end example +@end itemize + @c man end VAAPI VIDEO FILTERS @chapter Vulkan Video Filters diff --git a/libavfilter/Makefile b/libavfilter/Makefile index babcc7b676..8571e9e2af 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -582,6 +582,7 @@ OBJS-$(CONFIG_HSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o OBJS-$(CONFIG_VSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o OBJS-$(CONFIG_XSTACK_QSV_FILTER) += vf_stack_qsv.o framesync.o OBJS-$(CONFIG_PAD_VAAPI_FILTER) += vf_pad_vaapi.o vaapi_vpp.o +OBJS-$(CONFIG_DRAWBOX_VAAPI_FILTER) += vf_drawbox_vaapi.o vaapi_vpp.o OBJS-$(CONFIG_ALLRGB_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_ALLYUV_FILTER) += vsrc_testsrc.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 1e024b3376..c532682fc2 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -547,6 +547,7 @@ extern const AVFilter ff_vf_hstack_qsv; extern const AVFilter ff_vf_vstack_qsv; extern const AVFilter ff_vf_xstack_qsv; extern const AVFilter ff_vf_pad_vaapi; +extern const AVFilter ff_vf_drawbox_vaapi; extern const AVFilter ff_vsrc_allrgb; extern const AVFilter ff_vsrc_allyuv; diff --git a/libavfilter/vf_drawbox_vaapi.c b/libavfilter/vf_drawbox_vaapi.c new file mode 100644 index 0000000000..1081d463e9 --- /dev/null +++ b/libavfilter/vf_drawbox_vaapi.c @@ -0,0 +1,369 @@ +/* + * 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 + */ + +#include "libavutil/colorspace.h" +#include "libavutil/eval.h" +#include "libavutil/opt.h" + +#include "avfilter.h" +#include "internal.h" +#include "vaapi_vpp.h" +#include "video.h" + +static const char *const var_names[] = { + "in_h", "ih", + "in_w", "iw", + "x", + "y", + "h", + "w", + "t", + "fill", + NULL +}; + +enum var_name { + VAR_IN_H, VAR_IH, + VAR_IN_W, VAR_IW, + VAR_X, + VAR_Y, + VAR_H, + VAR_W, + VAR_T, + VAR_MAX, + VARS_NB +}; + +static const int NUM_EXPR_EVALS = 5; + +typedef struct DrawboxVAAPIContext { + VAAPIVPPContext vpp_ctx; // must be the first field + VARectangle outer_rect, inner_rect; + + /* The hardware frame context containing the frames for outer_rect. */ + AVBufferRef *outer_frames_ref; + AVHWFramesContext *outer_frames; + AVFrame *outer_frame; + + char *x_expr; + char *y_expr; + char *w_expr; + char *h_expr; + char *t_expr; + + int w, h; + int x, y; + int replace; + uint32_t thickness; + uint8_t drawbox_rgba[4]; + + int fill; + +} DrawboxVAAPIContext; + +static int drawbox_vaapi_config_output(AVFilterLink *outlink) +{ + AVFilterContext *avctx = outlink->src; + AVFilterLink *inlink = avctx->inputs[0]; + DrawboxVAAPIContext *ctx = avctx->priv; + VAAPIVPPContext *vpp_ctx = avctx->priv; + double var_values[VARS_NB], res; + int ret, i; + char *expr; + + var_values[VAR_IN_W] = var_values[VAR_IW] = inlink->w; + var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; + var_values[VAR_X] = NAN; + var_values[VAR_Y] = NAN; + var_values[VAR_H] = NAN; + var_values[VAR_W] = NAN; + var_values[VAR_T] = NAN; + + for (i = 0; i <= NUM_EXPR_EVALS; i++) { + /* evaluate expressions, fail on last iteration */ + var_values[VAR_MAX] = inlink->w; + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->x_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0 && i == NUM_EXPR_EVALS) + goto fail; + ctx->x = var_values[VAR_X] = res; + + var_values[VAR_MAX] = inlink->h; + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->y_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0 && i == NUM_EXPR_EVALS) + goto fail; + ctx->y = var_values[VAR_Y] = res; + + var_values[VAR_MAX] = inlink->w - ctx->x; + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->w_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0 && i == NUM_EXPR_EVALS) + goto fail; + ctx->w = var_values[VAR_W] = res; + + var_values[VAR_MAX] = inlink->h - ctx->y; + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->h_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0 && i == NUM_EXPR_EVALS) + goto fail; + ctx->h = var_values[VAR_H] = res; + + var_values[VAR_MAX] = INT_MAX; + if ((ret = av_expr_parse_and_eval(&res, (expr = ctx->t_expr), + var_names, var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0 && i == NUM_EXPR_EVALS) + goto fail; + ctx->thickness = var_values[VAR_T] = res; + } + + /* Sanity check */ + ctx->w = (ctx->w > 0) ? ctx->w : inlink->w; + ctx->h = (ctx->h > 0) ? ctx->h : inlink->h; + if (ctx->x + ctx->w > inlink->w) + ctx->w = inlink->w - ctx->x; + if (ctx->y + ctx->h > inlink->h) + ctx->h = inlink->h - ctx->y; + + ctx->outer_rect.x = ctx->x; + ctx->outer_rect.y = ctx->y; + ctx->outer_rect.width = ctx->w; + ctx->outer_rect.height = ctx->h; + + if (ctx->outer_rect.width <= ctx->thickness * 2 || + ctx->outer_rect.height <= ctx->thickness * 2) { + ctx->fill = 1; + } else { + ctx->fill = 0; + ctx->inner_rect.x = ctx->outer_rect.x + ctx->thickness; + ctx->inner_rect.y = ctx->outer_rect.y + ctx->thickness; + ctx->inner_rect.width = ctx->outer_rect.width - ctx->thickness * 2; + ctx->inner_rect.height = ctx->outer_rect.height - ctx->thickness * 2; + } + + vpp_ctx->output_width = inlink->w; + vpp_ctx->output_height = inlink->h; + + ret = ff_vaapi_vpp_config_output(outlink); + if (ret < 0) + return ret; + + ctx->outer_frames_ref = av_hwframe_ctx_alloc(vpp_ctx->device_ref); + if (!ctx->outer_frames_ref) { + return AVERROR(ENOMEM); + } + + ctx->outer_frames = (AVHWFramesContext*)ctx->outer_frames_ref->data; + + ctx->outer_frames->format = AV_PIX_FMT_VAAPI; + ctx->outer_frames->sw_format = vpp_ctx->input_frames->sw_format; + ctx->outer_frames->width = ctx->outer_rect.width; + ctx->outer_frames->height = ctx->outer_rect.height; + + return av_hwframe_ctx_init(ctx->outer_frames_ref); + +fail: + av_log(avctx, AV_LOG_ERROR, + "Error when evaluating the expression '%s'.\n", + expr); + return ret; +} + +static int drawbox_vaapi_filter_frame(AVFilterLink *link, AVFrame *input_frame) +{ + AVFilterContext *avctx = link->dst; + AVFilterLink *outlink = avctx->outputs[0]; + VAAPIVPPContext *vpp_ctx = avctx->priv; + DrawboxVAAPIContext *drawbox_ctx = avctx->priv; + AVFrame *output_frame = NULL; + VAProcPipelineParameterBuffer box_params; + VAProcPipelineParameterBuffer params[3]; + VABlendState blend_state = { + .flags = VA_BLEND_GLOBAL_ALPHA, + }; + VARectangle box[4]; + int err, nb_params = 0; + + if (!input_frame->hw_frames_ctx || + vpp_ctx->va_context == VA_INVALID_ID) { + err = AVERROR(EINVAL); + goto fail; + } + + if (!drawbox_ctx->outer_frame) { + drawbox_ctx->outer_frame = av_frame_alloc(); + if (!drawbox_ctx->outer_frame) { + err = AVERROR(ENOMEM); + goto fail; + } + + err = av_hwframe_get_buffer(drawbox_ctx->outer_frames_ref, drawbox_ctx->outer_frame, 0); + if (err < 0) { + err = AVERROR(ENOMEM); + goto fail; + } + + /* Create image for the outer rect */ + err = ff_vaapi_vpp_init_params(avctx, &box_params, + input_frame, drawbox_ctx->outer_frame); + if (err < 0) + goto fail; + + blend_state.global_alpha = 0.0f; + box_params.surface_region = &drawbox_ctx->outer_rect; + box_params.blend_state = &blend_state; + box_params.output_background_color = (drawbox_ctx->drawbox_rgba[3] << 24 | + drawbox_ctx->drawbox_rgba[0] << 16 | + drawbox_ctx->drawbox_rgba[1] << 8 | + drawbox_ctx->drawbox_rgba[2]); + + err = ff_vaapi_vpp_render_picture(avctx, &box_params, drawbox_ctx->outer_frame); + if (err < 0) + goto fail; + } + + /* Draw outer & inner rects on the input video, then we can get a box*/ + output_frame = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!output_frame) { + err = AVERROR(ENOMEM); + goto fail; + } + + err = av_frame_copy_props(output_frame, input_frame); + if (err < 0) + goto fail; + + err = ff_vaapi_vpp_init_params(avctx, ¶ms[nb_params], + input_frame, output_frame); + if (err < 0) + goto fail; + + box[0].x = 0; + box[0].y = 0; + box[0].width = link->w; + box[0].height = link->h; + params[nb_params].surface_region = &box[0]; + params[nb_params].output_background_color = 0; + nb_params++; + + err = ff_vaapi_vpp_init_params(avctx, ¶ms[nb_params], + drawbox_ctx->outer_frame, output_frame); + if (err < 0) + goto fail; + + box[1] = drawbox_ctx->outer_rect; + if (drawbox_ctx->drawbox_rgba[3] != 255 && !drawbox_ctx->replace) { + blend_state.global_alpha = (float)drawbox_ctx->drawbox_rgba[3] / 255; + params[nb_params].blend_state = &blend_state; + } + params[nb_params].output_region = &box[1]; + params[nb_params].output_background_color = 0; + nb_params++; + + if (!drawbox_ctx->fill) { + box[3] = box[2] = drawbox_ctx->inner_rect; + params[nb_params] = params[0]; + params[nb_params].surface_region = &box[2]; + params[nb_params].output_region = &box[3]; + params[nb_params].output_background_color = 0; + nb_params++; + } + + err = ff_vaapi_vpp_render_pictures(avctx, params, nb_params, output_frame); + if (err < 0) + goto fail; + + av_frame_free(&input_frame); + + return ff_filter_frame(outlink, output_frame); + +fail: + av_frame_free(&input_frame); + av_frame_free(&output_frame); + return err; +} + +static av_cold int drawbox_vaapi_init(AVFilterContext *avctx) +{ + VAAPIVPPContext *vpp_ctx = avctx->priv; + + ff_vaapi_vpp_ctx_init(avctx); + vpp_ctx->pipeline_uninit = ff_vaapi_vpp_pipeline_uninit; + vpp_ctx->output_format = AV_PIX_FMT_NONE; + + return 0; +} + +static av_cold void drawbox_vaapi_uninit(AVFilterContext *avctx) +{ + DrawboxVAAPIContext *ctx = avctx->priv; + + av_frame_free(&ctx->outer_frame); + av_buffer_unref(&ctx->outer_frames_ref); + ff_vaapi_vpp_ctx_uninit(avctx); +} + +#define OFFSET(x) offsetof(DrawboxVAAPIContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption drawbox_vaapi_options[] = { + { "x", "set horizontal position of the left box edge", OFFSET(x_expr), AV_OPT_TYPE_STRING, { .str="0" }, 0, 0, FLAGS }, + { "y", "set vertical position of the top box edge", OFFSET(y_expr), AV_OPT_TYPE_STRING, { .str="0" }, 0, 0, FLAGS }, + { "width", "set width of the box", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str="0" }, 0, 0, FLAGS }, + { "w", "set width of the box", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str="0" }, 0, 0, FLAGS }, + { "height", "set height of the box", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str="0" }, 0, 0, FLAGS }, + { "h", "set height of the box", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str="0" }, 0, 0, FLAGS }, + { "color", "set color of the box", OFFSET(drawbox_rgba), AV_OPT_TYPE_COLOR, { .str = "black" }, 0, 0, FLAGS }, + { "c", "set color of the box", OFFSET(drawbox_rgba), AV_OPT_TYPE_COLOR, { .str = "black" }, 0, 0, FLAGS }, + { "thickness", "set the box thickness", OFFSET(t_expr), AV_OPT_TYPE_STRING, { .str="3" }, 0, 0, FLAGS }, + { "t", "set the box thickness", OFFSET(t_expr), AV_OPT_TYPE_STRING, { .str="3" }, 0, 0, FLAGS }, + { "replace", "replace color", OFFSET(replace), AV_OPT_TYPE_BOOL, { .i64=0 }, 0, 1, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(drawbox_vaapi); + +static const AVFilterPad drawbox_vaapi_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = drawbox_vaapi_filter_frame, + .config_props = &ff_vaapi_vpp_config_input, + }, +}; + +static const AVFilterPad drawbox_vaapi_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = &drawbox_vaapi_config_output, + }, +}; + +const AVFilter ff_vf_drawbox_vaapi = { + .name = "drawbox_vaapi", + .description = NULL_IF_CONFIG_SMALL("Draw a colored box on the input video."), + .priv_size = sizeof(DrawboxVAAPIContext), + .priv_class = &drawbox_vaapi_class, + .init = &drawbox_vaapi_init, + .uninit = &drawbox_vaapi_uninit, + FILTER_INPUTS(drawbox_vaapi_inputs), + FILTER_OUTPUTS(drawbox_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, +}; From patchwork Mon Mar 18 06:06:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 47157 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp823727pzb; Sun, 17 Mar 2024 23:06:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXX3VeQzP2gsbZ3eUAzQ0YtmbQKANnfFhBk0D1zo8ZefWkuth6FkeMbOtoHsDOP5bLTTrFfTP1y2NBhvrqx45/yqF9e7TRDnBu3g== X-Google-Smtp-Source: AGHT+IGQ3nZZ1c5a5NNrG/OeybHS5zEiZ9OFvPj5QOwXI20Tw0hZ3mQK1EvlOWHbbjcqwmA0lLmD X-Received: by 2002:a17:906:24ce:b0:a46:b11b:ddb0 with SMTP id f14-20020a17090624ce00b00a46b11bddb0mr2272128ejb.43.1710742015631; Sun, 17 Mar 2024 23:06:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710742015; cv=none; d=google.com; s=arc-20160816; b=SAvMH38MYTBdkBJ6OSsxI3zmzJy2suPA7wQ8A4w2dElzVbXTWSGLYhwVMygKN+gB3J 7/x7VMhsyLmWPJ5y/nGa/HRgC9/tKIGn9bGu2Kug/akILx0cMnwX8I8aWVdmCwt5stBg W+o1DKLosE14gyXdR5u7MqN/DaX1ZmJEn2HqogTRr0Q/CTFNBuz0jjrXzT4yj43MOZzY U5LpE7ftT1WEa7v9g+x4Su5ad4zqBEDEafBtDAZOR/0yIT1k/0PXLz3nexqmWqSQaVbP kCGglv9v87qd95Z6BAdJZDnYsjoh3D3DreqRdGkEfveM3cmV3M9M+5uZenhr0z35jwF8 ecoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=mY2ohoEerWMAWY1djaxJnfaub4iyHcwtwnCxj1odFs0=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=KpPVWKMvM3rLi2TuZFIFE7NSZtGP54lHeaO7r/o5Wp/pYBQUORSibHEVnuSszlm15h 1kROJd4suFx281lVfHoDLjEZ8fxyWQjCK2U8JDk/OkaT+QGXI3+NXe8SA1mSa3z3L0OG S7Ah84Wkt8l3EHRCwQjQzxNajoqLHRhj+07+SodKpvyLICFWw6d+cFPTedt8GsGuv21c efZUKiGyPYuqdPF6pVUqJw6ZuHV/YW97w4SZITMH92rXsJuNBhq5ckCf2onhqR1VO6Fk WxZngrjmkahRqlNavFS78ZllHpjwhP2Rag1IKWEqmXnsxG5MvcdWuJPcWi2toxTRNsuy 3ykg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=WEgAhj14; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh8-20020a1709076e8800b00a46a924d627si1874009ejc.395.2024.03.17.23.06.55; Sun, 17 Mar 2024 23:06:55 -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=@intel.com header.s=Intel header.b=WEgAhj14; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 561BE68D24D; Mon, 18 Mar 2024 08:06:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB19F68CEBF for ; Mon, 18 Mar 2024 08:06:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710742000; x=1742278000; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iSJQXxq39QzOHbR+IRYWQxNlEXTVBaPf6HrrJF0dtCE=; b=WEgAhj14bNgabXqt0NPG2Mh7xoGwO6QimfJ8DrzOBfQe/KEQpunrDCnd iefnKRhlfy6YhFxEEs5Zk8V3XViCCncC3/7AvGkA11PHtA1iFx6UxR+vq WvPIu7U7YCbuUHQlsiUA8CAYbibxb+sDi52guWkWSSGophlYywHxz5Cbh WVN8Y1LLHf1c7SAH5Lqa3+FFTZQ5oVBeuPnB8umM0UjPC0O/DKCldfZc5 c8LKsmSuhfXipFNiQbzO/TO9NrRpGQPBnDffjdueXBN55nNVR154dHhdj S8r2jrzshrPv6QQIQrjP6UflLp+NoLcb6+xluTwobSr9WGmEy2eFw8kTh Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11016"; a="5390547" X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="5390547" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 23:06:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="13302939" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 23:06:27 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 14:06:16 +0800 Message-Id: <20240318060616.3625377-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240318060616.3625377-1-haihao.xiang@intel.com> References: <20240318060616.3625377-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] Changelog: Add pad_vaapi, drawbox_vaapi entry 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DYhWAGSv515S From: Haihao Xiang Signed-off-by: Haihao Xiang --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index b7d7535a9e..27da4b77f0 100644 --- a/Changelog +++ b/Changelog @@ -34,6 +34,7 @@ version : - ffprobe (with -export_side_data film_grain) now prints film grain metadata - AEA muxer - ffmpeg CLI loopback decoders +- pad_vaapi, drawbox_vaapi filters version 6.1: