From patchwork Sat Feb 12 06:41:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34256 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3856202nkb; Fri, 11 Feb 2022 22:44:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJyeGQtWnTfK0zyj7Y9e5AtG/aphxHpLzcApa2WtmvPMJ1QdO2THh+hOpwkKlh2YtQaGiUNH X-Received: by 2002:a17:906:7306:: with SMTP id di6mr3975898ejc.410.1644648250394; Fri, 11 Feb 2022 22:44:10 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fz1si9043411ejc.316.2022.02.11.22.44.10; Fri, 11 Feb 2022 22:44:10 -0800 (PST) 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=OtizUKvk; 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 6EF9068B2D3; Sat, 12 Feb 2022 08:42:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074027.outbound.protection.outlook.com [40.92.74.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E255F68B2AB for ; Sat, 12 Feb 2022 08:42:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VN0qDflVzjSbKu6W8NDGAbBDMqeFTUmnQK6vc1QUpNfX616yujqhFq9rVejkEB1BdQMuG58eZwaVAj4wOGBuAhMy7+k5/KTS2arLyvz+MRDfCRF8sUpXN31GSeAe4dfCQ5Kq27aJEGAJ6P5vBr3QzvLV7Wk/18YxMD1esRzw1NxH8R9Vqt4F72zb0UDtOU3wx+9cdtr2SqSsKq6R6C+uxp13WVMtFujh3dhpYvWDnrIC6yh5T43nO6HSTk/vj3WrN+787mUZ06DghcHS4OffItznG5+lgk4O99wLQFcR0OK90sty7LVySts5syY0HjKk2IAMgraobI9XzD4bsHIdOg== 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=8abhhGbYUQGnIYQolTX5rTLAlQnrUPVHOW4wvlt7WXg=; b=eEB3Ez1irU6Mtsv3eiGQtjmyZ/vBsmXxdcG8xgivsKNdEpir7wxlMOwrLIJnRYtKiYVTbzRg5hQ8JFKGz7O7Gn1C+X6kORCa67i9GbO/qIKN4e1AurzZb6EKNtZEXGFlZpo/9C6yJwdn0jIiteKv3luwYjAqBl3OU2gSkBJp5fAWSCkBcUnO581d2EsUWV16hl05hmAaog4ErtKTSXhSlboZ77XkL0/BYUod73y/1u+meCH/Wh31tc+fs842na1mKcxrQFlYiQTLE0UaBYxdqIoaGSQFpbZ/XpZ9n0eRZyjsaXgmyDRFACtLOSmUYfDVv1X0Wb+mdGwGfb46yr2VrQ== 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=8abhhGbYUQGnIYQolTX5rTLAlQnrUPVHOW4wvlt7WXg=; b=OtizUKvke45P+k+G9+48IZ2kqOu65QzF7ayCfAUBbAhMii/ZztAcWO3vc3KhLpOcREBa3d5r6zvexoP1yKo5U073xo+zWmScudxPtAkT4sfQt6DcG4vFTLiw3dxZV57TtbiUqnAsID9x9w67uHPYrN68I0rQK2nvusEwQRPjJDgOAta5jnZDrdiP5/3UiRTMPB5wvDKxEuG6Vq8lyNkMt9PDqIzhfxKZP2LMWr2nKcl7cqOtapC7m4p7vBFl7w6ZMPD95pvMaaGvpogh9TYHCAOzo/GFxvdQDwP/XRowNnXm/uNmavI5zmEX3H27qaVopmlJAv8/AvY/xncdTG65fg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB6723.eurprd03.prod.outlook.com (2603:10a6:20b:2d8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Sat, 12 Feb 2022 06:41:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Sat, 12 Feb 2022 06:41:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Feb 2022 07:41:22 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [cu0RwkOHNuPmHguJrUVy0WZfGQ+4ujUO] X-ClientProxiedBy: AM7PR03CA0008.eurprd03.prod.outlook.com (2603:10a6:20b:130::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220212064131.2265452-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: abfe0e85-a29e-4ed9-48da-08d9edf2bf86 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUp0/JksszMwZGXS7aFQs58gD9p+KWVfU7S25niUSJEonGXzsdJ4bYNZMzg7sDgfaOgf7wvePjoMV6oha1amIC3PgoGVxW0fKSNmOZrKmR03bofhIVAGAF6QOGoaG4Y2ZSe99zqnTLVZJerKnvSuhKJ18f6cWB+X8bKEpt9WGl4wlNZAO3OxZx7IcSOK47QWsSuJbmkJ6kVt7GxPlVSoLFwPGyuwAxc95rpme154gaZ1R+iojjEtFIbk1HJqbi6AsdEw9N/BciezyoMnvlmZC25D4fjzVCQo0yo6TxcgOpvmXneGimDFNxr3WpjNPsXRexx207EwNWMnMjrHdacfqT9+4ZKGHJ2SOMh50n03xgKsJrw3/RoOHCjZVWPgWw42h/au9NXLKs6sDjbSjESfDXUXta4DKyIsdTgVhPtWKdzajaFlBlSjfLlI1/3/Y1XECt+0is/hcXSpuJ0pzIIIKXbBXMeVML5QcduB34wBmOH6u+ZH8yNjP/bOL/r6GPqTXA3wReiqT9Ig2DrSPgeOi31EffEyBy6KjYaJN8dNE8Vf9OWIlOXoSrjVqDvRevme/AecH/102yx7+T5wnB1yQEEymyPu89JZEI7cr7vX+vXePYVNavoyz6irnOX+g+t3gmn/FioMennaq1QEUy3SXbufNgjPSYnepWcnUs9F3XSVo2I5xEqj6k8wun1xUj+OUDRa4p2ScXhhdBQj8dAyf3CY9M+cAk0lK4= X-MS-TrafficTypeDiagnostic: AM9PR03MB6723:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9xLWT5/Sw6AISprB61cYvCS16wou62LVmIyj/NaNv9zApmlomwL15wDeeMOjGiLKrPosuF2zzkvcRIW6KkWB36CgkI1C5WGLaRve1w+kdvjBkU/x+6N9C3PMiEmk4QTPYQJ3iD9gLkRi1gmI/ReSuvcnBqV4t9YJ7m+77Zwl4wOO03MIrZt8rviXOrhfJLsobtn02dF19dlRArIh6PXij4PJD05AygEi/sbuNlxA6nU4eBwf7qJ0PvLZQ7I7lav12w0HYeYMbHORfmgunNUem8msxM/LJjXprg4Mfz71lBYAES1pqLVTELrh9cNkafx2l3I4m+uxBIbFZgtcha7ubaDQ5aof4C5aTEwNS/aFUs5DDcNTMOTwSEP3xHYnfbIm1yxb8x0cUtr2reUxj9K74O+LpBO3vpXcgCt1z3fmI6S1pwo8XQ13YZKvYw1uBVL3d2oI8BcqyAtJ2VSHxnFAVh1MvgGv+/QnRz7QkrT2mb2SxRqFdI1SqPrhDPg2vINQ4Bmy95xt3H45d1J3wN4JBKEgW9orWnvLNOsmpug38GwnRjcjYk+vcmnItNMij8+7UNv2Ip/I3Sr4mBRuoKXDyQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bwuWeaf/jfAX6IsgxLzKPHEq5Rm95g+Y+U6Z/DppLp/MJPjojvIfTPXfVk75rnoeKMdyPOjUhDi9YBiIwb0LCPvmPmzi4t2ojYtLxISmSKhJmGYzPm3PkcW4U8VS5SMd10/GcGUvc/UQiPejHA39oeA/eb6q4jnj3oeUOnd8sz8nnLgOVYtRBmSgCAy+d18VND8qwN1Pn3dbEr510rrE5aIoSFZgcoRFz1PbbYvWwYaqaL8iX+xBngNDT5CmAaM7pM1WZPGio8Jv0nGk7dAY7xg1QgD29QQenGC1Od3VimY8eprI0cuJJQepabibRgUczptiTdSEmGppf9gU0nUGha0feZUxtljQ1yqP5u8pVtjEw3qVlPOtvSzZ9HEVVvXJYXD57uaoDiTNM6w5zQdl7asxBCIXPoFLYajv2RATamrIs9hiBlRNWsLmzfCtcQU4zK4x266gLCKjWZ1//altpVvGMW/D40wrA26raPUK2F1FbxenSMjIcCg1W5sjPd/pvFl9QtSJ47wX95zYrX4GW4ZdOw1+TUVnWk4HkLFE3L5YuNUUj59sWtAqkKtL388hCZKZV+tYdQNfXGr9/OWxfqc6E8lMXUmFxWpjOSZaqdnwPszscpF57/EDmTyKHkvgBApWWrs0/fFA1VerzUM77amJ1VYnXA0U8fw4RhDiQAEhxvnDxg083r6j4bEnCZ5Nd99K/TzVO4qiK4TLF4NFo5sNb9M0ocEbTrpvJOOve/v9QuKR6GNXOTy7gsgdzDTVFSRAr8pk4m92XxfOg3KkweRPCj6zaBc1PfZ7WTrr9E5XICfWVtPYgpu1vPANO3J5/SXPNsRIzFGwdmnuIX72z/kPwd25sWftQ7xfmVHxSwddGBB+ixTvNz9/QaTeRDwLN8ioHZuv2Gcp0DZHLFlqLHRW+Zpx91GClRvCo92v/T4NVMl7qor0uPttpo0Nm5400Ef83f8G5DatLM1vnl5Hzw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: abfe0e85-a29e-4ed9-48da-08d9edf2bf86 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 06:41:50.2627 (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: AM9PR03MB6723 Subject: [FFmpeg-devel] [PATCH 08/17] avcodec/alsdec: Improve code locality 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: Ea/LEP9HWa+V Signed-off-by: Andreas Rheinhardt --- libavcodec/alsdec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index f8609e61fd..c09401d257 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -2094,12 +2094,6 @@ static av_cold int decode_init(AVCodecContext *avctx) ctx->reverted_channels = NULL; } - channel_size = sconf->frame_length + sconf->max_order; - - ctx->prev_raw_samples = av_malloc_array(sconf->max_order, sizeof(*ctx->prev_raw_samples)); - ctx->raw_buffer = av_calloc(avctx->channels * channel_size, sizeof(*ctx->raw_buffer)); - ctx->raw_samples = av_malloc_array(avctx->channels, sizeof(*ctx->raw_samples)); - if (sconf->floating) { ctx->acf = av_malloc_array(avctx->channels, sizeof(*ctx->acf)); ctx->shift_value = av_malloc_array(avctx->channels, sizeof(*ctx->shift_value)); @@ -2125,7 +2119,12 @@ static av_cold int decode_init(AVCodecContext *avctx) } } + channel_size = sconf->frame_length + sconf->max_order; + // allocate previous raw sample buffer + ctx->prev_raw_samples = av_malloc_array(sconf->max_order, sizeof(*ctx->prev_raw_samples)); + ctx->raw_buffer = av_calloc(avctx->channels * channel_size, sizeof(*ctx->raw_buffer)); + ctx->raw_samples = av_malloc_array(avctx->channels, sizeof(*ctx->raw_samples)); if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); return AVERROR(ENOMEM);