From patchwork Fri Jan 12 08:26:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 45585 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp2204706pzb; Fri, 12 Jan 2024 00:31:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6IM2rVHzvT6hJ7qIbOP/93ATvg6lneekD57h21CXw/hUWkgwXvHiP1gTygqHoLpPTNwU1 X-Received: by 2002:a05:6402:1606:b0:557:7d3:84f9 with SMTP id f6-20020a056402160600b0055707d384f9mr443906edv.37.1705048314940; Fri, 12 Jan 2024 00:31:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705048314; cv=none; d=google.com; s=arc-20160816; b=uxr1w/vhNCUU4rxGoiSJ/tMQElL990w5UVOS+6hvZDozozY20Z5sndLY7RwS1dZRXN skZnzA5rqwDYI89SlAuhK0KlfJ67/5H1QhW3QKw2ASvdFi8BtMrMCYvT18ju9ID1An71 R8cWObGlnSZMUdeWG/EE6ETqvmfrA8kTMCiVXlxgna5T9qr9Pb8XujM0V/LSWdwTFoUD EP0wMl7lrmBM6J+mfEUrNMvzx0bE6TfzMgVa3zkwgPdRqiCg76qTlAmR5wQxCjIBrIDM JLHPEb42OYnHtEmwrWsgj/dY3tcTOCcJLlwXWsMw0B0zb49afDJmRGQxehlBYsHFH6WV 4Qig== 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=kxK97hWC8VrV0S1lCctUxdEWlj3CsNtQ7YcfECS8EM4=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=AfmahBnpCbMuUzgZmqB6KO2ztpNj7TxQWnx54iAFTBvzDxQ+V6stvai3LFJCe5WOVe yBj83awTWvopbZlnYdJZgdp6ZGYwfNjH7i7sITNoryqlKhP6f86YyVqrbJz2tuVIkJcI YCqizwgmN769bBRAdDDvYp32ZSK4M+RgaHdHkWrxhtZN0btp6nw3zkMhDElKDuanOfYR xCKHT7qKVFItx96KIiLLOx1Um5QPgrXeF37e8nkAWz1Q4NgbkswAqoaPWQDm92i5tler Zz/sqAY6P/857WQorvQDGu1kjm7JaeY/4GDZJGntVnYmFWopZ0ccVPCVuiJ/4yc5ZoJa SYjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=l0geKFtu; 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 h11-20020aa7de0b000000b0055593fe28e7si1227792edv.498.2024.01.12.00.31.54; Fri, 12 Jan 2024 00:31:54 -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=l0geKFtu; 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 980A668D0D6; Fri, 12 Jan 2024 10:30:15 +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 20F9368D08E for ; Fri, 12 Jan 2024 10:30:04 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id C32C04B77A; Fri, 12 Jan 2024 09:30:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1705048204; bh=eHDIPp5N5uk/DyqAGcKuid9NOKVIU5QpuaSy5+r0MDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l0geKFtu1DQn3jdc6xS+Da4+fXKfQ7a3PkHpLpMp2Y9PNMr5vnVfpM0Q/lbLpjUbk KcTjt9ay/Xjba07Y4CBsFXRchUYYo8bQWhwdNnpxTJUjQHX9LlFBB/POoDa9R1Mu/o 2YucR/Gj3Y/rx4W3PyG3Svq5zBs9MseDwJbrcl84= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Jan 2024 09:26:07 +0100 Message-ID: <20240112082950.41637-11-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240112082950.41637-1-ffmpeg@haasn.xyz> References: <20240112082950.41637-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/11] 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: tz48lwbpat3y 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 cf15d3d953..024aa2924d 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2981,8 +2981,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) \ @@ -2996,11 +2995,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; @@ -3139,12 +3133,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)