From patchwork Tue Feb 1 13:06:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp608787iov; Tue, 1 Feb 2022 05:17:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfqQV0m07tZZgaI4u2SfYqMqJF9abfYLut4+8r+Ux2/TR8Qp0oja0pDNY8fJOvJaYPDMrC X-Received: by 2002:a05:6402:548:: with SMTP id i8mr25092283edx.60.1643721460701; Tue, 01 Feb 2022 05:17:40 -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 f2si8332242ejk.839.2022.02.01.05.17.39; Tue, 01 Feb 2022 05:17:40 -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=R6LE8J4i; 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 16F8668AC87; Tue, 1 Feb 2022 15:08:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2064.outbound.protection.outlook.com [40.92.91.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B11668B39E for ; Tue, 1 Feb 2022 15:08:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WcSPSq7KpYDGIzo9L9ThC0aR7CpyWNwB8TCZLRxMASkV0FfzRS9E9Aj07lAvuzHeHPqPnzrROWZq5JfXx2DvHC8/CVOwtu4HnviU84Wrcelmpm4v3qnEIVFliAx1Jxi4gexSnmHdVXePo8i2ly5gdxje8gLXLubjkhX1zaS47171K8ZLKjSys3R/XXDA3BC3oY6UedLOZRY2WTV/8PCJ8bSeXNJuLP439xquep9N+AmCCCLjUM1I3hUD++BlE/m6XqmROPKhrkdYoVtw+7KVfCqnKh+HCociKvmJ6uQfPUDvkvvKbdp4Hxu3+R2je21T+VKWW2xliYMwKg+62qSeVA== 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=HSIfec9IqmyEleOgL7gVcuoQyPkwC53gLfWVM5Bv9uI=; b=m7hBgMGwAA5A+WVxSc2LebAVdxaXQDPpPENp6LXrg/gyJzrsTQ+6bWx9OtOQSbE4llclTs/NsctNOjg+7LFQg0ldZTqlZB0wn1eeNB9dUtn35HQX2T+Jxtk5NWflMgLlGel2bIN7CGRE8XMhS+J7Jz1DFlW2OuYeCrfnksK0SyQCY2mcCTDYxZia+vp7Rhsf+sdt/0XtCn+IMwJzLc7R5nBwfZAm/NjdE2sQMGGvVAqm60Fi1F2vjM0Cj5FlaWI762mdG0Mfhv/8DiEWn0GlQFk0amidO8AZ90E2DlmHlog07wHDN7ebjrltwByWVuWp08tsSaUegKd4cTSksFP7mw== 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=HSIfec9IqmyEleOgL7gVcuoQyPkwC53gLfWVM5Bv9uI=; b=R6LE8J4iFrp6zeXSi6yuHEBJTqhEJPZpJawuKRVEjDyjL+FNYy4p7XuJtRs7VmoPNK41BXIZA5o2eg4Oxq+ysJZDaox3hINVloEgR4gktOGaPSnz5Yk343/GF7n5aGBO7H+9IQf0RT2jtByWd7s1z/SsUKG+5kIOMJtU2uO6iojCybLBVoE9c98ZeOrpeKJV5xNX5DANzIfykxcUiLQxbEQGnZ0049WHQ8XhHkYA8581XmLfdvNGHRcJVtj3/X7pJqgypmfxIq3Z0yyU/qFdFV/WxddJoLl/c5n/cfFkZZFMxrjZT++/sQVf0XlSD9RU8lHzBlMT2aGH7t5+gF5uPQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB7962.eurprd03.prod.outlook.com (2603:10a6:20b:439::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:08:38 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Tue, 1 Feb 2022 13:08:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:44 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VwwuFWvPj+yX1/PUK+fczp5AzaRTvDe5] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-46-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 49513215-a87d-4e59-318f-08d9e583ee43 X-MS-TrafficTypeDiagnostic: AM9PR03MB7962:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AHkxJOkGDw3J8/cIcEjfhs+qlG1oUXYs9WBKqlap7J05GJU71fPyICgTonvF0N3SwlR7adOfqaRio2VGK0gzgQK0vQT4HIRYsVV7ZAUamCtlp6Bl+KnHZZJvT2WTaaEV6sppQfs55Wm7s4puHsGKsrazF4ZfW+NJe5KiMBK7k5GIux8J7mrZzrg9lLrkJjq0gNLApi3AnccU8T/OUrUCmVoFNTVKxye4yRjGocG/SBkL7zUy3HV4VfUaafqkzynj+qgjEqU1z59axeBuU45CqHsnMvrJQl3XHdoS89Rxdz21qpxfp0Gt9/OJ3cfgkPEM9c5RvN4Nj4HJYYUELmqfR6eUQIJ7PK2+fA0VTED00koESIY6s9PZtQqD+nmoVt1NdRG/6KghZGQzIQID8SgP36RJ9PnxZESMd99Z8URWaBbFY3+6UrXKDeBABnvrMAzQOGVfJURONLM7H2P7rfTwmfxg6xC7dsIi98226BxVfgNgtYZw2dZPNf4h3nFsOsGE/DmvO+23EdnGZh+7N21bJrNi6WMYov8LeyC3h0T7yieKxYCmbg9iWlmSERtcnPzA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cC+Ge1iScjlbV7ncadobQbCBZPWN2fOLzRC3LoRQaO2prgA6mvjnl4JKxyDVhswr+fmkkwmwfatTBPJxqcgJPIGngamuFvhFRupEN3Ck5lMqM6PlXRtIyUY0qMqf67mjiJ5MTcKPtv4631TCkJxNChZ57RK8uKGXH/Jv+wxPuwczyxHDXNEj8q5xMR81VMglT+SBcq2l60oRY4z/ABqUbUKI2v+TsbXr/6Kze4/RfknIg8VAuuXPSxE+Rxa7qRX7tu3562rpRVkY2v9HdLaZ4nrbqqkTtaebT0ne33awQDXhBSat/dj/9fgoj5vhRRfRxr3tDxxvya55V8FmckNy9Adlxy6iLNyCiI9Z9FHAk59znZOmj28AGhr8ClNoc8n/K27So6i2miXwFZim3UlCzOggzE0dinjYYHj9TrrHXJoInq4FCBy5vYdb7svLvxp/CP13UWTNxbKj+uJNwJFKpHD28C4yp+5WYux20CRmBmabrcMtziZtqsNDpLTeZ9RQIWjQx+J3gkwB95QHRx1Tq+NR7SDBx03Hy/pCsoMUsFgmS6B7n5kjztAwNSUwkW79RzrK8JV+FQRjvVMbolMrEf6Dl/r96jkYZ50M/GMX/Cqi4FmktxSqgVtFXgqNlvOCvLnOsLfshCyuzW6RrFQmpakWHGuzZez+xJzyw1qflgv4O07B1lNHKzwFxbhSVoM+GB3wYoIzogQ/jCT5fYkoncAprxTVJKxZW23VnJv4DQzkAZW2M6dvzFJiJJq6hK3o7KP1kH87jvYbjyA5LeOk7r208mXEWN+fhzCRg0YVumuhksxtISOmGdaC1Zsxlw5mqX02gjbZglvs6g6P5y18G70gOjTKmk7w1ilY8nn6OeGuPcBvOUXD4pr/6AtbvQsMaF3c+BAAcQnljJ25ns/+hdHcMw4EvJRKvmxv/4rQkK29POp91rdpm3M12WuWma49O7K01JoHMKyoMDmFQDBXNg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49513215-a87d-4e59-318f-08d9e583ee43 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:08:25.1418 (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: AM9PR03MB7962 Subject: [FFmpeg-devel] [PATCH v2 47/69] avcodec/mpegvideo_enc: Initialize non-JPEG q-matrices only once 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: xWfodoHN2LtW Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8b2de4770b..75f1db2a76 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -947,6 +947,10 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) ff_convert_matrix(s, s->q_inter_matrix, s->q_inter_matrix16, s->inter_matrix, s->inter_quant_bias, avctx->qmin, 31, 0); + av_freep(&s->q_chroma_intra_matrix); + av_freep(&s->q_chroma_intra_matrix16); + s->q_chroma_intra_matrix = s->q_intra_matrix; + s->q_chroma_intra_matrix16 = s->q_intra_matrix16; } if ((ret = ff_rate_control_init(m)) < 0) @@ -3599,13 +3603,6 @@ static int encode_picture(MPVMainEncContext *m, int picture_number) update_qscale(s); } - if (s->out_format != FMT_MJPEG) { - if(s->q_chroma_intra_matrix != s->q_intra_matrix ) av_freep(&s->q_chroma_intra_matrix); - if(s->q_chroma_intra_matrix16 != s->q_intra_matrix16) av_freep(&s->q_chroma_intra_matrix16); - s->q_chroma_intra_matrix = s->q_intra_matrix; - s->q_chroma_intra_matrix16 = s->q_intra_matrix16; - } - s->mb_intra=0; //for the rate distortion & bit compare functions for(i=1; ithread_context[i], s);