From patchwork Wed Mar 10 21:54:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26332 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 9A1BE44B799 for ; Wed, 10 Mar 2021 23:55:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8608D68ABE3; Wed, 10 Mar 2021 23:55:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F210968AB27 for ; Wed, 10 Mar 2021 23:55:41 +0200 (EET) Received: by mail-ej1-f42.google.com with SMTP id e19so41902809ejt.3 for ; Wed, 10 Mar 2021 13:55:41 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=ajahs6bg1BdK9agnUhazDcAnrNvVkh/vZVOSw0KA+Rk=; b=aRq2Zp7sVj3Np7w8V+me6GZkgRhGJC55cjGwzqngSx/Idak0JGgNYxeparLeBJdvHl tVm9WOp8ONW1ANxmWXXGJESiuQuVZxrLX53OqPwN3EgVFRC1iMFWkd8EBa6mJ+Sl3cRe 9TeNSiyQHFpmpMGyIWbxUGEcMkF8pI0ip04luJxbxXEgSIm6Sy0+teLXgbWu2aIjBOgq sCUVfYXUZdpt0pGH/TvLqvgS9C/YEA5CUhhznxFj1L7kuvCS5h23tZx2SNKFa9lHdGVZ a2I1LbdaPc1Mrd/dNnM2raJVVpcE1WSGJI51ZfYEJh+AzDnMlBazwVszS5uurOyvuPaJ FohA== 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:reply-to:mime-version:content-transfer-encoding; bh=ajahs6bg1BdK9agnUhazDcAnrNvVkh/vZVOSw0KA+Rk=; b=uoAVVDVbzly4ZuqAiygxkOA2IztLjN7l3ggblexjfxDhFf/96nFZRJhYFckMq5tsdo 5UqPW2E8ZqLkjJmewA4u2Fxf+mJcQjh9AyIiGeqQ9oUehBWlhuOQ+iURRTpr1V+bRcPF OZl/irQAlI7ecZRMgLwsvl5fMIdld3bHNeUbFPZ7c1WCgjhshQlbIsNRPhuuaDpaCfEz dr8WNtTeddwCxRlHi0E2bidZlICPjBWXsyfZWuHm1ot+QD4kONGKBuzjW3z1Cakgacc7 qYqyJ2fr7DaZpr4bRCmSZiWBbf4USoRaSt0xt8wPmbQtC0CJ0/AMcGACJQEHtQhq2tbY zMyQ== X-Gm-Message-State: AOAM531RsFO+0FhdLUeQvd1PE1tPRNFfLYiGzqEQtXWjkr0wQUqYAzdy mOtWa3vkW6GsW5kr/o1lqENGR58yW+I= X-Google-Smtp-Source: ABdhPJxorvWV7XZWZ2uyhhJUOB7MTH+4/UWXGTaP7XcgKsb0ZTjnzKI2sR0lzdCvPaB3pN9jxgEHHA== X-Received: by 2002:a17:906:5689:: with SMTP id am9mr29675ejc.298.1615413341412; Wed, 10 Mar 2021 13:55:41 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id m10sm351993ejx.10.2021.03.10.13.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:55:41 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Mar 2021 22:54:44 +0100 Message-Id: <20210310215446.1396386-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210310010601.1142819-1-andreas.rheinhardt@gmail.com> References: <20210310010601.1142819-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/23] dnn/dnn_backend_native_layer_conv2d: Don't pretend convolution can fail 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It can't; these are just remnants of commit 3c7cad69f233252e5178f7732baa0da950d74bbd which let the worker threads do the reallocation. Signed-off-by: Andreas Rheinhardt --- libavfilter/dnn/dnn_backend_native_layer_conv2d.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c index 44e5bdb5f7..f7f1ef9b6b 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c +++ b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c @@ -180,7 +180,7 @@ static void * dnn_execute_layer_conv2d_thread(void *threadarg) output += conv_params->output_num; } } - return (void *)DNN_SUCCESS; + return NULL; } @@ -244,7 +244,6 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera } } - //join threads, res gets function return for (int i = 0; i < thread_num; i++){ pthread_join(thread_param[i].thread, NULL); }