From patchwork Sun Jun 21 18:42:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20544 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 6A7FF44AB81 for ; Sun, 21 Jun 2020 22:11:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 470A068B852; Sun, 21 Jun 2020 22:11:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BF316898D5 for ; Sun, 21 Jun 2020 22:11:40 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id z63so7317877pfb.1 for ; Sun, 21 Jun 2020 12:11:40 -0700 (PDT) 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; bh=AJVZpS8x2d7pGe65QnDyV4agCs9hQtK/TlgfEonUG9U=; b=rYDS3xtbgLz1DKzd0FoXG8qwUzZwYSmDZQRZ4yXq+HHNfTHUgx2OWnuY9Gu/QGPBUU uTYvy9HOxYX8eSMBkRfhO7RGLCdkm2pg6HRwt3hvC6CRznWRdYC4LkZsvKeXaEnUSYAU bT9cu0pM/peAPzindIRd1R4DRtxJA6fgeoX1rQMr9rLN+ntXaeWKphwA4gXRqmXJh31T Du33UuYXdospWAdocp0kCdrrDRhLFAwnwgaDzAmIIzVt1PqF49HoSM0XwtriRyAzUfHr aUipm++Bml9aURnOGTwp+LceS/6pYzRmZ4fjIZTcbpLzdgJFnlQL+Ml9mnttJr/ePvUz Z5BA== 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; bh=AJVZpS8x2d7pGe65QnDyV4agCs9hQtK/TlgfEonUG9U=; b=X+mu+g4v2eaZnXVzXI0xekeL8G/UsXeBjtgTlBIANqpEkKfBjmWcEesaEAlRugz8fy ztsVhhLvtmyReGhPPiq0WlH1bm2Wcv467WMxAQXdu8kpCu8GlID1lR1r6I0IBX5nspSP xL/CQkxN6yug2jcfeA/OtZpHwvpVZdzwmmUQJjhhJCTHWIdRojUPnvlX9jYobFKx1bYM Ugpak/Ixm4Jx679IcXIf2j/IO9heickAgEZXYmnE5iGCzXjK206bgXUxuAo/5I9DsKH3 WOb+/hzbcDolr4ns0u1WqzcDO03NWb/i+vyb8tnQsDWL3aLjOcEvLv69DKmJ1d4yc8sq Lc3g== X-Gm-Message-State: AOAM533Pev1scokZEWXXXZ+SMys3hZDQbhGHOQaYxtpYRWP7GvMd+mQa xhvSyB4Cy8i1NqNoz38FhLN+Zuv8oZg= X-Google-Smtp-Source: ABdhPJxWceieJqfKzmbPiK3j67YdFue6U27bsXU3aT0A3c2F7z04sTMhS8yQIYjKgRHK+zdXPWNo6A== X-Received: by 2002:a63:d317:: with SMTP id b23mr10160490pgg.132.1592764954653; Sun, 21 Jun 2020 11:42:34 -0700 (PDT) Received: from localhost.localdomain ([122.167.28.239]) by smtp.gmail.com with ESMTPSA id s1sm10786414pjp.14.2020.06.21.11.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 11:42:34 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 00:12:08 +0530 Message-Id: <20200621184208.27665-5-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200621184208.27665-1-gautamramk@gmail.com> References: <20200621184208.27665-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] libavcodec/jpeg2000dec.c: Remove log2_chroma check in pixel format selection 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan The log2_chroma_wh is derived from the sample separations of the codestream if the file is a j2k codestream. Not sure if sample separation is same is subsampling and whether using sample separation values from the codestream to determine pixel format. --- libavcodec/jpeg2000dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index c8c89803ac..2b9659bf96 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -225,8 +225,6 @@ static int pix_fmt_match(enum AVPixelFormat pix_fmt, int components, case 1: match = match && desc->comp[0].depth >= bpc && - (log2_chroma_wh >> 2 & 3) == 0 && - (log2_chroma_wh & 3) == 0 && (desc->flags & AV_PIX_FMT_FLAG_PAL) == pal8 * AV_PIX_FMT_FLAG_PAL; } return match;