From patchwork Tue Aug 20 13:37:43 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: 14614 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 243C24481F9 for ; Tue, 20 Aug 2019 16:38:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09CEB68AB0E; Tue, 20 Aug 2019 16:38:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CF9F68AAB1 for ; Tue, 20 Aug 2019 16:38:32 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id v15so2668154wml.0 for ; Tue, 20 Aug 2019 06:38:31 -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=wT+e+Wag3OET/AA+CrhYAje2gGScQhmMiTPq6AOghMc=; b=oRfYLIbWXu3eltXMvvy/TxwWUoO7zFnrJ/MXzw/Ow60JfKwHkSOt4EZF2aLgDdqNJU 73SfOyEdYQS/aJ6kyN1pq8fgIu9GaxymCZ0QueeNrCt6kIH6rWuUnM4jcPcPL5UCgPKY 7JMhpNMxfJsNfzi8DzedaKqujNheiX18egPWSp6raHPMbM/tEmmC3wP2KsoR+zThh9Rj 0ndgNjHJ9lLAEyYBLqWIXgO2BUTn018PpbIAhboIkY9ZPtaH3IBNzP6rBBfVdxBiqbKl ejsTrI5AFs89ag1TS9L+o2++mRqf7A+qKUokRsg25EOokcL2y034iifAKB7I6gh+Bd5E XQCQ== 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=wT+e+Wag3OET/AA+CrhYAje2gGScQhmMiTPq6AOghMc=; b=oYANeAmsJYCSrLzCDWPBr5o3jSSyfum995iXpZYcQ4Ly02UrGAeHVMusX+Avz5gX6W mP7/vNM3OS/mQ3O+7ilIbiBFtIxcrM3l71piAr08Vzdf33Ent+ecwmzJifkpN51mUbfj 5Zs3LsZNtBwTbQYGLl2Dhjr5rHEMm3t3xBe71IPPVQhTjjblZN7vRTwg7dJJwCReK8WW Hn+mrRxYG1usrwh3CJXMSTCtpCBlYtA3aKP7HWTUbakA+tI+WM9DZkgsL/c3hDHzz8Bc lEfbngeI7Q22brInAXtk6TTpf00SF82XthEdTj6jpvyJc8DeRoCRd4NOMs0LFBGWqWOl jQxA== X-Gm-Message-State: APjAAAXBfqhCGqGFStpDR3CIj098+Ma3fJeOvTBIXtbwkNnsN93HaJ/w kQPR43YTsoRG9uuPa0eWA78jyGBp X-Google-Smtp-Source: APXvYqxYu+OgbLY1gSwToabSfeT6zMGQEj/SynO8BHA4FFFn5MRhUWWjicovqek8CKl4bSJR0SKVAw== X-Received: by 2002:a1c:3d03:: with SMTP id k3mr60145wma.138.1566308311045; Tue, 20 Aug 2019 06:38:31 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 06:38:30 -0700 (PDT) From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Aug 2019 16:37:43 +0300 Message-Id: <20190820133747.30983-11-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 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 35234dc05e..d5efd05d7c 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;