From patchwork Sat Jul 29 03:35:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7927:b0:130:ccc6:6c4b with SMTP id b39csp1122393pzg; Fri, 28 Jul 2023 20:36:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlGG2EM3WBVKoxSKvi2JIMx3YkFkLQTZvfdzrOpRRTOaJjRJJ3wW9g01bt20NRjwxteF9Rmr X-Received: by 2002:ac2:58f7:0:b0:4fb:8aeb:d9be with SMTP id v23-20020ac258f7000000b004fb8aebd9bemr2619276lfo.30.1690601794934; Fri, 28 Jul 2023 20:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690601794; cv=none; d=google.com; s=arc-20160816; b=KnmqvSVF/I7ClilHbYEkWRta33sRL9JvHVxavEZrofeZ+fAvFyw9/w/Xsco7I3H4J4 u+/XymuW/Vn0wUKwlUlEoxaABhcUG/VHxIMabTD0CCMI84OAKYg5DS8JX7g9ghzonxgg dKlHHqKKy+kP/S1/7+fBYWj9hJwn6Xn7zponMP7c44itgH8Uu88ufd7YRDJB8+CF8Cbt JmnYFK0G9oPAJ556uykFyfWeygsRR/Uua53iuA2BorJD97lSGf5lAVvDaXYF2w0xyN1T X2yglFmhfGpIQyz/ZisAoUa748H4iEz1U5pdmR5nh+jgqdrQ/4fvMawuaSCmX38e9yxk SPYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=O/CHGtMdDsH5X7u61k+Gcza12J1HZejqVQw3E4Ca/GU=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=vIOZzECCjUdqVdMjzTi3OAD/VBYBpI0yCl2hwTRfMBgZvU4UqZIMNqxU7KJY8xIFM4 whw6o8KFhvaJmIvUS84I8+ZhmKa6smCf+g78zeaxCRc2mBns0D7Gue+ZUskKkJ9NFo9i xbTZVI0T9tmPkP8SthAoYkf6MIdd3FFqkEdUlNXLXuVOg7am4QoC44+7GCFRYIYqm2mp 5H6D6z8OJmD1i/awQmbnbXC/P27p5s3R47up6U8SQyDc0cKK4Riop2Hf7gsdnV4dLOVt c9v34sU+3kiQiLslEh/+57kwmsWUwzYYJxKdR9UuzT9tMn6+auxEJNB/zXsF1E+r21MD SezA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=hdJDJ3p5; 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 n4-20020a05640206c400b0051dd43b81b0si3479476edy.25.2023.07.28.20.36.34; Fri, 28 Jul 2023 20:36:34 -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=20221208 header.b=hdJDJ3p5; 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 9500A68C797; Sat, 29 Jul 2023 06:36:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2324068C5EC for ; Sat, 29 Jul 2023 06:36:23 +0300 (EEST) Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-6b9c9944da8so2386717a34.3 for ; Fri, 28 Jul 2023 20:36:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690601780; x=1691206580; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=kz86iMUXGpELlWMw7/uSAooBTCfkYh8BulePq8JRRBo=; b=hdJDJ3p5YweufbnvEjupMO6Bx2mia679u7U1gTXXYHKlUQo5v+awC7VnCUSBtuyC5H QXGcBMkyge1vN3YWmcuCAazCAFA1yp5Zq4D0HPElgwr99363065TxrNBlMdOzcg7o2z8 Q4Y8vaBJwOOSrt5RVMez1G0xInBPA/+wUjSw7VVyFOyasiayCgJmaKxcdQDUwPnhxRdR F2w/mZd6U1i4liwyi4hu9z2V+rmO3z+G5gD4tNYLr3S1Y6p2fEvtj0mvZbX82mrfm76i QOsiVaN8afpAgAJeFwb49yIVgo3/Dv3SdD9DeAqnAqieTi7GR2KVZsV1/T1KL+p9q6b3 MOHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690601780; x=1691206580; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kz86iMUXGpELlWMw7/uSAooBTCfkYh8BulePq8JRRBo=; b=OASUYQzu1j1MX3CAyYk4NN+OXqFcZcG+Tz1Pk4DDKO7rY2kPL6h0V4+zIqR0zkI4Ft sL3j+vpqZgec2cxcYDKAZA4HmYQls/ianmXUfAwwQAsLUhP4l4ZDBYOnhu2jIoj2ukW1 F7E7DuyfZRQIY7DvgeNxguFvgZVaIxYmpUFkU2T4EmyjQlNVNuzUJVD8e1XgXFGsqjOd seONJkptpXf0UO5/RHwzxlnYKUl7L+LP0SHLLj5VRy1LCrh82KEkxV/tfKaAcy2LDUxq /AeRgums2DCtgLpuwixJIBP564lgmQ8s9scxIT4F+5dISkoX5IiQwUXwnzwHUMNwquef ZuvQ== X-Gm-Message-State: ABy/qLbJIeLcjTaOcvw5z58y10UvTMmX7iy87C7zrQedNoNEaMsZVV/V I0aPJx30plVKK5LVNwIJPprY4qhfdnU= X-Received: by 2002:a05:6830:18d:b0:6b9:1af7:48c5 with SMTP id q13-20020a056830018d00b006b91af748c5mr4384480ota.9.1690601780492; Fri, 28 Jul 2023 20:36:20 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id a24-20020a056830101800b006b9cb784553sm2225126otp.36.2023.07.28.20.36.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 20:36:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Jul 2023 00:35:38 -0300 Message-ID: <20230729033538.1731-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/qsvvpp: remove usage of deprecated fields 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kxtRO77L3efv Added by mistake in 88b3841149b9f41d6c5ec7930dcd5c6caf28b198. Signed-off-by: James Almer --- libavfilter/qsvvpp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index a03de05d9c..2833703891 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -540,14 +540,19 @@ static QSVFrame *query_frame(QSVVPPContext *s, AVFilterLink *outlink, const AVFr mfxExtBuffer *extbuf = s->vpp_param.ExtParam[i]; if (extbuf->BufferId == MFX_EXTBUFF_VPP_DEINTERLACING) { +#if FF_API_INTERLACED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS out_frame->frame->interlaced_frame = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + out_frame->frame->flags &= ~AV_FRAME_FLAG_INTERLACED; break; } } out_frame->surface.Info.PicStruct = - !out_frame->frame->interlaced_frame ? MFX_PICSTRUCT_PROGRESSIVE : - (out_frame->frame->top_field_first ? MFX_PICSTRUCT_FIELD_TFF : + !(out_frame->frame->flags & AV_FRAME_FLAG_INTERLACED) ? MFX_PICSTRUCT_PROGRESSIVE : + ((out_frame->frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? MFX_PICSTRUCT_FIELD_TFF : MFX_PICSTRUCT_FIELD_BFF); return out_frame;