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 8C184474E9 for ; Sun, 10 Sep 2023 12:54:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8270D68C8E7; Sun, 10 Sep 2023 15:54:29 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2047.outbound.protection.outlook.com [40.92.75.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49EB768C7D3 for ; Sun, 10 Sep 2023 15:54:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gpFn36c9gyP4vWHrdd1Kn5BOUgl4kwz0raLtsbB6Sfnd5gaPZu6xgke7i1ag49VPekTn5TGkv9xobPT2KxGBm8Q6cC8ct7dxmooDDuyPm/dtOZZ9qAHK8F9QGYkGXQb79PfLL6L68U90LzaEDVVwxyaBr6b5TPUPvknRxHHFajLvYQuWyz7Trqi3Kx9pcnmDup8oMMdH5iSCfPzr+dhGWlhTBJ+Sa/SuBj3Ehg5r57ygP7xAUd15Q2OVgKx8BpL7AOs1yY6HPbcN9TPoGojrSSiW/7s/LX+eN97K/Vd5dgie7lSO9i1PIpYiFi89kKwS5Y+00kjmEbaR1BvX9SxPjw== 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=mvh2UIJZAD8AapBL58vnJtS95s2TyYMzhsllsBjrBRI=; b=hsupg7KIIIQ8Br1ETVv8qhpoLaVh2ns/rQC17CyJyGJe3bbrWDWTuXQDjCB1rmZC0WSKDGwlvm6PU8u0H0q3aY4g8Mo14QW3yt1a+oulRLZhS7vN0c6IMkSqX99Ssuo/DiA4C8tMvuN1bWAil/WKdoeSWo130ri5bX1Ry2LyKPYETBQiZOALl3Bjy1cYRg3NvN9mg9we8Nwten4AzRCQkt/qhRh8NI1sEQFVVjFUcZWtq03F4jlm+V5Tt0OFHSDjLFK+WJVkSOFHLJXfyx6pzme/lzur+ru183rjxFOw64rBkX9nLDj6y4HbC1k00BHvrw5AIy5aiZbAqnqmLN48mQ== 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=mvh2UIJZAD8AapBL58vnJtS95s2TyYMzhsllsBjrBRI=; b=beiFoFwCc2FoZENFKK9/kD/hfefkAVTD08s8YpYqrRhuSYCjhwk7VSuVGMlSNrAtf1WD7O8DFe+rUQKmU7rKmCtYHSjPhaUmvue/Dyyy/MXnv792WTt89C7TnaslJMylnXjoTG5Wfrexs5AnOquB+zs8Sybg5i6C/ZpUDYrpn+QYny/Osj9hoeeWnzVDkP/+5iUqD90YLc5tMN0nbby3dSXIh/DJbhJAgEorgRX13CjC/4MWAN2cHKm1juwNfRtGduZ2i9st0KdfcQks1/1jJfC6LynfgMnBlnHiTR9I7kcIIYFZEauMK1/AO/yR4+HvO0N8YDoQPXkik40g7wUbyA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0229.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.33; Sun, 10 Sep 2023 12:54:22 +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.6768.029; Sun, 10 Sep 2023 12:54:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 14:53:31 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [dxOKmav4nwpRcSfGW73ZQvQoDljGJeVJ] X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230910125331.2863957-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0229:EE_ X-MS-Office365-Filtering-Correlation-Id: 79dad66b-27e4-4cf8-0da8-08dbb1fd0dc5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NspQiBc9jKwUx/LCnQ9qI58y5jDH+2bsEIxXIT6NsReyDB1b08pPG70qaPlkU9bU+Mtw3ew915mhhXD7iuAfvS5G6lL6X68Hi1U/gwuJ2Kr44GUC9KxKgwf2xbzvee+jdCDzT8M/ETOfnyTy1r6ygayhLCFxZOc9evSQufH62T+MoHN47BwAYWII1bAwABiV8gtvSepEJfdAZeypAXCn8UOtEgk5e1JNqesuxDx5p22+2vrw0C1wkikIuwDw1yOusONtiB7Dn0tVOkQYdte2rtOFAsp+ijL8AZ7t2hOFZl8MeLn2TdAA+8UBB3qLtcTuYOLz6InXupGAaXXSq4RqZLF6N7olL+hLkHYWeBcnlFlVk9sPsjXmDw8fOyHNl3ySBHVaF6hKX6UJOSS3pNlH9lRZ19Y8MtJ2xOzm9e/eoolR50rd7CUad96//MPv/i8FiTRRgQBJDS7ZmAVx+07ImFHi0kfFXD7Ejbt+M89sn1UWn94lmVpQngdpW1eR5kK3Tm0sHCcPJ/nlbEbyoJ5xRtK90QMWsx+ksVO9jF4oXP5Iw58tjMeUHtoq7gvWSMCwZ5c3g5vXDzPbQiSA+AokQRKKOYidRU1iMEVVDxi+GFv0y9d2ZVEVADV5alospF0B X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?urGxdJK6SqkzDarco42yQigJZ32u9vP0ofLgPtQU6Jx58fRUrbhaEUEbQR+z?= =?us-ascii?Q?wWmfDw5Z1RtuwViYdRFLga96Puowmzs2/AEYLUmG/RkbjXDZKSwYPFerW93f?= =?us-ascii?Q?ASbQZ0qpqswqXkLyUZeVIQkm+nwDA3qlvkOPe8+xQUN3PSN0FPvooDdlF+fO?= =?us-ascii?Q?dcMTxejphDZ4f1gUTKgPs6km4wwFlKoBny+MLhckRIPB5vc9f/k/cnvoVBxT?= =?us-ascii?Q?ZwwOYdqQM7b+ZAPXZjfbiBRbyJXTOPe+bCf86bTSq4/oMrwoVkG6XupuYxzY?= =?us-ascii?Q?ryyKA+guok3WXsivPTKs2zpK9wSJHfK5f1N/9w1lINxCCUZbbP8efrzHFua8?= =?us-ascii?Q?o5xiz5ir3cT4dRbAzMf5GNyGLq3CJ6jVK37Youi3ZvyM1gjZFSmbdnaN8IKw?= =?us-ascii?Q?6L2k24+H+zjRF0jCUdKCCDsCbnAJpI1gW2fnV8imowA5dVaMU0WUa3EUTdVc?= =?us-ascii?Q?4pH8Y4Qb1sBLthNrpEl/oxTCcAli+XpAK+R5N0ruBKnK0jnkbwA14kSP6yMa?= =?us-ascii?Q?4U8jhHuhwUvqrEw6BqW97cs4fRKCrRMd7h8WBLHLpCX5rd0tuxlGbq4fwaCf?= =?us-ascii?Q?rF9TLMRhU3aj0td6xjfFEo6K/k4oqNIVfzroZSJiedUVLAJE4BQRlPRHKX34?= =?us-ascii?Q?+cL0vBarXDEQLYeaer149mRKMBoRJVXm28umdFnCCzJI7BsgJVtLWHGGW4wa?= =?us-ascii?Q?hsofyAMZW1MKAZl+Goe4LFvAPTDaSG42k+cXjOFhxKUO2t7PtsSysO3FDNys?= =?us-ascii?Q?hZyD5FCzc06PSE4TGmgdKiTM/AkPEuvoP0Q1u8TAY7PWzj5ZZkH7W6grEPer?= =?us-ascii?Q?8U5yWwQQK35jxgflLPsLSCKKIaER2b4l9MO/0nzjKJSrKQvKMnUFyseTdpLx?= =?us-ascii?Q?s4q7HDqB6GSgsOCwTPKxt42zeYQpjQ0iBJ8t6VOuCI+N0RyYp6wq5S2R6YNo?= =?us-ascii?Q?6dKtZMrhqROK83fK01CZ9rA68Hoss/qXQdkH21woa9qsrU35ZEJL2dmj4lfk?= =?us-ascii?Q?qbyh7mo7kTIsdN22ufPDXmIsXWf2A7FUia82YaK1MRIIzYtAMjoviUEMtV7Y?= =?us-ascii?Q?y03+GKH1veeq0owYbBKRJ0omWvToZXYEAVrJTCbuNS+QkZLV5/GdSdf4t0iE?= =?us-ascii?Q?1nVctykDt/uUCrlIHcoXJ5HtlJ+JEzYZ4N6LAMZTtRK0bK2Tp3at2BKzRRWh?= =?us-ascii?Q?FkyL0g3ptCyKdcITbIbvYTRlSaLHR757HnoOp6vmtgc1aUGfDv+/9bd4kLCR?= =?us-ascii?Q?jeRd3PudrCdltWZytunn?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79dad66b-27e4-4cf8-0da8-08dbb1fd0dc5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2023 12:54:22.1251 (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: AM8P250MB0229 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/thread: Remove ff_thread_get_format define 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: Unnecessary since FF_API_THREAD_SAFE_CALLBACKS is no more. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 2 +- libavcodec/h264_slice.c | 2 +- libavcodec/hevcdec.c | 2 +- libavcodec/mpeg12dec.c | 2 +- libavcodec/proresdec2.c | 2 +- libavcodec/thread.h | 2 -- libavcodec/vp9.c | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index c523c457ec..39ccad5bf6 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -613,7 +613,7 @@ static int get_pixel_format(AVCodecContext *avctx) *fmtp++ = pix_fmt; *fmtp = AV_PIX_FMT_NONE; - ret = ff_thread_get_format(avctx, pix_fmts); + ret = ff_get_format(avctx, pix_fmts); /** * check if the HW accel is inited correctly. If not, return un-implemented. diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 6cd7bb8fe7..f3af345c99 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -922,7 +922,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback) return pix_fmts[i]; - return ff_thread_get_format(h->avctx, pix_fmts); + return ff_get_format(h->avctx, pix_fmts); } /* export coded and cropped frame dimensions to AVCodecContext */ diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index ad22d0a30c..81b9c5e089 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -521,7 +521,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) *fmt++ = sps->pix_fmt; *fmt = AV_PIX_FMT_NONE; - return ff_thread_get_format(s->avctx, pix_fmts); + return ff_get_format(s->avctx, pix_fmts); } static int set_sps(HEVCContext *s, const HEVCSPS *sps, diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 1accd07e9e..677360f954 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1168,7 +1168,7 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) else pix_fmts = mpeg12_pixfmt_list_444; - return ff_thread_get_format(avctx, pix_fmts); + return ff_get_format(avctx, pix_fmts); } /* Call this function when we know all parameters. diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 9297860946..def58b2604 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -278,7 +278,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, *fmtp++ = ctx->pix_fmt; *fmtp = AV_PIX_FMT_NONE; - if ((ret = ff_thread_get_format(avctx, pix_fmts)) < 0) + if ((ret = ff_get_format(avctx, pix_fmts)) < 0) return ret; avctx->pix_fmt = ret; diff --git a/libavcodec/thread.h b/libavcodec/thread.h index 88a14cfeb1..2c8c0cdb16 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -62,8 +62,6 @@ int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture, */ void ff_thread_finish_setup(AVCodecContext *avctx); -#define ff_thread_get_format ff_get_format - /** * Wrapper around get_buffer() for frame-multithreaded codecs. * Call this function instead of ff_get_buffer(f). diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 89f7549ef0..3cc27aa812 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -250,7 +250,7 @@ static int update_size(AVCodecContext *avctx, int w, int h) *fmtp++ = s->pix_fmt; *fmtp = AV_PIX_FMT_NONE; - ret = ff_thread_get_format(avctx, pix_fmts); + ret = ff_get_format(avctx, pix_fmts); if (ret < 0) return ret; -- 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".