From patchwork Thu Nov 9 12:19:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44599 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4fa4:b0:181:818d:5e7f with SMTP id gh36csp445232pzb; Thu, 9 Nov 2023 04:28:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGWtqw479oL+5otauvztDoqwVmGr993N7GZfIDijwfmEegnRWlUdzpSRAdqf4B/FgUFHFQc X-Received: by 2002:a17:907:74a:b0:9a5:cbb2:3fab with SMTP id xc10-20020a170907074a00b009a5cbb23fabmr4040277ejb.2.1699532913858; Thu, 09 Nov 2023 04:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699532913; cv=none; d=google.com; s=arc-20160816; b=UXjvdD3wqCwCO74gbvKHs51XqNStyGAN2RGZVFvPx3wQ3AizaPTeK9tkUV5tFRV2O6 7ceu6utRMlaOtKzw7Rkc6pPMKufkCWS/jBM5Yqzw4WR4fJcR5qpd92qXt92b6x0f5teG 5aSyH1d2l1XgsEQAFpE63EfRbBO8PWGjqY+QtiaJH9J0JwSe0stVCAM26Aue/Lo3f1BP MuX8FftA++NMCVp351mvaPKgNCByMjlXShKD3TanRwxIIbVkpnmQIKlHqJBl8AsgqXrk Jh8kZpiiHFnpAgEVFkWUdIArh6WfnfO/G+161ruBKLVoTTB0akgij+G9O2mapbVLs3eh Z2og== 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=mztKYscE4SErQOoJd18lG67EiZ8992G01eWmcAliiDw=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=G7OA3xealr7E9JLBhWaD8iHJ8R4qCJ/oabYOCx25hvFRzJ3IuA53w0k0YklvZKVRdX KPODqOydMjhEZmxA4IgaZw3wXyIDlsEX96uY4frt8o5WC2kTV/CZnDAH8tbCb6kZ60zJ INPSO7XswMizTdx5MIG8dld/j9LFne6eEPaYtdXPz4+GUPTKCsqSv8lefmj3an6W0tLR FrXzxZjxQcSPI+wLCW3055Xt2Bg9GnF0e3o4BujYfcMinGUSjCW2Zhlvw5IRqeOelgTT mRnbjFQQzsB7802CXtFbwXxhvZMgIuT3DGc87HWTIcx9yJcdXHXNw5C4AqCo3KAU2j3U N3hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=mcVfau7d; 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 l10-20020a170906794a00b009e1ba3f2066si3450319ejo.50.2023.11.09.04.28.33; Thu, 09 Nov 2023 04:28:33 -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=@haasn.xyz header.s=mail header.b=mcVfau7d; 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 F252A68CCB3; Thu, 9 Nov 2023 14:26:02 +0200 (EET) 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 6A3DB68CBF5 for ; Thu, 9 Nov 2023 14:25:42 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 22D5D4361F; Thu, 9 Nov 2023 13:25:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1699532742; bh=SxSjAy5SXHCHW8N9LWLch+Al47aKlUcfl0EjLoQyrFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mcVfau7dz6xO8dX+x7vFwWJnWtGkhlaK4421X2dt+XLomT1u6/pNfH6YPT9um68UO iHF3XCYt+0cgyjCn0nUwQzlH4mOloUODRzwxCEppqoUhwudaV28KqGaJdrxLb48H3M xhnkrsYGJon+je0mFlP9Vd8f07WVtNtdDTOUP9Xg= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2023 13:19:56 +0100 Message-ID: <20231109122534.124157-25-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231109122534.124157-1-ffmpeg@haasn.xyz> References: <20231109122534.124157-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 24/25] avutil/pixdesc: remove old yuvj pixel 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: n6QeHalX5UzH From: Niklas Haas These no longer exist. --- libavutil/pixdesc.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 2886c9e0f5..9244b9d7a8 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2977,8 +2977,7 @@ enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt) #define FF_COLOR_NA -1 #define FF_COLOR_RGB 0 /**< RGB color space */ #define FF_COLOR_GRAY 1 /**< gray color space */ -#define FF_COLOR_YUV 2 /**< YUV color space. 16 <= Y <= 235, 16 <= U, V <= 240 */ -#define FF_COLOR_YUV_JPEG 3 /**< YUV color space. 0 <= Y <= 255, 0 <= U, V <= 255 */ +#define FF_COLOR_YUV 2 /**< YUV color space */ #define FF_COLOR_XYZ 4 #define pixdesc_has_alpha(pixdesc) \ @@ -2992,11 +2991,6 @@ static int get_color_type(const AVPixFmtDescriptor *desc) { if(desc->nb_components == 1 || desc->nb_components == 2) return FF_COLOR_GRAY; - if (desc->name) { - if (av_strstart(desc->name, "yuvj", NULL)) - return FF_COLOR_YUV_JPEG; - } - if(desc->flags & AV_PIX_FMT_FLAG_RGB) return FF_COLOR_RGB; @@ -3135,12 +3129,6 @@ static int get_pix_fmt_score(enum AVPixelFormat dst_pix_fmt, if (src_color != FF_COLOR_YUV) loss |= FF_LOSS_COLORSPACE; break; - case FF_COLOR_YUV_JPEG: - if (src_color != FF_COLOR_YUV_JPEG && - src_color != FF_COLOR_YUV && - src_color != FF_COLOR_GRAY) - loss |= FF_LOSS_COLORSPACE; - break; default: /* fail safe test */ if (src_color != dst_color)