From patchwork Thu Sep 14 17:01:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43734 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b2f:b0:149:dfde:5c0a with SMTP id fp47csp554361pzb; Thu, 14 Sep 2023 10:00:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdOEWDWlQIgQZ952mlBBRzEl5DWt163AsepKO1BLkAHoxPrp3iXyGAkTHFhns84j4oM+Og X-Received: by 2002:a05:6402:3714:b0:530:1bab:f8a5 with SMTP id ek20-20020a056402371400b005301babf8a5mr3093518edb.6.1694710834476; Thu, 14 Sep 2023 10:00:34 -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 e4-20020a50ec84000000b0052369c1025bsi1724593edr.459.2023.09.14.10.00.33; Thu, 14 Sep 2023 10:00:34 -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=lV9xTcjr; 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 3B07B68C809; Thu, 14 Sep 2023 20:00:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2075.outbound.protection.outlook.com [40.92.90.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C45268C804 for ; Thu, 14 Sep 2023 20:00:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gt0YolEBydS/dnfqmncnFvBMJt5h47cSQQIcfKZzsrpMG33jhRAa08/6kmMe2tQJm1Q/P8BheE0b4H5lKwCyEgK6cZm+gr5Pa/aY5JvH9ocUX3iRMp2IXYvSGgJ+jxjZxv9XrErBH3fa1CqPenGMyjY9ZcrdQPsD2CrRlxHa7IA9dAxrJPk0XSxskqFLap9H0mXykCHQPwO33dGXGGPp5G4jIb9j+dtOqSkMg0PVgrZO+9iBgrNfvIzUZa3FvST0BTKy4gP5U49js77Mo/LWajvFHh4tJcMlYOwt+I9FIuT1gPvc9bez/VYG2Cf0r8ZpWWShLoTiJiHTX+jirUiogg== 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=PZ1WNVK4Nq/r5Lz4BWHNBiTecDm7hNk4H3s3WR4JorQ=; b=ZWQNBFf0qSTUR39r7EfoI7CfEjcA9q/xsWoV0c81w8jSWTrHIuWNUTIc75erK1RjRc5MMGM/tvXYIuIpa83/bnWcW8sG8SULQGKIxr6LxJLlKTKyYmmPfU6kNwTmug0Ek00NcxadSF3xbc2f5SxfmMBr6D99oQAolDdvkOfSeH1eFJHsgRUsrff3tV7oQ1YL8+JN4+0Gy30hOwyzQDjqdhTZaNpi+MAffwfWTCqcJzGw8VslZl4xOqi3uaiPSEjYu5VLUirCsRbPjJ8mJiLv241U+YS3RMvXXE81epQ0wyKM3bJGGeIhVlRcm7o3lqc4Cww1lRBvcKLgLrCxRqggKw== 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=PZ1WNVK4Nq/r5Lz4BWHNBiTecDm7hNk4H3s3WR4JorQ=; b=lV9xTcjrapSGAWapRbAkTf+keek0Hv2UQ/9r1150yMZL94ny4LPyDAUAtS85Q8l11D1BCZ1hDtyinpoTaMDL7MnimVIpekJRoU2k/vOD2Bx0+KYdb3w+c2U6gaWf/WArs4OK1tmDiO3Yw4BBONllykhXrCxAP1F4+/Pvw0zE9bYI1eGOh52+dlPwVWgxq0oQpqlxFcTqZZH9nmvRxY0cB+eZGj8JZdUwus6+cVcbTxVFjukdOPu1QQ0eEr3iEs69+BOKGJUX38e/jLZ24+LCJB/ZlK6AjFc8vpPYIP/85s8TE6zgZh4S5YQj9rCh23ixK4oKonJ+lY49fG19S/GcIA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS1P250MB0405.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4ad::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.31; Thu, 14 Sep 2023 17:00:05 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::3fff:eb7b:b8e2:4dba]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::3fff:eb7b:b8e2:4dba%4]) with mapi id 15.20.6768.036; Thu, 14 Sep 2023 17:00:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Sep 2023 19:01:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [kocByVeBOqLOx9rNdXJep3P02YLQDd5u] X-ClientProxiedBy: ZR0P278CA0187.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230914170112.135540-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS1P250MB0405:EE_ X-MS-Office365-Filtering-Correlation-Id: 5463a3e6-7358-4880-742b-08dbb5440b10 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IROJ40KBPO8MIn2AEfkqnKbuimrajw/r/aK341UjzvlX+FqP4wuAqb5Ao/YNouYzKQaxu/ilFYzbpW7hZQvod51gqjQpKC0l3bVksLe7bSzBXuzv3ZZVCn/vmaXT8qPxW2YkBo1XZ2bPeLYb2n7R60fdqeZPwoQuRO67cfOwNbBOkuU9Pja+rVma9U9E/PftX9lrQjDu3Q+Zo5shuHVCqepViLNhgXSfWGtqdoGPbL5+QhbY5ds/QkYtP+krRCTg+6fJGSow+VhMi3hfjFXT+Sc0zjHDxdHU+4cnCUDrLTPHe0kpQFNDjcwHzxgZQT+ruZC4c5egUf9mZXWazgAHAcMAnT5nW3tZRoI57bdp8dn5CcXXcJIHEigynemDhyWbk3YrBEMKkRJi43hHuW/yMqikeTps/SoraCpOE9mKH8XVPLTaM9FNouQ+UE2UULqojSHe0EJvdvDfo/uY/T4/PpbI328gSNmBi02qlbRiuZRq1vKW2RCa78zb/2E+w/gMYsSIO0NvaRrc9PeBi+CZuZggN2t25m7ITZ2bMWAn3yJQiguKDl4FWd0PwFzsAeXfrNQdEVPM8OPpwBEhZfiBA+c83BM1PvbttPw27D61IJ6PI0d2KWYiDaXGuR3izBzS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HeQwDfTxcBZb19UNnLGI61h6xQsSNRd/dqCaztKm8v90POFJ6jFXVAPrXCva1c6UIVXrkDIJjVbtcG2GXfQHrFV9PVs60I1OMO/mKLkr0aLITHMuR8AEAAx+W9XtTD5Q6H95Rh6g+kHMQxLVXqBulxwDOC0gHWtPXymEYomkxXBrtLDz2/7ECXqStLZ4Q7hUwD/2uJu9WNpRMs5rpVQWi1AO14uaQ7xK5Mrug/dbHw9JXtJLIx7I5i+SPpeIwYe+e9+0KKeUKiIdiJLcwE3LaXZ5rm97ylJpCzFGNIdlsj55TIjg+bWzQW8SFzfIPDLgx6c6GUfiwzsESxQHcl6x7cq1taKcIdQnCETR8d0xWdsK0rbR859OAeYi77fWmaPnA31QBOYRZcBbCybtm5SzwQEhHcuWZHqeIMor13oJUreLkStJ5D6lgyZBbpa6p+MVZo7g8MlYwdq6TmbTTzwUjy9rKMs0c8rv2HYbQ5aa3rf3a2kOfpr9SHK9YzqXPddkWcaGm3W4nUIEbu9RqsplzHxZoYOOOQKzKnNz3+wyakwcmFznHFJ5mwqD50Aj2DE93XHuwuFTw0PN8eRSs+gk3TVBXkcbslflYMh7fpaOilVUi2CfTlz9Gdtr4mmU2U/A7QknaWR7qp70oNoF933CCtm8izuJ6tjE2wTiKq5jRheuUZZJ7+3J3cqBZ1C/YChuNTFybK8y4/ZrkG665TzQpz5dhxdNwaEWhdBOPVuvqCAf7QErs+xHH2nmjGbwZ169xP+EFNYXShhCBWEEiQ+gBuDZk7nhopzgeQFbrYyH9/9Pe8gwyB56tbYW77VionSrOVHvbctbSEIC3zHts7ef63j2C326n9rwqYsIAo4IPu8/erRggE3EOIdI9g2M4VnYu2cekOwUEL8q6+ftncE7DMS/1sK8HEJTC/AudBF4Iw+/+6MQ30ouVYLwyXsEEesrzXuZAsxRV8Me4PxRvaBEu+RJ6GehanNsHhhQUaIjDoto4WyHa2OzdWvzI62yeuMSIxAgMe2tro75A2XLpTX9ZDIi/Q8syVyt9NdSKTDuZ1fDmffrBhWoRjPF1CcA9UX5y07teuahAmOVQG4Bd2ZzB7c7UlGMq0u6naRmjudfZo0I6+r/+viYiDsmiTGdHT59VZmKsdT2dRYiT/sqMIba1Hq9QIWTlco8BZcxrsgTtPKjW/JIGq7klVp+0MOjcldlO84F8s6e9sSuziRw8qQGXOk6Y8gdZg2MG9DyT8MjqtGVfH3ElRJxdbh9yM5cSrSZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5463a3e6-7358-4880-742b-08dbb5440b10 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2023 17:00:05.4082 (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: AS1P250MB0405 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/threadframe: Move ff_thread_can_start_frame() to thread.h 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: qfjYOgxgVgrQ It does not use ThreadFrames at all, so thread.h is the correct place. bcb0faeaba60b5d329fafee2e55f28d3c709e7b1 was wrong. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 1 + libavcodec/thread.h | 2 ++ libavcodec/threadframe.h | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 6aa979433c..7aa46a4e25 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -37,6 +37,7 @@ #include "mpegvideo.h" #include "mpegvideodec.h" #include "mpeg4videodec.h" +#include "thread.h" #include "threadframe.h" #include "wmv2dec.h" diff --git a/libavcodec/thread.h b/libavcodec/thread.h index 180e1137ae..4edcfc3172 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -52,6 +52,8 @@ void ff_thread_flush(AVCodecContext *avctx); int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt); +int ff_thread_can_start_frame(AVCodecContext *avctx); + /** * If the codec defines update_thread_context(), call this * when they are ready for the next thread to start decoding diff --git a/libavcodec/threadframe.h b/libavcodec/threadframe.h index d581c408a5..a8403c8976 100644 --- a/libavcodec/threadframe.h +++ b/libavcodec/threadframe.h @@ -87,6 +87,4 @@ int ff_thread_ref_frame(ThreadFrame *dst, const ThreadFrame *src); int ff_thread_replace_frame(AVCodecContext *avctx, ThreadFrame *dst, const ThreadFrame *src); -int ff_thread_can_start_frame(AVCodecContext *avctx); - #endif