From patchwork Fri Aug 9 16:29:56 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: 14361 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 4BE024494E8 for ; Fri, 9 Aug 2019 19:37:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2525E68AB43; Fri, 9 Aug 2019 19:37:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CAB468AAC7 for ; Fri, 9 Aug 2019 19:37:40 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id p74so6334373wme.4 for ; Fri, 09 Aug 2019 09:37:40 -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=UIXj6tDBTRAatIvemlrG3LvhozXsUctoHfVxiygDlZrfvtzPT0nWJPdzmkU8oUaUWQ /k4Oil+/vSdViwtAMxnPJRsUHHJikbq7IicDt/6d6+VMfDnvtX1IvO/KVSve/5VruuF4 P79c1x4lcypHiRwBwsoOeLoFg+deMwvyKqmsW3EA8ob6QSMGfhDbfU69kTFzky2Z8kKQ LIBuOeG5mK0RkrZqpOSEexkJ2oiuO1AV4FXcs6APelZzjgAWiADBnPRCMraL4YbpLoNn Io0R8XfnHkGRSm6WbGaYYn7CA+bqYImY0zaZvEziTLxnDO6I0qCbQh3RAo0+cEHAIsik wUeA== 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=oSd2Qq1je1OeT8h2C2pTfun47gB/A1FwMdxcWIy/VGO870rdbdElhuKEjfO+XCWL/o HOXjNIe7wAqL8NqxK6hI9B0AQ2tTlsuW+9K76HSmMYU1f+JnvUy1qCic5rFDzg/kU1WU /FrXiGaLj/Ejuw6p5q0m1EEVSABEVw8IA8T/u2WfZoyi0m37d7d2uVwM2V/UNOZna5S5 xkZxZkruqcs+98xvXBzA5zt8q2iRB1wT92rMzjybUWdRxUoOYOSsLmqg4uvmShIJBO5E OWwm0+f+mRhX+15DxtIszw8mr16K5g6uAX+tlragIuzLyorcgFEWI0JJwWgfNb16BhvZ 1n5A== X-Gm-Message-State: APjAAAUwyNd9/sZRsdR+bC6cINQrW2541w02nJ5uZ2kmAymUVER5rovZ YyVPXcZiiQBxeIXDHn1FUy6AUPcZyr4= X-Google-Smtp-Source: APXvYqzHK1KDCWCBmoIdUKPPUQbqXfyD1YXbw9l8dsaH5NBumYUJOA5i8Sa1h/epY6ofiRc6ZIXeRQ== X-Received: by 2002:a1c:f20f:: with SMTP id s15mr11465012wmc.33.1565368297446; Fri, 09 Aug 2019 09:31:37 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:e9b3:b00d:2017:357c]) by smtp.gmail.com with ESMTPSA id u6sm6721745wml.9.2019.08.09.09.31.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 09:31:36 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Aug 2019 19:29:56 +0300 Message-Id: <20190809162959.17924-11-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190809162959.17924-1-velocityra@gmail.com> References: <20190808205233.16368-14-velocityra@gmail.com> <20190809162959.17924-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 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;