From patchwork Thu Oct 26 14:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf16:b0:15d:8365:d4b8 with SMTP id gc22csp671265pzb; Thu, 26 Oct 2023 07:24:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEirduW1y+Lf8GHrEpwr++cRF/HyNjKEQuz6FQ6Mvb8joy3HC51QNdM6pcUXVkKF4FOYlFj X-Received: by 2002:a17:907:7da7:b0:9b2:b149:b81a with SMTP id oz39-20020a1709077da700b009b2b149b81amr13773317ejc.64.1698330262445; Thu, 26 Oct 2023 07:24:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698330262; cv=none; d=google.com; s=arc-20160816; b=FQNcVEtTGma9gCcrnH3gz43aYD1YeJAOQKeGgMPbzLDUAdvelzpZVkttzyZ9fEo6I3 YxLWNRVnN+SE+Hr+36bFSjQPEkbpF8YJZ6rN8BC9TdpZeCCYhJjUCjxFhb4jzryAWvvQ 5L2vqt2lQ+8fdahF5CdF1t30sNV3t8ciQePsQ8Lpy0y7N940qcHJJLTtxGpcp4Gx4AR9 EtHIflZGOq+ad8Qd6VIMOJ5tU6m2uhwt5lLzTOoqFY3ss3GVqFHhiNUoUga63n+mlmxP Zgi91dI5/GLwZYglHAL/x2T8g5cEm8uD9cF7LBxYKk3/ENBXsznx6vuIhv5bxzDhdlGK GpHg== 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:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=wAnerD3APz6g9Ovtezw3Agpu4qY73wTDhtUFbAFEqYU=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=CHwrcBAZX2MJ5FoEP5u/TDefvj9nivaDklJcBFTJ50lKzKqfA8bPn3/wjP4l9i8i8b w5q+yBJewJUp9BA+yH/c5dLHucQRO3EnXqJEnUj+jPgpReSGdc1fna+tadbRF7njGQ+g 8BBTz3LuBfpsLs6bG61v5Wme6vVfB1OriSs9UzZG66O4OT+TdXQVLWRtIyHoaMfz+hnd rB6rB7kdl5wwltKsizIzYIndQT4Re0RzddlRT+veAo78pfYAjiTMIkIOcSLUvao3FbTu gdDVcCnkmBcE/CuhI2uDVZlnDKhrUkBr30rGkJVI4K1pVlV0wKB2+dEeVYMN4xYKkI+i 3+VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=YPaiZ1d8; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di18-20020a170906731200b0099cd52f95dfsi6435840ejc.332.2023.10.26.07.24.00; Thu, 26 Oct 2023 07:24:22 -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=@haasn.xyz header.s=mail header.b=YPaiZ1d8; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1AEE868CBA8; Thu, 26 Oct 2023 17:23:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D92968B4D7 for ; Thu, 26 Oct 2023 17:23:33 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 57FD54B800; Thu, 26 Oct 2023 16:23:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1698330213; bh=AQhB+/Z5KBmpbCGV4ELZY0MkfAN/cTE55UHaxafuRTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YPaiZ1d8qt+lhPATO+rciPmZYOM/dht+76zcvL243Lj2L4dadsIPexMSKPJJJWFCa +/OdobDbAQBPJcNuGeG10t1wsVghS1FX+pcdZ4eecDxyztMLV4SKatklVpMVHltxYE LeckNV2ZQ4jIesXmaAL9nUJD8C74aKMIdrOoqinQ= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Oct 2023 16:23:25 +0200 Message-ID: <20231026142327.52694-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231026142327.52694-1-ffmpeg@haasn.xyz> References: <20231026142327.52694-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] avfilter/drawutils: remove redundant xyz format 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BYHAuZIGoqEx From: Niklas Haas The code above this does a whitelist on desc->flags, which now includes the (disallowed) AV_PIX_FMT_FLAG_XYZ for XYZ formats. So there is no more need for a separate check, here. --- libavfilter/drawutils.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index c31ab6bd5a..1081938d86 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -22,7 +22,6 @@ #include #include "libavutil/avassert.h" -#include "libavutil/avstring.h" #include "libavutil/avutil.h" #include "libavutil/csp.h" #include "libavutil/intreadwrite.h" @@ -94,8 +93,6 @@ int ff_draw_init2(FFDrawContext *draw, enum AVPixelFormat format, enum AVColorSp return AVERROR(ENOSYS); if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA)) return AVERROR(ENOSYS); - if (av_strstart(desc->name, "xyz", NULL)) - return AVERROR(ENOSYS); if (csp == AVCOL_SPC_UNSPECIFIED) csp = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? AVCOL_SPC_RGB : AVCOL_SPC_SMPTE170M; if (!(desc->flags & AV_PIX_FMT_FLAG_RGB) && !(luma = av_csp_luma_coeffs_from_avcsp(csp)))