From patchwork Fri Oct 30 11:10:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23283 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 CDFF344B966 for ; Fri, 30 Oct 2020 13:10:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B48BA68A543; Fri, 30 Oct 2020 13:10:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4DFA1689C3E for ; Fri, 30 Oct 2020 13:10:25 +0200 (EET) Received: by mail-pf1-f194.google.com with SMTP id 10so4965501pfp.5 for ; Fri, 30 Oct 2020 04:10: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; bh=0s0YMoloccGrtayUiXWzO6Tdt2qBcBxLcNJHdv2ADBQ=; b=fATP5nMoLF/i7q0LhUOT7YMv0Sw0rjyP/xuWIHGJ2sp8l3TYF1TauKKT6qla6Hwq+r LCAzmmy0t1YJyBptO0ygpI5n0O2ZmgVYoE4J1y5CWovsYR5XhvIiGyTKouZmJfyX1a/N Vjq4co2NXZmomkQj6W4/3wNB8ZXBzGy8XwuGSvKhw36YFOt2rCiRxQ7U5/GHMzr3jCGn v2jJ8yelLsJSUCnQMySHzxF/jefL8HFuWlpPnxFqM+O2y3ZVp4HbHVKydTA/FH+IKiB9 muYFH2qQEIFtlJNwnwOZaYLkccJmFHabv4YwCHTrUR3xpwJs8+eO+kCQLLYsUm7lCFtH Gw+A== 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; bh=0s0YMoloccGrtayUiXWzO6Tdt2qBcBxLcNJHdv2ADBQ=; b=RIdAO/4Km6hakkCzWC7P2uxXVeM4dhOL/2yKZ/rC87HqfMgK3U0MzecObkOx6EdYvy WQNw2Bgxh1aFSPKOSMhq5v3XN2qb9rooKMIMF10aw12Z2eEz0YexqunusRc/6K4QeOYc 4fZt3NfG32qSzkr0pGHY/WnhF7VVW7o6F4V8juOfDv1xcNTK0HZ1Dl5Q1U8ZZlS+8fJD pf/FvW8Ut8J2XRkn0/odNkRvENzd/FSY9OoHlUwA2S3KPfKNb8yHKhmhTz9WWdAvqxUC F/yn0LYOGL7pasFwTEtGY5CzMklyKjn3W8TN52kB0feXVIkpWoyZkKrn2cXhOwgkyG7R 3rhw== X-Gm-Message-State: AOAM532so7IF3i1A4M9FmgrNTVopJkIWbnZVZhnsZe4VvAKw7KedydHs vxRr1NyoqRKjYdUA/lGG8DX4y/vIbsM= X-Google-Smtp-Source: ABdhPJz1kVCEBvaXGYef572AyVm87oX04cVpbD324E31+PN9tSIjgQvY4p/6g4c1EDsLEsN/tcaYEg== X-Received: by 2002:a63:490e:: with SMTP id w14mr1710111pga.275.1604056223088; Fri, 30 Oct 2020 04:10:23 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mv22sm3034415pjb.51.2020.10.30.04.10.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Oct 2020 04:10:22 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Oct 2020 19:10:07 +0800 Message-Id: <1604056209-16491-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603967178-3765-1-git-send-email-lance.lmwang@gmail.com> References: <1603967178-3765-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 1/3] avfilter/vf_unsharp: add 10bit support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/unsharp.h | 3 + libavfilter/vf_unsharp.c | 162 +++++++++++++++++++++++++---------------------- 2 files changed, 90 insertions(+), 75 deletions(-) diff --git a/libavfilter/unsharp.h b/libavfilter/unsharp.h index a60b30f..253e32d 100644 --- a/libavfilter/unsharp.h +++ b/libavfilter/unsharp.h @@ -48,9 +48,12 @@ typedef struct UnsharpContext { UnsharpFilterParam luma; ///< luma parameters (width, height, amount) UnsharpFilterParam chroma; ///< chroma parameters (width, height, amount) int hsub, vsub; + int bitdepth; + int bps; int nb_threads; int opencl; int (* apply_unsharp)(AVFilterContext *ctx, AVFrame *in, AVFrame *out); + int (* unsharp_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } UnsharpContext; #endif /* AVFILTER_UNSHARP_H */ diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index 7b430b6..416bf1c 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -57,81 +57,90 @@ typedef struct TheadData { int height; } ThreadData; -static int unsharp_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) -{ - ThreadData *td = arg; - UnsharpFilterParam *fp = td->fp; - uint32_t **sc = fp->sc; - uint32_t *sr = fp->sr; - const uint8_t *src2 = NULL; //silence a warning - const int amount = fp->amount; - const int steps_x = fp->steps_x; - const int steps_y = fp->steps_y; - const int scalebits = fp->scalebits; - const int32_t halfscale = fp->halfscale; - - uint8_t *dst = td->dst; - const uint8_t *src = td->src; - const int dst_stride = td->dst_stride; - const int src_stride = td->src_stride; - const int width = td->width; - const int height = td->height; - const int sc_offset = jobnr * 2 * steps_y; - const int sr_offset = jobnr * (MAX_MATRIX_SIZE - 1); - const int slice_start = (height * jobnr) / nb_jobs; - const int slice_end = (height * (jobnr+1)) / nb_jobs; - - int32_t res; - int x, y, z; - uint32_t tmp1, tmp2; - - if (!amount) { - av_image_copy_plane(dst + slice_start * dst_stride, dst_stride, - src + slice_start * src_stride, src_stride, - width, slice_end - slice_start); - return 0; - } - - for (y = 0; y < 2 * steps_y; y++) - memset(sc[sc_offset + y], 0, sizeof(sc[y][0]) * (width + 2 * steps_x)); - - // if this is not the first tile, we start from (slice_start - steps_y), - // so we can get smooth result at slice boundary - if (slice_start > steps_y) { - src += (slice_start - steps_y) * src_stride; - dst += (slice_start - steps_y) * dst_stride; - } - - for (y = -steps_y + slice_start; y < steps_y + slice_end; y++) { - if (y < height) - src2 = src; - - memset(sr + sr_offset, 0, sizeof(sr[0]) * (2 * steps_x - 1)); - for (x = -steps_x; x < width + steps_x; x++) { - tmp1 = x <= 0 ? src2[0] : x >= width ? src2[width-1] : src2[x]; - for (z = 0; z < steps_x * 2; z += 2) { - tmp2 = sr[sr_offset + z + 0] + tmp1; sr[sr_offset + z + 0] = tmp1; - tmp1 = sr[sr_offset + z + 1] + tmp2; sr[sr_offset + z + 1] = tmp2; - } - for (z = 0; z < steps_y * 2; z += 2) { - tmp2 = sc[sc_offset + z + 0][x + steps_x] + tmp1; sc[sc_offset + z + 0][x + steps_x] = tmp1; - tmp1 = sc[sc_offset + z + 1][x + steps_x] + tmp2; sc[sc_offset + z + 1][x + steps_x] = tmp2; - } - if (x >= steps_x && y >= (steps_y + slice_start)) { - const uint8_t *srx = src - steps_y * src_stride + x - steps_x; - uint8_t *dsx = dst - steps_y * dst_stride + x - steps_x; - - res = (int32_t)*srx + ((((int32_t) * srx - (int32_t)((tmp1 + halfscale) >> scalebits)) * amount) >> 16); - *dsx = av_clip_uint8(res); - } - } - if (y >= 0) { - dst += dst_stride; - src += src_stride; - } - } - return 0; +#define DEF_UNSHARP_SLICE_FUNC(name, nbits) \ +static int name##_##nbits(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \ +{ \ + ThreadData *td = arg; \ + UnsharpFilterParam *fp = td->fp; \ + UnsharpContext *s = ctx->priv; \ + uint32_t **sc = fp->sc; \ + uint32_t *sr = fp->sr; \ + const uint##nbits##_t *src2 = NULL; \ + const int amount = fp->amount; \ + const int steps_x = fp->steps_x; \ + const int steps_y = fp->steps_y; \ + const int scalebits = fp->scalebits; \ + const int32_t halfscale = fp->halfscale; \ + \ + uint##nbits##_t *dst = (uint##nbits##_t*)td->dst; \ + const uint##nbits##_t *src = (const uint##nbits##_t *)td->src; \ + int dst_stride = td->dst_stride; \ + int src_stride = td->src_stride; \ + const int width = td->width; \ + const int height = td->height; \ + const int sc_offset = jobnr * 2 * steps_y; \ + const int sr_offset = jobnr * (MAX_MATRIX_SIZE - 1); \ + const int slice_start = (height * jobnr) / nb_jobs; \ + const int slice_end = (height * (jobnr+1)) / nb_jobs; \ + \ + int32_t res; \ + int x, y, z; \ + uint32_t tmp1, tmp2; \ + \ + if (!amount) { \ + av_image_copy_plane(td->dst + slice_start * dst_stride, dst_stride, \ + td->src + slice_start * src_stride, src_stride, \ + width * s->bps, slice_end - slice_start); \ + return 0; \ + } \ + \ + for (y = 0; y < 2 * steps_y; y++) \ + memset(sc[sc_offset + y], 0, sizeof(sc[y][0]) * (width + 2 * steps_x)); \ + \ + dst_stride = dst_stride / s->bps; \ + src_stride = src_stride / s->bps; \ + /* if this is not the first tile, we start from (slice_start - steps_y) */ \ + /* so we can get smooth result at slice boundary */ \ + if (slice_start > steps_y) { \ + src += (slice_start - steps_y) * src_stride; \ + dst += (slice_start - steps_y) * dst_stride; \ + } \ + \ + for (y = -steps_y + slice_start; y < steps_y + slice_end; y++) { \ + if (y < height) \ + src2 = src; \ + \ + memset(sr + sr_offset, 0, sizeof(sr[0]) * (2 * steps_x - 1)); \ + for (x = -steps_x; x < width + steps_x; x++) { \ + tmp1 = x <= 0 ? src2[0] : x >= width ? src2[width-1] : src2[x]; \ + for (z = 0; z < steps_x * 2; z += 2) { \ + tmp2 = sr[sr_offset + z + 0] + tmp1; sr[sr_offset + z + 0] = tmp1; \ + tmp1 = sr[sr_offset + z + 1] + tmp2; sr[sr_offset + z + 1] = tmp2; \ + } \ + for (z = 0; z < steps_y * 2; z += 2) { \ + tmp2 = sc[sc_offset + z + 0][x + steps_x] + tmp1; \ + sc[sc_offset + z + 0][x + steps_x] = tmp1; \ + tmp1 = sc[sc_offset + z + 1][x + steps_x] + tmp2; \ + sc[sc_offset + z + 1][x + steps_x] = tmp2; \ + } \ + if (x >= steps_x && y >= (steps_y + slice_start)) { \ + const uint##nbits##_t *srx = src - steps_y * src_stride + x - steps_x; \ + uint##nbits##_t *dsx = dst - steps_y * dst_stride + x - steps_x; \ + \ + res = (int32_t)*srx + ((((int32_t) * srx - \ + (int32_t)((tmp1 + halfscale) >> scalebits)) * amount) >> (8+nbits)); \ + *dsx = av_clip_uint##nbits(res); \ + } \ + } \ + if (y >= 0) { \ + dst += dst_stride; \ + src += src_stride; \ + } \ + } \ + return 0; \ } +DEF_UNSHARP_SLICE_FUNC(unsharp_slice, 16); +DEF_UNSHARP_SLICE_FUNC(unsharp_slice, 8); static int apply_unsharp_c(AVFilterContext *ctx, AVFrame *in, AVFrame *out) { @@ -155,7 +164,7 @@ static int apply_unsharp_c(AVFilterContext *ctx, AVFrame *in, AVFrame *out) td.height = plane_h[i]; td.dst_stride = out->linesize[i]; td.src_stride = in->linesize[i]; - ctx->internal->execute(ctx, unsharp_slice, &td, NULL, FFMIN(plane_h[i], s->nb_threads)); + ctx->internal->execute(ctx, s->unsharp_slice, &td, NULL, FFMIN(plane_h[i], s->nb_threads)); } return 0; } @@ -238,6 +247,9 @@ static int config_input(AVFilterLink *inlink) s->hsub = desc->log2_chroma_w; s->vsub = desc->log2_chroma_h; + s->bitdepth = desc->comp[0].depth; + s->bps = s->bitdepth > 8 ? 2 : 1; + s->unsharp_slice = s->bitdepth > 8 ? unsharp_slice_16 : unsharp_slice_8; // ensure (height / nb_threads) > 4 * steps_y, // so that we don't have too much overlap between two threads From patchwork Fri Oct 30 11:10:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23284 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 D65A044B966 for ; Fri, 30 Oct 2020 13:10:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7C7668AA64; Fri, 30 Oct 2020 13:10:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCF7968A82B for ; Fri, 30 Oct 2020 13:10:26 +0200 (EET) Received: by mail-pg1-f195.google.com with SMTP id 15so4887136pgd.12 for ; Fri, 30 Oct 2020 04:10:26 -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; bh=Hph81Dx/k0Y0+RSyWa8e1lM16MsOESy6OGYaHK+XkeE=; b=lDZ4Y1V7yeYp+177VcyybZ5ZRIuvGKpQOv/2BL52MQdXd99gIxIeib2UmnaKodwimz oJKMi+nNCeoTXexZ8IZ6WA2C0z2c/5dkn5TZNlShi5XVVJl6JU7WfA7bsWbEOYuJzfUr /osGNn1mvrrDZ00N3dBb9wMZD31GxOzNxKQ0EkQXk2HHd5AU8Z5RdqwQZdz++/Uyfj7R 5IvcliR+g0F5K0ArBpl6aGoPM+m1Byefvnkve+6pLUKw8s4BpykCgkRYdBro5qeh14dI SxXOEIQjq98ot5M6aOIn3/nhjwxFqiJ3Pmn0H+H+pNFVbynqnrEuxK5x1jK73QGterkZ npZw== 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; bh=Hph81Dx/k0Y0+RSyWa8e1lM16MsOESy6OGYaHK+XkeE=; b=NPs2Q9eLyVgtsOC44Nukr7HJYXhjOqIOg7Gxh3wj3Wa1HYFWLh3fd5dGzhNunzTGQr C9v0I75Kvtuo/NkFTYNTBV3P8r3vIqkLO1sZW/MkwsHsTX8IpYXo4Sxugc+fuCrSBU2b eyzExXTXYMq3SDiCTl8R0/lqcNAzFIIx8JCVNxcd/C+6x881zplwwnqiMsRUwYZ/514T dmH9Z4w8spCtBToQK6b1dFJr6qRxdDjv2KiLNpd4aqzg8cehS+1feJNUhinjjeHobJmb HjfblNvdZovB0PRULLs3tBm62UxN+3/yuCNBNXj56vs9kbTd5CViLStEvfpHU7zlUxtT 9LsQ== X-Gm-Message-State: AOAM533WMitDy1tP5ZjSeV58nxrHxkUkl5OEEPYLMu6lfoXpT5GhxuHq qNMnyMZc6o9t27zPwtGoSMDS/uuWqQA= X-Google-Smtp-Source: ABdhPJzKV5+smWxtVIiyj9EWAHcckKnsYPDPybwvb51irixLMn5K4+4w4PY7r+6rf/Ef8DB0ZFXX3A== X-Received: by 2002:a63:4204:: with SMTP id p4mr1748596pga.219.1604056224994; Fri, 30 Oct 2020 04:10:24 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mv22sm3034415pjb.51.2020.10.30.04.10.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Oct 2020 04:10:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Oct 2020 19:10:08 +0800 Message-Id: <1604056209-16491-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1604056209-16491-1-git-send-email-lance.lmwang@gmail.com> References: <1603967178-3765-1-git-send-email-lance.lmwang@gmail.com> <1604056209-16491-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/3] avfilter/vf_unsharp: add more pixel format support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_unsharp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index 416bf1c..e9b6c90 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -201,6 +201,10 @@ static int query_formats(AVFilterContext *ctx) static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, + AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9, + AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV440P10, + AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE }; From patchwork Fri Oct 30 11:10:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23285 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 C834044B966 for ; Fri, 30 Oct 2020 13:10:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AEDB868AA9B; Fri, 30 Oct 2020 13:10:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D17868A42C for ; Fri, 30 Oct 2020 13:10:28 +0200 (EET) Received: by mail-pf1-f194.google.com with SMTP id 133so4945861pfx.11 for ; Fri, 30 Oct 2020 04:10:28 -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; bh=YIKVjN67WGY1Qftl3P8Ax24U8aNYMC75t/PAvpmo7+Q=; b=BR11K+c8+kYEQrIjRRu7ODgMwufiRSY1dmvuVxJ0l4isLkKcVsxHP+1V9mpJz2En4G Uyct9d/YcU8Ygkvneez7TNWevHONBlusiR7cFbAVx/mlJ7i2C3EKugZCUgsSMcW7XAQ1 OjfIk9Pd1yQVJl3tfZoHtAhXdLPpYx+NX7c5+30DT7QCQmlmDZQqIVxGQinlkwAOjiCZ w8sl8syo+EABZjDfEyO6E36KzY8w/aRSlKT4Jce7ACHiKJdT0RSopz+4L4YOqIYlfq5S c+Jddyn/rGwfzMueZ7HvWqj6RwfKnvOMs+9HFRZghsQxwTM2Y45FwQHkbGdS8xedjpi1 M8Bg== 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; bh=YIKVjN67WGY1Qftl3P8Ax24U8aNYMC75t/PAvpmo7+Q=; b=dkkJgGrcy0cKoXFpz4yvexzebo9G1WbUjoV8x1qy5bj6avQdTpOyoPhsXFXbatBQmi Gsib59Hi3kNdc+2dYK8eSpWMxYhphCkNT/wqgJkmrA/Rb85uaUmsCeDkf1uQGBJgxN38 k8tLvdGiHhTnmrOSxSx+d8nlBVcKzxa2/jthxipVZeI8jdn5byOkgooniGoP9x5ETcW9 zGjEcOJtyQb5rjOKT0SXa6Odo44RxahWmPlBk+954XFH9CEqXCoYaaaQBalY7NNFNqEK SyjCCC3FB/9hH3cBoQq+N8MIyBzp8BZPtllJB1cc5Ul81g4ag7EmtMVHq01PoKTm/XGC hWgw== X-Gm-Message-State: AOAM533p4E/5pwWr5+pDhOGkpfAm6/sbxxxqT89ae+YdA71LXBr6xZsZ uv5fVcWsvDLjmp58AJAAszsLOkgaccM= X-Google-Smtp-Source: ABdhPJwTDwkjGp1ZCffBsYKbLQy7bSlslwdUi3Ub1jipyLDTJ+r0YNBtJi1y7V6cb4Xj7OHYXmyk/w== X-Received: by 2002:a17:90a:5d11:: with SMTP id s17mr1068914pji.107.1604056226682; Fri, 30 Oct 2020 04:10:26 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mv22sm3034415pjb.51.2020.10.30.04.10.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Oct 2020 04:10:26 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Oct 2020 19:10:09 +0800 Message-Id: <1604056209-16491-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1604056209-16491-1-git-send-email-lance.lmwang@gmail.com> References: <1603967178-3765-1-git-send-email-lance.lmwang@gmail.com> <1604056209-16491-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 3/3] fate/filter-video: add 10bit test for unsharp filter 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- tests/fate/filter-video.mak | 3 ++ tests/ref/fate/filter-unsharp-yuv420p10 | 55 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 tests/ref/fate/filter-unsharp-yuv420p10 diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 639f957..d7420f8 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -410,6 +410,9 @@ fate-filter-untile: CMD = framecrc -lavfi testsrc2=d=1:r=2,untile=2x2 FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp=11:11:-1.5:11:11:-1.5 +FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp-yuv420p10 +fate-filter-unsharp-yuv420p10: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf scale,format=pix_fmts=yuv420p10,unsharp=11:11:-1.5:11:11:-1.5 -pix_fmt yuv420p10le -flags +bitexact -sws_flags +accurate_rnd+bitexact + FATE_FILTER_SAMPLES-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILTER) += fate-filter-hqdn3d-sample fate-filter-hqdn3d-sample: tests/data/filtergraphs/hqdn3d fate-filter-hqdn3d-sample: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/hqdn3d -an diff --git a/tests/ref/fate/filter-unsharp-yuv420p10 b/tests/ref/fate/filter-unsharp-yuv420p10 new file mode 100644 index 0000000..20f82f1 --- /dev/null +++ b/tests/ref/fate/filter-unsharp-yuv420p10 @@ -0,0 +1,55 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 352x288 +#sar 0: 0/1 +0, 0, 0, 1, 304128, 0x375a055d +0, 1, 1, 1, 304128, 0x43374234 +0, 2, 2, 1, 304128, 0xba34fded +0, 3, 3, 1, 304128, 0xaab09f3b +0, 4, 4, 1, 304128, 0x1e42b90e +0, 5, 5, 1, 304128, 0x135f1088 +0, 6, 6, 1, 304128, 0x780c001a +0, 7, 7, 1, 304128, 0x10f209fa +0, 8, 8, 1, 304128, 0x54aa698a +0, 9, 9, 1, 304128, 0x72470a4b +0, 10, 10, 1, 304128, 0x7cac80ed +0, 11, 11, 1, 304128, 0x820ffb09 +0, 12, 12, 1, 304128, 0x7386656a +0, 13, 13, 1, 304128, 0x3662c47e +0, 14, 14, 1, 304128, 0x1b07cbce +0, 15, 15, 1, 304128, 0x2577c6d2 +0, 16, 16, 1, 304128, 0xb478c1a6 +0, 17, 17, 1, 304128, 0x27549b49 +0, 18, 18, 1, 304128, 0xd2f628ca +0, 19, 19, 1, 304128, 0x95cc5544 +0, 20, 20, 1, 304128, 0x844a1bda +0, 21, 21, 1, 304128, 0x4bcfc8b2 +0, 22, 22, 1, 304128, 0x403e2302 +0, 23, 23, 1, 304128, 0x275214bf +0, 24, 24, 1, 304128, 0x2f1e8e7b +0, 25, 25, 1, 304128, 0x14d68a42 +0, 26, 26, 1, 304128, 0x2d966e74 +0, 27, 27, 1, 304128, 0x7d2f0bf2 +0, 28, 28, 1, 304128, 0x5744d92e +0, 29, 29, 1, 304128, 0x4c89f858 +0, 30, 30, 1, 304128, 0x9702e22e +0, 31, 31, 1, 304128, 0xea18c80e +0, 32, 32, 1, 304128, 0x5290813c +0, 33, 33, 1, 304128, 0xc8909e8c +0, 34, 34, 1, 304128, 0xf9c985f9 +0, 35, 35, 1, 304128, 0xcdf626f0 +0, 36, 36, 1, 304128, 0xc517d607 +0, 37, 37, 1, 304128, 0xe765923b +0, 38, 38, 1, 304128, 0xf12fa5f6 +0, 39, 39, 1, 304128, 0x04bf7f2b +0, 40, 40, 1, 304128, 0x695762d6 +0, 41, 41, 1, 304128, 0xb1bf1983 +0, 42, 42, 1, 304128, 0x654dc4b2 +0, 43, 43, 1, 304128, 0x161854b6 +0, 44, 44, 1, 304128, 0x3d56b1c1 +0, 45, 45, 1, 304128, 0xa16f54a8 +0, 46, 46, 1, 304128, 0x02fffb2f +0, 47, 47, 1, 304128, 0x04bddde4 +0, 48, 48, 1, 304128, 0xf5687316 +0, 49, 49, 1, 304128, 0x2a9a7dc6