From patchwork Wed Oct 23 10:27:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15911 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 4541D449802 for ; Wed, 23 Oct 2019 13:28:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3122F68AAD3; Wed, 23 Oct 2019 13:28:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEC8A68A93E for ; Wed, 23 Oct 2019 13:27:56 +0300 (EEST) Received: by mail-pl1-f195.google.com with SMTP id c16so6137006plz.9 for ; Wed, 23 Oct 2019 03:27:56 -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=mGLXRY8e34Fmuuhmv7rE6l6gW2OebOEAEOWt4gaX8hU=; b=mehuMqtCWublGXfZqE/D8tM/GlzE8+7i7wlAi6QHBwX+CTIJ1yblZjV0w0P+AFRVCT JmNDsSdctoNQOZE3+/sc851JHK6bQyn76VSkCJiLmujHVIL1DEC3wejrRtgolOHseHU7 tT13OzqNxPFaEa9ln8YISJ601OieGzBlT5grzL/F75CJivOhSCen1slm2K9afYZ53Jz5 ssIiCClakfWM5EudKkizehMgq8PyXGR7hRNF84Vf1MXII4CRGyqtGwQmejR59PBz5DRj re14mD61vbMiauB2KtwYrhdq1E2xr8/5ZA/aB/rkZabqUDZxBZsEBzAvAd63vcUeBXgL Fq0A== 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=mGLXRY8e34Fmuuhmv7rE6l6gW2OebOEAEOWt4gaX8hU=; b=rdFn2H7Gj+1H2S23nuRPDkjfWpswd6o4Yfe00+TEJWmXhQwce9wEmYN1bEbi0AvkE1 bizTeBFSW7n5jjXP6jSMxkQ+TXBvozmOYq+KFPYAK4v51dpyS4UnnsocXMrBX6vn6Qf+ wFyjJzppU+gx8etiSplYkpjS/1LvqB39TPlO5JlmMdl4sfR6pk8Okj8NCobQcKSiUbXP 6E1gATnR6zmMGO2x4ctNpADy2jMcAvctDvp09lxcQ/GXx85rt7VI7KxXRRL3z7Wbtqiw zVD7fkPs8EnmqV5GmS66RCYdZwMngGZMQIhPEXiethZcKee1iT+C32DgyWVBsfKMaYfb a73Q== X-Gm-Message-State: APjAAAVku04T1DhcCqNVY8NnzwCiUEoUrNkfne9kvNIbLCKMtiSPl1pL Ss/XeWGOhTowVANVGe0eccQZ1rvi1T0= X-Google-Smtp-Source: APXvYqy3u48eNZvaonsIBIDf53HsdUQsYsxnz5orr2A2PJlJ2Vj/HIT5YHD8Hx31RnfI/MoaR8uJgQ== X-Received: by 2002:a17:902:724b:: with SMTP id c11mr8924771pll.6.1571826475081; Wed, 23 Oct 2019 03:27:55 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id w11sm20453068pgl.82.2019.10.23.03.27.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 03:27:54 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2019 18:27:42 +0800 Message-Id: <20191023102743.19979-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191023102743.19979-1-lance.lmwang@gmail.com> References: <20191023102743.19979-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/3] Revert "lavfi/colorlevels: Add slice threading 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 This reverts commit 360bee8ca49d94d5cc8b77106887d6d7250440fe An alternative approach will be used to make the code easy to maintain Signed-off-by: Limin Wang --- libavfilter/vf_colorlevels.c | 110 ++++++----------------------------- 1 file changed, 19 insertions(+), 91 deletions(-) diff --git a/libavfilter/vf_colorlevels.c b/libavfilter/vf_colorlevels.c index fadb39e004..5385a5e754 100644 --- a/libavfilter/vf_colorlevels.c +++ b/libavfilter/vf_colorlevels.c @@ -105,68 +105,6 @@ static int config_input(AVFilterLink *inlink) return 0; } -struct thread_data { - const uint8_t *srcrow; - uint8_t *dstrow; - int dst_linesize; - int src_linesize; - - double coeff; - uint8_t offset; - - int h; - - int imin; - int omin; -}; - -#define LOAD_COMMON\ - ColorLevelsContext *s = ctx->priv;\ - const struct thread_data *td = arg;\ -\ - int process_h = td->h;\ - const int slice_start = (process_h * jobnr ) / nb_jobs;\ - const int slice_end = (process_h * (jobnr+1)) / nb_jobs;\ - int x, y;\ - const uint8_t *srcrow = td->srcrow;\ - uint8_t *dstrow = td->dstrow;\ - const int step = s->step;\ - const uint8_t offset = td->offset;\ -\ - int imin = td->imin;\ - int omin = td->omin;\ - double coeff = td->coeff;\ - -static int colorlevel_slice_8(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) -{ - LOAD_COMMON - - for (y = slice_start; y < slice_end; y++) { - const uint8_t *src = srcrow + y * td->src_linesize; - uint8_t *dst = dstrow + y * td->dst_linesize; - - for (x = 0; x < s->linesize; x += step) - dst[x + offset] = av_clip_uint8((src[x + offset] - imin) * coeff + omin); - } - - return 0; -} - -static int colorlevel_slice_16(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) -{ - LOAD_COMMON - - for (y = slice_start; y < slice_end; y++) { - const uint16_t *src = (const uint16_t *)(srcrow + y * td->src_linesize); - uint16_t *dst = (uint16_t *)(dstrow + y * td->dst_linesize); - - for (x = 0; x < s->linesize; x += step) - dst[x + offset] = av_clip_uint16((src[x + offset] - imin) * coeff + omin); - } - - return 0; -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; @@ -199,7 +137,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) int omin = lrint(r->out_min * UINT8_MAX); int omax = lrint(r->out_max * UINT8_MAX); double coeff; - struct thread_data td; if (imin < 0) { imin = UINT8_MAX; @@ -225,19 +162,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) srcrow = in->data[0]; coeff = (omax - omin) / (double)(imax - imin); - - td.srcrow = srcrow; - td.dstrow = dstrow; - td.dst_linesize = out->linesize[0]; - td.src_linesize = in->linesize[0]; - td.coeff = coeff; - td.offset = offset; - td.h = inlink->h; - td.imin = imin; - td.omin = omin; - - ctx->internal->execute(ctx, colorlevel_slice_8, &td, NULL, - FFMIN(inlink->h, ff_filter_get_nb_threads(ctx))); + for (y = 0; y < inlink->h; y++) { + const uint8_t *src = srcrow; + uint8_t *dst = dstrow; + + for (x = 0; x < s->linesize; x += step) + dst[x + offset] = av_clip_uint8((src[x + offset] - imin) * coeff + omin); + dstrow += out->linesize[0]; + srcrow += in->linesize[0]; + } } break; case 2: @@ -251,7 +184,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) int omin = lrint(r->out_min * UINT16_MAX); int omax = lrint(r->out_max * UINT16_MAX); double coeff; - struct thread_data td; if (imin < 0) { imin = UINT16_MAX; @@ -277,19 +209,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) srcrow = in->data[0]; coeff = (omax - omin) / (double)(imax - imin); - - td.srcrow = srcrow; - td.dstrow = dstrow; - td.dst_linesize = out->linesize[0]; - td.src_linesize = in->linesize[0]; - td.coeff = coeff; - td.offset = offset; - td.h = inlink->h; - td.imin = imin; - td.omin = omin; - - ctx->internal->execute(ctx, colorlevel_slice_16, &td, NULL, - FFMIN(inlink->h, ff_filter_get_nb_threads(ctx))); + for (y = 0; y < inlink->h; y++) { + const uint16_t *src = (const uint16_t*)srcrow; + uint16_t *dst = (uint16_t *)dstrow; + + for (x = 0; x < s->linesize; x += step) + dst[x + offset] = av_clip_uint16((src[x + offset] - imin) * coeff + omin); + dstrow += out->linesize[0]; + srcrow += in->linesize[0]; + } } } @@ -324,5 +252,5 @@ AVFilter ff_vf_colorlevels = { .query_formats = query_formats, .inputs = colorlevels_inputs, .outputs = colorlevels_outputs, - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, };