From patchwork Sat Aug 10 22:19:28 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: 14399 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 4816C448F16 for ; Sun, 11 Aug 2019 01:20:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35D6868AC16; Sun, 11 Aug 2019 01:20:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CC2E68ABEA for ; Sun, 11 Aug 2019 01:20:16 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id t16so11270989wra.6 for ; Sat, 10 Aug 2019 15:20:16 -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=UtPyWc3iGdJpgRwo0UdulFgSOI7UzVG44h+emzdkP4k=; b=obg8XACeEhKT/Kwd/KXRJNmZqADXAWaDRO6u/8kJ0Y8GgU9xMnE5HDZdWxVCYSEBYm N13ob4eAHfS+S8WXU+GCFwIKh4hbD3gDsPtCTWXfqiD8H18mCmJgOh2PmkEbhN6Hg/i2 Mq85QD/QXNd0uCoUMdGMTXI6teQrhCVQFBFjQMzPVcFKktYaloF6B+gQ/tpnNOR2nhaT bZyNs8DKdvDBrIZNqSDEKBX+TnF1JrKW5WdT8beRgO7yIhxohs8xJBWdSE4kbDsIZex2 syNmSnxgQxhTvbmm6bPjepTgOkJpy0ha7zOMeUTffdztomGJ7JqxMw4eW3m/6dpdpxaO SQcg== 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=UtPyWc3iGdJpgRwo0UdulFgSOI7UzVG44h+emzdkP4k=; b=CQDB8ry6eOyg8JN52cGkFrFJv7ooUy2+ol+2fy3wETexwSU+ROHOrhriJU7RBOyqYh DpioI6ToPSH1i9NGoa2ICYPbWgD7SiUlguj2pOrgixL6AXDQhizgFd5nbnM4BqNVtDXE FvXsykqvmKsCvvlRjvke6NfScsDNZDxmm3bMB6H70mqMc36lqlYJk1mnaLq3wTgwNdRI VpKaZD4sWJqJ+jjfTVZq8M8c4QbfiBUB0ypubabs90h/8+X0/837k7GFEGuZf/FMDVJT EaohGmsh6K7e8Soqn3d6ceY8eUEEN1sE5Xn16Dlj57hbLYHXVrtWrzA20BYgxZPoBdTl /EJg== X-Gm-Message-State: APjAAAVXTuvBZgfce3EOfkNBEMft0DP+rsjSrGgzHydBs9vEC3vMb6/3 V9LZXpxN5yqK2dw81wzlLNbo7wFvmyE= X-Google-Smtp-Source: APXvYqxhnQFsN6J8NHwnYP2+puQiFNb/5fxLpCdfiZt8MY5x6yklmPvjrCxQ3RPVNHBa0QByZdjuOQ== X-Received: by 2002:adf:c508:: with SMTP id q8mr4768086wrf.287.1565475615762; Sat, 10 Aug 2019 15:20:15 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:5c0b:c2fa:5389:82dd]) by smtp.gmail.com with ESMTPSA id q20sm40403233wrc.79.2019.08.10.15.20.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 15:20:15 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 01:19:28 +0300 Message-Id: <20190810221934.44996-8-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190810221934.44996-1-velocityra@gmail.com> References: <20190810221934.44996-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 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 174ca168c6..9d20763186 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)) {