From patchwork Fri Dec 30 11:34:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 39813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5490692pzb; Fri, 30 Dec 2022 03:35:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXsa/fCGAVnUrz5KKAXmvLjIRy3JWs7++NJl4mO0qKqp7ovc2taeN+eT6tHJ37hl5tVTlTOw X-Received: by 2002:a17:907:72d3:b0:7c0:fd1e:972e with SMTP id du19-20020a17090772d300b007c0fd1e972emr34462962ejc.46.1672400138565; Fri, 30 Dec 2022 03:35:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672400138; cv=none; d=google.com; s=arc-20160816; b=JQSK9IDfwNhQcHt7co6yY+FssPMb5FyMGv9oArTTo1BxqTA/Gqaln00wM81Xxg3qmq JK9+v66UA0nUIxAR9EBxt600K5ndby4MBL35gxx0yDxNipI60wH+ZuSUsOH3JwqjVV9Z oVi7lKYz40Wvjf0g22AuwfDo5iXhGRQ9wZ8p2NI8Mrd+zgJD70umf2h3lCCJOjiuI9Gi MBGJjrf/uxcAPR8McsZmD+QLPj82h8fjP8PGHFyIQAtGx/v4XlLm5vXD6k6Ejq0GzrOJ CXfw7VMabGfgy5WMotEn3SYA2V/rgd/SfUsl0PO5q5VdXscCZCv9DIp9J9hg6yi+NF8q meBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ZCFK2xsdtNp3R3dBoa5xiI78k30AX07xebZ/3pkvTwU=; b=N0q1Sat+xnFfy5Vln8tFETjs3ic8h9aolPjtkAEj6GtVWm7Mf+YBsh3XGSo22+Uxb9 h0ixdSdHK7TDIUJDDq3QPIJJlwDBAD1j4noIv+wpB0IVFE0ZOAtgHcK08MRH5Eb2N4eg SVndu3RwmOtAqbhghq+c9FuCOnMoBydnH3YXnYqhqeoNvJhOKMxnyeRau1RhOUM+p4sS BAGsOdyDtX6wU7L3+AHy9x2RSFhUZEegdAP2jy8X4P9URHlLOFszyw4up74MbNH6QzI7 figRf1nnWez+gO1Cl3HP49YacgEkIqNEd7S0HKEqHJWBFGdRUbKlFCewp43yX7fp9t3+ UC0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=Pk7svx3b; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=pkh.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id xc2-20020a170907074200b007897abd2d17si17481767ejb.468.2022.12.30.03.35.38; Fri, 30 Dec 2022 03:35:38 -0800 (PST) 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=@pkh.me header.s=selector1 header.b=Pk7svx3b; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=pkh.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 66FA868BAA5; Fri, 30 Dec 2022 13:35:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ssq0.pkh.me (unknown [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68DA968BA5C for ; Fri, 30 Dec 2022 13:35:08 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1672400098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sJs+x6Nv8+wDMwsgd5w+i7K9XyfmKAjOqBh4uwfGea0=; b=Pk7svx3b/zUPmR8Sv1oWWHNHuHe5QqXbk6ZsvezTcsJNcA3gPjmzB3E0ABOMXP2JjRZmnR A4+C7Tj3qLYFcVJkLewSXScI/CXHBP82YVzGIQ/xKbBM7Z22JkzCL1aBsOQGn2Fma597rE J0o9Dmg1SHJOMZRHUNcPFAfkBY6YYWA= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 36edbaae; Fri, 30 Dec 2022 11:34:58 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Dec 2022 12:34:54 +0100 Message-Id: <20221230113455.2632289-4-u@pkh.me> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221230113455.2632289-1-u@pkh.me> References: <20221230113455.2632289-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/paletteuse: add atkinson dithering X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: agPKX56cm4tN Atkinson according to https://bisqwit.iki.fi/jutut/kuvat/ordered_dither/error_diffusion.txt: * 1 1 / 8 1 1 1 1 --- doc/filters.texi | 2 ++ libavfilter/vf_paletteuse.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 16a8dde4f3..2672ae6ee7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -18520,6 +18520,8 @@ Frankie Sierra dithering v2 "Lite" (error diffusion) Frankie Sierra dithering v3 (error diffusion) @item burkes Burkes dithering (error diffusion) +@item atkinson +Atkinson dithering by Bill Atkinson at Apple Computer (error diffusion) @end table Default is @var{sierra2_4a}. diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index 3c3b6b3ef8..252ad746f0 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -44,6 +44,7 @@ enum dithering_mode { DITHERING_SIERRA2_4A, DITHERING_SIERRA3, DITHERING_BURKES, + DITHERING_ATKINSON, NB_DITHERING }; @@ -117,6 +118,7 @@ static const AVOption paletteuse_options[] = { { "sierra2_4a", "Frankie Sierra dithering v2 \"Lite\" (error diffusion)", 0, AV_OPT_TYPE_CONST, {.i64=DITHERING_SIERRA2_4A}, INT_MIN, INT_MAX, FLAGS, "dithering_mode" }, { "sierra3", "Frankie Sierra dithering v3 (error diffusion)", 0, AV_OPT_TYPE_CONST, {.i64=DITHERING_SIERRA3}, INT_MIN, INT_MAX, FLAGS, "dithering_mode" }, { "burkes", "Burkes dithering (error diffusion)", 0, AV_OPT_TYPE_CONST, {.i64=DITHERING_BURKES}, INT_MIN, INT_MAX, FLAGS, "dithering_mode" }, + { "atkinson", "Atkinson dithering by Bill Atkinson at Apple Computer (error diffusion)",0, AV_OPT_TYPE_CONST, {.i64=DITHERING_ATKINSON}, INT_MIN, INT_MAX, FLAGS, "dithering_mode" }, { "bayer_scale", "set scale for bayer dithering", OFFSET(bayer_scale), AV_OPT_TYPE_INT, {.i64=2}, 0, 5, FLAGS }, { "diff_mode", "set frame difference mode", OFFSET(diff_mode), AV_OPT_TYPE_INT, {.i64=DIFF_MODE_NONE}, 0, NB_DIFF_MODE-1, FLAGS, "diff_mode" }, { "rectangle", "process smallest different rectangle", 0, AV_OPT_TYPE_CONST, {.i64=DIFF_MODE_RECTANGLE}, INT_MIN, INT_MAX, FLAGS, "diff_mode" }, @@ -418,6 +420,25 @@ static av_always_inline int set_frame(PaletteUseContext *s, AVFrame *out, AVFram if (right2) src[src_linesize + x + 2] = dither_color(src[src_linesize + x + 2], er, eg, eb, 2, 5); } + } else if (dither == DITHERING_ATKINSON) { + const int right = x < w - 1, down = y < h - 1, left = x > x_start; + const int right2 = x < w - 2, down2 = y < h - 2; + const int color = get_dst_color_err(s, src[x], &er, &eg, &eb); + + if (color < 0) + return color; + dst[x] = color; + + if (right) src[ x + 1] = dither_color(src[ x + 1], er, eg, eb, 1, 3); + if (right2) src[ x + 2] = dither_color(src[ x + 2], er, eg, eb, 1, 3); + + if (down) { + if (left) src[src_linesize + x - 1] = dither_color(src[src_linesize + x - 1], er, eg, eb, 1, 3); + if (1) src[src_linesize + x ] = dither_color(src[src_linesize + x ], er, eg, eb, 1, 3); + if (right) src[src_linesize + x + 1] = dither_color(src[src_linesize + x + 1], er, eg, eb, 1, 3); + if (down2) src[src_linesize*2 + x ] = dither_color(src[src_linesize*2 + x ], er, eg, eb, 1, 3); + } + } else { const int color = color_get(s, src[x]); @@ -894,6 +915,7 @@ DEFINE_SET_FRAME(sierra2, DITHERING_SIERRA2) DEFINE_SET_FRAME(sierra2_4a, DITHERING_SIERRA2_4A) DEFINE_SET_FRAME(sierra3, DITHERING_SIERRA3) DEFINE_SET_FRAME(burkes, DITHERING_BURKES) +DEFINE_SET_FRAME(atkinson, DITHERING_ATKINSON) static const set_frame_func set_frame_lut[NB_DITHERING] = { set_frame_none, @@ -904,6 +926,7 @@ static const set_frame_func set_frame_lut[NB_DITHERING] = { set_frame_sierra2_4a, set_frame_sierra3, set_frame_burkes, + set_frame_atkinson, }; static int dither_value(int p)