From patchwork Wed Aug 28 12:27:19 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: 14739 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 D810E449447 for ; Wed, 28 Aug 2019 15:28:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0B1068AB40; Wed, 28 Aug 2019 15:28:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CD8068AC11 for ; Wed, 28 Aug 2019 15:28:36 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id u16so2340334wrr.0 for ; Wed, 28 Aug 2019 05:28:36 -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=pFP5KJ4F7jqgMdDvcEycs59bGXnuBzRFJ6t2IynYkRU=; b=Na4E08lol9jiG5tyXPaoemDJGS6k141qDHDzPLr5WegIMnyagDlg2CMsILcvEpoqYO jEXCarZrDI/0uB2uvLGeQbiqV6MedArwV5fw9VsnlT2r8pjTJi9OGXmDZJhc+JmwhV/R gj8N7GkjGarBpaOrOvxv369CMQYHJS16OaBpCXVLOWCRJ/I47MbIftKWKHVM9pq12JVF iJzotcmFWrWns3GkpkY7uwWEn9mRTtDZW0z65KnHV9A9wTZvGk2YXki9le0uz/DAICIq 0nEokG9BiRxky+3f4dTqxDW7u8tmEwzLxq84Da9L1/2KqOjI1D7thVAtA46UAq9/eIix wkHg== 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=pFP5KJ4F7jqgMdDvcEycs59bGXnuBzRFJ6t2IynYkRU=; b=Czkw1NZpCNKr7uru4DD2W/mnm2befaBjJCzM2n1VZ6MtQNDB+vmt2eTW9Tpf4Zi8Q+ cdP8TJcQv9byJqAQ/en3VcwBZJheZlhJDmcfG0oZDQ1nYqqxzPqW1pI1Mu72a7Lhkvx0 ApDfKA5rgY5KqUsZr9mRWI3LFvNzg5L4Z2gmNYMJet4k2Rmqh+hMdEeMjS1VumOw7twV T6eBi9mm6hi+FcoYPG60ubNwdryEF0afNUzFgYk/EDU2xbdoabF85+n350xFqEurTJGG Jms6LhfCGs9+0l7Pypy39fRmEz6YY7IVp5ugP9b9bLb9ffLriQAkJcJh2tzMn8XcjhqK RVDA== X-Gm-Message-State: APjAAAUPSffbtYwc6QneKRnwzLgyvvoXxbo0XNX7psZItj4oNSGKPhJK /N0MZueNR4+GMsQDSDHTvJOFXPUr X-Google-Smtp-Source: APXvYqxZ79IsNnQwIwVK2HpwUFuU+2bNecJDkMzsaMwTSLxs8af2BYx28W85HsRjo7e5wLlW3zrHgA== X-Received: by 2002:a5d:4f91:: with SMTP id d17mr4368163wru.74.1566995306556; Wed, 28 Aug 2019 05:28:26 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240d:9b00:f046:3e76:1fc3:c038]) by smtp.gmail.com with ESMTPSA id a17sm2588958wmm.47.2019.08.28.05.28.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Aug 2019 05:28:25 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Aug 2019 15:27:19 +0300 Message-Id: <20190828122723.19640-11-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190828122723.19640-1-velocityra@gmail.com> References: <20190822125635.GD23202@sunshine.barsnick.net> <20190828122723.19640-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v16 11/15] lavc/tiff: Decode 10-bit and 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 10-bit sample: http://www.rawsamples.ch/raws/phones/RAW_ONEPLUS_ONE-A0001.DNG 14-bit sample: https://drive.google.com/open?id=0B4JyRT3Lth5HVndyOTVOdWktM3J4TFEydTk1MnY3RWlpSzVB Signed-off-by: Nick Renieris --- libavcodec/tiff.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index d0d045397d..61a140fe09 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -309,14 +309,19 @@ 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 10: + 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) { @@ -1067,7 +1072,9 @@ static int init_image(TiffContext *s, ThreadFrame *frame) return AVERROR_PATCHWELCOME; } break; + case 10101: 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;