From patchwork Wed Feb 24 11:53:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25960 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 323D144B5C7 for ; Wed, 24 Feb 2021 13:54:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13B3368A8F0; Wed, 24 Feb 2021 13:54:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89A9D68A192 for ; Wed, 24 Feb 2021 13:54:25 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id u14so1624440wri.3 for ; Wed, 24 Feb 2021 03:54:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=83WBI2r+wqAawMrkyIl4Xsc3T7bN8YleWIkpajbxN7k=; b=QFiPjp5g7V4TKPX25HNFAUGoQHpoFNLMqdHFi3qmBt7EGjCicXDSDWPoz6MqGlFFzG ga5CN91D61IveqtO2XK3YmyA+d02orjri9KlcAtKqV09wWWwbMaNBvYul/UzEwN3ZocK OFR8aRyw7lp3tRx+9luo7tRsz+w4jvfkwRhKssElwOyloGKn34nVTZkCLRDhIynyymVz /HYWWuglvaTkrsQ+1A1PJYzVgpLOtio4IMaJLAIIPaiUlS/3g0Oz13fADPtEDBq+Kofu oesOlpngYgVaX2H2uQgWYn45eIeLLygVpJykcL/SZfCJSUmSPLNN7Py/sliRPSPArVS3 LztA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=83WBI2r+wqAawMrkyIl4Xsc3T7bN8YleWIkpajbxN7k=; b=h1h/zssSFxxpWNG9fBy4dz0qF3URd8XhVhZJ8R3JJzn2Qr+g9CgO20DBNotOCKwsrR dPLn5cp4kfO2xz2ro4tfFyJZzRaHMhgI5Lj1HGE+47S9/xCScumkngHyGHK91zSwFrZC qITwCzR71orOIrrviPdp1Mbmfu8JRPNZlbQ/iUp3E3EEUgaB/2L6IEjcL6NjoNoEiAN+ yQ+8+ptM2sXdpaDjRb3tNn8r55glLnb2ptxI3MlnJcvt88AVLnxOSMNWgVfYMmiaFBQ8 sT0g6lsN1EqP5LPEuJBFyA+5l28mNZ3SjjkReqoufhmi/+EDTnG4raOarpri3pxItk8s Ma6w== X-Gm-Message-State: AOAM5322yXDHq41IlLpZS7AwoF+4eaIXUjvSdOQ+9i9LaeXvttkaUBOF SL6+vnKf0CcqsT9dAn9OMLnpIg/QwJY= X-Google-Smtp-Source: ABdhPJwO+4PYHPqotJG8TfWb2iVj9iA9rq17ZY8laHSprAeqVO3idFfw89GmyD0s2TWaKYVwVVcjUA== X-Received: by 2002:a5d:620d:: with SMTP id y13mr31082185wru.88.1614167664920; Wed, 24 Feb 2021 03:54:24 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k15sm3911776wrn.0.2021.02.24.03.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:54:24 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Feb 2021 12:53:35 +0100 Message-Id: <20210224115341.794293-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> References: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] avutil/pixdesc: Use av_strstart where appropriate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It makes the intent clearer and allows to avoid calculating the strlen separately. Signed-off-by: Andreas Rheinhardt --- libavutil/pixdesc.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 8274713226..2a919461a5 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2702,11 +2702,13 @@ static int get_color_type(const AVPixFmtDescriptor *desc) { if(desc->nb_components == 1 || desc->nb_components == 2) return FF_COLOR_GRAY; - if(desc->name && !strncmp(desc->name, "yuvj", 4)) - return FF_COLOR_YUV_JPEG; + if (desc->name) { + if (av_strstart(desc->name, "yuvj", NULL)) + return FF_COLOR_YUV_JPEG; - if(desc->name && !strncmp(desc->name, "xyz", 3)) - return FF_COLOR_XYZ; + if (av_strstart(desc->name, "xyz", NULL)) + return FF_COLOR_XYZ; + } if(desc->flags & AV_PIX_FMT_FLAG_RGB) return FF_COLOR_RGB; @@ -2907,8 +2909,7 @@ int av_color_range_from_name(const char *name) int i; for (i = 0; i < FF_ARRAY_ELEMS(color_range_names); i++) { - size_t len = strlen(color_range_names[i]); - if (!strncmp(color_range_names[i], name, len)) + if (av_strstart(name, color_range_names[i], NULL)) return i; } @@ -2926,13 +2927,10 @@ int av_color_primaries_from_name(const char *name) int i; for (i = 0; i < FF_ARRAY_ELEMS(color_primaries_names); i++) { - size_t len; - if (!color_primaries_names[i]) continue; - len = strlen(color_primaries_names[i]); - if (!strncmp(color_primaries_names[i], name, len)) + if (av_strstart(name, color_primaries_names[i], NULL)) return i; } @@ -2950,13 +2948,10 @@ int av_color_transfer_from_name(const char *name) int i; for (i = 0; i < FF_ARRAY_ELEMS(color_transfer_names); i++) { - size_t len; - if (!color_transfer_names[i]) continue; - len = strlen(color_transfer_names[i]); - if (!strncmp(color_transfer_names[i], name, len)) + if (av_strstart(name, color_transfer_names[i], NULL)) return i; } @@ -2974,13 +2969,10 @@ int av_color_space_from_name(const char *name) int i; for (i = 0; i < FF_ARRAY_ELEMS(color_space_names); i++) { - size_t len; - if (!color_space_names[i]) continue; - len = strlen(color_space_names[i]); - if (!strncmp(color_space_names[i], name, len)) + if (av_strstart(name, color_space_names[i], NULL)) return i; } @@ -2998,13 +2990,10 @@ int av_chroma_location_from_name(const char *name) int i; for (i = 0; i < FF_ARRAY_ELEMS(chroma_location_names); i++) { - size_t len; - if (!chroma_location_names[i]) continue; - len = strlen(chroma_location_names[i]); - if (!strncmp(chroma_location_names[i], name, len)) + if (av_strstart(name, chroma_location_names[i], NULL)) return i; }