From patchwork Mon Jan 20 17:25:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Gonzalo_Garramu=C3=B1o?= X-Patchwork-Id: 17439 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 8B7C444A524 for ; Mon, 20 Jan 2020 19:34:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 58B9668AD6D; Mon, 20 Jan 2020 19:34:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C53686881CF for ; Mon, 20 Jan 2020 19:34:13 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id j9so15921qkk.1 for ; Mon, 20 Jan 2020 09:34:13 -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:mime-version :content-transfer-encoding; bh=9CkJeNPyflyIVCq23WPCxkJVpHhRtInMrm/QJ7u3Jwc=; b=FECABQ5MH3HymDh82K9ox2uIo3Tuz1HoiqDHNR52HbRbo/2DRVYCt5yUB5HNa5ARSw LINooSD6067OZa3fOiqoLFTLDJyFogyt7BWznH+2ooyvd6ktFquGds9HKHX1dR62+Vc5 iB5Yz1hKaw6DYdPkiMlP8/SPKCzwSRIir5wZ4GGlKQaj6KdmMuH6vdZ2PXE6B6FuFnwL acck9ZmUHmAuGxmz70DsJeBsUpCYs71M4pdWz4m1YFWkC5rkfxB6loxskhuqjGwUQdQI McUWS6BPH8hgulnE7gaP/akF8kGo4+2BdN0lQYFrYexx0MgCBf5M4iVnBIGeDRY/XONe 4AWQ== 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:mime-version :content-transfer-encoding; bh=9CkJeNPyflyIVCq23WPCxkJVpHhRtInMrm/QJ7u3Jwc=; b=KxD6F4X0bVL8DnbEqEGgOmlDtta1EaQBSfGpFs24/Ogw0mv5wLLd4FV2WH54qJJY18 deKeOzbiqlGLCRLDN1S0w7mGEGZDT+bH6GETQRoOxJyb7atsU8WE82hBdd3JU31IOFAy 9+Xa6xz6FWrXnNTY9MVKcA8Bru3VRmTdKLQhcuYbDwStL7dTcxWjnoEh8zX8TCVxhDlp EzXy8uMrettb4rk1iaQtRZTKyU/B4EH0FFxxkPTSFmrlPxE5exU4TeYm4oXqPrTEZMi3 kmwn9PyvmaZKmzF/0IXfCqoBKDwD2c+NKKNJzHF05V+UloZGL+d3W/hbvTnIShpdKXrQ M/mw== X-Gm-Message-State: APjAAAUz2qgeLGLNu1ftXaAMu4TzadNKUv2SsKztfT6Ch1sN0lcYbVX1 Q4FUp//aNDVFt11SC5Ye4q4Cwc4aSZ8= X-Google-Smtp-Source: APXvYqwkPDn08MUMl/HtOIhF4A2GVyn35f3UnhUrVb41nPT2Fi8AyRMVUNKuZu/nvDwtCbYLwBXrKg== X-Received: by 2002:a05:620a:128d:: with SMTP id w13mr562921qki.289.1579541178187; Mon, 20 Jan 2020 09:26:18 -0800 (PST) Received: from localhost.localdomain ([181.167.196.166]) by smtp.gmail.com with ESMTPSA id v67sm15949341qkh.46.2020.01.20.09.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 09:26:17 -0800 (PST) From: ggarra13@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Jan 2020 14:25:50 -0300 Message-Id: <20200120172550.3137-1-ggarra13@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/exr.c: Made channel name comparisons case insensitive. 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: =?utf-8?q?Gonzalo_Garramu=C3=B1o?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gonzalo Garramuño This change allows ffmpeg to match channel names in lowercase, like Diffuse.r in addition to Diffuse.R. --- libavcodec/exr.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index aeeaed40f5..49250dd095 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -41,6 +41,7 @@ #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/intfloat.h" +#include "libavutil/avstring.h" #include "libavutil/opt.h" #include "libavutil/color_utils.h" @@ -1399,24 +1400,24 @@ static int decode_header(EXRContext *s, AVFrame *frame) } if (layer_match) { /* only search channel if the layer match is valid */ - if (!strcmp(ch_gb.buffer, "R") || - !strcmp(ch_gb.buffer, "X") || - !strcmp(ch_gb.buffer, "U")) { + if (!av_strcasecmp(ch_gb.buffer, "R") || + !av_strcasecmp(ch_gb.buffer, "X") || + !av_strcasecmp(ch_gb.buffer, "U")) { channel_index = 0; s->is_luma = 0; - } else if (!strcmp(ch_gb.buffer, "G") || - !strcmp(ch_gb.buffer, "V")) { + } else if (!av_strcasecmp(ch_gb.buffer, "G") || + !av_strcasecmp(ch_gb.buffer, "V")) { channel_index = 1; s->is_luma = 0; - } else if (!strcmp(ch_gb.buffer, "Y")) { + } else if (!av_strcasecmp(ch_gb.buffer, "Y")) { channel_index = 1; s->is_luma = 1; - } else if (!strcmp(ch_gb.buffer, "B") || - !strcmp(ch_gb.buffer, "Z") || - !strcmp(ch_gb.buffer, "W")){ + } else if (!av_strcasecmp(ch_gb.buffer, "B") || + !av_strcasecmp(ch_gb.buffer, "Z") || + !av_strcasecmp(ch_gb.buffer, "W")){ channel_index = 2; s->is_luma = 0; - } else if (!strcmp(ch_gb.buffer, "A")) { + } else if (!av_strcasecmp(ch_gb.buffer, "A")) { channel_index = 3; } else { av_log(s->avctx, AV_LOG_WARNING,