From patchwork Mon Apr 8 20:13:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47951 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3f98:b0:1a7:a0dc:8de5 with SMTP id ay24csp136423pzb; Mon, 8 Apr 2024 13:16:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUYVSQEbcKi2f4NVa5/Ee04ulWo08X0Lc+qaaYsPZ+oqNhmxB9/01pfk8hFWkhytjzcnz2lBA2sxfFAQy59Yd3C726z6oR0bRY6AA== X-Google-Smtp-Source: AGHT+IExw9b7g3D6zYXnfeMd81TgnNAuc9WZ2ccYW1bj6a9Z3DzKJZpQ6AO/LTsSohrM62tfrWFQ X-Received: by 2002:a2e:8095:0:b0:2d6:fa0c:77b0 with SMTP id i21-20020a2e8095000000b002d6fa0c77b0mr6001330ljg.2.1712607397818; Mon, 08 Apr 2024 13:16:37 -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 z19-20020a05640235d300b0056bd5d042d6si4084863edc.33.2024.04.08.13.16.37; Mon, 08 Apr 2024 13:16:37 -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=NLyTBNC0; 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 BBE2168D3C5; Mon, 8 Apr 2024 23:15:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2044.outbound.protection.outlook.com [40.92.66.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2D9C68D39C for ; Mon, 8 Apr 2024 23:15:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iECm7U/WbXmKy1WzzixA0FibFf3DkN2qMR8ed5WOj+1jznoRZITW+ZoQCxAydwh3yUw/N2cOQPEDjDYfUseLCyUlF1gJEE1WlX9HywkbWfmOT9oblC7PtWyLbuUW1ul8GJGfiMNdeGS6YV+yqBs31jigTZXAMmVBGZzyMFQvuBBTmMSfa8EULbuBwQ6syXLvNif8cy7gwETUW7TZrxyRClPJ6eC2hziEmr0HMfDdB3yzkqLXvkGDCmdrdJFIR5R2d0fIMgb0DqBJOD0mso3ZIGBJraZKhP7Xec9JSGzNrHy/jHGuc7eoGEuDHtw+HWl7DsoOQVoq8aMYY0Tc96UbzQ== 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=tIGWLTxeNrZT351vrRnGgIzD4qq6WMUb7xfGfMSeSng=; b=ZhjFt5O5XVcQDu/c+BEzHcf/j0NB3fzOSS1SLMV485l+RhuDQW+Eh1eiuOe3fGi9GysKASLxLe2SgMFfzq54Rbzbr8apEU0V3QuSrxGHvLRxy9LkmP/SCdEyVwPDJXZN40rabvNUzFT2/q42112lVoip0Wt5DvbDZjaVLLrbrTfEJoGuW9OHA58gGupxFWn2Cjl03q4zDeIOvADGw8S8CpbFuXEM0WzxKm2ykrgmvBRImsiE8vPwQIZZENj62SHbPQq2uer4gLG9fy51nhButYGKyYf/7BMWc//MFPLfvr8m2+fhoBTiWB8eP3pUV+fxvdmBgENa8Ngj90TApz2efg== 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=tIGWLTxeNrZT351vrRnGgIzD4qq6WMUb7xfGfMSeSng=; b=NLyTBNC0qnxxX6i1RdhcdODW3IwQJTG3bfU2BG+32E3CdS3LypMmLdd5MledcerUMJx/AKoKrTF48OhGsqHnrHrEVi34nIt+/zedggaTjkcgNfmyFAWf7KA2+2L7gcN1vmKKVRZ3S2A9wMLB0V+cWaoBFJY8G+wbhLCyIjTwr1l0Yfi9oO5pn2WsI650fvKNGMuDwQJUzuMqgrMHmBTN7A/vM8ya/T4b+8Nz3Vg7f4Y2NRS0/HWFC1mnUB2ZKTeSEJ5MO2R84NuKi02VR3M1lUsLU02MR1GAgJ3BMoH1av/MDmnl0Ti7AxIctQXAc5fO7UqpJFRBdIaZep4RpsqzWw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0494.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:28d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Mon, 8 Apr 2024 20:15:11 +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; Mon, 8 Apr 2024 20:15:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 22:13:53 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [SpL/dHe/hZ5G+aY+03LSmmgt5t2ACPUX/X8ga65HiUo=] X-ClientProxiedBy: ZR0P278CA0124.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::21) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240408201405.2136840-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0494:EE_ X-MS-Office365-Filtering-Correlation-Id: 01be9373-bad3-4feb-0d46-08dc580897fc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YlbbTM6vZCidvHdtAFjeJWBF266UzzfWAs891NAeY0oBlNrMSbfQrE85s4ifxvYmuUBty1cCeiYWhXcE9OwMV08ECkUkYzZzW3FMZcOSlHP4TNHxaGykHdy8o18Gsin6U8B8zaf0qCP2JQwV8q6Hjwe7QtUqI2TK3XLsjqdgzYFEun9JRX8bpOYqyGJh6D7HSBpmG4uGU42eeVFwS1RDtgqszdwbiOh3m68FNI1D/o5E+yTj5SUVBvTKf9+eNNhX8/Gj/tFHVAs7r2fXa08JQ4lhJ/gviJJu6GalifVvVNXcr41LTJFkb7L4F+aIShnHMdIz2nPDI0N887ZWgB0+azXKfY3JPQcwpMg1TpfkIEfZgjMgIB7KFXXg35dm+CiBGfy7PLs8MKdWD4si7Jk3Dh9433e4RlzbZn5yF1jvCT79U5u5kPwE+L/TLm69R5aR7K4mTDWhEsXyaFQ5CS0H3kqzn5t9HW3Ihk5Mc7L3li50aGnR1O5rkuoRxeYRRgMm58VGS5AVeJJSXnRtv8x3Gm+PuLo32FWVtWPA3KlXOYt6qTfEsM7m/pWvniCehz9KLrmgTK45rM9fD/9nU5O61bu9u+4PPk47VyYkbg7HRi55l23xezPeyyiE3fXsJZbP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QhFKgS/znwzR3VNa83bw+JOrrw7lDZC1QP7MfM/xe9UjEQbiXvfBOQzBfWWSCO/ofgXnzR/gogF+b4C3k7TzKqsmIInzbvvLeFHV1Z6h/hPy78Zpw/NDMudFVQDhEJCMKJU0OPZOZPI3bCksAaiuTuOERHIlknxRupgL0+CtxbZbWjT4utPgL26Gf0IwhwsyJyfTplbOCxyzgmdOJ0C2etrJSKTJ3tXcJv7IOvCI35jLb2AppKOZjCT9q5Iy+NfF2KdAls+p2gfGuGIJxxf74cDSGo1DaFVsUE+MJ00ls6ku0wosM98k6yc7W7mHx2mRYujeOA6U2FmKBLusHGdubYeo1Br+/7s4zpOafl/i/bVcxGlbGUWI7D2sb6cqCxRASJwKp+I3+dvUMwkGWMyhUUcxYnojKVrWdsPyhE13JcmYW7av0T2U3Rm91mypzeLMxUQPGaT5mIKemAGdnWRbxUE3A3t7VhWUUp/J3u4qkBt4v2zVVvxCz8lGwVxquvaAdWHdG3yR77sNzliRZkeNSXB8TS2jdeEOITxH8YXi+DxuHJCYDbYefr4KoopQk/63rHyN7KAUVgDOTM5mCdZdVgHmKD19R0d6WusSdz4ws20Oi4GYNTvGZnTmjmJOJ7gfgTB6vZenguI52HcTRVeD2oNDqXS47qsFPYBb6FysMrPo/aYaGjQhBwcEjnLczO3oVNlYHzRl1TW0U7VlsGZcsPMK3I72UOrnPqeputx4y86elvccEOcKS0D88r6/I7L4Y5V49V0cG9JM0popONAMCcCCOlxcc2pnyVBW/O6YyQ58oB4XAGZd634S+mojTpSSKyui7RQ6imANCMIPorU+MDeDON+GbZRWDRYTLAHbusWgXnI7gtnaXQ4bAbGuhFQuSnucOULj2VsXQRBJvNEUAR80jJ+l5WcWZEYbKk7rOogwiR/14mQo2aql8DBAk5EeFHwx5VD9Ukm8IT5Cf4hQ56zx3WSTp1/FqtwyDl/cx5siNX9E7t+mXUkdR0xU/cKngQ7Ujj/CvmLE5X5Jshyb2xTa2X+ycVbj+Dq7KLujRuESqycsqddAyBolTWpXRSHoxTnFyir6+4QD+Mz2LZP5prY0nqJJu2FSSUJiHrNwUj7DU6xyxdpWNfp2RWWOPuKaVYUePT3TQqeHYnZBg2+Z2CH21hC+khvQhCjBolROevYhWtLpFuC4/Dfa9STLLm9qMn1QToGO5E6YmY1ezBLJGNbU49XpivCoCeDaEhFytDEry0zlZqb+9sPxLQyBRqRHq7FQ/UDCG3533k9Rhamnlw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01be9373-bad3-4feb-0d46-08dc580897fc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2024 20:15:11.4550 (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: PAXP250MB0494 Subject: [FFmpeg-devel] [PATCH v2 15/27] avcodec/wavpack: Move transient variable from context to stack 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: shvSW2UDG/UF Signed-off-by: Andreas Rheinhardt --- libavcodec/wavpack.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 6ab9088213..d4cf489c0f 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -103,7 +103,6 @@ typedef struct WavpackContext { WavpackFrameContext **fdec; int fdec_num; - int block; int samples; int ch_offset; @@ -1638,14 +1637,13 @@ static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *frame, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; int frame_size, ret, frame_flags; - int new_progress = 0; + int block = 0, new_progress = 0; av_assert1(!s->curr_progress || s->dsdctx); if (avpkt->size <= WV_HEADER_SIZE) return AVERROR_INVALIDDATA; - s->block = 0; s->ch_offset = 0; /* determine number of samples */ @@ -1666,14 +1664,15 @@ static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (frame_size <= 0 || frame_size > buf_size) { av_log(avctx, AV_LOG_ERROR, "Block %d has invalid size (size %d vs. %d bytes left)\n", - s->block, frame_size, buf_size); + block, frame_size, buf_size); ret = AVERROR_INVALIDDATA; goto error; } - ret = wavpack_decode_block(avctx, frame, s->block, buf, frame_size, &new_progress); + ret = wavpack_decode_block(avctx, frame, block, buf, + frame_size, &new_progress); if (ret < 0) goto error; - s->block++; + block++; buf += frame_size; buf_size -= frame_size; }