From patchwork Mon Oct 31 06:20:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 39077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp731263pzj; Sun, 30 Oct 2022 23:21:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/BGUi6urDUZSiqgbOmeTwCHCtvDCI5eaIC6+s16H4PJhF9wqwCHejXuZ5XNXLkRNvCOR+ X-Received: by 2002:aa7:ce16:0:b0:461:865a:ae44 with SMTP id d22-20020aa7ce16000000b00461865aae44mr11755228edv.280.1667197265893; Sun, 30 Oct 2022 23:21:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667197265; cv=none; d=google.com; s=arc-20160816; b=ZgRIz+5OHc86JfvPu6j+8zYlMVbFsPVcR4CwM74PaMVrAZB58bJY7/WCJkfzrZBWT3 durFHQkVGieoSvsLMdRAd9xjJadGHmqiqoHO5q3Y2lGb0pwA95uhDM0WAJ7ILmG/YAVE WamdbsF8oNg3j/9vLKQavt8jMZwZJWn2Jv0XEeU3T2u6MhwVucpDbY2qQImjcNgc4G7o IP8b7w740byuXI9GG2O0ydGPsJhumHzBDHKpFVla3RPkmxSRVBRYYTFGhv/WDlm2uAn1 Joymw3rHie+/zkLPf9GYkW2nNmCUNuGQmJlBSa+D3v9CRBTstMS0SSHL30lKQGbbHhAR CJBw== 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:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=2EvatxmRBjA4FlISrCcsJ/z3sh+saRoFIt6o8IZ+8+4=; b=RHx4OZcyNoNQXBRsV/5IAIvKwnebt6QU+NPKpz6zkViDmZdRieeXqaUsB8UeRjGCkk qpl6saovlU5HHyyVqOGF1EvoFqsyHLRmR7ul9SRjTLi/4wdfnM7W8GwgLBynw8zBApej L6J0SG8eRPFUFN49wotwmdXoLvZljccfdXchF2GMACBvsR3PazHniskTQBIXE5Xw964a xDyCjmeVKTqEIHzgrVVKruSIiCo0aY3dBBcl3+ymMWWZBVwXXgxaIv6fKZ6TgeHvZa/i fOShd7SI1T1c/iI7ToSM+i9f2c3XacLxC8T1sKAdhj+eJwHANZd8bMaYhTqHnhofEabR ME9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CbjMn4yA; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qw35-20020a1709066a2300b0079b9f472d85si7641963ejc.698.2022.10.30.23.21.05; Sun, 30 Oct 2022 23:21:05 -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=@gmail.com header.s=20210112 header.b=CbjMn4yA; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6413C68BE05; Mon, 31 Oct 2022 08:20:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF3FA68BDBD for ; Mon, 31 Oct 2022 08:20:16 +0200 (EET) Received: by mail-pg1-f169.google.com with SMTP id g129so9868531pgc.7; Sun, 30 Oct 2022 23:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=WePJQVhzQWDnZAzcQP5M6U0Ut9G/tm0gOxL/p50tWEw=; b=CbjMn4yArgZr5dHg/deFBu2Npmu2w8PwqN+Zf4ZVg5v1qva69E0h6VCyQPN1W9pjO5 bMHtzO60vOgJ2Q7OldlyivcZXrFPVSnBrivH1uTvoEX28l8KpXtV/x+U+M0WijfJk/bo /JwhVYUjJR6pdmH6mBip0SMIMX3FSAyFgLPQbVCETHZvzsUCe3icTsjAdCw05pHiUAjq 1Rya8jZeHdidEN3vAsYy55dLCZqTMGUuNn58N+OKgMET3GS7STK8BxMSfgs/UpdFqP+a Ha+RDgjJ9mjFJJo5kucx4UN9PIBCPxG9TE+uXb+Oj4s0CGfCvaZ9ekQ5I3ZoRKsTvTRT CFug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=WePJQVhzQWDnZAzcQP5M6U0Ut9G/tm0gOxL/p50tWEw=; b=khpu1WuXRLjxpZ/6xzDiZplAosGgV9CAqI+6BjljetJQ8YKJfF2te9s2PzC32PmOmo 8C3JuDsFaQBwGtO+HhZna7BdOALYpPVgSFZg1ikHX0Rv1XP11Q5oXVKerlDBYg4A4oaT 6QBHIklsYlPPjjoVVPxPxJUoKjePrjBYEJRQy2nuZnXrncnfbBlrTaKhZiPZvj9SatCy 3izVzGOPDq65XS+Jv/8MAJEQjmMTQts34ZEJziLKYVW2zLgVZeUk/jgYz2Z9wsfxu7IG z7bafOjyHkO5nU87Lb6a+Mm6iF7YWjRRzMul6xwFsuljxQXCs5Akh8H5Cq2MXmhnx9ya DQcg== X-Gm-Message-State: ACrzQf0d7v61M+wqpJXKZPTxaUpY9wOWNLCFUy5cajQid74rkM3dAB9g eBLohfm0p+Kr3cjYjwwwF2R2KP+bnKA= X-Received: by 2002:a63:485f:0:b0:458:764a:2224 with SMTP id x31-20020a63485f000000b00458764a2224mr11157832pgk.620.1667197215135; Sun, 30 Oct 2022 23:20:15 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id o125-20020a625a83000000b00560e5da42d5sm3659470pfb.201.2022.10.30.23.20.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Oct 2022 23:20:14 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <4fba07d9f978cdbad394c1ab4af763bcc2a2ad71.1667197207.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 31 Oct 2022 06:20:04 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 08/11] avfilter/overlay_vaapi: precalculate blend_state, enable pixel alpha 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: softworkz , "Xiang, Haihao" , Gyan Doshi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EQPoki2LpAhm From: softworkz Signed-off-by: softworkz --- libavfilter/vf_overlay_vaapi.c | 44 ++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_overlay_vaapi.c b/libavfilter/vf_overlay_vaapi.c index f4f9cc58ec..b2c254d9dd 100644 --- a/libavfilter/vf_overlay_vaapi.c +++ b/libavfilter/vf_overlay_vaapi.c @@ -36,6 +36,8 @@ typedef struct OverlayVAAPIContext { int overlay_ow; int overlay_oh; float alpha; + unsigned int blend_flags; + float blend_alpha; } OverlayVAAPIContext; static int overlay_vaapi_build_filter_params(AVFilterContext *avctx) @@ -246,8 +248,8 @@ static int overlay_vaapi_blend(FFFrameSync *fs) memcpy(&subpic_params, ¶ms, sizeof(subpic_params)); - blend_state.flags = VA_BLEND_GLOBAL_ALPHA; - blend_state.global_alpha = ctx->alpha; + blend_state.flags = ctx->blend_flags; + blend_state.global_alpha = ctx->blend_alpha; subpic_params.blend_state = &blend_state; subpic_params.surface = (VASurfaceID)(uintptr_t)input_overlay->data[3]; @@ -269,6 +271,43 @@ fail: return err; } +static int have_alpha_planar(AVFilterLink *link) +{ + enum AVPixelFormat pix_fmt = link->format; + const AVPixFmtDescriptor *desc; + AVHWFramesContext *fctx; + + if (link->format == AV_PIX_FMT_VAAPI) { + fctx = (AVHWFramesContext *)link->hw_frames_ctx->data; + pix_fmt = fctx->sw_format; + } + + desc = av_pix_fmt_desc_get(pix_fmt); + if (!desc) + return 0; + + return !!(desc->flags & AV_PIX_FMT_FLAG_ALPHA); +} + +static int overlay_vaapi_config_input_overlay(AVFilterLink *inlink) +{ + AVFilterContext *avctx = inlink->dst; + OverlayVAAPIContext *ctx = avctx->priv; + + ctx->blend_flags = 0; + ctx->blend_alpha = 1.0f; + + if (ctx->alpha < 1.0f) { + ctx->blend_flags |= VA_BLEND_GLOBAL_ALPHA; + ctx->blend_alpha = ctx->alpha; + } + + if (have_alpha_planar(inlink)) + ctx->blend_flags |= VA_BLEND_PREMULTIPLIED_ALPHA; + + return 0; +} + static int overlay_vaapi_config_output(AVFilterLink *outlink) { AVFilterContext *avctx = outlink->src; @@ -353,6 +392,7 @@ static const AVFilterPad overlay_vaapi_inputs[] = { { .name = "overlay", .type = AVMEDIA_TYPE_VIDEO, + .config_props = overlay_vaapi_config_input_overlay, }, };