From patchwork Thu Oct 29 10:26:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23272 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 448924480FA for ; Thu, 29 Oct 2020 13:16:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EA5B68AF78; Thu, 29 Oct 2020 13:16:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A113868A0F1 for ; Thu, 29 Oct 2020 13:16:42 +0200 (EET) Received: by mail-pf1-f193.google.com with SMTP id b3so2081237pfo.2 for ; Thu, 29 Oct 2020 04:16:42 -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; bh=0s0YMoloccGrtayUiXWzO6Tdt2qBcBxLcNJHdv2ADBQ=; b=jEr2+x07qKA1bRsmpnqNOG5tyxhnuyl19p34oar9VnAIvkDz1/e5Vk+KMVXQcLSJv9 V9/w/5Qqb3GexQ4rf1Lp8zpdl2/B+P7xTqZ+Sun5xjU10K3DFV6Ey3B38jF8GYvKaQoR PFu8np2xoq9ynHN6Nn42r+dzdZAaYsID7o81mD+EhsuTesyEtI+174unCyv7k5g+f+J+ sdULcZBPONsJAGYaFrLWVhEI3hembDp6SxuLQP2h/vjF8xz/+mT/8P2jI4KmZGOvCAO+ JwdRQfpPRtz7Gh/kmV+sVpcwHv4rsgoZt0RNh/mj9CHGkdsdbrjfJ8dikTkc/gbmhEhp mLjQ== 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; bh=0s0YMoloccGrtayUiXWzO6Tdt2qBcBxLcNJHdv2ADBQ=; b=VJ2XfoiC1LRmiGbsCZiMYdJ8/nQ+chDHpr4BZQR4SHYsHOnPRoLQ7UjK7avCF6d29D /bTUhNtec+yTE2TgfFnHqLVqIZTW7pJNVoNzO4QmLOCRBIiHU7eRPIJyMRxeC28VMa3v U0OzQSeK6zx2yisH6KnzcXkPDQv/ZCPJJEmU6k+gpJ0DI65UhFDIuVz3Zd/aprPUkK6d 4jwhPDZf/336Jb/KfbXB4WaLM6wUkZYr5W1G/JwQfjKuKnBLb76gslep6rgQo6fbS7jC 5uj98D/nmvuTVR6Lvc7dMq/zc3gzKzBe1QcpuDfNWTfrXrqIq+OT8a29oX4tUWNn46aS ZEfQ== X-Gm-Message-State: AOAM532zosD+6auKr9Aa7w3AJeD3FU9Xz/DiuXptLspP40YhzSq4EWGY AmRqoeY+opYGyF+nlrnrsp8oaLxxR9M= X-Google-Smtp-Source: ABdhPJz1XqPhfi49VVafx5/4mSt5NXD6Y89gnPEE5h203QwbuC8BUy21+k94q9mgEgJ8dLqcVBktMg== X-Received: by 2002:aa7:9e4a:0:b029:152:54d1:bffa with SMTP id z10-20020aa79e4a0000b029015254d1bffamr3794982pfq.6.1603967184649; Thu, 29 Oct 2020 03:26:24 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id ca5sm2738874pjb.27.2020.10.29.03.26.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2020 03:26:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Oct 2020 18:26:16 +0800 Message-Id: <1603967178-3765-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 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 Thu Oct 29 10:26:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23270 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 D375B44952D for ; Thu, 29 Oct 2020 12:26:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD4EF68AF5D; Thu, 29 Oct 2020 12:26:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F94768A5A8 for ; Thu, 29 Oct 2020 12:26:28 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id y14so1942985pfp.13 for ; Thu, 29 Oct 2020 03:26:27 -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=QkOy7t+Z4YY33qAWwVaBUL+Kh3xCvil7RtEZIohsO4C66EPZGTHD+L7V2a0Hjc06hg Qbrr7Q/6gUd6o1Yph+vd0+cd5BxWf9frbHfUGW0m/XhqQlYFrU8cK5PmL+O1zLNaFDgo CV7iYHmiMlq4iYV71qAXlpGXOMfduXFxlnCxSkolxKL1t8Y4bFLD5ON0Dkvhi790Yd1c zIMOghAfK7Uy7W+ngDHwxnVU2mUYR2crR+y9RxOQLGHX74wtckscZL9+OEPKnadQuNDU ULdHFg/XsDZbRUmgu2jmfPuHCweiOju0zaV7JUzfEQa8qpNHcrmpIrpuUHqOG63Hwb9Q AYmQ== 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=m1arDw/21Pam8ovr2Xn8Apu2b5OxRsxk/QmZgxi1pskjSa+eJ2TVMMJej+dZzj+7An Iw5dF8mUJvGnq46+ZaJPO6SIm1XKuWumyJvf8wjHqp7E2qvbOP0xbQAbDGg5rmlEadbY nu1UnPOtzo12/Rc0VQP5kSohJZk31aLxSdwuGr3y+Ju+yQDwBTD2dBKSw8dUuQZwsYdP pDuNa87LxfABfbmtKcPZvaNfTH9irpwCVK5x4UaDW9WpqHCOoeDTsfhXS6xDEvp5A9zX R9R7w5zDPi6B0hFh1+pwmILwe0UA6Or0x/l9/FnFPDkbULxpySpwmK/ghmE/R9ipNwTm j2/Q== X-Gm-Message-State: AOAM531BAwg8yrN+zc3FNQMtlHbxJbvg4irkCPw0YDjhmVjkHXBC1dEs 4z3SjesBuBX+mAJxt/VHiyEtQlQeyl4= X-Google-Smtp-Source: ABdhPJx1f+Z40xauNOQHFlZDpyGPvqu00KWXEYVbS9Bp/tAKhQ6uSHK0q0axdjx2nxBYmH67HgC4hg== X-Received: by 2002:a62:1d4b:0:b029:164:892d:51c7 with SMTP id d72-20020a621d4b0000b0290164892d51c7mr3358797pfd.72.1603967186314; Thu, 29 Oct 2020 03:26:26 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id ca5sm2738874pjb.27.2020.10.29.03.26.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2020 03:26:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Oct 2020 18:26:17 +0800 Message-Id: <1603967178-3765-2-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 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 Thu Oct 29 10:26:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23271 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 9A0ED44AA27 for ; Thu, 29 Oct 2020 12:33:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6447B68AF83; Thu, 29 Oct 2020 12:33:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4260068AEEA for ; Thu, 29 Oct 2020 12:33:29 +0200 (EET) Received: by mail-oi1-f195.google.com with SMTP id k27so2665807oij.11 for ; Thu, 29 Oct 2020 03:33:29 -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=320HhI7VDLSBoZ6T+o5NT7mmhj1IFYtoHcHkbMzoHUo=; b=ADnCXUQzKHCMy8YL1IeBKmRLjcrY59DtF/JhfrdFDMU3AqBSRNlxmyPZ07hJ016KVi Pb7OEPMz+1zS+G8SMXY7w+0vchDZZllMSoff87W5fJKtMQP+usGv5ESiAplmazZganBV qIQvv+N6CGPC6b3ZHKt9HTMxubFPsG+2fWoXEX9vQZ5D2NF7WexLf70U+lJT8xJxUgdF JLWxueY/GQ16328dWfd9tAvwP3adJ3U3qIQdSzgtu322kEJ9cKWKdRBZH3jySNUGYLmF a0umMB2pJl2R4caoz8K6ae0FPrcoK2poXrE3GJBBIBgmauOLZY6PGcxsoZt5oGAcVee1 AbgQ== 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=320HhI7VDLSBoZ6T+o5NT7mmhj1IFYtoHcHkbMzoHUo=; b=kMyLo7qjq6U9N3Lqio3wNMefJhH7ktvDDYYAGnyYIskWzPaR4DLyz6bWwSt+o721iy BPmVWejUCOXIC7NJvBiF9gUSozCK3ZKZlMmiAotyGtf0ZbXQq+E4PVWJhBo0JDI2TbiQ 3eIX+RHtxcwlOhD4O+R2bhX24sBAwjbHb6mLyLnmPW8LCBgUxUYbO2qxySA6m259HLrd bCPe3ZH5Okf+f9oY/AaIC4aBMXimKCZTGRpg/evJYI3X3m4BqKly6HzJ5/oFufJbCwL/ cFyRzWwso9mF61z1460er3zxmm2vusLNTZmWyFAOu6NRfH9idIGRDjNlw2u2sYmgPmx8 PY0g== X-Gm-Message-State: AOAM532UA6en5Ywg1EfYLmhrF6HYROXX6PdLB8wDASlHNEZtHQ7i+RCf m5nj5+h/tqzWZQivW/3R+YgC1Mneu64= X-Google-Smtp-Source: ABdhPJz5um/ZYVPuofVnI4w+fm/qAKigd8mof9T7TyYExrQBTesrF1FQ95HJUREBNMseUQAzBB8dyw== X-Received: by 2002:a17:90b:e8b:: with SMTP id fv11mr3747637pjb.83.1603967187959; Thu, 29 Oct 2020 03:26:27 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id ca5sm2738874pjb.27.2020.10.29.03.26.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2020 03:26:27 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Oct 2020 18:26:18 +0800 Message-Id: <1603967178-3765-3-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 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 +++ 1 file changed, 3 insertions(+) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 639f957..f295df4 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 -auto_conversion_filters -c:v pgmyuv -i $(SRC) -vf 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