From patchwork Sat Aug 10 22:19:31 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: 14398 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 90CCA448F16 for ; Sun, 11 Aug 2019 01:20:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79EBA68AC11; Sun, 11 Aug 2019 01:20:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09B6768ABC3 for ; Sun, 11 Aug 2019 01:20:20 +0300 (EEST) Received: by mail-wr1-f54.google.com with SMTP id k2so15538615wrq.2 for ; Sat, 10 Aug 2019 15:20:20 -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=e4KEaOq8jfFCYQp815rr1v8cOMX/QWCR7CeYzTqfhw8=; b=ZZSkdJ0Du+jQFolcyBAisi+NTYb9tK+/uqooK8V7wyIkbGl6m0nziofdQJYJxZ8vTB yRA/c9J5kxmS4JvFKLaadjZvTNkgp/+Q1YGEw7UX8menVnGNdrPcI0vxYpvFgA0MNrAr 3c8xC2vgZElMiRVbo/QCtF08YxfQREm4x9o24Go2JzJompicTU4aTzUbTClRuOhns2tJ DEW52qlqjxgmU8hgShj05AC5vJfjGhidcXyaoHK0QEVv4tM6eK5ijgFWPJerpp2ym8l/ lTDrNVqZFbX77VhgiEeBPrDQmaoL8+DNMSwJ/QsBkvrkrGxhraYgV2J2MdS57i8Qz93i Lx2Q== 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=e4KEaOq8jfFCYQp815rr1v8cOMX/QWCR7CeYzTqfhw8=; b=tHjoAo26HssYp9/sIOosaJcAOJ3lpa/11YIP4fDquaGGE5AmXCuBP486Nc+UVS8mIJ xZdq/83Fbsa+wjVe3uB+rkKIwxjU5s6pugKP//Jj99bCJvXVLa38LCAOQnT3DNH1eiwy iT5hTGPlGhejL9WA8echD2OZTV2A37yd+p08OunzrWmZNxM/gJdr1edvOQsO6FW/nVb2 QIXS1R+dhCpCC171oGHmzNi3KYoSuqjFhj9kyPe0JyGAE6kHVQGRpyTuAAPeYwb2QMlP vP4n26oyk8FomJDS6ZpGZUzR6Vmr9ulK0TnwBftMm4ixFE2Hzyer2f7eRFvc7DhQzi0N OrmQ== X-Gm-Message-State: APjAAAWXzzd0JJYNoncR+ppVaC2/Q9yEKFQ/t7JPWTjnXxgNAkwO+jBd V/UuSWOIEF+yjOzBg6ad3wSp0XL+u/s= X-Google-Smtp-Source: APXvYqy1OLRFPJMMmfAITzPYWXO4yd/qJ2ukPPglpbrKmXiNNBIlDAwD5CcBGsuGQmlyk9g3cbtL8w== X-Received: by 2002:adf:f884:: with SMTP id u4mr29645524wrp.264.1565475619440; Sat, 10 Aug 2019 15:20:19 -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.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 15:20:18 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 01:19:31 +0300 Message-Id: <20190810221934.44996-11-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 11/14] lavc/tiff: Decode 14-bit DNG images 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 Sample file: https://drive.google.com/open?id=0B4JyRT3Lth5HVndyOTVOdWktM3J4TFEydTk1MnY3RWlpSzVB Signed-off-by: Nick Renieris --- libavcodec/tiff.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index ecd87c0b2f..0d931641c2 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -309,14 +309,18 @@ static void av_always_inline horizontal_fill(TiffContext *s, dst[(width+offset)*2+0] = (usePtr ? src[width] : c) >> 4; } break; - case 12: { - uint16_t *dst16 = (uint16_t *)dst; - GetBitContext gb; - init_get_bits8(&gb, src, width); - for (int i = 0; i < s->width; i++) { - dst16[i] = get_bits(&gb, 12) << 4; - } - } + case 12: + case 14: { + uint16_t *dst16 = (uint16_t *)dst; + int is_dng = (s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG); + uint8_t shift = is_dng ? 0 : 16 - bpp; + GetBitContext gb; + + init_get_bits8(&gb, src, width); + for (int i = 0; i < s->width; i++) { + dst16[i] = get_bits(&gb, bpp) << shift; + } + } break; default: if (usePtr) { @@ -1068,6 +1072,7 @@ static int init_image(TiffContext *s, ThreadFrame *frame) } break; case 10121: + case 10141: switch (AV_RL32(s->pattern)) { case 0x02010100: s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_RGGB16LE : AV_PIX_FMT_BAYER_RGGB16BE;