From patchwork Mon Sep 18 01:40:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca2:b0:149:dfde:5c0a with SMTP id fx34csp1660702pzb; Sun, 17 Sep 2023 18:39:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuTp+IAcTbmEWRsCB5kVNgOq02I98h+IrzGc+MklKr9e2opdTBe5alWNafugUdtvyZAVAT X-Received: by 2002:a17:906:20cb:b0:9ad:7f13:954d with SMTP id c11-20020a17090620cb00b009ad7f13954dmr6436262ejc.31.1695001174918; Sun, 17 Sep 2023 18:39: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 f25-20020a170906085900b00993a68a3af5si7124015ejd.529.2023.09.17.18.39.31; Sun, 17 Sep 2023 18:39: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=faoyq6n4; 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 BA32468C176; Mon, 18 Sep 2023 04:39:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2096.outbound.protection.outlook.com [40.92.73.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2187E68C176 for ; Mon, 18 Sep 2023 04:39:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T1X3RqH0Ucp4CBrpqUcYal3F+GHcnCoraijPjsyZYREhE1lAZFsb2DHfoqqSVFJx8dcwGR+WAWT7g9R5MMMd7fY2O131MwpCRkJ6pFWKIAqt+ZFHkHGN/mmx0pjpak+sQXrM/BVrOdJaR4JAXeiEtDGdsQ4fUvu1ljopjBLPpUI62o/aZXbGymFuuSZ/WgmZZw8k1/5ifv9AFJPJ9CVTI+2vghSDvZPXfyOCx0QjsYwgk3x39tqOuJLsn8UL/eWQCVvWTLPwkSfQosYl0lzarDpmp+84nmbQiPXheau5gudnc/aUiDxP1IQLvjCB0cF99F5Dipg5FqsealSosHSZtw== 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=SjgFqWFVnh+3c7lsbvPil/46H5OKOMo5h8orD48h9Lo=; b=JtZ9hiBIgI1x/NvPmhu/6SNuWgYoU9fWU22PUmnMJzlqWEdtG5nZ45GuultF+irGwQ4P4Wn74L3K3lhZGhGTJ+WhVp1S3qzYHDwAvnj/EtkxmwN6G9D2zZ7REMgso4e4hO/F3ZQ5iZgPPoyZ975lEL86N0Yac2rK51u9k459Mgbe/dX+XG9gCQQMqPjCWYabax3NA1HelaSDwW4ioNQ5fKmx69pAWjixw+ouTuvLnzJ8X2w2+LHJ/1ggNAMzkqPyntHrtY4lC9CxKn/4iKcdWDwxSWUOZmauRGOgL4ueCWV66JhySf5vkUO7n0LBTeSm44OoEYOLOP1gox8UmkW/Jw== 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=SjgFqWFVnh+3c7lsbvPil/46H5OKOMo5h8orD48h9Lo=; b=faoyq6n4feCGMbXIZEiEHUgQsAXSl/v4OtQr+Z+g3eI/A/g69FwqIa6ifA2jA5hLwQ2GN5uNVX4d4xx+RN6/tFQyfb5iqfG2ZGuhTisPHph6ZeYI52FeHmnxv0JD7NT7W3e+UvM4Zxwt0EXYdeV/dYdEDI2X886n168zAbAlkNeB2i6/nZ6a/RgoA4HzEMxXruMND5UdRmFBNSBF7WOkovnia0+zTlzhCeyIktrBnC7WTKYgAjwq4mKY68mPqYPJZmgzKrgGEzZevGqIRfwgEi3beqvV0TI4A9x+RIDsDvgL1i9zos/k1wQrbaID9qRrtTdDt2dS7JYwZXnGnhPVrg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0040.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:35b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep 2023 01:39:19 +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; Mon, 18 Sep 2023 01:39:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Sep 2023 03:40:26 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [ccsvJw4gTTcM+B9miS/A81Vdcum/koAb] X-ClientProxiedBy: FR3P281CA0194.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230918014027.1944801-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0040:EE_ X-MS-Office365-Filtering-Correlation-Id: 060b1659-0ee6-4884-4a07-08dbb7e8139c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HA8zbTu2qlFbc+vuEaCqUnn/wLmI5h6xtg8cE3aXo/66QW7oGhwyJtA/bCAw48Zj49gsPChS0MgTP8ADo7PqtfMIC1EXXnlOAV2yggMKHS+22TxN63crL4n9bpl6WIXcXkGkSQJJxSxp6Oc8CbJQhhQXt2v1LiMMoTh1tJfIW6vHrnX3WxARisbRCSBKOGQPghehjrKMK4yPLPXT4q7ckJUhu+WDf39xpUto2GNhVMNRfHQf5STmmX+YKnNYgFXFsz+lyVwBVOlkTutMmPtPpWvr+ODu6bCw/QPo2KVK+PVtPfL90+qj4VASYi1P0Q6SbcHfY5Zkha+/8FRRE1//f4fpukKqeP86ZdBR5MZLPPrkPeJ/2umya68AfD06Wlh0DEeQwlhUH8VIq+DNac5JEEOyWyUpINcBvE3DXjTCrogfc+Jd5RiYRvh6/ZFHIY29EGdcTkWYSaaOwyvxt+JMnsSB5Il4CIV21bdoH+HVHaf1mQaXwtCUvkd3NUnYI6C5OPcx07r7RNdmPmSSEczM6QZ4UyapZ728xcn/TGs22/eYjzmMLfeCmy/QC0x90eVN59dlESWEnhxhP4BTWzQdGM19JSHKQJIdlEVz0VrAXoqzmk4R2Xh5B8ffl5IXsyIR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UdOD0UiqWnD80GyO8CpLKvLhK1i8FZ1GNMXYeWNrxoX7rkp7PxkKeTLQ1dfkHYIWdWPQ5d7xzgyor/jin0i28XDy5G7+mcc697kEhnJQ+0v+DG0MiGDw5UqyD04TZL5YhhP6JzQfuGsJsMUDO7xkTZ4ClS6WUCpr7NJDg3zie4LvyV5Bz0QGMgvTl3EkhDjJDLLcgaHB5pbXCFaKK/RYFn3iw6oyxzWN/5ZeGsOO45L3jPQoTSe+LEdsNXP/kMGOogLyXBJGOJQ2Yy2Y9dZZLDhRlEe3Crj0V6FjdCIo3ibeOx6Rv8R+aubb5NbtBK7XlxeN24BmDfp7Ehet60gxGzq1xGXiv1Yb3EnfvtpkI/Bipf+QSb27jFsfKfKd682UTtnDSRJdj7inaioZ+K3cgsxVjTnrf28AhBapnsHRQO8nAgZ3LIDF0xkeYujP+SQYfTsm6t7uTc4/MpdGipgQ4ulfD2cuQFTbKuqKb3852+/87XE9Eg/DWSyYXuAiAf5r8XvInSat2v2EIWf2GZBZ0gQYcnPMJQ8kNU09MEwF7exomVNvh0LG2J5iXBrFMdECNnHz8qUKHCLcwyN1FMVVh8Jy0wptHLoDxYgK6nVz9yutFpMfmB7ueeghSWgQTNWHDGD4DbchhUL8yzNKNZL0d4egynZda3OS39TiZ9NWYiKnOWgUB0eBHGkQddbkeXcsUFxnxCNp6BrH47JPuvXG5DtQx5DfG9SNx01+n5vOxU4uOkwfmrNmX/yz4XjSZlTNTlsYiuLWG/ThlE3FF7BnmItDQPWDQ3ayDXJK0a/wX23LrROiqNMMgAmXYOJOK+yik9bVa/F6n05RXrJR6MRUmkcLWQfow8ZAG5P29panzVcgeVGnVK7DQyXJ30JvRggSr8eqpp25cQ5VFPtlNnWkbqWRMWy1QavOoCdUyL+1Rqx0Hq4WL2dEKMkD4WxaslLhrqihmI5HnPIE18PMtq9zZpm8e+wBpLChB4tS63AvAm7BGTr7tK3HuWVRgYcNw2wC9u7FHuqkByvhSC6fukTIhIYibq1i9GzDDpqyNnajVyiYrlQ48rgod4sQ7JUgwf5bVIfcmzjCmMXC7nHKu2w+Q+hdiSvhH8gGaNqz4hArstoYtkhjm7Qup5uu8/0EyrpUOwXM9j9yE+N7xmqyz621/se5Y/SnoCZVoqVgEVMGCFPxSjqaQS+vau75bL/Uc7sOkaBi7EAAJes6pCSQgoHCsx6N54TmBpSgmlUbTY+FG7xSZbtWCL4qJPBK1D2ePNnz X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 060b1659-0ee6-4884-4a07-08dbb7e8139c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 01:39:19.4844 (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: AS8P250MB0040 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/pthread_frame: Remove FF_API_SLICE_OFFSET 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: m3DhQ4vllDIq Since 432adca5fedcb277b9a715a723cfd40735ec58f8 no decoder looks at the slice_count and slice_offset fields at all, so there is no reason to synchronize them between the worker and the user thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/pthread_frame.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index b53fb54906..59989831a3 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -424,22 +424,6 @@ FF_ENABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS dst->reordered_opaque = src->reordered_opaque; FF_ENABLE_DEPRECATION_WARNINGS -#endif - -#if FF_API_SLICE_OFFSET -FF_DISABLE_DEPRECATION_WARNINGS - if (src->slice_count && src->slice_offset) { - if (dst->slice_count < src->slice_count) { - int err = av_reallocp_array(&dst->slice_offset, src->slice_count, - sizeof(*dst->slice_offset)); - if (err < 0) - return err; - } - memcpy(dst->slice_offset, src->slice_offset, - src->slice_count * sizeof(*dst->slice_offset)); - } - dst->slice_count = src->slice_count; -FF_ENABLE_DEPRECATION_WARNINGS #endif av_packet_unref(dst->internal->last_pkt_props); @@ -756,12 +740,6 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count) av_freep(&ctx->priv_data); } -#if FF_API_SLICE_OFFSET -FF_DISABLE_DEPRECATION_WARNINGS - av_freep(&ctx->slice_offset); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - av_buffer_unref(&ctx->internal->pool); av_packet_free(&ctx->internal->last_pkt_props); av_freep(&ctx->internal);