From patchwork Sun Aug 11 14:45:39 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: 14421 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 17A94448588 for ; Sun, 11 Aug 2019 17:46:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0715468AC73; Sun, 11 Aug 2019 17:46:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38F7268AC2F for ; Sun, 11 Aug 2019 17:46:38 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id j16so181086wrr.8 for ; Sun, 11 Aug 2019 07:46:38 -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=t0FOvlMOaVGNXXtTT+NXl+VFl9Vk6Y0IyIWyETvtmW0=; b=nHmq2I0E99FcuBKOIutg67H+9Hd6y3BOzM+p+DBYVx9RaG4ineoTuop17ueH3BMGpy rBZXp15jTrZCFThyHpLSKMlMWa1vibYF6Xnp2H23BnhOejbL4qJBKFSgnkgEC+z48hpH NSn7v+WtM4YFfWX/XFgaBPQLIMvU7bd3pssIllZoY+cdVcDWtaGFmJCOJhq9Bn1idk/O Fd0gtvg2lFw9Vs7gbzxPiryodPzRleVG9/xQetMORNUnN7tv6Q//hnysf8GNX+JGmQ7Y fyp2u7e/MNf7vYkZG6V5cEnp1c1f+iFXefskwQ82fEotu/iA45RtNU7bM0SdBwknew8p /MUQ== 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=t0FOvlMOaVGNXXtTT+NXl+VFl9Vk6Y0IyIWyETvtmW0=; b=HT5PTs33dB14ZRgQBA9cbFbQioM8Y4PMKQ+C0cmg9jshIYeb51jJZtyW38lQRGY4me H5eoSfp3H0ixKQ99DEkmZV9JLYUSJkvgqJxQB2vaERF1+QnEy4aGY/iRCHhdAjRs37nb BPdCV6OXOpXal/Raz8oSyRZi93AxPn6bPEF7iSPFyfmi5t38qIBPziYmbJxPcAAYbViz UDWBQeHRuZCsGpo1THFBNNUvscPHqolUHb9TjxKiZplxOa5LVApFCj5pWF1TwV6mIw3O JOSwT3Hys4u0rePylfPqBhkKq0OAeopfw6J3ibpTiRQ5iXh/VX0/NIANTowAOSYZfoZu 5ouw== X-Gm-Message-State: APjAAAWDuhR2iFI+zWIFVktSnAforomUWpqgtJu2fCtODTLhKtG3VHwi jqcd9U/kfeZid1ixQ7GPrIUa+KRn5qg= X-Google-Smtp-Source: APXvYqxAWBPHXSbDDFS0jAEMM1Svuc5BXRNxQwAMU6SVcfzgPZAOiDAl7lq08L/fLtgTrkMvsLsvyA== X-Received: by 2002:adf:fc8d:: with SMTP id g13mr34187688wrr.234.1565534797005; Sun, 11 Aug 2019 07:46:37 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:94bc:d60f:d153:ccb1]) by smtp.gmail.com with ESMTPSA id f10sm8376360wrm.31.2019.08.11.07.46.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Aug 2019 07:46:36 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 17:45:39 +0300 Message-Id: <20190811144542.11704-11-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190811144542.11704-1-velocityra@gmail.com> References: <20190811073641.GZ3219@michaelspb> <20190811144542.11704-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v14 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 36ede2e2ef..62cfd8d99d 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;