From patchwork Thu Aug 29 13:10:47 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: 14790 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 5A85644A068 for ; Thu, 29 Aug 2019 16:12:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35B1A687F4E; Thu, 29 Aug 2019 16:12:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9913D687F33 for ; Thu, 29 Aug 2019 16:12:21 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id h7so2047531wrt.13 for ; Thu, 29 Aug 2019 06:12:21 -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=PjEPo6mm9GeJedtZdyeycVFj4SMOKmuwZ52plxlkyzc=; b=QFdsTqo0maXCK0XZ7/XvVkgzdxSrXTPNfY6BX0Uhh03Kl37/1G4IoboLpTXlSjHi9Y +9HAT3JGvO/aP22R6ZQ/HYVbesDS0K6G/hPMuhNQxpUth4eM+wVSkvcc1jEQ0h0x/4Qi t24vMJ/uxRdEfqGOsu1Br3m62Jni2Bgm7u+DDX/ro5uaovhOL0AY2mg/4yCfHcoFgID5 J4Z9NIQMs0xhY2fAHjj2kpIkxgiIaF1/F74tkuy2KM42u1vJvNrrQFJD6MFadb5VBEXk puuhbiKO2XhUePhVNPixbay8kia7jd5erjt/MaZTYi0EU8oRVuNNFF4vQWGkftnMvc2m WVFQ== 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=PjEPo6mm9GeJedtZdyeycVFj4SMOKmuwZ52plxlkyzc=; b=ehO69EtSd/qsR6kgPTPjNsE0jIkbKqUuv2VdXpq+IB2OGNJLQgqch4HR2/9G13Pswg 1Y0K7GXQnIw24P+e8/PTIm2xy9O8HGnUEwsNXFhLExXzkJecBGMO52NyRhBd0JBBMN4T q2H+IS4TzvSfF2DwK/gJjQeydB7SA97u4csyGNPRWmDSIDwxVhwxHgw1WXav3aCE+nDN NMV+lxZqyKxVCpTm151ZAdjqN1DEcTuuSWWxRV0PvN37eDcvsVpsV1YLt4uJ1F886Nkf Zw14e4zKtDgbXVfb+aS/nonErf3g6twJufpd3nAPl8TMD1k+HdUKE46rXjaxzBM7uTz9 0e6A== X-Gm-Message-State: APjAAAX2smT8HG7xudEYqb4MgLstF6DRLklYQG89QI1sjzJDbMqZf/QS iuuEgX8btjlMVpVYBn63XeJVrwvg X-Google-Smtp-Source: APXvYqy5VGFHcoXjcDlpAEngAdsgqItqzVJOIwi3GLghUvc4MfM5csAY5j0YiskXlfOLwKTNKV6L8Q== X-Received: by 2002:adf:a55d:: with SMTP id j29mr10863484wrb.275.1567084340599; Thu, 29 Aug 2019 06:12:20 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240d:9b00:4ca1:2ce9:2e6c:c246]) by smtp.gmail.com with ESMTPSA id m17sm1676644wrs.9.2019.08.29.06.12.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 06:12:20 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Aug 2019 16:10:47 +0300 Message-Id: <20190829131054.16404-8-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190829131054.16404-1-velocityra@gmail.com> References: <20190829131054.16404-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v17 08/15] 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 This fixes "X7 RAW" and "X7 CinemaDNG" samples here: - https://www.dji.com/gr/zenmuse-x7/info#downloads 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 28b8f42edd..b1d4c50e74 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. Examples are images produced by Zenmuse X7. */ + 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)) {