From patchwork Thu Aug 29 13:10:50 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: 14789 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 6D0A544A068 for ; Thu, 29 Aug 2019 16:12:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F552687F49; Thu, 29 Aug 2019 16:12:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1417687F2D for ; Thu, 29 Aug 2019 16:12:25 +0300 (EEST) Received: by mail-wr1-f47.google.com with SMTP id z11so3390824wrt.4 for ; Thu, 29 Aug 2019 06:12:25 -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=pFP5KJ4F7jqgMdDvcEycs59bGXnuBzRFJ6t2IynYkRU=; b=qyXUvIaMUKanffkgGQXfJXAq3uSJNQaiV0LYQrw/Num1r7dVyls1ux1ehPDSVchPmq MWHO8s3xBdxgXn3G+iOICyUpwm4FUKGQzG9NudXEYKe5grtvPLP18oojssb22GycUz7F Mi+e6grhiJHtQCG3n+3Ksz5R+NerVbPCQvzvZr+EaIC8W5myGk/U9NXoKhUhvjamS2yi eY9KVa/79NDgdMgRiMz3I4D8Gtod3K8VXWuY4a2cb+t5+MCRjSomR4cTALNrh6A7UIma fURX2/Dun9qWSfkfeCYZQv3ao+Enpd7xGscGm0dSUviPD82G+XE4EQc6ix7cNQ0V4oL5 nVpw== 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=pFP5KJ4F7jqgMdDvcEycs59bGXnuBzRFJ6t2IynYkRU=; b=cylv/4H/fNWQAdVfMXB1cFcidzq3SMxi1q5EqMt3FTlV5O5bw+u7sbefP+ObaHRTV5 z99EbGiN8QslikEF+EnaLLDV/64TjmTHNc9E12zfh22JtlCmsn1A4qk2aINgGbyqkr7E cHN5O90yU6t49HpTfpcIsTtaW7LO4RCYEXsZBr1w415r9DimMVIDkzpzXc6QOQkqnB26 ZSMrxOs+EjPlvXV1ZO3pdiGa4/II0HXG5fV/UjpueYG6m3Wi3/WU5966YIW2B0IWZ0oH swb1kXEl2DCa6ypLkMUUftZz6SXi3JEUDPAhhhCvP6xB0d1EeZ+Bnb6+FfLGGJY4wRaE MppQ== X-Gm-Message-State: APjAAAVLjfiowduyafqX+iOmg1O7TJSxOGWZuB2ezvH+Kql1SAc2eEA5 LJtgMDSefLtkAoZKVSHxAlvKEZf0 X-Google-Smtp-Source: APXvYqxptJPdM8zBcD0ZtdJjh4Gjw7yZXB+NX0kruhNnWOLY5u+n4aJnM6OVYmBBBguw0hkeobgMQw== X-Received: by 2002:adf:e9cb:: with SMTP id l11mr942052wrn.35.1567084344588; Thu, 29 Aug 2019 06:12:24 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240d:9b00:4ca1:2ce9:2e6c:c246]) by smtp.gmail.com with ESMTPSA id m17sm1676644wrs.9.2019.08.29.06.12.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 06:12:24 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Aug 2019 16:10:50 +0300 Message-Id: <20190829131054.16404-11-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190829131054.16404-1-velocityra@gmail.com> References: <20190829131054.16404-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v17 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nick Renieris 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 d0d045397d..61a140fe09 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;