From patchwork Thu Oct 26 14:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf16:b0:15d:8365:d4b8 with SMTP id gc22csp671135pzb; Thu, 26 Oct 2023 07:24:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNOe/KzpFjcdYS+V/7M1Aj3hdOujoPzR9yl9qMR1H6c3N2os6rW8o3o0Y5O0gS4XADztDU X-Received: by 2002:a05:6402:4487:b0:529:d147:e9f3 with SMTP id er7-20020a056402448700b00529d147e9f3mr3165665edb.5.1698330250704; Thu, 26 Oct 2023 07:24:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698330250; cv=none; d=google.com; s=arc-20160816; b=VX4jtUbyHW/v3VR1crtNWBtB5oM/JbQNiT+k6Q+cvHzI5rgSmXQgec2A5BpFXlu5zR 9YIEEHYnmfV4HHRHUgeYJjbJQYuJzCutpUExmVgpCSNMt1+1arrml/J9vVTXBzlzjaC5 z+XG2OTA2VWitnE914nY7RHlvkaz+1s328nuCj0usvAVNA2oj/MDc9LcvLmhpD4hndQk CUMgslq4C31CFz9E3i6e5Ph9PN3E1F438IaFtxsOso8kHzk3s+9dqJqmwNqlCLSjXKSY y7DPSSntID2t/FBo8MkAXt1zDyvCECiljN+e+v7DzTRBbIydnL4MoiDgZJTVkAkJuiac obEQ== 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=SxQ2M/TicYeJ76aNogSLAPH8mGUJNA/k/gNUFGYq1Ow=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=yVp8rbpEAIus4lcAJC8uiYcXtTgM0jeM2Iqiq7aE54bROhcxNjUlD0K9+MkHV9HvDS W/vs9gDlDVlD0/G2inYxN5kvwUvzHUvnyAhIJ3/cQr2lpLNIcT69DPh9Y8tqG7P+FMHe EVYsNy9rI0/JgPFV5UsRNA5VRCqgKzrqjU8xCsuBI74hqmlIfB4zxELPM6+/HfzPzE55 Kl7qPhbsFz0ce87E/J68z1RFA8LtfFiKAC7dXf7iiTffRtYpiXbW7usCnqgX8CgW4QIr Ak7+Flt1boH3NKCXMLwhhSSn0kbvswHkaa/1acwXgNzVTIWxEKa9Puzf8EgnKarCQR2D coBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=PZiwKUUX; 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 u7-20020a50c047000000b0054015a7cb23si5072225edd.268.2023.10.26.07.24.10; Thu, 26 Oct 2023 07:24:10 -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=PZiwKUUX; 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 315A868CB3B; Thu, 26 Oct 2023 17:23:43 +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 D946C68B4D7 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 96D4E4BB73; 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=KKsk2XrZZAqAgnqRZIYmDg5Hls5nZ0XT9/Wxc4EcMi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PZiwKUUXjKChKNfhiBym9dKjKeP7zaDnEY4DprNy2GWO8sZddayAkA62KtHHOtWMt 7m/VN3ImogqaqNPUL3pxpHx4v4i/EGGNsi/RxBwds02TQi3bNk1mVKGmku/Nw1sG4i Omnved4/KJZuMBqYR6WEey7YTVKGZlTW28ao/l5c= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Oct 2023 16:23:26 +0200 Message-ID: <20231026142327.52694-4-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 4/5] avutil/pixdesc: simplify xyz pixfmt 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: wyRcSHvwAVEL From: Niklas Haas --- libavutil/pixdesc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index f2647d3d55..4e4a63e287 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -3055,13 +3055,13 @@ static int get_color_type(const AVPixFmtDescriptor *desc) { 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; } if(desc->flags & AV_PIX_FMT_FLAG_RGB) - return FF_COLOR_RGB; + return FF_COLOR_RGB; + + if(desc->flags & AV_PIX_FMT_FLAG_XYZ) + return FF_COLOR_XYZ; if(desc->nb_components == 0) return FF_COLOR_NA;