From patchwork Tue Aug 20 13:37:40 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: 14615 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 2E5174481F9 for ; Tue, 20 Aug 2019 16:38:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1CA8E68AAE8; Tue, 20 Aug 2019 16:38:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECA9E688391 for ; Tue, 20 Aug 2019 16:38:27 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id d16so2691568wme.2 for ; Tue, 20 Aug 2019 06:38:27 -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; bh=Qgt7rUcujwO95RLox5XW1AvPZkd/Znb5gBmYVG1AKf0=; b=ivKpxIoeSQvpEGkc3W/yJ8iqXx3nCY8Eexz658mqXhPI8egg1OCeZD+N4WIPf9Bpsr Vp4huucrXnX57eEufxOnnpahc2ABxS8uxT1Or12RlL7xgLi6Bk3Dm5Y8hV6WHc+I8dfq z6xb0cy3wMenUposq9NOLrXn16iM3Fq7VV/e8x0tfUgGWKZrFhwjKgbTMsOVaSGBB9ou 7H17TfNQl14HdpG6K6AOlUZRGo4JgvwpBUJmPi+2h28guBmdqhiYgswFgY6OtMSYQk5w rceQ4RnzPaKPbWf79fMNICJhFE0czSMw70LGLLi6w1CaVS/Vgj2o6dl68draliXaDOEm NOLw== 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; bh=Qgt7rUcujwO95RLox5XW1AvPZkd/Znb5gBmYVG1AKf0=; b=HeKwbwkV8g2/J3Da0lb9gEOjx5ZSlDKePnb/eALDG9/CylEKWEDyCxMnXR7jKKQRse Yr1T12qmjvEezXq8v0UNtVsZ6a7LrkjWXpOUm68LxMaA+kE31JcJoFkhEgfPMJR9muDA +YZsXgX85X6yxNnLw/aqN8BI0Nb9GEVemMzMimey+ePav5Yp4+HoWNAis761ueGERL9i lBUSzOAQJpFOAvmmG7TDyVpA61IJFDuuvOUlZTMlPQyQQqymZDn54FL+8Y9Or+DBei+6 6mFyTPLryruBcTLjqf8Um/iJNx7SL0KWV9rHeREBNA82XFd921cw39rBTcR2/ttes02u 7mYw== X-Gm-Message-State: APjAAAUd0lOmQbBLoNjydpD0w/jbSGcQOafzIiD/pGizQDDO3MqKs9Rb DDD8JuAeW99yPzLU9YWyfgf37/4P X-Google-Smtp-Source: APXvYqzBuYB5v7AnmM+HLzuaPvBnATWBv/vNXGWIDL8UZvMKcPM2aPxDqFf0XiYunciozmvN/hAHug== X-Received: by 2002:a1c:45:: with SMTP id 66mr70913wma.40.1566308307009; Tue, 20 Aug 2019 06:38:27 -0700 (PDT) Received: from localhost.localdomain (ppp-94-66-223-133.home.otenet.gr. [94.66.223.133]) by smtp.gmail.com with ESMTPSA id t14sm11545882wrs.58.2019.08.20.06.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 06:38:26 -0700 (PDT) From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Aug 2019 16:37:40 +0300 Message-Id: <20190820133747.30983-8-velocityra@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820133747.30983-1-velocityra@gmail.com> References: <20190811144542.11704-13-velocityra@gmail.com> <20190820133747.30983-1-velocityra@gmail.com> Subject: [FFmpeg-devel] [PATCH v15 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 1ca9a59dbf..d9750891d4 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)) {