From patchwork Wed Aug 14 03:20:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: llyyr X-Patchwork-Id: 51008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a746:0:b0:489:2eb3:e4c4 with SMTP id f6csp656355vqm; Tue, 13 Aug 2024 20:29:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXqb76YuFRZN/dVgp8InFhEodY6Ov9pWkZSGrMToAVND/XkheDWClL5LPZlw7Ag19ND0HbbhE0iaihQL7Y6Vc0TbdQAYph4whS9BA== X-Google-Smtp-Source: AGHT+IGVTG5u58/rOqtZExC68GOUA12hGSoVdQEopW4XXiPi6rbsju5TWjDjq6fOrG8Ax/GPUBQQ X-Received: by 2002:a05:6512:3089:b0:52e:fef4:2cab with SMTP id 2adb3069b0e04-532f13720b3mr170777e87.2.1723606191262; Tue, 13 Aug 2024 20:29:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723606191; cv=none; d=google.com; s=arc-20160816; b=kNV8tw08hxJx/79U8M/w758x88pIdKa/KpPspHDDy9sWNa87XhPgnhUzPcjO1myyqv BoC7zGKZb1O4hI4r1aMScpXYCzqahs0+Cg4YaANgFPeoGeQjo/HCBkUOPPID3HffdItx Xdc6YxeBkpUAUoCZrOGKuS5lmimRp0+fkZqrEtCkiDpuSi93rkAmJ8DFiUNXHqWle+SI oohGqToUc9LpFlWDgs/2sn9p3IQx3Jngr9TrOf04Ys3jM/Ik0Dan2yYmsASGbowyfLD/ mU8N0bc9V+mOjw2+4TdkBY8ps5TMOh7QJY1DlwkE8pDWuJv0R3FavQzU8Yg4CZgCPJGv SOKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:from:to:message-id:dkim-signature :delivered-to; bh=GUT3btVcrkowIml/wYIyjvPwHcw4Y7J8CKyX0JeedWg=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=fvctpKmV7DXpD6R3DedWCH1/DpHm7+s9zQIEj4zZQWDLKSIaEMkKUQ6tPpEBbEAmce XxN+8z96/c/S1gMW+dgxaS2olYsrvdrJXBaXaeYUxZFWP3noR5TeYAbm60dsnS51z1eX oOhXAwq91jNmeESv1eZP9PT79/kxzGyJZHzBIK7WbW3wbiYi/+8q+NUQxsfkAMWn5Z60 SA1SU4ebbDmIJHxn+Z3g2Hk7feqlms5I8vMMCiJl7CKqkaZJ9Mdokqo142YFRv3w5zt8 pRCAH93XHFjoZKpdEvm2ZL7/NYj0mufnUEuOjgi6Vg/XnvyfTuqcxfrmkyKxi+06RldZ 4yuw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Ug8PGMZY; 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; dara=fail header.i=@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 2adb3069b0e04-53200f05850si2647979e87.314.2024.08.13.20.29.50; Tue, 13 Aug 2024 20:29:51 -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=20230601 header.b=Ug8PGMZY; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E47368DA4F; Wed, 14 Aug 2024 06:29:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03F5968D92D for ; Wed, 14 Aug 2024 06:29:40 +0300 (EEST) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-2689f749649so1929994fac.0 for ; Tue, 13 Aug 2024 20:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723606178; x=1724210978; darn=ffmpeg.org; h=subject:date:from:to:message-id:from:to:cc:subject:date:message-id :reply-to; bh=CFk0OyCMKUXJeEyOXvb4iZW0+Bk1xnXH1W0c41socYM=; b=Ug8PGMZYfkWuTqY/WB4vI3rV5uTQvcjrYNzwkGDMTOzLKp/gS37O557AOcohdrho+R h0mHYMr4Y19z7NePmG21V8Yw+ob6MSjotOqe9lgjAoDo1mEswIFiWgTVmfdTBMtm1m29 cV1P/L+aTqvNLKCUPO2Gb6ttfqRltmq34mRdyogFZZ9lW7x+P1BEpkTXUhdVACIVvVTX PUfLNt9GZa5aqQ+i2HD2kIjIzCjrsvpx0eYJIbtMZI6bwGhq6HiVrlKjnv2v7kxr5bA9 k/97LVldOVEzw1N8G7AE1wSy+ls2hl/H8/Q5c4JLZxavi3C6YZRPW/4TmBQSM7SVRMA/ hsdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723606178; x=1724210978; h=subject:date:from:to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CFk0OyCMKUXJeEyOXvb4iZW0+Bk1xnXH1W0c41socYM=; b=Dv/0TvXM4Wpu4CT+t5hC2aFIs9QfbOPdm+TrNZ2grVQ58ViT6jbq3FbyD7oc7sIs8R oacB+9pqUMAap/e3lftKqG5HNQpXY0XOTa777xbLRwbJMjG80mAejAIyw244+/2T1SoO FipnpAT9mUMyRLQrRaLiyMnFDGwPqS51DP337qsQuXRtb9ljm9iIWQe9Bfi2DDX249D6 jGzC8bRy5CznL4CwK4KHF1nylSyvQ1JWySvwoYI1pxU6Y6rlggQZwkNvUumbEuXb5ipa PVlCezzBO7a+wkJajLPO9zQXXMG14qmjmYR2VYGw7F7n9wH8HRFCfEg4TZLc4hMN6dMy IXZw== X-Gm-Message-State: AOJu0YyL0De04mJ/BGOmC4YI1gcTGjaxWlg9iAoTooY9w1D9wtC4kFVU DWrUVQz1ImBP7a3ioHYpahmWNMl3NksNXB6NYyFP0BxDGOsCTCFeqE9BdQ== X-Received: by 2002:a05:6871:691:b0:260:fc35:b37e with SMTP id 586e51a60fabf-26fe5c58a19mr1959279fac.44.1723606177697; Tue, 13 Aug 2024 20:29:37 -0700 (PDT) Received: from localhost ([103.208.20.155]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-710e5ab7a72sm6439846b3a.198.2024.08.13.20.29.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 13 Aug 2024 20:29:37 -0700 (PDT) Message-Id: To: From: "llyyr" Date: Wed, 14 Aug 2024 08:50:30 +0530 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: move deprecated field inside PL_API_VER check 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: b+IepmFr1uEc Set equivalent new option instead. Deprecated upstream in libplacebo v7.346. --- libavfilter/vf_libplacebo.c | 8 ++++++++ 1 file changed, 8 insertions(+) base-commit: 66592e8b100f4b521b48962f15940e19ef6eed48 diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index be9000aa8ea7..e4e750d4edfa 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -882,7 +882,11 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) } /* Draw first frame opaque, others with blending */ +#if PL_API_VER >= 346 + opts->params.border = PL_CLEAR_COLOR; +#else opts->params.skip_target_clearing = false; +#endif opts->params.blend_params = NULL; for (int i = 0; i < s->nb_inputs; i++) { LibplaceboInput *in = &s->inputs[i]; @@ -892,7 +896,11 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) opts->params.skip_caching_single_frame = high_fps; update_crops(ctx, in, &target, out->pts * av_q2d(outlink->time_base)); pl_render_image_mix(in->renderer, &in->mix, &target, &opts->params); +#if PL_API_VER >= 346 + opts->params.border = PL_CLEAR_SKIP; +#else opts->params.skip_target_clearing = true; +#endif opts->params.blend_params = &pl_alpha_overlay; }