From patchwork Mon Apr 29 00:35:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48357 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1702547pzb; Sun, 28 Apr 2024 17:50:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX60RDCCy+qnnfBQr2vF5bQOAuU0LM14xIdZCasR0yPC8azDlgkVbDU+j/HPu2gz2O+TP8V8wk5uk4FPHZsh4Mbnopp0PcpogApoQ== X-Google-Smtp-Source: AGHT+IGd1rVEjUx3pKX9S0yOD8ifkz2apDx/QNOr0Kcu/hZ+ewEiHdBUihkto+RjOnAeCPVhSfRG X-Received: by 2002:a17:906:8416:b0:a58:a268:2c79 with SMTP id n22-20020a170906841600b00a58a2682c79mr7302749ejx.11.1714351819845; Sun, 28 Apr 2024 17:50:19 -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 ga41-20020a1709070c2900b00a53ed1aab8esi14696023ejc.910.2024.04.28.17.50.19; Sun, 28 Apr 2024 17:50:19 -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=g9Q+Gp3g; 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 74BDC68D447; Mon, 29 Apr 2024 03:50:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2074.outbound.protection.outlook.com [40.92.59.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB18168CF12 for ; Mon, 29 Apr 2024 03:50:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gIk/cXvBbo+liQUL4OpOMUd9CkTXE4gnQAjs9Vhg82UcPhfGykftVTAmovD9M9zIpuQ2YavIOFlZjDm+juHC/Vdy4U+jgshQh/JKV7QVPYTySp7JXXZaF2TpnA/VLU/gjsa3wv24pb7L8dCB7kqPGPM6Anzo3hFsQgbRtMv8o04MtfngRWykmg64URzrnQE6/rxLrZ+3rNRNngoMG40kGD0Vah/d8nlXnxkozrdi3T0/o/0pmzDzpQJb6hqxP9wL89sFZuMyhTywHEyrPoaMhAUDsWZBRKw4d0ryeKhG5YOUrZQ8jORmjnUYIPZhrXgm8uzaezzXaMEJ2QClwz7l+g== 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=6Q7M1C+gxsPSSJSmaJVJp0GUpHgljhRQ/7UmSh0yFoc=; b=dvzELy67QFf4KfgP3YEpbHfT5D3hqtnpmL2oKcP+eyVAU9QIfZEXUcGxXAoxtazTDQb8LWku3ydFPPmcsR6RIgGYkpXdWkVX8+8rgOWKxn8gWpmN2NpA6+j5zGlmmUtHcRaFa9q/+c5ahCCRTbES3ghL+Fmbd+/h/tZTv3g+xYWlDJuzzcI4m3z+SvWHp5hVtzJ5tGGQifoVzbz81+NHptUC7JY8I+A953mqkUtPZPCkYS20vQAo63o6Kx74FkSy1k7WBeKOOAinXgRFgcq/EzCqR2JrHb+gRh5HAJiZabD5SvSt7zWvHCH4qyd2nzuf0QoDZEn5iOSY733MwIDRKg== 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=6Q7M1C+gxsPSSJSmaJVJp0GUpHgljhRQ/7UmSh0yFoc=; b=g9Q+Gp3g951y4jedKaQrwIMUJqRVhMyUdNonr0w/MamECimdIxXh7A+HQePDbfqrFzB+GBa+qflSCyJv9Okmh/rMXAb1BHUeWutIW37Y9jzCQL1+7T9FFD1rKSlExOZgGDlb/2iSa3r3MvxDsVs7pYUMGXrOW4Nz4f456mN2xGdoPbQCYFRjkk+eAiaGI1g97YnSxPq71zmE6VA4kCsWQ2ECq6XBN9FLLDfVqtloWBC9NJg9TdMkkr+e5VB6BCJwVztiEF60yLMIMZoHZwCd771YdqcTSU3OTA0jHP+GS1/GRrYlhoZlMyVvZP/4M1M1vJ4vPf56243UfYWmIcFFNw== Received: from GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:60::6) by DU2P250MB0077.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 00:36:00 +0000 Received: from GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM ([fe80::4eb:f54f:b451:34fd]) by GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM ([fe80::4eb:f54f:b451:34fd%4]) with mapi id 15.20.7519.021; Mon, 29 Apr 2024 00:36:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 02:35:35 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [mEplPvAuVVt54s5YKx88biSXY6BJIPJkWwDEvItdxSs=] X-ClientProxiedBy: FR2P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::13) To GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:60::6) X-Microsoft-Original-Message-ID: <20240429003535.1516058-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0021:EE_|DU2P250MB0077:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e8fff8b-0f5c-432c-09d5-08dc67e457fd X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: VvBs5LpPquGNhvc8dfkAoJ2li7wz1XLxrCngL36Gpw45VXPo2RwgV64mV4NgsQWwT/Rop/SPnEtc0S5Ox/uxA8UVjg7uqnW4pqBqXc9JnMBMsNHLwgv3iLb/kGta7Ol7oBd/WIGyt+lTFDZ/LlmbHF27zwXdIFM3HDTXgINYyi/VTbfvSS4JqZcsBN6ctAG7CO2lq8dKEBnk9kf3hf1Ur2mzHoN+/o79aOjFZB6BRUXhcNSfJGK2BI5zMk6subvMEu44AfhlGvEirRxkn0yseTrKq7wr2wRc1dbiocorauffHXZ3ryTeOZIxMC+1QhjCR5FUHjgB4b3dKmpUnReFeFXVZpgGlS76JtGkjv9ruutfSlBOPZ3oDNMVbYvrR9+qq/ewVlqc1gP705coLoOuRqak2CMeFnkqCdfd2bIdB3HyHNRwf8JHBCzabHX80shve63RooZMnZcynXwcV8aKt1K6IYBDq/P+w8J07RocwPEtZmKCSJWegptjsBL10mQcN2DYkQdMOdsLoNnAxrKhOR8jD7rNf5hr4ubMfjySYcUeJ2y1uO60zsgVwloxJyBa/R3v3srqqyKGD2EY6xRBpZoeQTf57mV3ftC1rROxellc+tvX37SVf0i7nr+0nwlH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TtYba9xTwMO5/Zj8K5HT9ZL9JMlQGja2lrKpFDN5pSP1tSh0CjMffrfukipMSDajNvfP8W8dRkAO0Kv1d4S1FWynhUp3Q9vhTI9zbGQRBKlDVD9c9xqghWMcwKdMRbVvmdwgp5t7pQxvliUrPOu79fPl4bdtuFJB7WFKOPc7JTU5PiDcopkIJx+Ymqy4ao7nDfEVCV0uNAWBhgl3aRcc02OLOuXZ6mxH1xclaKaPbxhDD4Gef4sOr2wvzoZMImb2SCNowuH+e0L+MmE3uPTmpa3vRt5qmeHxqaoeHFC0zpq9LmC1/TwCTxbre/CaaQnP9Z5sqlNgANSQup2RvqzO8YlbXeb3cGTS4rqaSO9GBdW0wa7LQ8TByT9r3v0roWPHL2bk5sAFbTIv75QfFmplnkPrFBObopOZ3ero8KjIhTFUFl4U447uyxzqi4iOEhYAmtdpQqQtNLcuDxkknOWZhKTUxwXhY53byjaGL8BIExlDqGBp2s7E9U89tZFgxsYaoMaWwySsvU5shm/dNNaPW0SrAL7XXy3HhRIZ27SvGGBntqRnKZBka8toj09j2KCSeXVDHwdzTS95jKyJKxHqzpA3MoDx4v8D7Z7xWZJ7kw0KrSTI99Pmg2F1ralXo1qspfblVfggK601oaqOGHfqj2e93ykTVj0F8llawNuZhNpqgWu7R3E3DEMJvXze7RzxqXj+OoZz9FsLXL94zrhoznbqH9zlXXg050vudenQbNhRmOnl3M8tbXpKuAqhNtZuI5EjIkZjiFsj3x0uOcvnkRUO33Un3O9rHRCIzcS4Ql7PNkvvmNibmib3oZvmopM07Qmo/w4qiFymIEnO8D92FrKCN9eRtgQsvAItl7BPjT5GS0GC4lxLJD43eXzw8/d4F54FVh6e/v6QuLMckg38VCVTPBADglSA4qih0IZSiKZWGAbVnhrPXhjKkq2O0Zcout58IjtS9XqL0YbtFuR3iw+Jm78K5ALW8em0cbZm8AQgGc3MsYfGf19NtEXpjsgVse+2uOL7bRKmLPPA53J7o4KxOp7+wL+NYqZ99P28azTA5QHbyJ9zSVXTzMjDy46JwEQGCbAuqhMdBe/i1jc3SH6RU/UYQ1ygG3GVfEGRHVPpJcaOVdqVDZC81iTcuHcUHWlVXKwzJzRy+IRdwOyhFm6ileBiTT9u57flxmRLvbratA7587NOZ67Cf5ze/RCHKFGmCMz5J2i0wHGC6jOS2+0RYVlCayoFoEbUfMst9yiqAY9+uOfE3YhXNqF0cGovb1wylAuT5u8AKEXa4U83QQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e8fff8b-0f5c-432c-09d5-08dc67e457fd X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 00:36:00.7965 (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: DU2P250MB0077 Subject: [FFmpeg-devel] [PATCH 14/14] avcodec/mpegvideo: Only allocate cbp_table, pred_dir_table when needed 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: E4/nclZJzOmg Namely for the MPEG-4 decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ca6e637920..2ef69a5224 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -593,13 +593,12 @@ int ff_mpv_init_context_frame(MpegEncContext *s) tmp += mv_table_size; } } - } - - if (s->out_format == FMT_H263) { - /* cbp, ac_pred, pred_dir */ - if (!(s->cbp_table = av_mallocz(mb_array_size)) || - !(s->pred_dir_table = av_mallocz(mb_array_size))) - return AVERROR(ENOMEM); + if (s->codec_id == AV_CODEC_ID_MPEG4 && !s->encoding) { + /* cbp, pred_dir */ + if (!(s->cbp_table = av_mallocz(mb_array_size)) || + !(s->pred_dir_table = av_mallocz(mb_array_size))) + return AVERROR(ENOMEM); + } } if (s->msmpeg4_version >= 3) {