From patchwork Fri Aug 20 14:21:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shubhanshu Saxena X-Patchwork-Id: 29642 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1309562iov; Fri, 20 Aug 2021 07:22:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYrY2sjITacMHpFgBEkAzyDRP99xBYEtjEkyQq4z2KufJBGnEKUXJBEqWJBf3UiLvVmcgk X-Received: by 2002:a17:906:30d8:: with SMTP id b24mr21933761ejb.358.1629469373078; Fri, 20 Aug 2021 07:22:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629469373; cv=none; d=google.com; s=arc-20160816; b=Cv3/kxC35Hox06rTEVVXoADmcABI2QweyLw8Nr0X7fmt5aaw3/F+WovcFcV+VuCAZD JI+YAvYEDnOIE/fsXmyFaE4BkUbcEd/fLMmIQcRWuWIjjJTc4dvIRFwOcJopveJFhrsn Wr8l0oVwCJkEBJ+klH8nH5tDn3oZjqEJ4Ka1P8owiyH0EuEPbIfYTDmEenP1KdmVWr5h W3eyxwlG+GPmVQaTY3+Tn3zLNQr47AA/eOJdG1nK2GWqzojeCqZW+1jo/Ctsid+SfYOv Yk7V0Umx7FZQl7FrQY50imUx90VySchhfqCEmaxRGBhDF2XC1We31kBje9PC1Zgima0Y lkEg== 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=liQPCk/BLYweUBLyY4Yl/L15vs9NMQoky7YRcU4k51k=; b=slp8O3k7NZe6SeQi2DMJ3m7PgZwG42qBawAwJfh8JhhAl6dGSPkOfO23d3HK+Zjp74 VwVwgV+5e9ATKn2AvmwDWUE23/MDmsTA08NgM+ws94JP8osk8/I2nnnx/9MiF+gM4W4x s3V3IVrdZlti2dMoS1cnpjNCZnqKAaJ3XKJKn1UkFGe8l8MZMWMgraoibUN7oMXhxqnw ZCkAwLzCz6C7ddRX/ESC/7pLaWgeI8MVC86cvOOQw2Jo5FJlntJrMGxpaVMU9UO+GOFC gYefGGGS6thj0qEogzggVQVyOi/zEtAvrd8PIPvkoEbhfgQLn0OHiPKp+iPJ6z/N8a1D RLAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=i17BnDcU; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf29si6789877ejc.618.2021.08.20.07.22.52; Fri, 20 Aug 2021 07:22:53 -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=@gmail.com header.s=20161025 header.b=i17BnDcU; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0DFA68A369; Fri, 20 Aug 2021 17:22:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BC4D68A199 for ; Fri, 20 Aug 2021 17:22:23 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id o2so9327926pgr.9 for ; Fri, 20 Aug 2021 07:22:23 -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 :mime-version:content-transfer-encoding; bh=kr7KTKeKKVyXzGXws8VzzEwi1rW5pO9vD1GaL8so44c=; b=i17BnDcUYjQqF4vbY7m31rKzaigiODlOoTIKDc7TXqzLn/7LbZLLYp7FMgmUDVP7eU n/dHaeffy1xXD1siTYDx1lx5s78r+xtvLlr3T5q2LeidC+vVdmCqZfRNTLjr8DcCQyLX AcpRwGLJ72Qmcb+3wnJdN+5uL5/30L7CeIgRfGpY/5FcgarEc09lRKdTkqs30MnOERiu PXfr3bAoOlYpNkoGLmZKtHYY/H0uP4UzV5yAApVrHO8+wP5ql2PHybrrOMT6Ak/CqGnZ 8CZLFnqGPBUZCCxpeAN2hUu1o9KLHJzbT5b1iBp/Clvq3tWq8digLLPIBGF6QwhgFdGg IPpw== 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:mime-version:content-transfer-encoding; bh=kr7KTKeKKVyXzGXws8VzzEwi1rW5pO9vD1GaL8so44c=; b=azB6Qd+ImIOaL2GjGp39B/nYRE2o+Q9WOkJ/a4F6aMsuaPfAX/9N/ZnT3jD0eVKkh+ by26DtRWcI4+OyDL2+emPx+1Ny0mKINanj5bhQIu6TD2xrbIkFBVq69wEjdYLAPWT7sJ EDq9NXNukHxJhOfv8U8qsOhgbsehOBFIP8JnQzCX+YGBT1KhR6nFuqxePfv5lviNkuJh MT1SSuGsjjbh3g16z7oOFGlDn5nKXuBItrKMWsqnnelWaAW98h+YeidzMEwqFMiDGCGH lZq48U0SkTTqU8z7Q1kmiY6CGm+DeWZ2ox3FbcX1YJsdZujxCevx+RBtL2BpVIiYkZgi u47w== X-Gm-Message-State: AOAM533wgqq5jHcwpIbdAIR5EbnkKw1oIqupyK2V/IXM0Yd9W51JCkD2 7niaUoq6BOV8ZbKEv7F79sP/xn/kXi2HCA== X-Received: by 2002:a63:1e5c:: with SMTP id p28mr19187296pgm.89.1629469340446; Fri, 20 Aug 2021 07:22:20 -0700 (PDT) Received: from Pavilion-x360.bbrouter ([103.157.220.241]) by smtp.googlemail.com with ESMTPSA id x19sm8276043pgk.37.2021.08.20.07.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 07:22:20 -0700 (PDT) From: Shubhanshu Saxena To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Aug 2021 19:51:00 +0530 Message-Id: <20210820142103.14953-3-shubhanshu.e01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210820142103.14953-1-shubhanshu.e01@gmail.com> References: <20210820142103.14953-1-shubhanshu.e01@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] libavfilter: Remove synchronous functions from DNN filters 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: Shubhanshu Saxena Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hCAL8Qs2MfPm This commit removes the unused sync mode specific code from the DNN filters since the sync and async mode are now unified from the filters' perspective. Signed-off-by: Shubhanshu Saxena --- libavfilter/vf_dnn_detect.c | 71 +--------------------------- libavfilter/vf_dnn_processing.c | 84 +-------------------------------- 2 files changed, 4 insertions(+), 151 deletions(-) diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 2666abfcdc..809d70b930 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -353,63 +353,6 @@ static int dnn_detect_query_formats(AVFilterContext *context) return ff_set_common_formats_from_list(context, pix_fmts); } -static int dnn_detect_filter_frame(AVFilterLink *inlink, AVFrame *in) -{ - AVFilterContext *context = inlink->dst; - AVFilterLink *outlink = context->outputs[0]; - DnnDetectContext *ctx = context->priv; - DNNReturnType dnn_result; - - dnn_result = ff_dnn_execute_model(&ctx->dnnctx, in, in); - if (dnn_result != DNN_SUCCESS){ - av_log(ctx, AV_LOG_ERROR, "failed to execute model\n"); - av_frame_free(&in); - return AVERROR(EIO); - } - - return ff_filter_frame(outlink, in); -} - -static int dnn_detect_activate_sync(AVFilterContext *filter_ctx) -{ - AVFilterLink *inlink = filter_ctx->inputs[0]; - AVFilterLink *outlink = filter_ctx->outputs[0]; - AVFrame *in = NULL; - int64_t pts; - int ret, status; - int got_frame = 0; - - FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - - do { - // drain all input frames - ret = ff_inlink_consume_frame(inlink, &in); - if (ret < 0) - return ret; - if (ret > 0) { - ret = dnn_detect_filter_frame(inlink, in); - if (ret < 0) - return ret; - got_frame = 1; - } - } while (ret > 0); - - // if frame got, schedule to next filter - if (got_frame) - return 0; - - if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { - if (status == AVERROR_EOF) { - ff_outlink_set_status(outlink, status, pts); - return ret; - } - } - - FF_FILTER_FORWARD_WANTED(outlink, inlink); - - return FFERROR_NOT_READY; -} - static int dnn_detect_flush_frame(AVFilterLink *outlink, int64_t pts, int64_t *out_pts) { DnnDetectContext *ctx = outlink->src->priv; @@ -439,7 +382,7 @@ static int dnn_detect_flush_frame(AVFilterLink *outlink, int64_t pts, int64_t *o return 0; } -static int dnn_detect_activate_async(AVFilterContext *filter_ctx) +static int dnn_detect_activate(AVFilterContext *filter_ctx) { AVFilterLink *inlink = filter_ctx->inputs[0]; AVFilterLink *outlink = filter_ctx->outputs[0]; @@ -496,16 +439,6 @@ static int dnn_detect_activate_async(AVFilterContext *filter_ctx) return 0; } -static int dnn_detect_activate(AVFilterContext *filter_ctx) -{ - DnnDetectContext *ctx = filter_ctx->priv; - - if (ctx->dnnctx.async) - return dnn_detect_activate_async(filter_ctx); - else - return dnn_detect_activate_sync(filter_ctx); -} - static av_cold void dnn_detect_uninit(AVFilterContext *context) { DnnDetectContext *ctx = context->priv; @@ -537,5 +470,5 @@ const AVFilter ff_vf_dnn_detect = { FILTER_INPUTS(dnn_detect_inputs), FILTER_OUTPUTS(dnn_detect_outputs), .priv_class = &dnn_detect_class, - .activate = dnn_detect_activate_async, + .activate = dnn_detect_activate, }; diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c index 410cc887dc..55634efde5 100644 --- a/libavfilter/vf_dnn_processing.c +++ b/libavfilter/vf_dnn_processing.c @@ -244,76 +244,6 @@ static int copy_uv_planes(DnnProcessingContext *ctx, AVFrame *out, const AVFrame return 0; } -static int filter_frame(AVFilterLink *inlink, AVFrame *in) -{ - AVFilterContext *context = inlink->dst; - AVFilterLink *outlink = context->outputs[0]; - DnnProcessingContext *ctx = context->priv; - DNNReturnType dnn_result; - AVFrame *out; - - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); - } - av_frame_copy_props(out, in); - - dnn_result = ff_dnn_execute_model(&ctx->dnnctx, in, out); - if (dnn_result != DNN_SUCCESS){ - av_log(ctx, AV_LOG_ERROR, "failed to execute model\n"); - av_frame_free(&in); - av_frame_free(&out); - return AVERROR(EIO); - } - - if (isPlanarYUV(in->format)) - copy_uv_planes(ctx, out, in); - - av_frame_free(&in); - return ff_filter_frame(outlink, out); -} - -static int activate_sync(AVFilterContext *filter_ctx) -{ - AVFilterLink *inlink = filter_ctx->inputs[0]; - AVFilterLink *outlink = filter_ctx->outputs[0]; - AVFrame *in = NULL; - int64_t pts; - int ret, status; - int got_frame = 0; - - FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - - do { - // drain all input frames - ret = ff_inlink_consume_frame(inlink, &in); - if (ret < 0) - return ret; - if (ret > 0) { - ret = filter_frame(inlink, in); - if (ret < 0) - return ret; - got_frame = 1; - } - } while (ret > 0); - - // if frame got, schedule to next filter - if (got_frame) - return 0; - - if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { - if (status == AVERROR_EOF) { - ff_outlink_set_status(outlink, status, pts); - return ret; - } - } - - FF_FILTER_FORWARD_WANTED(outlink, inlink); - - return FFERROR_NOT_READY; -} - static int flush_frame(AVFilterLink *outlink, int64_t pts, int64_t *out_pts) { DnnProcessingContext *ctx = outlink->src->priv; @@ -345,7 +275,7 @@ static int flush_frame(AVFilterLink *outlink, int64_t pts, int64_t *out_pts) return 0; } -static int activate_async(AVFilterContext *filter_ctx) +static int activate(AVFilterContext *filter_ctx) { AVFilterLink *inlink = filter_ctx->inputs[0]; AVFilterLink *outlink = filter_ctx->outputs[0]; @@ -410,16 +340,6 @@ static int activate_async(AVFilterContext *filter_ctx) return 0; } -static int activate(AVFilterContext *filter_ctx) -{ - DnnProcessingContext *ctx = filter_ctx->priv; - - if (ctx->dnnctx.async) - return activate_async(filter_ctx); - else - return activate_sync(filter_ctx); -} - static av_cold void uninit(AVFilterContext *ctx) { DnnProcessingContext *context = ctx->priv; @@ -454,5 +374,5 @@ const AVFilter ff_vf_dnn_processing = { FILTER_INPUTS(dnn_processing_inputs), FILTER_OUTPUTS(dnn_processing_outputs), .priv_class = &dnn_processing_class, - .activate = activate_async, + .activate = activate, };