From patchwork Tue Apr 2 01:37:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47718 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1084288pzb; Mon, 1 Apr 2024 18:37:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzp27udponSsSJsA0Sv6twVjAK/rAVp+V+ditcmEwG7gV7rTq0/NcRIxf2/Y8is2ovhYjZXGhQgvYai7gyJ9fQGu0c6l/RzdRnKQ== X-Google-Smtp-Source: AGHT+IEF16vTk1vUrOCwakGF5XyvjvZfwzlBphLCMTuQRiHiJdXVrjeKOzn8mkgF78lu47XY6ee4 X-Received: by 2002:a2e:80c9:0:b0:2d4:720f:6f46 with SMTP id r9-20020a2e80c9000000b002d4720f6f46mr5849267ljg.15.1712021872907; Mon, 01 Apr 2024 18:37:52 -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 fd5-20020a056402388500b005656776bf67si4914429edb.655.2024.04.01.18.37.52; Mon, 01 Apr 2024 18:37:52 -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=nHleam3S; 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 4F00A68D092; Tue, 2 Apr 2024 04:37:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2066.outbound.protection.outlook.com [40.92.75.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45DCC68D083 for ; Tue, 2 Apr 2024 04:37:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B/zBh72E/ztS3ZHsHuwVfnPmJms7bqicctkd9vDkV8bCGehUJKzAkvczG7lceRPwXgyY8ti6NL+xdsGqOHYPHK90Hdv6DxQwQnfvvFqZwlO5SUQckgoibqpa19epIHsqBt8v6x8yqBhXdl8lEbPIwEELyvv7Otp6j2iIy7/qumO4bIhLSxRfqll4Zefj6G2l3Ds2iH6gIce3tceCwlxV6d05qMizOmcs2t7wGGdnZHVrmhEgIf8NDB5Gvt7V5BbGNDJ16c4m2UW9pPUGX4zaaRwkV32THSRiJAh+t1GHQvWB4JOZu4NnaJO7zT5y4s20uOCdYNhN8ACX++Kuo/3Zvg== 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=BbENm5wnbexCZbFGPkhvKtUke+kh1WuqqLpMfEyd7bk=; b=E3ZaMlcwPf7J0oU3e9/sElS6ITayyhR5P3t5uD5bseE9NCJymUum9xvBPqlMcGFKeDQgyBnxasx+BUVCFkPojf5E6zIO/OZnOLmoKqwaHeupQFOAGnEwu8o0l4NhkQAXtUwQ99gCLc66nyhBzAsD215+28VduUsVVs6NijaNeVNO1eLLFiBqujdJYGsaQkJgy9MVVphF5YhmB7hqk9cnN3+hb4truc4SjH7n0zy4qzpRovpra9cXgugossl6GY3YJstXOGq6ToZSlC+v14j+TLElNWCA5y0ibmbOCxSV+zRKWkcY4rWsoq47dQ4JaxzjzY3V+WZMvFlLUND7VO813Q== 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=BbENm5wnbexCZbFGPkhvKtUke+kh1WuqqLpMfEyd7bk=; b=nHleam3SP5yIcJyu7txIcOhZzIhFh+fqRdidSg/vTtbtahHgM6df0/cZZWbSByFyPEBsC3V/36I7tNpW6hJD/bFJX8zvkKCqUyERYppwud74b/oisKxW5M2l6puTErKHIZ/0okkIS+rv4oJobXc+/67Pt1Z6vyvveoFoLxXQZvm+MnePb0AIuJ0xVOSeVtP1Vl5zXLVyHLlHjuPwAS0Cz5yGeJJEiXK5mC29VgHnwwqfBeNqY4k1dTqPWRWq07wD6fCZ5GzuIq1h/kTdkPaC98DWjiAwNLAgHRGFWdD0DhV1xeoxzxB8XU1Vkv35VN8A/IUNVsKF+wnNqmgMcBXudw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Tue, 2 Apr 2024 01:37:20 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Tue, 2 Apr 2024 01:37:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2024 03:37:05 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [/iaxq2hrlg/3irVSmdUCoU4+YJlDQqd9SEnK+5eWxyg=] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240402013708.1510327-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: dac48f77-bc58-4c95-0cad-08dc52b56fa1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nP9GEonRxcGJ8yPRZQ240mh+NL1imHdYMgNlVx8W5/w/c1ewTZ/UfRVUEm9vnt18k0fAvFFn93CHqyqRRiwQ66Yjl/u4GQssHM1iDx/sAA6ZoM8vEalBTNGJYX05FWr/xs5iNhy0fClEb8HaMwShi9lWxYXD8dsZTFYk8dmK/2EAPUeTVbHEzl9Y5GRtpuJjl4A1oCGGJzWWHYEzHee3GKHTwu2oNZGpHtYoDKAgCnMNe3SsRH1KuTlwWqtpyNeozP6GhdRPzL6G+Y3TTpt16Z9FbzxIn1yUD08i8/Qctoj5yrc4J3r/DERyYl4ftEW7z5nPiK+JqOW7xJNI3YOjrhAVpDQKNfkCck7fmkOhnPKcNYBUlGa0G6kAWuqA9kwbVLjAxvyNlRBS4vNUjmCN9eJtfQnAyHt4iWcPZSFodgupR5MYhxF8jI5Ttv9HtGMXfLQHTIhG5kudjaP5Gs/Ezyi08R91T93MRE2EfZIqWEhKNVy/CjD1r4J6bWwxLNYGk/DP+DXsG+ailGgzW96JWGcITPeHuuhfVG2iu6xzP9DoIjG71GRtzEdGpsfYo5bntsZKQYJwZZGxCUEyvgDQGNKCq5fYn81BHKneWageiIs9452NzJr/FJRTGHNmEntu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J3BZTqMehupatwEtBrusAMZf6vREOcaa6ksVNzZoeT4qkAJ5s0nX4BKPVZRMGfMJIpirNaEBgzEcVFrflVDyH5PO4fiZBPrN7yH7IXF/6e/ABV+eWyxoiiatJI+oE1Nkuz4L4UMv5FkbsFjwcdkVWP3aSSA9BFT3f6JlxQvPhhKY7mr2/8W0SFPOwBKJqDInE33WD+iZsQYzX1Yo/cjhA8URwBUiNGwwvczI4hIxMcSU5ho93lDeAxYIVDB849nMQjyvuWXUtIlgdIS7d0EQwfQx+ceYgmEsHX7fobrgeZ13fv0qKAi9DfSjfldLiPrqTGtC7/bEsGlXdIr0tdQrA8tbSFPtthVnJVCdleEA8mb4i3CG+mk9zmzh9AbTI9VANoe5k/t8DHfP4mQF4sz0LfHk3XA46xKfCDILsTYRvVKsuD3SXNbLGgV9HgXBDg97DU8nRakoeZ0lDV1e10LXzqROwkLF1gDRe+UJTSN+Yj7W3Vfxu9yUSJhLeBvAVCMGchZB5ID11hLVJlyNtpaSYi9UqF/k4KiCNZW2piCu0g5/9Ckgjh8WmsIkv52txnZwmR1DM2rOf0S9HhhxeyUxJORuWJECLhoFS+Dq6IHHvHFC3JVZfxu7KW10Ey/v0YgNzDxXRw2/IjnjjQ4d/szH+zElfFhVzSFZVrwOTXnDeT2RkRZHyBrNbXrt18RTmU8MlZS0emnnoPeMXvQnUB18hfAGjoNBChaMdLsuhdSvbGS0D+Jv0/7Hs3AGv9iyIysb4ce+gnXZE76BLBwcan4YOe5TCOjAQpFImGjeUY+p0H3RbKPIJ4JLx+tNhaNmRngdphUSau1qZRvLho+iYA06XnDJBwwVg0IFnvLHYZWSGOV3xoYlFRrUzTjc+gcowK0gSmmDNnl54Tavp5WVSirp2rvzi8s9K3set/Z2Ryvb91l+guRO7L4zIcsOjcIm3jGyMTdNPRawm5x73npfTMjgZa1v8ceCf8pVhjI8b9EaVdG1AbXsZAOmsYvcTRuwGXzBiwZme/+bDJGwliC4K7uMYuaYbDTaDTyxL8OKSbIwyCm1OthF6MM8jF4F+hlUxFmDQodtLfwVqE5+EbBKd0JrNh/tOxruZRI5o/TbScR6b9lWhX7cpq4ceTrww8fJTD/zNiPKIQ0GsQn+Ctlz8P2wc3azikTHhUFF3Own81O6EB98eZuHnStJiAqTgwJc43RDKeyWec+b+6kIUKfrf3NDzlhGIRsjTUilrjcQB42cRHQgx0/MpNNJRpUxCtPZNTHdsBv3odnTs/GOkkDjYJZSHw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dac48f77-bc58-4c95-0cad-08dc52b56fa1 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 01:37:19.7225 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/wavpack: Only initialize DSD data when encountering DSD 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: 6bYC8uiVjljx Signed-off-by: Andreas Rheinhardt --- libavcodec/wavpack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 36bd4662e8..c96c8e0583 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1049,8 +1049,6 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx) if (!s->curr_frame.f || !s->prev_frame.f) return AVERROR(ENOMEM); - ff_init_dsd_data(); - return 0; } @@ -1529,6 +1527,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, return ret; } ff_thread_release_ext_buffer(&wc->curr_frame); + ff_init_dsd_data(); } av_channel_layout_copy(&avctx->ch_layout, &new_ch_layout); avctx->sample_rate = new_samplerate;