From patchwork Tue Sep 5 14:42:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mateusz X-Patchwork-Id: 4994 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp4195728jao; Tue, 5 Sep 2017 07:42:21 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7TxmOU94YCPV439rRiPREJ6KnCLsdrFJ2AyhuMgc+HteWYRJJqU5lrdsR5x4kAxML9F1cZ X-Received: by 10.28.208.75 with SMTP id h72mr2185134wmg.163.1504622541405; Tue, 05 Sep 2017 07:42:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504622541; cv=none; d=google.com; s=arc-20160816; b=ZkdMaIluoaJ5nMVtkhqmC5qx0DW29dyuUwgL78k1yBqXyI7NR8YOvUKpb92TZVL9pj Eo14Y1LM94ZPK7sVRkSZ5bw7Q6dbI7kymuPlTnCMuntkIXLF7XX69vehMPhXC1ghPspQ Hvs+aSHSIvOX/+Mynsf3yBZfxxODKcqongndQgw4WwOD+1Ge6ZOB90DJV2HRwmOoRNnr rQ3v/IPk1fNV33KrFKnQD+GAN0bZLxxr8azMGCqqIaLvUOQjCUNYblb+vjwwZF2e+9ap 8CYMDPu0IXBTc/jCj/sG+Crdw+idu0YCnJjSEYu9zeH4zo4uYoWM74r9ObG66tlrmlar 0NOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=5H6UjA32rEV9jP9Y2h9t+1RTm+3JvqvAvUJSxQlHLYs=; b=ADPK5gIeQLvpQ9vs4A0zRGgkHIkInBlHpQpFJ5knBxjxk9kxqxPKoB5QpTqlRzihqK a5lGLyfA90vSx14o/t2BeghXY9bN/Q8gqm7mxvT5ZHDllnFRIF3T+whDRYovAhmq7g3M ZgR9/CMqDhSh8S0HbwQ6W5Vj9orX7gqmYHE61C3kduFeM12C6ziB1qNgVnmjYA6yU1q+ aiduDZ8lOf72b5kGH8oHXZ+AI3gj8Bzb/96Oc1zT+UJWUM1qEwKsDzYWKoSFMBt+UrG3 Ed61i/JdQKO2A7tQWmD8lcwZURLzBSXLIpku+kiI2WLIr6v19GX8trqV2QIH9CMGK2P6 4ZfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@poczta.onet.pl header.s=2011 header.b=SC8v1ucL; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b25si469515wra.232.2017.09.05.07.42.20; Tue, 05 Sep 2017 07:42:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@poczta.onet.pl header.s=2011 header.b=SC8v1ucL; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C773F68A242; Tue, 5 Sep 2017 17:42:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpo112.poczta.onet.pl (smtpo112.poczta.onet.pl [213.180.149.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A30F7689A72 for ; Tue, 5 Sep 2017 17:42:07 +0300 (EEST) Received: from [192.168.1.2] (affs228.neoplus.adsl.tpnet.pl [95.49.148.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mateuszb@poczta.onet.pl) by smtp.poczta.onet.pl (Onet) with ESMTPSA id 3xmqDb3w2Bz11Gqj9 for ; Tue, 5 Sep 2017 16:42:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poczta.onet.pl; s=2011; t=1504622528; bh=rY+dFscWpqirWCVebOlMStk98BmaiFwv6KsvSoD81I0=; h=Subject:To:References:From:Date:In-Reply-To:From; b=SC8v1ucLk5RJ4iAaP2xv47w3OeYPvzQ0j1+b/fd1DedrCzvGsIHK7+SzwWHPSGi9M BHancruAqC27XKdW7HN8okMIpDZ8Ut30akpVbYeV9bfkZMy2qebGD3a6xEpFuiVvk1 j5+42XO5j2UF4FVXcE7wlVgF/aJBTnesDpPV5Xdg= To: ffmpeg-devel@ffmpeg.org References: <8fa31561-5155-6975-738c-7406150ba73e@poczta.onet.pl> <20170905134031.GF7094@nb4> From: Mateusz Message-ID: <89fdce7a-a6b9-189d-6d87-778e325c600c@poczta.onet.pl> Date: Tue, 5 Sep 2017 16:42:06 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20170905134031.GF7094@nb4> Content-Language: en-US Subject: Re: [FFmpeg-devel] [PATCH] libswscale/swscale_unscaled: fix DITHER_COPY macro 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" W dniu 2017-09-05 o 15:40, Michael Niedermayer pisze: > On Mon, Sep 04, 2017 at 09:33:34AM +0200, Mateusz wrote: >> If ffmpeg reduces bit-depth to 8-bit or more, it uses DITHER_COPY macro. >> The problem is DITHER_COPY macro make images darker (on all planes). >> >> In x265 project there is issue #365 which is caused by this DITHER_COPY bug. >> I think it is time to fix -- there are more and more high bit-depth sources. >> >> Please review. >> >>  libswscale/swscale_unscaled.c | 44 +++++++++++++------------------------------ >>  1 file changed, 13 insertions(+), 31 deletions(-) > > please provide a git compatible patch with with commit message as produced > by git format-patch or git send-email > > this mail is not accepted as is by git > Applying: libswscale/swscale_unscaled: fix DITHER_COPY macro > error: corrupt patch at line 6 > error: could not build fake ancestor > Patch failed at 0001 libswscale/swscale_unscaled: fix DITHER_COPY macro > > [...] I've attached the result of git format-patch command. Sorry for 1 private e-mail (I clicked wrong button). Mateusz From 9b96d612fef46ccec7e148cd7f8e8666b4e7a4cd Mon Sep 17 00:00:00 2001 From: Mateusz Date: Tue, 5 Sep 2017 16:09:28 +0200 Subject: [PATCH] fix DITHER_COPY macro to avoid make images darker --- libswscale/swscale_unscaled.c | 44 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index ef36aec..3b7a5a9 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -110,24 +110,6 @@ DECLARE_ALIGNED(8, static const uint8_t, dithers)[8][8][8]={ { 112, 16,104, 8,118, 22,110, 14,}, }}; -static const uint16_t dither_scale[15][16]={ -{ 2, 3, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,}, -{ 2, 3, 7, 7, 13, 13, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,}, -{ 3, 3, 4, 15, 15, 29, 57, 57, 57, 113, 113, 113, 113, 113, 113, 113,}, -{ 3, 4, 4, 5, 31, 31, 61, 121, 241, 241, 241, 241, 481, 481, 481, 481,}, -{ 3, 4, 5, 5, 6, 63, 63, 125, 249, 497, 993, 993, 993, 993, 993, 1985,}, -{ 3, 5, 6, 6, 6, 7, 127, 127, 253, 505, 1009, 2017, 4033, 4033, 4033, 4033,}, -{ 3, 5, 6, 7, 7, 7, 8, 255, 255, 509, 1017, 2033, 4065, 8129,16257,16257,}, -{ 3, 5, 6, 8, 8, 8, 8, 9, 511, 511, 1021, 2041, 4081, 8161,16321,32641,}, -{ 3, 5, 7, 8, 9, 9, 9, 9, 10, 1023, 1023, 2045, 4089, 8177,16353,32705,}, -{ 3, 5, 7, 8, 10, 10, 10, 10, 10, 11, 2047, 2047, 4093, 8185,16369,32737,}, -{ 3, 5, 7, 8, 10, 11, 11, 11, 11, 11, 12, 4095, 4095, 8189,16377,32753,}, -{ 3, 5, 7, 9, 10, 12, 12, 12, 12, 12, 12, 13, 8191, 8191,16381,32761,}, -{ 3, 5, 7, 9, 10, 12, 13, 13, 13, 13, 13, 13, 14,16383,16383,32765,}, -{ 3, 5, 7, 9, 10, 12, 14, 14, 14, 14, 14, 14, 14, 15,32767,32767,}, -{ 3, 5, 7, 9, 11, 12, 14, 15, 15, 15, 15, 15, 15, 15, 16,65535,}, -}; - static void fillPlane(uint8_t *plane, int stride, int width, int height, int y, uint8_t val) @@ -1502,22 +1484,22 @@ static int packedCopyWrapper(SwsContext *c, const uint8_t *src[], } #define DITHER_COPY(dst, dstStride, src, srcStride, bswap, dbswap)\ - uint16_t scale= dither_scale[dst_depth-1][src_depth-1];\ - int shift= src_depth-dst_depth + dither_scale[src_depth-2][dst_depth-1];\ + unsigned shift= src_depth-dst_depth, tmp;\ for (i = 0; i < height; i++) {\ - const uint8_t *dither= dithers[src_depth-9][i&7];\ + const uint8_t *dither= dithers[shift-1][i&7];\ for (j = 0; j < length-7; j+=8){\ - dst[j+0] = dbswap((bswap(src[j+0]) + dither[0])*scale>>shift);\ - dst[j+1] = dbswap((bswap(src[j+1]) + dither[1])*scale>>shift);\ - dst[j+2] = dbswap((bswap(src[j+2]) + dither[2])*scale>>shift);\ - dst[j+3] = dbswap((bswap(src[j+3]) + dither[3])*scale>>shift);\ - dst[j+4] = dbswap((bswap(src[j+4]) + dither[4])*scale>>shift);\ - dst[j+5] = dbswap((bswap(src[j+5]) + dither[5])*scale>>shift);\ - dst[j+6] = dbswap((bswap(src[j+6]) + dither[6])*scale>>shift);\ - dst[j+7] = dbswap((bswap(src[j+7]) + dither[7])*scale>>shift);\ + tmp = (bswap(src[j+0]) + dither[0])>>shift; dst[j+0] = dbswap(tmp - (tmp>>dst_depth));\ + tmp = (bswap(src[j+1]) + dither[1])>>shift; dst[j+1] = dbswap(tmp - (tmp>>dst_depth));\ + tmp = (bswap(src[j+2]) + dither[2])>>shift; dst[j+2] = dbswap(tmp - (tmp>>dst_depth));\ + tmp = (bswap(src[j+3]) + dither[3])>>shift; dst[j+3] = dbswap(tmp - (tmp>>dst_depth));\ + tmp = (bswap(src[j+4]) + dither[4])>>shift; dst[j+4] = dbswap(tmp - (tmp>>dst_depth));\ + tmp = (bswap(src[j+5]) + dither[5])>>shift; dst[j+5] = dbswap(tmp - (tmp>>dst_depth));\ + tmp = (bswap(src[j+6]) + dither[6])>>shift; dst[j+6] = dbswap(tmp - (tmp>>dst_depth));\ + tmp = (bswap(src[j+7]) + dither[7])>>shift; dst[j+7] = dbswap(tmp - (tmp>>dst_depth));\ + }\ + for (; j < length; j++){\ + tmp = (bswap(src[j]) + dither[j&7])>>shift; dst[j] = dbswap(tmp - (tmp>>dst_depth));\ }\ - for (; j < length; j++)\ - dst[j] = dbswap((bswap(src[j]) + dither[j&7])*scale>>shift);\ dst += dstStride;\ src += srcStride;\ }