From patchwork Mon Oct 31 06:19:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 39073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp731006pzj; Sun, 30 Oct 2022 23:20:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4s3tt1GolYHXAYrLcXGjityENMWtC92agREC7vpXhB4XSKumq9Eflqrcx+qUgw7MW0/ky+ X-Received: by 2002:a05:6402:84d:b0:454:f41d:6ccf with SMTP id b13-20020a056402084d00b00454f41d6ccfmr11988115edz.129.1667197225207; Sun, 30 Oct 2022 23:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667197225; cv=none; d=google.com; s=arc-20160816; b=zg6h3SbfOABmAUIm8PivqrRJmD9QK+YvJ4wI8WNkbEPp1vIwthSHZtkpuCNLMXYn2O m3bAGNSe5tmQrSEVUP9xZUvjYy1FGrLQ7JX60xBDpV+BhffpMSAkV1GbxNy83Syq8+lL 60hlicIYEGxPbj/Yda3+hnK19zck/GgaHX81bB/vd7GdYmGIqrqx7BDVwe0c8aHjDesH wczrkAHNK3LI8tTuPPkjf2LZUPLjfDHhEBy3Oro0C7UHDFZnYJAKPuxexpahikKORRfx 4UQoLKvG3dMTEJaGI+V3uWu+//2fQ3UxyosxyEVHi1uIaka9To1hmy4SsupRJMLx99EY H9Ng== 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=DjsnIDSwt4ZFmairkJqRh/aLGG5P5mI8BklfnEfWuVs=; b=VpbsyKva5RddY0SZ9dCbtWYxdOEHg9Qy8e+fKdH6vSTbMOQRpMxWGbMShwM5pu16S6 FDgX6uSGE6nfuUsL2MsTNSt4C79xU4fwlN96dInNUg5exVQtnWPeCJdCshZPcJQ5/+X+ AIcLMsr8nD89yJdDuT0a15WJsn1nBAlQvnLHYAIuyGXxdjAdOh+ax4VBpDNMC+dQGlhk vVHtEtkbCV0nVjUvyT22aF/Gj3l+aY884xF7cco/tx3XiMkWTS/ipSXKCXRdPzSbNFyA MY1MXhlOSfcTY2ZbEsht5RliLqWrMOgWUGMmVpowsAGCUUHkXh7n2IHrq4CuHmYY7iYO PcQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="edE2u6Q/"; 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 nc4-20020a1709071c0400b007adc0d5ad94si5178200ejc.938.2022.10.30.23.20.24; Sun, 30 Oct 2022 23:20:25 -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="edE2u6Q/"; 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 28A6268BDB8; Mon, 31 Oct 2022 08:20:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B7CB68BD68 for ; Mon, 31 Oct 2022 08:20:14 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id p3so9887558pld.10; Sun, 30 Oct 2022 23:20:14 -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=qBtc49Yhz04Ls0at0l1X8Z+WY0GwRn0aN79XFeVtAkk=; b=edE2u6Q/kPPvu1SfD0Odo56N2f6EwobnVKag0KBgDqIwGwWSRmhuFKWrxL5RBuzbWQ cZNDniF9U6Jzbwx/WGEMkcRNabJlR7p5mje+jKc/7So7Y5pxPLFvdCltPEm/eIbPk/S/ l5xro8NNOyklcjhf9uHwJL4fdGWXthl9edmaE2Xzg8SYm3JQmNgs3eQvMlYxJ7GFXTLy 3sUWRrJ3ACf+OLpeGFf4V6dBXDlsQjEZYnhQYEHRK80t1caQbT5U1OvNaoAVzkbeeQFr ds0ibhzkKc8CJJAPUDgh953arXEwvXlhKkOeN1Tnv46Lhb2D2iMXdqQWK6DvEQ2foZes Po6A== 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=qBtc49Yhz04Ls0at0l1X8Z+WY0GwRn0aN79XFeVtAkk=; b=vo310LDssf9j6WZxJaNBly0b3U4l+MnYo1hvSJPkw+KNElHhKnZieGY7D88Z258vy+ YhIUthwnKRX2k1v8309npvOnHjHLovtf0gzzZze76BvEeko7LiBeniaN7YpZQoUwC3E0 M7R2iT7DVVVlkWeZFHESwLhmDhe/EpwoxYCYz3kFlh3J7is8V+UE2na8Kcf2M+FguI2T GZyAy+tW05sTISjUjATDVh2EdyOMSTWPxxH3Roo9IpCGmfVFXE9Pt7k/zAjpK5xoAPIB ALuu16hNVFuL9kUV1kYk3Xnasr5dA4rxCduk85JXrISDlpzA1/49kJghK8UOtH56OXKA NEIg== X-Gm-Message-State: ACrzQf1S8ADv3i3npySfv8H6yOXl/BHHGBSJpk2/rBIa/bdQDz/duEFA McldpWaB0QyYO5/vPvXZRBColA1KHJk= X-Received: by 2002:a17:903:230b:b0:186:6041:51bf with SMTP id d11-20020a170903230b00b00186604151bfmr12321593plh.24.1667197211691; Sun, 30 Oct 2022 23:20:11 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id e2-20020aa79802000000b0056b6acb58a0sm3678180pfl.102.2022.10.30.23.20.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Oct 2022 23:20:11 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <2bd535abb506d1af278e1146de38529c22ed625b.1667197207.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 31 Oct 2022 06:19:59 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 03/11] avfilter/overlay_vaapi: remove double framesync init 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: 5vicVb2eS19e From: softworkz Signed-off-by: softworkz --- libavfilter/vf_overlay_vaapi.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/libavfilter/vf_overlay_vaapi.c b/libavfilter/vf_overlay_vaapi.c index cf17426b5d..66e736cce4 100644 --- a/libavfilter/vf_overlay_vaapi.c +++ b/libavfilter/vf_overlay_vaapi.c @@ -265,28 +265,6 @@ fail: return err; } -static int overlay_vaapi_init_framesync(AVFilterContext *avctx) -{ - OverlayVAAPIContext *ctx = avctx->priv; - int ret, i; - - ctx->fs.on_event = overlay_vaapi_blend; - ctx->fs.opaque = ctx; - ret = ff_framesync_init(&ctx->fs, avctx, avctx->nb_inputs); - if (ret < 0) - return ret; - - for (i = 0; i < avctx->nb_inputs; i++) { - FFFrameSyncIn *in = &ctx->fs.in[i]; - in->before = EXT_STOP; - in->after = EXT_INFINITY; - in->sync = i ? 1 : 2; - in->time_base = avctx->inputs[i]->time_base; - } - - return ff_framesync_configure(&ctx->fs); -} - static int overlay_vaapi_config_output(AVFilterLink *outlink) { AVFilterContext *avctx = outlink->src; @@ -294,10 +272,7 @@ static int overlay_vaapi_config_output(AVFilterLink *outlink) VAAPIVPPContext *vpp_ctx = avctx->priv; int err; - err = overlay_vaapi_init_framesync(avctx); - if (err < 0) - return err; - + outlink->time_base = avctx->inputs[0]->time_base; vpp_ctx->output_width = avctx->inputs[0]->w; vpp_ctx->output_height = avctx->inputs[0]->h; @@ -313,6 +288,10 @@ static int overlay_vaapi_config_output(AVFilterLink *outlink) if (err < 0) return err; + ctx->fs.on_event = overlay_vaapi_blend; + ctx->fs.opaque = ctx; + ctx->fs.time_base = outlink->time_base; + return ff_framesync_configure(&ctx->fs); }