From patchwork Fri Oct 18 23:05:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koushik Dutta X-Patchwork-Id: 52397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp1466793vqi; Sat, 19 Oct 2024 03:54:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6kacoNRAm5Z7xBdR3xlUdDSff4jCzLVZAMruDlLDX6nEaD89JsQ+hn4yBKL9PlJaAK79cRyqxNFdzbCE60puT@gmail.com X-Google-Smtp-Source: AGHT+IE81vlmGJSU2+1tuxfvPtwtsgosckCAWfCOA1t0a1CyqX00RaM/zD17HHM+yWfNhe6w2SMI X-Received: by 2002:a17:906:6a24:b0:a9a:296:b501 with SMTP id a640c23a62f3a-a9a69a684efmr507915966b.26.1729335251683; Sat, 19 Oct 2024 03:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729335251; cv=none; d=google.com; s=arc-20240605; b=ZuTk/SC7FrjW/bPgydAWMIwOgdQ/8nSPPY7yHsgrA6+X/X7oZoCEiiVWg0w0yADjlG 9VBOdRXaXoKVCerhoEMDcGWIahEDiHbX4shFKnYTyoN7EY+7ChqZQsvtNjPjqD7nCXqm TfIumjgrw5hi8ZA4y6dfhHLHQmja9hv7cuxvI6ZlWAlW6FWIRbQPrmwF8SNkWhRsI1Iq U5yXAljxACxdLnVcIYYsVT8lb60EtbEdEEmTna2KO8k2XuZ/WfU8yHLLG5A5EG+DPGqF uMx9OrMEjBg3Hd0mt+eU/74WiD6ZhHnmFak5cX3bl7kYgZw3MlVJ6gx0HKuQzBw4rPgI 0c7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=y1eGd07yn9+HYcDOTlwaXd9jnZtTQY/IfTZuAf8DWe0=; fh=vf1rgm8KpEMxcRKiIfYPC5TR7MMWdHSIxg51vjgwMpE=; b=hN/dwI7+ZMP93Bxrt145d0h47MaCfNZZrSO7bXshK2U/k/ifBRpwcXki6RawxApkVG Ss3/fhsjfWToWkKE4dz2zCDml+1nGGYTwvpoWGyO3xYPhd1jCTNw5kiqmzY1htQjf/Ws 6Jtv0YapGd14a3/8pgTVPNHuNhQA7wvaVieUw3kAT47u/49aO+GV3YdsHyCR/DU1gLOl VDWB1P10DCUUaRvzWXTTwjvQXLpiACure0T7brcj8hH9zM3tyLOurc6jv0HL6AHxhuU1 0YFt1x7KyYtAvB0K4n749HonA+lRbyOLiVuS2ysdCKi/5F8JGaOG6iSZADpyaetZptDf HERQ==; 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=F3xttRha; 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 a640c23a62f3a-a9a68bf785esi274302366b.575.2024.10.19.03.54.11; Sat, 19 Oct 2024 03:54:11 -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=F3xttRha; 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 5956868DDA2; Sat, 19 Oct 2024 02:06:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A59A68DD13 for ; Sat, 19 Oct 2024 02:06:18 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-20c767a9c50so25703005ad.1 for ; Fri, 18 Oct 2024 16:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729292776; x=1729897576; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nZNBMasmzn5GJqgNrkMf2/WF4fiTfX8W77rCZ+wcT6U=; b=F3xttRha8g+jhsui2dx38pfKq12iAYOdq5jpzwq08Ez6OVVSVDpSXguODDhszxmVcQ q76JdAFkKLeXzrME+oWljUIY4cHrGJo64b3cHb2iq4wSXePMvNRLOLdL5pkezU77HTK1 Lob8NYrNfLPnlwZWOi6vAVhCqEJMoowZiujGkATb1WCDhc7DK9+KgPXM77faSHQ5H6Ll 0q3g6/u7HDTYrH0AgcmgiNM/gknrtvsx5BuyXovRoSicrLPiFs9A/HY27frZMTAzf3oB UUKMnfosLSZ7ioX5nlIlDvvsI1fYAX91jLPIGeCXNth9LljoxoIYHMMbvRJCpq0Gkdod O0SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729292776; x=1729897576; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nZNBMasmzn5GJqgNrkMf2/WF4fiTfX8W77rCZ+wcT6U=; b=EKslVjlxVYcVzXGSlQWxamBgKU/WL8+9v8DkSGHjX7Mbrq8SBCvZZniS8IJkB/CqYX fu0Dps6dsGyJx1d/6aL/eLVWXiL3HJwZsInSTzQDuQYjSLb9dPjW/cqkaYnAPiMr/94M bWfjIk5vtsy4WX5jxuTjYyHh1NWfQFlRTIaOp1srEv2d65iWOrRKQ2XINGVvwD6feYeF YtrUe26zFkd4uFS6xAq137ByPE4gEfWaxHW9rg5EYN/shlkZR+k/jaY0sPss9rGFgRMb OpLAcE08/yfJ6VH6WyU47/m4ImdMzxev30fkQXJiWA3K9MFlTejwx3Fliz7/raQcfRjJ 5BxQ== X-Gm-Message-State: AOJu0YzoAJDIWJIQAeRj1F3n9s9HsFuPpkV3M1O5hVf60/TcV/newZvC Zbk2sesOsWTO1wd01+9yIJcwzQz/bLKTQFIJ06uAuHZybRwSaemOh4Jgrw== X-Received: by 2002:a17:903:4408:b0:20b:80e6:bcdf with SMTP id d9443c01a7336-20e5a7a3737mr49870855ad.23.1729292776037; Fri, 18 Oct 2024 16:06:16 -0700 (PDT) Received: from Koushik-MacStudio.tail05204.ts.net ([2001:559:76c:0:493a:a469:ed1d:5e06]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e5a912dafsm17809655ad.276.2024.10.18.16.06.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 18 Oct 2024 16:06:15 -0700 (PDT) From: Koushik Dutta To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Oct 2024 16:05:51 -0700 Message-Id: <20241018230552.80169-3-koushd@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20241018230552.80169-1-koushd@gmail.com> References: <20241018230552.80169-1-koushd@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] scale_qsv frame crop support 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: Koushik Dutta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Wsk9rYJR31NR The crop filter has no effect on scale_qsv: -vf crop=100:100,scale_qsv=300x300 Hardware frames (AV_PIX_FMT_FLAG_HWACCEL) are expected to use the crop_* properties, as seen in the implementation vf_crop.c. This patch is slightly different from the previously submitted patches since qsv supports frame crop via the vpp_qsv filter. If no explicit crop is detected via that filter, AVFrame.crop_* will be used instead. Removal of vpp_qsv's crop argument may be warranted. --- libavfilter/qsvvpp.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 0818ada117..05ce387bc3 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -467,6 +467,16 @@ static QSVFrame *submit_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *p else if (qsv_frame->frame->repeat_pict == 4) qsv_frame->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_TRIPLING; + // if crop arguments are not present from the vpp_qsv filter, use the provided AVFrame + // crop_* members instead. + if (!qsv_frame->surface.Info.CropX && !qsv_frame->surface.Info.CropY + && qsv_frame->surface.Info.CropW == picref->width && qsv_frame->surface.Info.CropH == picref->height) { + qsv_frame->surface.Info.CropW = (mfxU16)((picref->width - picref->crop_right) - picref->crop_left); + qsv_frame->surface.Info.CropH = (mfxU16)((picref->height - picref->crop_bottom) - picref->crop_top); + qsv_frame->surface.Info.CropX = (mfxU16)picref->crop_left; + qsv_frame->surface.Info.CropY = (mfxU16)picref->crop_top; + } + return qsv_frame; }