From patchwork Fri Dec 24 03:08:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32880 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7805041iog; Thu, 23 Dec 2021 19:10:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4zn9kIZj5xbjNYjMw85lTa4FliUWXaki8QdP9t+FfsFt9NrhNyHZA7j99k3i1Mm14q6sC X-Received: by 2002:a17:907:3e12:: with SMTP id hp18mr3778048ejc.576.1640315428720; Thu, 23 Dec 2021 19:10:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640315428; cv=none; d=google.com; s=arc-20160816; b=vUupbMXQFDAe9crexG8QTSKutx7VXoQhHHTWlGfJfmCFldiyx0YgQTgdZQvxYf1/Xz qhk8KrnD+vKzCyR/nuKXLUWsDdrdI+vSybge7lDNmpuFwMq3xlmXvoKOtxnaKul5W9qR 7BxZ23DWNnWHaEw9PI8KHXikNx86UrBVdoBKMatLaitcUNHe1Lnn0sVnZuZ1PxTTAR4V QILrH+S66r8zdAzPM3QViimWLtBjwksnddU0bza+dkvxvhkiusQjnfPZIj/GnAK3lJkJ LpZ7KAFzXBN4yH59+dg2p6Pia3OUxxQfwJizcfOL1I7rmkmUOzqOtkVZU+udeXQdyUz3 J5/w== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=X3l4pWVb4wpFtSA1tIB6Mwl003xmO99WazGACLCxVzU=; b=X+VVGXMe/Wwuwoagu+4sQsvpFgZag0jx3w4HwjCXDLdyYmb1IQ+fCbhObM0FvqIFsh CKBpngqw6EQGQwKqXQSKPQnzkqR5dOM7ZuMpaTzYPk/yjY+V1Fhuv3a1KX+xStzlEMEk ODkmb8L3vPdmogWdoqsYGmvSRdobkmVhE1vel3bJeXRIS6FPkJFaSLVdZL7/VvJqtxCJ Ec4NrM89KQSBkEEQWZZPZNw5FGMycINFHg1brVgZHRAcWN/ug8kWnKZDYcOsqitpw/4n MaCcrIqn5z0jTKDrOMInMB+V8QxGZl4wNqcda8cG8a7Hfbdi6DeZ/2Oo680HHkcnZ+kk FH8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=V02W5gJ9; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id az17si2529483ejc.178.2021.12.23.19.10.28; Thu, 23 Dec 2021 19:10:28 -0800 (PST) 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=@rcombs.me header.s=google header.b=V02W5gJ9; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAF4768B226; Fri, 24 Dec 2021 05:09:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7434068B1F5 for ; Fri, 24 Dec 2021 05:09:24 +0200 (EET) Received: by mail-qv1-f48.google.com with SMTP id h5so6785334qvh.8 for ; Thu, 23 Dec 2021 19:09:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BN/bIQdPxSvqQ7CNOy1FNgwCQ78BvGdQcHekFL+2iWM=; b=V02W5gJ9nUnc+VH3vhkSR3e0osC6TbuBOvk0x/zeWuBIkEg/SMueXP0NEPYHoWXN82 rZkUskTV9tvXdCdjwWgDfrxDJtMcC/tep/Wdr7imapy5ujINCqBJbtqA9I+Eu2JHASfF LW4xnGEhwST7YKGYuoOVo8/RoVtMPrJSnLqNBfjvgFhqM8rOFrAyzTe2pONQGLsBuVkg X1fYt7GpMV89hq81bSdtGLVB+EdqZd/pv6lllT8mjizMA1gu5ZUq0GqGNxG44ObIolMx 1+fz28eZQjVxQWm9wwgQHdOaeBiByqV21DvBB53Ta9sbU9o3VM8w9Oc4H8FqN7EoLczk zFbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BN/bIQdPxSvqQ7CNOy1FNgwCQ78BvGdQcHekFL+2iWM=; b=ZXhqU+rwQmUDp8MxgcRhieWGMYV08GyaUrWIDaqAaUO000KR445AcS/my4WlW2CH5G HKRLHznHKi2//wKy8aHuwLuLh+ltrGOwZLEpcDglMcgNoG3Q7HeMa5q2IM/2Y3Ei8dKV fuqwcpaqvEOgwF1PXdnrIu1VAsVZsNEy99Me/fcGcF7ErQwC/GB6k495uJy9MifcKZUx gAAyYmq6ipyBA7pUWIeo+2SFx0capYfZFx2mgP21+FjMgCr5jeqOk8UIHfQg5bA9Bmms H28OMwHSTixTMuhUEGDvZ5teoxdXYudRp1j2RiJdOOt3577nkDO7detuji+4HBg00QyG w51Q== X-Gm-Message-State: AOAM532FIqnUw/oyUw5I7rMQcW9Kf7++3bKoWvJyHyHQn3usn8faVNmN Xf/a++LNHWAOSB1JrtNUegwKq4jDNgADafE= X-Received: by 2002:a05:6214:5096:: with SMTP id kk22mr4241681qvb.39.1640315362943; Thu, 23 Dec 2021 19:09:22 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:cd8d:58a:de7b:88f1]) by smtp.gmail.com with ESMTPSA id e15sm5162479qtq.83.2021.12.23.19.09.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Dec 2021 19:09:22 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 21:08:58 -0600 Message-Id: <20211224030904.1196-11-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211224030904.1196-1-rcombs@rcombs.me> References: <20211224030904.1196-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/16] lavfi/drawutils: reject shift-packed formats 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: lwbfJfJDxW2H Disables x2bgr10/x2rgb10 (which did not behave correctly before). --- libavfilter/drawutils.c | 3 +++ tests/ref/fate/filter-pixfmts-pad | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 6b46f5803d..0965afb03e 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -105,6 +105,9 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) return AVERROR(ENOSYS); if (c->plane >= MAX_PLANES) return AVERROR(ENOSYS); + /* data must either be in the high or low bits, never middle */ + if (c->shift && ((c->shift + c->depth) & 0x7)) + return AVERROR(ENOSYS); /* strange interleaving */ if (pixelstep[c->plane] != 0 && pixelstep[c->plane] != c->step) diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index 1362d198b4..74981cd6c1 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -32,8 +32,6 @@ p416le 6db094f8d7d27d7299bf9496ad66e2e0 rgb0 78d500c8361ab6423a4826a00268c908 rgb24 17f9e2e0c609009acaf2175c42d4a2a5 rgba b157c90191463d34fb3ce77b36c96386 -x2bgr10le d4aff89f5e15ccbb1812f319874ed444 -x2rgb10le a0c5925bd56b6f85f918c4e9fb93e90e xyz12le 85abf80b77a9236a76ba0b00fcbdea2d ya16le 940fafa240b9916de5f73cb20a552f24 ya8 5fc0f471207ddf7aa01b07027d56b672