From patchwork Fri Oct 13 14:24:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44244 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b15:b0:15d:8365:d4b8 with SMTP id fp21csp1039621pzb; Fri, 13 Oct 2023 07:28:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHd4wKRXiF9MQJoSWUauARoz2a/4CMU3f9FzTvhxS9kp1UsRbfgGh2CDcT18lAxFkgVGDf X-Received: by 2002:a17:906:7485:b0:9ae:5fe1:ef03 with SMTP id e5-20020a170906748500b009ae5fe1ef03mr23297805ejl.67.1697207296439; Fri, 13 Oct 2023 07:28:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697207296; cv=none; d=google.com; s=arc-20160816; b=Yv30y8uZl9X9pf8oMaUEVJYq8GvSFoISBPTVKRRqsm7vJRkpWCCSf/Kmj5lFpsrHXu n3/UmIMkPPwkSYMXomr6C+HWuXnVG5Bl9qH+4ZtFJun4//J2p1EyhbVEynetqeMf1B5o qKw8c6vRMn8XGHX7E2l1Oi3G4EZvY8tZDQ7KAI3e1KHd1EczHJeMgNKLl+LE15giAzq3 EATmf/XjeyEDtVbp2N8FclJQF7o0M/ZVSimZ859ssJfqp6AxISpgvb0Y79JfJX+MISgt PhH1FCGNdjZzkMlca608fwfFWPh7mLeHfr2LOwL1cioalGyVLXzOcu6IkDu/XXo6qgHr mxcw== 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=g5mMeL0Suk5OEHTc2rsz3An3MN/N8E6eiu5hHSD6W80=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=pWm9XVtGafIh9Z8dOzUUvBm1V26zj0+HFWLs7WaALayKzPHxdeAhzXnN0BW/SXq4bQ ZI/aRLf3sJ4llK8RKIYtdl9hgRkNabNxbJtsP1D+mYxNKya/bUBu46F63ap2nhbolXzp Oe7bLc/xJi3U0Uyk+1brqZd8UXlZXZederIOgzykVL3eLBQBQbRWgAZm12VHOf6ixlFP 7o7tKg367Pioz9lFq8hlgG6M/dmfEfZy5nz7XQTvzxZWSqqUUn1eOwmPSc9vtJf5OyJE jOjK6GiXL2C96BXwJ7B316iSu5edsdHRlSj63g8W4zYx7ZJ38YLtR3SsSV/e/VONfLsw XE+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=BUeh2b9j; 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 a23-20020a17090680d700b0099367afd642si8416389ejx.66.2023.10.13.07.28.05; Fri, 13 Oct 2023 07:28:16 -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=BUeh2b9j; 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 4FB8968C9DB; Fri, 13 Oct 2023 17:27:22 +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 9CCBB68C901 for ; Fri, 13 Oct 2023 17:27:16 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 43B924BC4B; Fri, 13 Oct 2023 16:27:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1697207234; bh=t1GlOAy+ymcWuZ7ZPAHA5BS7qYGfqMxzW4m87Laal6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUeh2b9jKSQG2IVstEecBOQE8ttcTOlKvQ9Sbooxm0wZer51pNm3QAW3juV2s6/20 Xxqc+maT6D9ZSVKzX+5QA3pVuJg7OYAOg4SN2hEXP6JtHQZCKAb7xfsaz3MG1WSv7W cFfEuOGT+2uoR0pjPpjT9dIKnTqZUzRrHfkaZDoQ= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Oct 2023 16:24:51 +0200 Message-ID: <20231013142706.23971-14-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231013142706.23971-1-ffmpeg@haasn.xyz> References: <20231013142706.23971-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 13/13] 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: zR8OHwiS4j4B From: Niklas Haas These no longer exist. --- libavutil/pixdesc.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index d640624aaf..75b1ae3cea 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) \ @@ -2993,9 +2992,6 @@ static int get_color_type(const AVPixFmtDescriptor *desc) { return FF_COLOR_GRAY; if (desc->name) { - if (av_strstart(desc->name, "yuvj", NULL)) - return FF_COLOR_YUV_JPEG; - if (av_strstart(desc->name, "xyz", NULL)) return FF_COLOR_XYZ; } @@ -3135,12 +3131,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)