From patchwork Thu Aug 8 20:52:30 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: 14327 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 593AA44A056 for ; Thu, 8 Aug 2019 23:55:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4417668AB80; Thu, 8 Aug 2019 23:55:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A5F068AB72 for ; Thu, 8 Aug 2019 23:55:37 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id k2so10376227wrq.2 for ; Thu, 08 Aug 2019 13:55:37 -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=RvSah62ujkd497lzbEp6Lyi5H9Gc8F3U1a50cQzo+U8=; b=rKpbPQnASDNU8k4mdX3HZFxpE/E0Egr52kwceT7IeWSmA4ZvMP8sm0NWarP4xA2Ibp 9ME7AIDRqfYiUN7Hq4MsWJINO9hnyl5INsh7WJGJWq/4Pmg6784Np79XFQtmxHj4QqWB 2dd8ztEWXmW6e8FfkuK/HOOQpZoeLkh60T6jiSezsjbg/4fnoqnhOkKx/On1Zy7QR0P5 8no8DSsoMX1nw1sRMm8jj1Q3ztz5+TcxPN8/Z715Gh2/ItJUfZF/xtJvkQm0bdU8ULHK 2+Gbkk4T6Wr2fmmOirr2WrmcfOq83k2d2RVxU9sGZvdO/xNYWZ+p63FCKpAne0+woJcP ncog== 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=RvSah62ujkd497lzbEp6Lyi5H9Gc8F3U1a50cQzo+U8=; b=ZyKdAb1UuUE9WQ3IWScs5gLt6GKqdXowntX5clMszMKk64KHX9M/o/m76CK/lKhbP7 SEbEIOd4dKDTZ5I9I2DcxLrEBDOs/NpQ9BZ8bUFEwCbjXzdnfqv4UWSfAeR4h64CpV+U a0yFh5OZQo6LTru3aQ0UrnBqysDv2MBOEYhQgi9gosusR2azPnsL4P0ximp6+fx2uVuk EXloLkr4bu+cbOXdV1lPe9VbOqlrSuEJvKldxWxRhnt5pqLZ0NjNJtiO+Y3XiTa8igcN m4uaWKwIeQ15iG+XzuQhMXMCtF58KnhMART0YZ8+Ms19mxwaDsztaiNWlcfD82jeL57N o3zg== X-Gm-Message-State: APjAAAV8/0WTrGZTwzJ7JXzZSbgTVQpHbyPB8HRWFgaP3lGfW5NW5tv2 096sKF91A14zEhVXjMGHM6iR3ostbHg= X-Google-Smtp-Source: APXvYqykKcmXRWpxBBEiO/EQQ7sFHEwXkyfbyXLbpQxoLgZpd0GekvhdluNaQ731enhgcWY1GHo/LA== X-Received: by 2002:a05:6000:11c6:: with SMTP id i6mr19144885wrx.193.1565297736233; Thu, 08 Aug 2019 13:55:36 -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.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 13:55:35 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Aug 2019 23:52:30 +0300 Message-Id: <20190808205233.16368-11-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 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 52c49e1bcf..7855c36aa7 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) { @@ -1061,6 +1065,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;