From patchwork Wed Aug 7 15:27:21 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: 14301 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 6A82E448872 for ; Wed, 7 Aug 2019 18:46:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DCB668AB4A; Wed, 7 Aug 2019 18:46:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C01CA68AB2E for ; Wed, 7 Aug 2019 18:46:33 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id n9so91984454wru.0 for ; Wed, 07 Aug 2019 08:46:33 -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=dHmz3Te8USXv8kcGCW9D+pDqeESj5RMBw24b80iCjxU=; b=T3/JxUBxjE8PeD1+xJwD/Mb0F9eoeWkoEp1CtbbuWZiTJCdgdPyFefOhKiIFXBa43A kyrKQDSqyNBc8Utqdw/vfGQsuMI2BaqZQhWNgcC/TZ9YW4+tr3aVm/1oTObob/TghFru yITCsTTDmI5vN43j0IbNccAUlIGu0pZ/z6bQd2eAw1X2EB8fk2WtiLs/yqXTE5bq7tNZ 7s4BuG0P8a2IQCJBm8ahK2qsB+y1aHdW7oAwrfnVyzPp3ewRuTLCdEoEDQhLfy5msvvd X4j3cYIpUwjePZrnGWgXjiLIDWPUX9ERFmn6z6z+iqPo0+wMyfv0vdsTSgNjY3YqmiN3 Odrg== 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=dHmz3Te8USXv8kcGCW9D+pDqeESj5RMBw24b80iCjxU=; b=SOenOx5bVbkQnWhpfW9f71aXD18eag8DKwB3trtjK4AlAgso0RL1MRWEbXVuzc1M5B HasjY0NnkSdBhPCjFKuEWiAzls1TU7q+sCJ5SKuuR/RyZB+kEpBnuZwiA8PDDd6zw7/E 838jXrq6aGMC3ZUMody4Fod+nqeuljn3z6S2aI2wbDcx8jBIdXcbOHhEEar/HHZZpX3Q 31YC/c/1UIlNXAx4d3Se75SlBxZEPYh9udPPMMb5/nIRME8QW/4BGjokS7WTktmR1MqM Juh9wfGbowQ+a7HshJl8KnokAf60d3qdF3fbMMQvoYMNDA8sfV64+KbEoGGvEPYxJPAM MeSw== X-Gm-Message-State: APjAAAUgIcG/ak+6jG+VJhwce7L0GlAV1k8SybHAnY/OBD7uZmTZICSo EUjMWLOrh9zGRLMKMyhL3SJ9PMIh X-Google-Smtp-Source: APXvYqyd37YlIlV5s3l3h5lIL/7N4tqhdw5HJpPVXxJI6RGwhne4ZmFUqbsl9y1pIB8FSh+phZv4cQ== X-Received: by 2002:adf:90e7:: with SMTP id i94mr10863046wri.224.1565192317840; Wed, 07 Aug 2019 08:38:37 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:b577:c48f:5aea:bab0]) by smtp.gmail.com with ESMTPSA id 4sm212050375wro.78.2019.08.07.08.38.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Aug 2019 08:38:37 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Aug 2019 18:27:21 +0300 Message-Id: <20190807152723.18892-11-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190807152723.18892-1-velocityra@gmail.com> References: <20190807152723.18892-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 11/13] 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 8a671538aa..a40bcfb3d7 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) { @@ -1058,6 +1062,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;