Message ID | AM7PR03MB6660FD8CD32735F7E6FF1AAB8F249@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Superseded |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1772181iov; Sat, 29 Jan 2022 22:34:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJzj2h1ikL9k/kG0ghvfTke1fmRuurmLcYCXdGxhbMfFPrbyrARNIaqGH9CCFyaq8AXbKxI3 X-Received: by 2002:a17:907:234f:: with SMTP id we15mr7703705ejb.235.1643524443821; Sat, 29 Jan 2022 22:34:03 -0800 (PST) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p5si5629066edq.250.2022.01.29.22.34.03; Sat, 29 Jan 2022 22:34:03 -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=UaOQxfxV; 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 E5A7F68B30F; Sun, 30 Jan 2022 08:29:23 +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-am6eur05olkn2023.outbound.protection.outlook.com [40.92.91.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5220368B2EC for <ffmpeg-devel@ffmpeg.org>; Sun, 30 Jan 2022 08:29:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fYVXebbWqgUvoh9C8XOb/X/pp8o98DecPG8RWd1v0Gweel8zeRRH/8jJbr1+Sq4aK63kYVnxzqgvpiz5NxLT/BLLkPSKa8u/WQgE/pDM4FDXX1LpTYkwXZGHephKw1E0v+BBo2gtuvLEP5dI8pWAYb5E9WuvH8tmDwFlufrjYaFzrzrtMDDof2WnOJezr8v177rF9+70CC1r2JnXkkYM/xINtR5TpgdyHcR7FvxtMiATJJHwZ6e0TeZOjKg1iFAgqcwV1h1HP6VIc3uJIQPeS+6zbwMTYr36YtAOkrJyt7P+yyOWLANKG3XaVxw72dt453zHeRI+Lad4flaOBQNkaQ== 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=JM7wgpCJi4YBZNSneq90SiN5B2As+pkZfrtQPS2f4ds=; b=fcCHQMeaVDNXzvmVPGWa/ChbigGkGyn7QOzTpAjlwUb0B1UrYuYn9ZqKc71gYLozn67RQi0gQ4LoL6q5Ek3S2kjlNPVkvrA6qzUagjstCQAYHbMghUC58i4BHdIrWNPaVSf0exIuwSYebxxG98UJX6M6cXMfZuhmX7SwRFkYBgzbiYfLyrQueJDYzH+VJgX/3d8jQ0LEITCrngZj+ZMeWhf7OC4rDMyDU0fmcUff7ziDwlRBaMxKmXoqqO43XAlTEk5ixd+kfIy9EJcCCOAFgA3LzfyKcyspKEHTejMLtII3+uP1Xk9D+RTyrKM8Zrx+djkCt3A0cqEP4wFVgDq0wg== 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=JM7wgpCJi4YBZNSneq90SiN5B2As+pkZfrtQPS2f4ds=; b=UaOQxfxVL2rH26aiuLWVPyn9VDfqLa2+jJMZ9HCuWpR+opp8Hl5Rdoeyx+ebmai9RNmQA++DLKlA5RfpCjZ4MjhvFEJu19Cp3uGQeeGWiu8OWq0rX8USmIR7X/D9wIFQp4XTLr/Iop/9RCQ/EAJBsWCyekS9/dpWOHZ0QsDmDY/CMh4UoifZwtFhHas1jedwSGVsfLNQLFU9EGYGrshS3i1Sws0n7XgBd0m4PTp2KJEziWYYLrBLPYic6PjndjoQoTNIsPc+ZJpnfOK0kucWfcCz6niA0VU5Brmg4fzbeDDCiDEzApM763lTsttG0F+KAHUUZ26cj3Jv8TPfIAgn7Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB6239.eurprd03.prod.outlook.com (2603:10a6:800:140::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:29:18 +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.4930.021; Sun, 30 Jan 2022 06:29:18 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:45 +0100 Message-ID: <AM7PR03MB6660FD8CD32735F7E6FF1AAB8F249@AM7PR03MB6660.eurprd03.prod.outlook.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <AM7PR03MB666068B09E9D0014E1CC65DD8F249@AM7PR03MB6660.eurprd03.prod.outlook.com> References: <AM7PR03MB666068B09E9D0014E1CC65DD8F249@AM7PR03MB6660.eurprd03.prod.outlook.com> X-TMN: [NFq+clwC+FQZFg9JtykIBSeGMIHcxNbq] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-36-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f96cdb8a-cb41-4327-e514-08d9e3b9d7fc X-MS-TrafficTypeDiagnostic: VI1PR03MB6239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CNWcRhOnR+5onVr+jALNND6/lGx/xBGOto71yolEgXS/vU3z4/6R/fNl6sxd9c0fa606U32K2tMmearKNvT05Eb/MOY8q5EJy+Spb3rX9npXtr6NaobvuUKJgLgoWQ5ajMbcCrd0tzDBpxjgDTo3C2QrhGwVYRZ9rWA9Zx0FDV3t8oe0pOiYpVQz3nyPicDc4LZ/xdGEEW8MchuYppxvjXSwPhLK/0Irr7RJ3gs1G6QbCQd38oEAjXr/cHePH4hfe67mA3QZA8xD3qd0dHiSD0CtIkCrFr5bjq+NmddLaLehPlNz9dcMPzn1Fh3C+sqWbVxaY/sjQs637VSBnSH1j1lDdN9RZF2jsQ7SRMTwkHSTSd+M0Za6f17XRqrG/g5qxp9GKWN+HpszQVsQ6qfzI1/1uO9WV/rv9SbkpWaC1cxG0SG+9IDNqwu2l3LvX1QWBR3lW++J6N+txOpm9rEHEzKHJQKPhQnb/kPh9IR77AU+pFhhpxuvkl+FsSBpAM/5ZcpODthtORhJd17rG//eZGz3QvmgDI/fRSEW5g+BIA+FwctVbEj27ZbSMteo5sh5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lA+JAMa/szPnN/k2hxH5tW/zsLlKbqP1Df3P/4VzR6NCLKDXBvasLE7WkZuSa0kphfZvOqs3o9eqJEspRXnuH/S98F1PGVaswKDXaKoecgYlg82whpvKdRv2R+AqWty6J/g3+5wfuJEHXH3Rnpy8RaRi+Mfor/T/hvG3wTGqToU1LXf9AigDXxWKodpvNgRMvnOpFLWUjjjndFmPKfpp7fwSl+IuofC4aD9neMHefEJgIzUR484OujZkR905oYygLnBvsMuN7NqJ9eg9StkoOy9eNJGD7cxKiEdqPcDRFZkW4qyMObzqPcMQYYra94EwJ2iccsPjfx8QIh2USViXAVC5wYKLGGb9wh5/BTkmP2OVZ0j2o7nPjcVeoqcBcpP4JLB5/j+G9UuB8l72ixSVWzR/4ZMNOVYO2NxXxJoXZHQVjLPOccjiO5JUs59siWLi8KpPiw0aVi/sAitxCohqevyPajhJ5xVNrLO4MrgTbns/Qg1eAiMAtIpQjB7livnwNAyrklP3E9C3CXudKJIqeKxIEyDeo7tZcz0uWUjsnCR7I45I/JvcrNaPrDmRQjxLXOMhuP/qGqkgZuMyOVn3AuyO9Q94M7VafrCnNuHmP+IMGD3WbjsvPTw2jmV5S/zbFjh7L8k3aIC9PTUPFSpcxjK31OOCdojk/3667GpwwhaLE8CbNEfMTylV4NtY3zOuEKEYGWLzw2KjG3Ym2sCPSUz2bqEDmAXYJi4k4FcCPSOeqJv9Ij8FNr61/29GsSEsPXAXsRRj+JlLqxwG/XQuRKgsqrbZ4Zb0MtHgrIdGcUJp1Wup59r4CohcCBxiZ784e3CKHZqoRfFP8AEEIo2LTBJbl6XabJQ6Yy4DBYZtnCaTp8OUZc3N5aw8L07tXXWEDaUXibKt88l53Adn9WACuLcxDQoY3z9tWXUGlaUMANiaEiK8WASsUL090MZMgEiHt5/19vQrpcsVubp6SAxnKg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f96cdb8a-cb41-4327-e514-08d9e3b9d7fc X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:29:18.2547 (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: VI1PR03MB6239 Subject: [FFmpeg-devel] [PATCH 37/41] 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: PSi0b8H70Zt9 |
Series |
[FFmpeg-devel,01/41] avcodec/mpegvideo_enc: Allow slices only for slice-thread-able codecs
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 892115b68f..7b55e9c17d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -945,6 +945,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) @@ -3597,13 +3601,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; i<context_count; i++){ ret = ff_update_duplicate_context(s->thread_context[i], s);
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpegvideo_enc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)