From patchwork Sat May 11 20:50:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48747 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp298494pzb; Sat, 11 May 2024 13:54:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXeWGBgwQ4/BBCQicnqV39iVjgZ0QQY22tlCJUIATUauDCH8KJuYtarOdc/sZDoShL2EWDZwRk5GrUnc7Kr/VQdsPNOq6ltx1LVjQ== X-Google-Smtp-Source: AGHT+IHBR60mHQQIntz2h/gPWXpPxDOHVbp50LgSD+kSlEDRAMZ+ui50csiSIl2AhyTn671vhwtm X-Received: by 2002:ac2:58c5:0:b0:520:7a44:3f30 with SMTP id 2adb3069b0e04-5220fb6ab92mr3927468e87.16.1715460875458; Sat, 11 May 2024 13:54:35 -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 4fb4d7f45d1cf-574b4aaccf4si705626a12.72.2024.05.11.13.54.35; Sat, 11 May 2024 13:54:35 -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=fD7QQkNP; 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 2745068D63F; Sat, 11 May 2024 23:52:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2014.outbound.protection.outlook.com [40.92.91.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E2C868D63F for ; Sat, 11 May 2024 23:52:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PUseIvN6UhQ/M/pNYHKgZpkgAkSaSaEHE13yG9xJKsKvOX93Edn26dhXGJCbtKN0O9vTPQVlAw8tPegkHQRIYa8cv1GiAShTN/qju6RIBXVE7GzXvzdt2Wdbk4A9yE92eN46h9js9We6BdBtk6899gtONuMkSCY8qm3WNAJk2EK44LlXrX7KmFzc4H/KkqKtwU8x3iJSa7t3Do8OuXzrK3risi5/9IrNcNdPUH4oJo6RA3WwDvvuop3sHWYGy1Al3jiswimKOtFgBO+8O/wqPTehUbv2V/yC4zWbJaLylvpKrDp8+psFw5KiihLx2JsrmrJc5ikSG71FpFH05cmBkA== 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=Dk8zYIAbar/5yZziw51khpKV8aKB7FjSW/SWqLBbwAXLrZ8jlfCwPIoOjqBeduULC5HxwhU4h6DVbMld8h9wKMhpewV3gWf+ULh5f2Zc351D701z66tlWcB7uAFnNdBat0KSP+D9AhgMM97LUo8iotateH5teJmvVs4yQ12x0hdnj+S0k9t1eERQREdnlMopdfqF3B0rjvyjLenpmwLqaQCqtwy7V+NdL13ALPtOAnVgMzpLKO8O1yBoT81zdY9eR/VkYCrQ/ztDZ5yuXgna4BHtXbxClPwqQVxOt/pAQKBzEuhcm7kpsviDKjAalNok5ehQUnByn/33LZpcXh38oQ== 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=fD7QQkNPUAaQqjkM6bX5PJj7JHmTpl3g5kqMk+s3jd7wB5nye95lGbJ120uWHTBsCt9mE4cFwLDyFihejk6UWoCal364sMnROuZ2XXeEop2do296CkgiGIaWnan6RasAlc0lkxvevjTw3YjFgFdATBzd0efw7XKhJM8N4CQVfwCRMe5rMTQK7V9IIaFvxOq04KgVDb2gPK/YFIfxk8QA+y5GjI5uTPdORsBk9xy8qrkTzqZTezLYdMBlE+maQ4PQNfdYzXzxIpEIfIrbEQslEX1lVBLuSDm1ZExNQDxickSY1Qk+BsovA6BBq4jf5EEsEz80fcXarw0Y6kZFznzihA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0370.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:52:55 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:52:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:43 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [qR1rdJ+y0N+DhATfLJjwfTc0tLWQz2Q++oYJkQo3EDs=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0370:EE_ X-MS-Office365-Filtering-Correlation-Id: a008aca1-048d-4dcb-eb28-08dc71fc54c5 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: f6uQ/sLvSGdnsd+Zj9X5798YIEa5gNIWzh0Ycu4bTEH7C8txSIbIprFxM9u4FM1PZioNsy+BruQPf315e1YUxRT1QWSJbeTnIsQBbYfJrAVfo9kI/D6qJ1Jp1c5Clnqa+2JZW1uIMa8k1oMWCJHMGiywQz9uh3sGdguT/jL3/7O/BSIBlWgwkRqtHXfigLMx122FmK+zQ0gqfGaekVw7EaObYeKY7mJ4leV87nJ/qTJUl8TFfyXwruJqGBB7jWUCkRQ51GQC0JhBou+JoGiNTh/lTRMQgFuO79jXXrYVTWrz8ZNw51N9fcf+OKTSblWIHGTX+Uj91VwZK+fiksJAZse6e9LQiywtbC20zND+9Yi1Ac6EOCDOpDjK2IDbeL8zCiSGD5aDVTumyI8C/3SwMi0V1ToXWT1NcfHynkGIOxZnskjxnK1m/nGPgGQXLnfxHQbYilq+oOftNNasJkN+MvuxV7o/IXWgUEGjkMdy10uPoxfbZ0Hn9X+qyJJOZNWn9QnokN/BRiIeVRzSP4skYLusACVciWQe30iPjdyoV7lEUS4xepYkYnQobf+M2juCwGNCclCOrek2EnnvXwy/tiDjTONcLAJHz/0IUFukU1dCyw+AMLL1BvbgmhjsQhc2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kympu+7KL0KK0qqsNVTBPd65oCXtL1jGZdXFIgCVZhbT/l9J8ph0MS4lIwn1cP4XwdAUSQFVK1F9bmpOVuOf0FlIn08B3pqGAzZmk817K7rTnMREozLDwuXI28kwN3oooVZSVDU+iCuDWsXuBP+J5uMHRZmjbSbDYeTPK6jxF8QvZRucZocx8VqYSc0qsTEgK6nmzKcyiurhjgj+huYjydL9B2MVOzpPCOH33cjrV/nav3dIp4Od7veSf9Suno6W9Sz791hBmRBvctqkZzyxOA5g1mVgH77BvrxNrZeUfuIHPUYltku7+6DD+19K8iSc1LoXLXe0pIHHF4xfP+7Pl4LkoDnKHaOsM9Zva2fqNfpQx29Eh/fVCaLH7kOjXe6TChPmrBXXH3nauOy9tMKf7LS9KGDmE+p4LIUDkbfggp1A9zD3WRJuWiZ7YtAurH4qg8PxPEIXV4tepX4695695zWKWgxabgfclqPA6G0MHgb+vI3RyjKuHJdVPMhbV+M2Xopy38ysCi4OBS/qBdCosMgjxwMdL950LUfziCped1vU/Zt3Gz9I/zo3k0sPyhYL0iNWopJtoelvxEINyee2G1nn/XYaZI8YIaKPeY1tF8A6yqpFZf42bj6WWaRoKINyMxt8/jyVq54q4YJMM6Bp1/rElG4SEtVZtjF7Du4h+7cd372T/vM4JROFMCA3YrNR0dwXZdnmPIGFN1XJI03KhCnJkVxfXNOjXaOSAoFh+0nF4x3DdDBcEAZI/cdFPFM18ICay4Qq3ZHx5RwohCVziAiyM4dWj6mCTpkQ+oU5zosp1A+wLu2eiJcyFde3uEpvNNAbDuo4TYIeNvKGQUNOA/NQf5p3pbHp6E/Xum8fMVeQ+wOze6uR6JFNwLTpbr1+RUok+gtufZND3OqwpmQdv6c4lDCQf6RfbHh4FXKCltBl17JtwVgMt0NFiyy51aS0rQC0mT8OnGg/Mk5cTm0QuKdaomFDFmvTK44XMKVVD67xJUXMinOC6QoGlxNR/kXh0ZK7EXg7tBrYAbxDidNbRHNoKOfgBvWHuRYJdyAKoLUjdYpIkHFOkbyQtnNp7DlYTPZbTCfllFqajojwlvGE0LSS7RGhCCiq4bTKnO9qwcxHu0WZi6b4Hn6VSxh89+9zHn6L3D+92zFTe3RsOkQVcCO40iUUy5AazSq0A++aKUDnjmtTA9Gf3sAVtr/bs5ddLtUOPp0lO5ntMiZfjinHKpOyWhzxGoLp+58MjQoPEtKlpdNJXKnqgD3iJt5Twe10JEcHcQz/LMCCuYmLB7wT+w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a008aca1-048d-4dcb-eb28-08dc71fc54c5 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:52:55.0547 (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: PR3P250MB0370 Subject: [FFmpeg-devel] [PATCH v2 19/71] 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: n0DixLuI0lBP 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) {