From patchwork Wed Aug 25 21:10:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shubhanshu Saxena X-Patchwork-Id: 29781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp910923iov; Wed, 25 Aug 2021 14:12:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2vaqBvFWeXZRvef8uhfxbIwO7TXko7ZZZ8LL+xCqGN5Ki9ErGAqZfZvFwHOQmJ/tzSw3u X-Received: by 2002:a17:907:d09:: with SMTP id gn9mr610678ejc.447.1629925933120; Wed, 25 Aug 2021 14:12:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629925933; cv=none; d=google.com; s=arc-20160816; b=Q3Q9HHgtbncFqfvnZXxJyAKJJi+Dunrqi0Ih3JCcRIuycK/2qQW5SkJO+xeUyYWbIa iuruw7l2b4pKgYtN/1eNlfatxDfhOLJHojw3AHg+GaE/qCvFYEKOmc74u4785Jve3d9W bCBdN7cIzVaMRCCfVe/eYzjz2MLr+TmPyocK+Ngtjfx2ccRudAFZ5HEZakwy9/jTNLP0 5PbdeBJHg5ntG29J+iqa+9KT/uJGacOjyRWTMPNfAZDufluYPQCa27D0CViZwRAjJIqt h32BtbA2QwCo2fbtMV/Hcqoz00OEZNVKepLEuYQvbXlQHyP6CHxE9qci4NmX+m4rp1gD ayEQ== 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=aDyuyN9A6cXr8vZwoEbueMIkKvvYAVL3+q9NfG/m2B4=; b=K4FcFI/S/SlXUAeaEfkvEcovuiH0Laly3ZYqe0428+KjqjQv6vrvlfUM1b2HzmiOBY 0asDTBMIUPI82wGemGCXKaSwf5RhzjUImUu0wcPcCOhPLlgE0SJkrQdVIulSs9MbU9kI MZtsx+UAhH0HZxBzpqVnv4MOTqtMKrf2ODXD53mgxAR/omxBUNnrvZnS2PVbBzQMhysD XoQFTFbHFSkVCipHQsvhfuI8yml7kYyjQJAWH9a5kY6RCvGebPF8PlYCJS42h6s3Z2yp kQLMs6THQCff8m+sswMGDxkJ4MYkRy0eABctTpyw4yudfp6S8YIS3nmIyY+TgzkIaRYn j9NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OTjdiVZ+; 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 nb10si839765ejc.412.2021.08.25.14.12.12; Wed, 25 Aug 2021 14:12:13 -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=OTjdiVZ+; 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 8642668A2FE; Thu, 26 Aug 2021 00:11:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5D8068973D for ; Thu, 26 Aug 2021 00:11:44 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id g14so792721pfm.1 for ; Wed, 25 Aug 2021 14:11:44 -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=yx+FRR2RQ5v8t6V/JDId/q0YNFgHorSWYANu7Qi9LsQ=; b=OTjdiVZ+mMyP1+2MLbtfGwoRTAafsZGRcPCkFlTv1++MuAEPnPJmvOR3M0wvbh/V5r xAjGM+u+rZTgfncL5dLcam8WzCxAbeLUJgMlZSxAN5VJz5OAD+yEjgidrsLfQzyN9z8l UE6SkaD5FCoQlZn23iCBdAqVdAyUMEX+Y4tQZcsvLPVkJr1e1M03MbhTFewo6ck4y56v DdKOVU9Jb2jHEUQ6Rga9bkaXE6/Ka30BOeWa3qiF9YpcAZlWlJ7DlIoVG+F9YhXU0C4n vKAa7LE2jKK660Sv8czAnJrdoUvtxCRppengPipR18ICcriRG9R9L7tevimaYa26rm9E TKow== 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=yx+FRR2RQ5v8t6V/JDId/q0YNFgHorSWYANu7Qi9LsQ=; b=CRjshWqDpz0O1TH7TOTMvnlSJb0LSQMZ6smNotU21vovRhY8GZkVIFDKMtLQwkl1ev If/mOv/aBT3p+ZRpELblkx6I1XOTa6dAvxsSfOBd9in+hbWih3ICT8Bc25JandukE3GM WnroTE2S9YJdSC8+rIp6BLAtaZMKaUy5D48Rp+qjUnyHrQ4Me4CP8UqRSVUKLImFwkM8 05Ylcw1kGYpLDQeLhSjHyOXWtPpYi46NB/nt4myynL5NrSUC6lRipgICF3eVelUAadsR fouzaBJFgJ/hC8bAfottbgjSQxj3ADSqMdOeYSOlJP3UW4b8yvuO6dtUnJt/iXCSAAzQ Pnyw== X-Gm-Message-State: AOAM530AIpL34eCayEExH/b5xvdHaVIC8IaZ4ZhxIoxOTn1LIHjmFXkO dxqkE+Gj/StyPc+YuaOGOiQ23xnlc8ylSg== X-Received: by 2002:a63:4005:: with SMTP id n5mr177433pga.140.1629925902948; Wed, 25 Aug 2021 14:11:42 -0700 (PDT) Received: from Pavilion-x360.bbrouter ([103.157.221.29]) by smtp.googlemail.com with ESMTPSA id o11sm600357pfd.124.2021.08.25.14.11.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Aug 2021 14:11:42 -0700 (PDT) From: Shubhanshu Saxena To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Aug 2021 02:40:46 +0530 Message-Id: <20210825211049.18861-3-shubhanshu.e01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210825211049.18861-2-shubhanshu.e01@gmail.com> References: <20210825211049.18861-2-shubhanshu.e01@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: QGI/st1JciS4 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 675113d676..637874b2a1 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; @@ -438,7 +381,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]; @@ -494,16 +437,6 @@ static int dnn_detect_activate_async(AVFilterContext *filter_ctx) return 0; } -static av_unused 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; @@ -535,5 +468,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 7435dd4959..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 av_unused 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, };