From patchwork Thu Aug 8 20:52:27 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: 14329 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 2BA2E44A056 for ; Thu, 8 Aug 2019 23:55:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15BD568ABBF; Thu, 8 Aug 2019 23:55:42 +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 64A3E68ABA0 for ; Thu, 8 Aug 2019 23:55:33 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id p17so96207205wrf.11 for ; Thu, 08 Aug 2019 13:55: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=PWPvoXcfjf49MzIwNDrMMylo1ToWtHmiiq2CtdjhMJbJ0T0liZdO1MmCEvp7ejx9Hq x3nkArhUwjlKuJT1f+XsNRCr2M1V8442X0C7htuCIAXSygBhe4Jt38ze1lPgtKIj18uo 1O2DlAwoTuGfvJshgvTaNPJ+bwYg0fMJnxlSOsMQnsWTcgyh0IwnlbiYyMHKYmg0kVLZ X1RfJO2CMyKVo4S+H1Vv8j2l2O6wCzfeqlhPYZ/UjwArgwJseIk9MuElEDilYcbfyoAP sTs6tYGD/wc8NFhHJ5UOf0/ujdCAim2IrSHhHMblxpW0yjZD8ZxGsZTt1mGmEoMZW1w4 zKEA== 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=qwwW/JzOd1BRzTb3HjaZr8jAH8aTba3sbE66mRA04FyTG0qhOYMIlJ3+IzUzSAUDHU FwO8qNHluH8Ne1nNw1vWDrNJHqU3h9SD5Ko+HwxGuZvk0dgI7VKUuWVsAX8rpgO3i4Sq JKTW9Qwk0Qla9hhufdNYf6++gOSse1RFlwOxXqTyMO1lG/mQYF4IXGbEc3XkvjGkdJUO 678AkwzoDh21RvfRfH9P6V4N3m6WgllMi/xuVxPcA6tzR3jPkzAuOg/VR6PSZelyoewx QR7Om5UqqI4ysdjoaFZuHIMZvnlr737r1C/nelrxT2O2KyEa9YbrS5bn4a/sOqSMH+uR vLMA== X-Gm-Message-State: APjAAAVgVIXTHQ/VsgRnYaL5Gd60r89VqAlJSZmBMcE0mFLNGRoEpdK3 VpdfBSCBs093AMgVtj1DCXG4BEIOevQ= X-Google-Smtp-Source: APXvYqx8nrIER6LKnoUfo0qMuvxiX3XW+ZmKsLOryyHRWosu7Su06oaM1h6SgFcTXQrB6X1v2sAzqw== X-Received: by 2002:a05:6000:110f:: with SMTP id z15mr7978387wrw.162.1565297732712; Thu, 08 Aug 2019 13:55:32 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:1de8:6b2e:8289:ee0e]) by smtp.gmail.com with ESMTPSA id g25sm3446686wmk.18.2019.08.08.13.55.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 13:55:32 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Aug 2019 23:52:27 +0300 Message-Id: <20190808205233.16368-8-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190808205233.16368-1-velocityra@gmail.com> References: <20190808205233.16368-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 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)) {