From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DE00147698 for ; Tue, 19 Sep 2023 19:58:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A974F68C971; Tue, 19 Sep 2023 22:57:35 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2027.outbound.protection.outlook.com [40.92.75.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21BF668C956 for ; Tue, 19 Sep 2023 22:57:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=flvSs93NQKqkfYxX7przf+7/X+pAfroJkNVxO23Wetlp9Z5xnU6ygnpHKdowiLh/3vXpfajY+itdQzvmHVeQrKD59oV5awtdtcq8kRdNqJ6HbeIG+IoAWG8ERf5oszIbtDTBRZ4QXk382HpZ83DMqIUebdBXeiF8HXygsyoNBNlz74JFdjdOcc+wpXhQaqfUUsEoFb3ZksZO10pze6oJY/+mWoIaI/RuHexkwLvgpCgeUMoLdmbSl0tGMoGPMSow/FcEWiyGBcKnYDD8GUNb7CkiyLGKYs9YzcsTGpA06cTnGzn1nHrgHOKC9wofyGx1HZZyTiKVOaZMW7kRYLoDtw== 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=xJIKyQMWteuU1+mUHNKiDp7xF/xnsFyAbn9VGPjrlWQ=; b=mQ1EX0+eED4iCNuWBHmAHkAahbi5YIlo0huTamEBVzJv27s+OK0BNC0CZvu4GiYGFHKolRiMvYyvWNoMbPhPVCAFKAMGEa6MvVIF6MsiOdv9WNU2LfBc0jDfcX948iv+2gt+UEOUvn8KUX7K+M9AiVIO8DKS4+8uIYKnNiqfvdmv8WX+pQyMe3pROFlrhv0TejMqv7f6kTmk55xB1E/13ORg8LLPlXWKq3L0Z3SxFhsjBNsYiVMcGfoyrx1/e07nnSTuS5O8ZCtWs5KW1DGzO8XhQDUuyeFl8kgBpf6wdCPpsWmSV0Cjm6WrQn5+daEsRGajko5JSH9hHqDggx8mYw== 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=xJIKyQMWteuU1+mUHNKiDp7xF/xnsFyAbn9VGPjrlWQ=; b=KR0HbiJjyMA8aILZahq5KLw53i95Mu226/E1J89Bx4s/MZFgL+d0BVFr+kIL4zciFGIkX3wnccPxY5ISvi6aH490AHqOefp6qTVTkDVbvHeggCNoOzu80fuQtxAuaHYFS0LLPipWPIM1pz5/jO+0uEw+09tDT69qQWUY3bDNopW+5wtt8FMsXf8G3hcSlfCR+LIwQnnBlzGRwnefQH8RutCdiU8P8mjAStafZFrd3A5y9gQNBeae0Y4+G9NUAgeKnWi/YP4JfbZ+cHfGKQqunvNVKca7XFwHOkEnPfa1m2Uw6g/mrd71aRbc58qWGFjrTvX0p04gxMnkqIJY7Xfd8A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0215.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep 2023 19:57:30 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 19:57:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:57:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [p8Xi8PbOwILxDDrYjHVoWOOUmtiv9hnW] X-ClientProxiedBy: ZR0P278CA0086.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230919195734.1005750-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0215:EE_ X-MS-Office365-Filtering-Correlation-Id: a1e97167-900b-4709-c304-08dbb94aa812 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yqsU0s+4z+kHIKAJYiYwJg7AzWy1a58m0G5sAMLGKhnG/u6GETfXCrQUFAK+ylXkkrdAUfRCs1xT8Ro2IuCE6e8pBvuXirpI4gc5YGFCauZT1GH3/Jz+ysSghbahfJ6GsdPyErLUpIlQVjyAlYv1mLl6FRg/Od+D69gXSaNYN1nu2uTKVFXUoCwlaMwunV7Ad70/Q4E7UkORnBhTlJ2/4lmfoIj/BKu0qu3ogkTzlhDxKhTsKbk7PfdIZCCeIDqcv7MQLdJu7y6zE/XVz7YQpTWopkp1dqWpKUYlU56Kms+0bPRYw2cuhHyjMr9JXY1Evf8HGAA2iIggUbChgKmYlVQYAUF2f+0Yx+53fQFm3wXQ2KryV78pBd8KwFPk+2ui0mL/Ryguja4eUbgmE9pRcRty3oggUI34Cp8//tAuNSVUVUwwITqcTehIBmqk66obVHlGYPCP5xIioZX7tc4wG+Loiz61GH4aBWCT8PhDXrPArqlTZYujsvjbnRVPfSpf5JGr92t5u4TLhdHHix55vjzj5WaMybqz/zjTVwVOJrcD9pR3sk9RKEsYcM5y+PYWfoyBVe7t19f4r27uWUcwUTxaF3hD7kce1u0km+EHQNGr16u1Hit9HKEtTO4nGLT1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BYme1NN/QByxSww2KLrXh5xV6tZNJfnAVNGRYzViwJ0OVzQ0viX8FrV6XWTl?= =?us-ascii?Q?fdpQ6sOef4qNJQlpUJh0SFTN1IQsfNs8/3MTgYgj0EJr3d+3S3GqCXu6upi/?= =?us-ascii?Q?XwniilgSdnpF1zZ1WCMqfFkDtIfEh8Lyu0xjajZKklnTqmdyGSckXu//vBMr?= =?us-ascii?Q?QpSBP8KAh08Z6yemyU2X5LHlM3q4tlnLi9J4D5FXu//elGI3We7jfa1linqf?= =?us-ascii?Q?B5YV6gxGMwJElft7Xzu5hH65C0953J5bhcx0MEAHr1u21RR16WotDIQII4gk?= =?us-ascii?Q?GZmji/gDoH6Q7Q5Wz5lSqTwuZzdmgOCMxzNVdYYM8xFKwFfXnI8G1w5XEGHe?= =?us-ascii?Q?Ab/iXss89zGDcaGx+hRs9OCpel2ajJIVEMSpnDO5JqDMdlUW+gzr4LRXM/R4?= =?us-ascii?Q?DeFgH5rC1g8UDWiGm6mSiE6j7DCFL7WGP6h0Bqkp8a0+CJ+AbHVoDd+AGfUy?= =?us-ascii?Q?K1O74WVwH/iAfz2vRFpz3fhPGN09oZc76X7sLbz1PCP6peoZSbostIF6YwPS?= =?us-ascii?Q?ULBqN87OD1HqkrMFhyrm55gdV36gTZ0xmAB5vZ4bV4m74tCMyBs3P//plF2i?= =?us-ascii?Q?nnlEdYNpQX93VGf1GnhtLv+0rluP34630lHQLnRP2UqsMHA3s5jwgoQYjQ04?= =?us-ascii?Q?4mAUEnE2tv1HaoiMdEN8eEQ5owS5rkw2i4B14X9nDHxPuQm4BY0gSdZc2Xqs?= =?us-ascii?Q?b8YTR6+p8gwPHdFBBDUfUOuHpfJSsl9EFrC52KQFA2Ud3cVU8rhBWfYJZk/Z?= =?us-ascii?Q?D1jpguXvNQkD+VgrtrnCbKCw+nH9faj3JKXkUjkUltEd8OzWyRr1I0u5kuxL?= =?us-ascii?Q?VGBDPWXRjGC/YsS1C8CyiSrWPBzNCYku7QmIH2//F0Ddy2mdk+OT9QGA/08h?= =?us-ascii?Q?rTcnkCnQEhAZc2mevGy7yDVqGdYqZJJB082fGu6qvk9tjtulMr2P5sBRIhyo?= =?us-ascii?Q?F9XinnmX4jRd/Q6sVAK35Lh7K+jLc1ETMIw0mwSUJlGGmQkY1PkK049DoLeN?= =?us-ascii?Q?OZB1zYINRoE2VNa+J1Jb5dQRVeI9K9ga3aV/qMAkB7tNTDDGvS4lUBbEi1az?= =?us-ascii?Q?Z3i442jutChP51uIjP3VGVx9sKBajvRnKcBjpotnl6JujMKYWwEm41flQh6c?= =?us-ascii?Q?xghTMdzF+I5eLZVB5BQxGiX3929ZdNBejCVYlfBopMs0j4nv24L6nOoSDyWL?= =?us-ascii?Q?+zNBEx3PgrquTXSraOW/HxukNPeReV280UzZ9gZxkfNWQvCJJO8pGHwkGckq?= =?us-ascii?Q?OH3UbHwdxeSF8HlTe7yy?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1e97167-900b-4709-c304-08dbb94aa812 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 19:57:30.3649 (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: AM8P250MB0215 Subject: [FFmpeg-devel] [PATCH 15/42] avcodec/pthread_frame: Use RefStruct API for ThreadFrame.progress 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Avoids allocations and error checks and allows to remove cleanup code for earlier allocations. Also avoids casts and indirections. Signed-off-by: Andreas Rheinhardt --- I actually intend to remove the ThreadFrame API in the not-so long-term. libavcodec/h264_mb.c | 4 ++-- libavcodec/pthread_frame.c | 23 ++++++++++++----------- libavcodec/threadframe.h | 4 +--- libavcodec/utils.c | 14 ++++---------- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 32d29cfb4d..4e94136313 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -66,7 +66,7 @@ static inline void get_lowest_part_y(const H264Context *h, H264SliceContext *sl, // Error resilience puts the current picture in the ref list. // Don't try to wait on these as it will cause a deadlock. // Fields can wait on each other, though. - if (ref->parent->tf.progress->data != h->cur_pic.tf.progress->data || + if (ref->parent->tf.progress != h->cur_pic.tf.progress || (ref->reference & 3) != h->picture_structure) { my = get_lowest_part_list_y(sl, n, height, y_offset, 0); if (refs[0][ref_n] < 0) @@ -79,7 +79,7 @@ static inline void get_lowest_part_y(const H264Context *h, H264SliceContext *sl, int ref_n = sl->ref_cache[1][scan8[n]]; H264Ref *ref = &sl->ref_list[1][ref_n]; - if (ref->parent->tf.progress->data != h->cur_pic.tf.progress->data || + if (ref->parent->tf.progress != h->cur_pic.tf.progress || (ref->reference & 3) != h->picture_structure) { my = get_lowest_part_list_y(sl, n, height, y_offset, 1); if (refs[1][ref_n] < 0) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 7e274b0559..282f3fad58 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -66,6 +66,10 @@ enum { INITIALIZED, ///< Thread has been properly set up }; +typedef struct ThreadFrameProgress { + atomic_int progress[2]; +} ThreadFrameProgress; + /** * Context used by codec threads and stored in their AVCodecInternal thread_ctx. */ @@ -585,7 +589,7 @@ finish: void ff_thread_report_progress(ThreadFrame *f, int n, int field) { PerThreadContext *p; - atomic_int *progress = f->progress ? (atomic_int*)f->progress->data : NULL; + atomic_int *progress = f->progress ? f->progress->progress : NULL; if (!progress || atomic_load_explicit(&progress[field], memory_order_relaxed) >= n) @@ -608,7 +612,7 @@ void ff_thread_report_progress(ThreadFrame *f, int n, int field) void ff_thread_await_progress(const ThreadFrame *f, int n, int field) { PerThreadContext *p; - atomic_int *progress = f->progress ? (atomic_int*)f->progress->data : NULL; + atomic_int *progress = f->progress ? f->progress->progress : NULL; if (!progress || atomic_load_explicit(&progress[field], memory_order_acquire) >= n) @@ -991,20 +995,17 @@ int ff_thread_get_ext_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) return ff_get_buffer(avctx, f->f, flags); if (ffcodec(avctx->codec)->caps_internal & FF_CODEC_CAP_ALLOCATE_PROGRESS) { - atomic_int *progress; - f->progress = av_buffer_alloc(2 * sizeof(*progress)); - if (!f->progress) { + f->progress = ff_refstruct_allocz(sizeof(*f->progress)); + if (!f->progress) return AVERROR(ENOMEM); - } - progress = (atomic_int*)f->progress->data; - atomic_init(&progress[0], -1); - atomic_init(&progress[1], -1); + atomic_init(&f->progress->progress[0], -1); + atomic_init(&f->progress->progress[1], -1); } ret = ff_thread_get_buffer(avctx, f->f, flags); if (ret) - av_buffer_unref(&f->progress); + ff_refstruct_unref(&f->progress); return ret; } @@ -1021,7 +1022,7 @@ void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f) void ff_thread_release_ext_buffer(AVCodecContext *avctx, ThreadFrame *f) { - av_buffer_unref(&f->progress); + ff_refstruct_unref(&f->progress); f->owner[0] = f->owner[1] = NULL; ff_thread_release_buffer(avctx, f->f); } diff --git a/libavcodec/threadframe.h b/libavcodec/threadframe.h index a8403c8976..7b52e6f6d5 100644 --- a/libavcodec/threadframe.h +++ b/libavcodec/threadframe.h @@ -27,9 +27,7 @@ typedef struct ThreadFrame { AVFrame *f; AVCodecContext *owner[2]; - // progress->data is an array of 2 ints holding progress for top/bottom - // fields - AVBufferRef *progress; + struct ThreadFrameProgress *progress; } ThreadFrame; /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 3cb3828228..90efa28ee6 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -38,6 +38,7 @@ #include "codec_internal.h" #include "decode.h" #include "hwconfig.h" +#include "refstruct.h" #include "thread.h" #include "threadframe.h" #include "internal.h" @@ -878,11 +879,8 @@ int ff_thread_ref_frame(ThreadFrame *dst, const ThreadFrame *src) av_assert0(!dst->progress); - if (src->progress && - !(dst->progress = av_buffer_ref(src->progress))) { - ff_thread_release_ext_buffer(dst->owner[0], dst); - return AVERROR(ENOMEM); - } + if (src->progress) + dst->progress = ff_refstruct_ref(src->progress); return 0; } @@ -899,11 +897,7 @@ int ff_thread_replace_frame(AVCodecContext *avctx, ThreadFrame *dst, if (ret < 0) return ret; - ret = av_buffer_replace(&dst->progress, src->progress); - if (ret < 0) { - ff_thread_release_ext_buffer(dst->owner[0], dst); - return ret; - } + ff_refstruct_replace(&dst->progress, src->progress); return 0; } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".