From patchwork Sun Aug 11 14:45:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: velocityra@gmail.com X-Patchwork-Id: 14417 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 5B00C448588 for ; Sun, 11 Aug 2019 17:46:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4121368AC55; Sun, 11 Aug 2019 17:46:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C84D68AC12 for ; Sun, 11 Aug 2019 17:46:34 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id z11so498225wrt.4 for ; Sun, 11 Aug 2019 07:46:34 -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 :mime-version:content-transfer-encoding; bh=46gw4xWl/wL2YwDc4Ibg/GKBFPSybA1qguVeUoPh7gw=; b=UBoxMa2u8MOOKSD9P2izpcDTLR1Zl8pmxavLY5XfAbfFQ7FtJGax9LJ3BoiziEJYIf K29clInVMv16Ld9F2NrLQdDGfSramhmxi9wHhCwTevKBq+h7NnZeA3scIgz9Yj6qgZxa 3TzKRYD1h8W6h522yQ+rBmYTEtBCq3jAPmKR3hlUVDxaNKcXgZMakieTElPvhpNOzzwv dyac0nZ0xDhs2q8XL6COYPoj8HrjE+7+a/4XfQtlfluuwtNNPdZxN1DrWfs3MPOmPPBR N+IbtZSwuHbBtHQC6hxAcBrlBT+JB/DSy5MCZuKt/wBbMSSqdkr6M+wsZkY8/99yoijM tvLA== 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=46gw4xWl/wL2YwDc4Ibg/GKBFPSybA1qguVeUoPh7gw=; b=mXQK/ZtbUxlhNFVl8lo78IBTCihqHTGwxwIoasZKRds0SR0z7lgsRf44h5sI8MmRPV XZRW+nX3aBHUAzbO/R2raUjeL2q3Kjv+2QszP57TL5nS4w369vkXpToZA82UuNcWbIAG W8fOgs2bXHdBz2XFqFNIsPhYMnAQPRNp9wXvmFeZRqowikChG2xYE7N1PffPhC4Tn1KD eymFN/AeDb5pXt09IAgVTYhNVTL3mMJ3KJ5l6kB9oGTczB3am+FcFA0G7Nkr+t3PLk0h m+bSk2iBwICcVn1B7ifaGGsqg+KfiZGTWlChslohhaUPD+uvnGIgv0xi3VvZpaPgcFRR omJA== X-Gm-Message-State: APjAAAX6P0vEB2dYGWhw0Yypivu4iLRC4dlKiRhm3esptNZDD0YnGm8e ld6fQ9rIhUmaWoKYeiIXpoNJ+HHTVWA= X-Google-Smtp-Source: APXvYqylgfPt8d/T36cRvrqgLdLXj36lkHdFFg1M3ASUqp2tDz9j0daZdeEwngCh9R9FB3ehgLwUcQ== X-Received: by 2002:a05:600c:2292:: with SMTP id 18mr16706599wmf.156.1565534793674; Sun, 11 Aug 2019 07:46:33 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:94bc:d60f:d153:ccb1]) by smtp.gmail.com with ESMTPSA id f10sm8376360wrm.31.2019.08.11.07.46.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Aug 2019 07:46:33 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 17:45:36 +0300 Message-Id: <20190811144542.11704-8-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190811144542.11704-1-velocityra@gmail.com> References: <20190811073641.GZ3219@michaelspb> <20190811144542.11704-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v14 08/14] lavc/tiff: Force DNG pixel data endianness on an edge case 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: Nick Renieris Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nick Renieris Signed-off-by: Nick Renieris --- libavcodec/tiff.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index ff9ac30b3f..709bbfb301 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1038,6 +1038,18 @@ static int init_image(TiffContext *s, ThreadFrame *frame) AV_RL32(s->pattern)); return AVERROR_PATCHWELCOME; } + /* Force endianness as mentioned in 'DNG Specification: Chapter 3: BitsPerSample' + NOTE: The spec actually specifies big-endian, not sure why we need little-endian, + but such images don't work otherwise. */ + if ((s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG) + && (s->bpp != 8 && s->bpp != 16 && s->bpp != 32)) { + switch (s->avctx->pix_fmt) { + case AV_PIX_FMT_BAYER_RGGB16BE: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_RGGB16LE; break; + case AV_PIX_FMT_BAYER_BGGR16BE: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_BGGR16LE; break; + case AV_PIX_FMT_BAYER_GBRG16BE: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_GBRG16LE; break; + case AV_PIX_FMT_BAYER_GRBG16BE: s->avctx->pix_fmt = AV_PIX_FMT_BAYER_GRBG16LE; break; + } + } break; case 10161: switch (AV_RL32(s->pattern)) {