From patchwork Sat Mar 9 10:08:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 12271 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 26BD14492BB for ; Sat, 9 Mar 2019 12:08:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0341F689C61; Sat, 9 Mar 2019 12:08:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f176.google.com (mail-it1-f176.google.com [209.85.166.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D5BF689BF0 for ; Sat, 9 Mar 2019 12:08:16 +0200 (EET) Received: by mail-it1-f176.google.com with SMTP id z124so131396itc.2 for ; Sat, 09 Mar 2019 02:08:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=j2fHAaw8HyMCzGyZALwLvGRf+2soTEf42vLEVuHV2gI=; b=NHALtfw2kls7ZTWzgoHZ1c1KMVXuKKnOOFOwts8l+9+it36EQ70sOtCKep0ClZde5G UxABgcfE0qWOuptncREraTAwHzXwLySllztBG/QLkX5rWwl7i6YTb+62UJQ9Fk335izw Ml7tCn7ON/rfHzMn18IGKbmaDR7CkfiCeo2+HGDETZxjamjUfDjvfJfrBm5e4PjAbjx2 ilyIpkdbSiNt2vNSMLIpBL2NevsdwMbnL6b87mAXzjKTEDLMqSRklH+6BBhvGCwWxH96 H6RnvIP4+47udI+jQDbxGWFi/gMEep8gqur8uwCjRTQGu0EJiQfM4jfbBchLnbEqo6m1 saUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=j2fHAaw8HyMCzGyZALwLvGRf+2soTEf42vLEVuHV2gI=; b=Krr2sfBVFSchXHOWo+/kiujDNtEwbS9m46DMgm2GtElv7rtI9QCglO28lIdHGS5YBw T3kuOvZ6V/VgrtmlXs7oNaRtWrXM4AsSBFd0N1xsFNKVWnmhY9sqSJSWROAAiaZ5icmh 3FSgHDKyJV3j9GwMmz90j51sk2LHKZZ06C3Rclg94pCXYzocNMrVawIguT4ZJ49OjohE 2BA9ZszqfMKp5pq9q9hPNpmh1WRWsDIb0GMHp7gHcdAgz65ix36kHvk2+Qdi/1GwqpId L2FkzsfAYE3I0if0OfRvKB2cNSTjk0HxSpZ7rmIBGm0/HIqFoPKaOS+9PNCoty1ds+nn 2sLA== X-Gm-Message-State: APjAAAVP/NHlPyhurmb+bu8WzzuSPhEPSoDy3EYwjOM2GcGNV0wfHz8E SHCFiBxpR21Cdyg89ZTBrfpX8Ma57hcDgm/gH14rqg== X-Google-Smtp-Source: APXvYqxJHBVMhVb7OBjmTFe47z5Jj/5uNNfcaE2Ub3eTCJDUTKxYQWgQkJ3cAlUcQNsWm78azMl7uufVZ9nzxnha5+E= X-Received: by 2002:a24:cc89:: with SMTP id x131mr9131913itf.121.1552126094656; Sat, 09 Mar 2019 02:08:14 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:fca:0:0:0:0:0 with HTTP; Sat, 9 Mar 2019 02:08:13 -0800 (PST) From: Carl Eugen Hoyos Date: Sat, 9 Mar 2019 11:08:13 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/tiff: Support decoding 16bit cmyk 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch improves decoding this image, reported by Ulf Zibis: http://samples.ffmpeg.org/image-samples/flower-separated-contig-16.tif Please comment, Carl Eugen From 7e98c7167f62506ed726780a1f32216515f4e29f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 9 Mar 2019 11:05:36 +0100 Subject: [PATCH] lavc/tiff: Support decoding 16bit cmyk. --- libavcodec/tiff.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 112f5b5..828ed9e 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1547,6 +1547,22 @@ again: } dst += p->linesize[plane]; } + } else if (s->photometric == TIFF_PHOTOMETRIC_SEPARATED && + s->avctx->pix_fmt == AV_PIX_FMT_RGBA64BE) { + dst = p->data[plane]; + for (i = 0; i < s->height; i++) { + for (j = 0; j < s->width; j++) { + uint64_t k = 65535 - AV_RB16(dst + 8 * j + 6); + uint64_t r = (65535 - AV_RB16(dst + 8 * j )) * k; + uint64_t g = (65535 - AV_RB16(dst + 8 * j + 2)) * k; + uint64_t b = (65535 - AV_RB16(dst + 8 * j + 4)) * k; + AV_WB16(dst + 8 * j , r * 65537 >> 32); + AV_WB16(dst + 8 * j + 2, g * 65537 >> 32); + AV_WB16(dst + 8 * j + 4, b * 65537 >> 32); + AV_WB16(dst + 8 * j + 6, 65535); + } + dst += p->linesize[plane]; + } } } -- 1.7.10.4