From patchwork Thu Jun 30 22:29:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36573 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp621528pzh; Thu, 30 Jun 2022 15:32:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1trsSEjGLXhTGCxt4XdGkApj0ymZsaMwlc37cILrz0EyN4QZxrsZa90YQiLIn1GwwQWQV6q X-Received: by 2002:a05:6402:400a:b0:437:7686:647d with SMTP id d10-20020a056402400a00b004377686647dmr14610760eda.422.1656628368819; Thu, 30 Jun 2022 15:32:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j10-20020a05640211ca00b0043583429934si3402694edw.565.2022.06.30.15.32.48; Thu, 30 Jun 2022 15:32:48 -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=@outlook.com header.s=selector1 header.b=m8DYzr+0; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9631F68B7C7; Fri, 1 Jul 2022 01:31:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2075.outbound.protection.outlook.com [40.92.91.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C343868B668 for ; Fri, 1 Jul 2022 01:30:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OeickTcJMCOzicNE8KjkyJXa1nDvIssPmojZCN9xjJKfaiUPEdOsCpREUB5ZuaGcfepjzu/ZDUVLfsNT3gjlW6Zq/2D2eFZpwEVz0OffZ6gUt1vj5hapxKkDxRTK+r3bcUC8dCIL4lXQxfcoNT2YW5NyWiGoH+M8G0NQ5JkcxXAT59DjBo32GIFyN2Kpvdj8ijfjj8VAjpuRKG3uHN/nD8UwOlXm+abhCKyJrgpPJoBjsAoSW0X+MvRVilbjquA2u4IVoQK1JeMDXDbTSl4sWPe+IBz3i3NQxQZMCaeSYTQ9kvHfXsPLdh0TUXin3eWEl2KomOyL7qUwmwH6mkJ/fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cu2/wz3TLTmbjhLl6RyqCIRy+sIxnQ0iag4FmtHHowY=; b=JU89D1j4+Ki0rQHXhCdkPNSsIszZ+p/dIiPjlS1E02b66OEiJrzEhYjv3UHOgLxh9aoal73ukRZ/ox1zZbOLjrv9aE0Ezzb6UvyapVxhnFliZLGEx9v723vg9Nd8DY9keGgWRnqC/nB0sPVQFsNd5YOtmtJg0kORNue+QmTslXVzmOmV01RxPTAq8M8bHEGHLm2csu+UfBaukmyDHJ10Sp+iMaf0NKPuLFulv8lhB2SEgfqJz/N34JpfQ7wfQhsd41QHWYKHlAxSOBNR41mGNKCtHCMQGXT6yOBLHEKYyDTGeke4eM9P/cc5VVwX7itsDFOD5gAVbP1Te5Xz/3Hjlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cu2/wz3TLTmbjhLl6RyqCIRy+sIxnQ0iag4FmtHHowY=; b=m8DYzr+0DjqtD0JUgqI5f8eWq3ghT+cfb3MpEDHk8wHsOqK4vJz96LNmm+GtkF+YGZ1eeEPEwovtxNyGCOXIOS9Yp54WIkvAMz3u5NcDgFuMO8iGHPUdNAuUwnBS+Ft7ezfnQgRbsfDceBGskC/ETDgfZadymzgCBd/zl9qj5yn1zsHX/8sJZHGWEu1WgUQkgqTIjmng63a24kDkE0eJG/ZPIqwb8+FUARz9b0cv/4sAmqwZFaPzdLqniOFmw1ap//ZNkJfjisysbE1xYDDLXF+GestvObZxWjF3uWwXQSd1t2Ed8d0pZXCy8jddCFbiVbw8sSQIgVXsFA09EgG4kQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB3PR0102MB3546.eurprd01.prod.exchangelabs.com (2603:10a6:8:d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Thu, 30 Jun 2022 22:30:57 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5373.018; Thu, 30 Jun 2022 22:30:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jul 2022 00:29:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [yk/lxnGqgj/VeygWuFZWRgtQp3F5d/DD] X-ClientProxiedBy: FR0P281CA0099.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220630222949.1758625-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3cb96371-a204-40e2-b9df-08da5ae83334 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXqMBxJfDcJWCkSlr5voV0aFL5m7pVkIuCUel2RDxeMLPUcvjqNSf6/oes+n79Sg9nB/TLbWC5oVC7jm58SJJHjIYm3UhsBgp2+9DKDvD1dCEdZosNdvpBiF0P0dbGJEoYfYTb5IYlsM97EI21eNJXgVvFqnkuOlJ6YP1sI1e26wES4jpQCmr3O5C/Y+2kDT/pPwKEujz6fk7jP0L4tHpbUF+a/fRFKqX5GN85EO1lm5rXntbJJaiI/Mo1hj4jnim20YnnZWh2ttYix1BGAJ7NysW/zyHwb3NQv2xRbl6AlMzZedd8f9hvw8a6UeuxopCjqntBHcupX3JTySACzQaBaIvJ1378UfTn28JP5Hn0rj+/FMH/BBgpoeffhgcPqY1XDNx0c26JFx/IHJ3qWSvysZ2lpzdJKIsDpBZ9owvnIyMNLfvqrwijr4rEAwUrLvdIFrVZmC6SDG/+5f1Fs9IQCYpO0sSrcXvwJjwa6/irVd4kN3E48zk0J+b9yg29imzN8/6ri4sPBgFfvrCXZUupzTvX6Zbq91rDBuwkFVOYdd3pgBI//5PjIl5xHJmvgoNA9vsHixFblilKZZ3ik/QcbjaqXayMlGl6h7km+RqmYtm5twYd7O4SPWP8eSEIG8LcgHFNLz+N2klv3KOoDgCWaOa4sRq1CB/7Bt5064UKdna7DvWaEK5aOwyYEqwVHDwQ4LG9JkUdQ5Z0SFnBmI5KbA9PamWrkN/A= X-MS-TrafficTypeDiagnostic: DB3PR0102MB3546:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NIYfrwiB2YqxjJFm+ZnmiffRuMI7IGiAhDn+GsaUb0QgJE3LrV0j64WrkNYTc8Ps8PSQ1iCPxxuqRl2FZ7Cz7cHZG/db1KJaRVlvMw2k6rZrj28jXym+4NozdCfiBFCVvB0jX2BBoAyY/ra4I38/VnLozK6wZXrobnTLHxIHDzxegm1CONBn5eOP0KgwbDzo4ExKUO7riTjEKgYXDXokxa+YxCQu1O3eCaxj171R8pY6BaAnyWGgr9mjjj9jAX8DZH7Ta6QpFGuFgj27p363KiyIPWcZTKChiIql0+FAsehcsnDlPLytttdFMIGinreMa5AlbLT9euvG/CgqVKcRGiQK31lBOJNtzqVn49dz5gd513OOZCQgLm8Fp6Ql332toVenWBmh0TBsSBIedT0ks+jCNVWLSfj2XUHd3OKr8xNvqKwMqphcJyzBLL+qCRAz/m3ja6rkm9PNcEi1Q+C+xPWjNpe8yOTettKpeUXOJjw2OZAwMR4TiE3+ujA4gabfqNX7DumRExeyJcbtJ6mocmeNJVXYTAbVN5aWrzhzepzr6mErX0+9TpwJ0p6Q6ckkuabx4oMsTbDkH+zw7nofE19e2Guyc1uCz8K0VCr4Gqk+mTNAEhVpzYDqc6FKmsF6K5gLvgpIDoGreUAN6nbp7QwDVuxIT4vpLtC74dJdQA9sdqGXewzkxhLzFKpGTnx3FP0VbFupSCM0/xh0Rr04Lg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8raNQB8GlD6/rNOsPRehqOAtwPTE4Ss+B0PdmR83TE2nbYXe32f6qI/5eKxp7s2JPq4Y700E8jnMnOZtxEHjTxR1GMMDMjOMysmnXWwu1wqkgcdgVDfV8Cu5q2y33ebbRXxaNwyHqM+KZQ62IWBGgw2u5SgOY7RSnzI0oyTSjv/arri/KGvazSpBSmI+fr8WJAUn5iLs75REot8Nxdq8rMhlT2wfkfP1fqKqdkKZuyTDqjsL/PqIcx1MYfRjg9iRcB1zomgSCjh+6YrSTW3gf1NQLDWUeBuq7z3m5LcG8akm+N8zt9W4gYDH8e7YcZVgfH9eKjdmm+TNbfv9+ehqFlqMywVSaba4Qnq6HUyTZ67jUSa0vTXK88brAwYZxKZOCFZiZ5H2y2Q1+ddc0XEV3l32a0UOeySqyKRzLjU0wFWIWtuJOS+i9qFlmPqoOCpAF9xvA0Xd7Win1n1ZnTyu2POJFkmDRxIJc6qZo+mN56ibyqbqdYie2nLctQUAbQnH7BNdP4uOyHsQqd42myK0oEEfFUy0etOrylPWmPePFXk07QC9eIC1ShWajLzS9Y4EZ4Sfd/WMxvaxMbLAWqX2DevCzj713Ln2jI6F3AQwX3x/f0P6MBSja1nZnluJvBq/QQzUpqDGtmEZ/yXWzBdBNJGClg0h0655pyYRz+KkCYP6H4hK5zy3dXCe2qpfLCjkAlLx2lgnKhgkMRjSy2fkTnYfucfejvPCHvHeaaPITcfDbn9E2ajGbSTkeNZG+UbijQAmCgVBMMEcNE8MYERfqYglPhgcxAgcfiT2pAHvOS0btVNUyVCk1Q1DnG/wLe9dDh3eNAWV2Vq3EyGaj2BBoOb6pvNk4bk0sEahj55aoqXcdbtC+ySSyOwCdUroBiToe5fkGpHan44uOiaxY6Zqb2+6N/tkiuDUTyipnzbEJVV8gOu04bE4Nw2NAwIHR58zZ5UER50vVFsKzKisuVHQDM/cb1Rtiilo/9g82S6bHWSiRiwkEmC6TlOF+joQkRecjeix+gDjf0z3QNRzTVVnJmHjEkAR3r+m/fhMMqiKq+9r1ZWmd6FlTegTofZQXsdmLJaUybteGBewHGPeJes9EhS0ORMPk44rj2tzzFGwXdQ9aNiy+NH+101HYHcKV4jsPz73MUokFhnFUC4Wi5Wes/8KLO7L0fw3QGNOnHoik2svgC1puh1T34hn5bNkhb58LOCucSbc8LBct3rJRIF4mCH2hmwi2VQ26ceZif/0X16hFhB07oMXt6arjbUIyiczaN/I/RmHIRQYpvNnowRyaDHTvnI/XH0tZGsjWsHcQew= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cb96371-a204-40e2-b9df-08da5ae83334 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 22:30:56.6696 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0102MB3546 Subject: [FFmpeg-devel] [PATCH 16/18] avcodec/pthread_slice: Combine allocating and zeroing entries 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /awFYccQIYTK Actually, ff_slice_thread_allocz_entries() always already allocates zeroed entries, so ff_reset_entries() was already unnecessary. Make this more clear by renaming it to ff_slice_thread_allocz_entries(). Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 3 +-- libavcodec/pthread_slice.c | 8 +------- libavcodec/thread.h | 3 +-- libavcodec/utils.c | 6 +----- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 5215f06e31..e2568c04c0 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2698,10 +2698,9 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) } atomic_store(&s->wpp_err, 0); - res = ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); + res = ff_slice_thread_allocz_entries(s->avctx, s->sh.num_entry_point_offsets + 1); if (res < 0) goto error; - ff_reset_entries(s->avctx); for (i = 0; i <= s->sh.num_entry_point_offsets; i++) { ret[i] = 0; diff --git a/libavcodec/pthread_slice.c b/libavcodec/pthread_slice.c index e34116116d..756cc59dbf 100644 --- a/libavcodec/pthread_slice.c +++ b/libavcodec/pthread_slice.c @@ -237,7 +237,7 @@ void ff_thread_await_progress2(AVCodecContext *avctx, int field, int thread, int pthread_mutex_unlock(&progress->mutex); } -int ff_alloc_entries(AVCodecContext *avctx, int count) +int ff_slice_thread_allocz_entries(AVCodecContext *avctx, int count) { if (avctx->active_thread_type & FF_THREAD_SLICE) { SliceThreadContext *p = avctx->internal->thread_ctx; @@ -256,9 +256,3 @@ int ff_alloc_entries(AVCodecContext *avctx, int count) return 0; } - -void ff_reset_entries(AVCodecContext *avctx) -{ - SliceThreadContext *p = avctx->internal->thread_ctx; - memset(p->entries, 0, p->entries_count * sizeof(int)); -} diff --git a/libavcodec/thread.h b/libavcodec/thread.h index 92cbd927f1..d5673f25ea 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -104,8 +104,7 @@ int ff_slice_thread_execute_with_mainfunc(AVCodecContext *avctx, int (*action_func2)(AVCodecContext *c, void *arg, int jobnr, int threadnr), int (*main_func)(AVCodecContext *c), void *arg, int *ret, int job_count); void ff_thread_free(AVCodecContext *s); -int ff_alloc_entries(AVCodecContext *avctx, int count); -void ff_reset_entries(AVCodecContext *avctx); +int ff_slice_thread_allocz_entries(AVCodecContext *avctx, int count); int ff_slice_thread_init_progress(AVCodecContext *avctx); void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, int n); void ff_thread_await_progress2(AVCodecContext *avctx, int field, int thread, int shift); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f78475d0ad..cae61d80ff 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -963,15 +963,11 @@ int ff_slice_thread_init_progress(AVCodecContext *avctx) return 0; } -int ff_alloc_entries(AVCodecContext *avctx, int count) +int ff_slice_thread_allocz_entries(AVCodecContext *avctx, int count) { return 0; } -void ff_reset_entries(AVCodecContext *avctx) -{ -} - void ff_thread_await_progress2(AVCodecContext *avctx, int field, int thread, int shift) { }