From patchwork Fri Dec 14 16:33:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11415 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 4550744D7C3 for ; Fri, 14 Dec 2018 18:33:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 69F3168AB04; Fri, 14 Dec 2018 18:33:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE1BB68AAFB for ; Fri, 14 Dec 2018 18:33:33 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id a62so6260825wmh.4 for ; Fri, 14 Dec 2018 08:33:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=o/CmVUiuoc6dzIOCfQOJUfMVNW1+eanclUA5XQA1YHs=; b=MrMWueLPr8JyoYS3gUP4xLr2r5KbO3JzLzDCeud6lGMmWFcqFE+zjHN8IXbedC9Tqp TviW83gKUdIkTN32S55wYcCkKUi1A4z1OVUyYnhUhYTGF0AeoF53peiRi9EHyrcWq08S 6lM4RNfACp9J9XEmJK5+Ldga9cOtd9As7bLpS8Hb3eXJSU+OsQnKUdXEJGyKUvcKuTnY NAZGKikH8I+U/1Y1S+6mnMF95lsfwM69uYHPTW0Cr74UaslldTn3qDWvdrvwzRwhyRZm WBCjpa1UV49K8bMMBmTtA+fTVIx+ruSW2ffNI1hgTuLpc6QZ0jUeu9I2RLEDJ2L9TotM aeRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=o/CmVUiuoc6dzIOCfQOJUfMVNW1+eanclUA5XQA1YHs=; b=f94Xuojjkdc9wjnROBcA8uOGVhzhCaVEt0IQVd0WTFIbXFMrQ/4SUhBTcKyZEZQAHh lpBps7MBNUXIOdTAmJjSJWmTptk+ZLa3c79vbw6YAEocRmH2XvFNRKN2s+9Mew1TpRFc P9QpFAST3xGLLK3hFSqZCmEw3vKhJmnaAqBGC7s8E3sLcOq2/v5QKPdePFfWTqvKmMb5 JNiFlIxq4DaubxvKPHstr1DyX+d88acZNSGQjUlQwCNvDF2SXQLTL56FmjoEOuaiUCSJ +2WBKQqXDRQLdNTJqMv+Rsaz8rfwpJs4IloSIMdrPDAa7SnCh6TIrz0IixqjhsNIYCgC ZaLQ== X-Gm-Message-State: AA+aEWb7xrmb+WQXV0HWxEkBc4iY2ujJvQo5moEFwn2RxOVgWhcpBrwX r3+EMLkMEN0pwu4pYnum7b0CF3Ck X-Google-Smtp-Source: AFSGD/UZyhz5Fia9aWfqZj/i7I/WzsRpqunj33877OgeRu4Hl6X7YWlchnKWwkV+dElebQyMrs8rOg== X-Received: by 2002:a1c:1b86:: with SMTP id b128mr3734515wmb.30.1544805213217; Fri, 14 Dec 2018 08:33:33 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i192sm5100281wmg.7.2018.12.14.08.33.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 08:33:32 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Dec 2018 17:33:25 +0100 Message-Id: <20181214163325.13217-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/tiff: add support for 12bit grayscale 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #4688. Signed-off-by: Paul B Mahol --- libavcodec/tiff.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index f71885d156..570b3cbd01 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -310,6 +310,19 @@ static int deinvert_buffer(TiffContext *s, const uint8_t *src, int size) return 0; } +static void unpack_gray(TiffContext *s, AVFrame *p, + const uint8_t *src, int lnum, int width, int bpp) +{ + GetBitContext gb; + uint16_t *dst = (uint16_t *)(p->data[0] + lnum * p->linesize[0]); + + init_get_bits8(&gb, src, width); + + for (int i = 0; i < s->width; i++) { + dst[i] = get_bits(&gb, bpp); + } +} + static void unpack_yuv(TiffContext *s, AVFrame *p, const uint8_t *src, int lnum) { @@ -540,6 +553,15 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid if (s->is_bayer) { width = (s->bpp * s->width + 7) >> 3; } + if (p->format == AV_PIX_FMT_GRAY12) { + av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, width); + if (s->yuv_line == NULL) { + av_log(s->avctx, AV_LOG_ERROR, "Not enough memory\n"); + return AVERROR(ENOMEM); + } + dst = s->yuv_line; + stride = 0; + } if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) { #if CONFIG_ZLIB @@ -587,6 +609,8 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid if (is_yuv) { unpack_yuv(s, p, dst, strip_start + line); line += s->subsampling[1] - 1; + } else if (p->format == AV_PIX_FMT_GRAY12) { + unpack_gray(s, p, dst, strip_start + line, width, s->bpp); } dst += stride; } @@ -670,6 +694,8 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid if (is_yuv) { unpack_yuv(s, p, dst, strip_start + line); line += s->subsampling[1] - 1; + } else if (p->format == AV_PIX_FMT_GRAY12) { + unpack_gray(s, p, dst, strip_start + line, width, s->bpp); } dst += stride; } @@ -705,6 +731,9 @@ static int init_image(TiffContext *s, ThreadFrame *frame) case 81: s->avctx->pix_fmt = s->palette_is_set ? AV_PIX_FMT_PAL8 : AV_PIX_FMT_GRAY8; break; + case 121: + s->avctx->pix_fmt = AV_PIX_FMT_GRAY12; + break; case 10081: switch (AV_RL32(s->pattern)) { case 0x02010100: