From patchwork Fri Aug 9 16:29:53 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: 14358 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 891E244A01D for ; Fri, 9 Aug 2019 19:31:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7122168ABBE; Fri, 9 Aug 2019 19:31:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DFCD68AB12 for ; Fri, 9 Aug 2019 19:31:33 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id n9so98914402wru.0 for ; Fri, 09 Aug 2019 09:31:33 -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=dlseiDD7C+gzS7sVsDcPazlkq8M2jw1NcVBrgcdCnQXQbhe5KH3PZ7IOn2Fd43d2UD dX4g9297xLw6AYHHcCsqBTSbqaFnvG2kTtMAYjtfrlA+rk/Xf+ojARMeFhgoJgo/0ADL hHnkTwcKtC/sPr45WcEhKKuZBh+PtzU38zAtXSC63v/1WLI2drOGnc26Qye3Ce7fSFsE oB5VpIcgUnqucTTBrqdPfx9Fv1gWe9yD0ji0LY67+gxn2jxV8N1stIZzTq4TrHYktvwL tA5HGDnzo78sLYWGlTvjo1n34nBCidURRn/NYZlNDPFE6KS0LoTII/xtFomV6HfYBwL6 LkAg== 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=OUUY7XoJmIcBktDrPmdLQKuxhmhVRuBH4WpN3aY4OSfwvOnFtWfabp2vPgWaaZ0+/1 g20f/GnloSKinFe6uJlQBzSpRHgzOR7yI7RK1feB3pxcHOsyttRGcBsDz0JHU4GGseF9 +n1EQ8n787Oo/F3UQcdBJWO60NRJVptrd6Spf2T4j4JsUEQEP3kpexTTjOt0aVm54lM0 HAcPsQIHlFPSQwIbZVbUjLLc61OljNxDQCFfUFzrnnlqyg5fg7uLz3AQ11VU10FDJfcl cnVyST/g2BoJbCZddWlrD97b7HJTLfbhQ0uAwvVOn06l//W4sC69C8AOEWEMa3kMFPeX YXWw== X-Gm-Message-State: APjAAAXGM5vzM0UVzY8nkpIHhFMaLcLq6HiXXa9ZqBFJ7KohqmhU6SgC zertNd+zW2CgIho1qtd3BtT3ZfPZltM= X-Google-Smtp-Source: APXvYqwvMqDrykgobHLFpkajc90MHtLNE2jR5b54WAWnAYYFAkWUbuhoaOn80RiK2MupJg/ReNb2RA== X-Received: by 2002:a5d:6182:: with SMTP id j2mr23633792wru.275.1565368292772; Fri, 09 Aug 2019 09:31:32 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:e9b3:b00d:2017:357c]) by smtp.gmail.com with ESMTPSA id u6sm6721745wml.9.2019.08.09.09.31.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 09:31:32 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Aug 2019 19:29:53 +0300 Message-Id: <20190809162959.17924-8-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190809162959.17924-1-velocityra@gmail.com> References: <20190808205233.16368-14-velocityra@gmail.com> <20190809162959.17924-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 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)) {