From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7B74840782 for ; Sun, 30 Jan 2022 06:34:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9511868B301; Sun, 30 Jan 2022 08:29:24 +0200 (EET) 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 72F0168B2E2 for ; Sun, 30 Jan 2022 08:29:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dk7XSestRmbkpWh55yYdGDl5p7d27k7yx0OF+aApicX58Th/kLSUOG+46dLGmEgCaqtofvmAfdfWfIH+pra8s4/o0up5AEQ0cG9WnP180vJVWp6FCBzFYbkPvHaEl5Ik8nco/OfFd1IGUQigPHeTjkpKd0S4B06bUgh9txx7//vi1jkOpuNW9TqhgQ2Isuo+9fgnsuWKgIqKveZ9UnTHNAxq7dw4IMeSWraz0vEDl2xokSfZe0wV/gnviR3U3gAgDNKCnUucceRkiMTbS9Y4ygQSfvq2QMHDlCMM7RieEiBp9TFb9//ax/uR83DRdQ2nhcZIHTCWxb3W+5JlTlEkpQ== 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=+7jEH1MDVCpEsTxi1Zsfk/nqzS6nu46LI02JNn8G8Vk=; b=K0N0l7mIV+YBr38/+u/uqde38aptC2cMMlayBrpUePjUN6faST1vgpJoCJthZNJTc60RJutjR66Nbz0nqiyYQUMXpTZOC+6dniTf2N52hV03oOqFwqy2XcswcEAkO5zmvCC8NERdN4iKMhjjXKh4UOOH+BmBgJFBimmPoIKRA3LrumFXnn0M9odSiHpO2NqiUlKx1dcVSrc5arTBv72EDDxhCtjFNPB/T4WOjyjTdocId7TE3NxHg0DnTsV+SWZmK1nqJwDJ++E9ZBLYswnMgku727fIpxpt8cYjDyfIimE1dOJ+wUkpNPb8VidV8nIwv2lzjT7muPKiLH2LsCDbhQ== 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=+7jEH1MDVCpEsTxi1Zsfk/nqzS6nu46LI02JNn8G8Vk=; b=fQcBFX8SpDRvog8+t/uO4PLXm0WKJGUX5ABOqPXQ4kIAniGPBeXuYPd2xerwXjcgGfDHVFUIXL9GYlTqrOwZUl9g8mN1v7v9J598vtXhU7tphWXcSthuzshdQxgl6ot+CntfKlbE3UTVnrDHwO5A7ljay/E+7VoVpXdlvSgWpktTilOCvPo7q0Qd8MAIknzxJIpC1ZgqM0cFSOEe90Jk61TYfbslFrKjCPYh8hEs+NoXAaTPWiPjBl0pGzo0vp4DUIgmN6MCaz7LFCcxtusZB9LBpV+aPXk+MJd9bk9eiLoP5XgOjVbTMyGlqX/VsJGY0zMKVWGQZPgZ8DlQbMT58A== 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:19 +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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [qULY2bxnLSdNf6TWw/s4B1TITp3GUGkv] 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-37-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 606d7b74-f3e0-4792-112a-08d9e3b9d8a8 X-MS-TrafficTypeDiagnostic: VI1PR03MB6239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cmoxUbEsIlOuQR5Gfp63Wl9vGXDrGru5KrYvOq2Un4Qdd/VodjS8n6cTeSifNK2ri5sftXeblPnBzHM4+zW+/JT0zjzqcoTWgJEVw6zrljeGGNE4KcCY5DTaxaJiDL5htTyh9OnjrVLz+tDPSfhxp9tiNCkysDi5U+5klmKpgJKnxCD1m0dXssCEEZ1rwYdjAOBFVY6EdkwgbiL+h14CwJkgKaX4qdOMo4gO3IS6CVObvt69a8pJ7dTHXDuIn1+NazADzl38HjF+KPSo+Q82bWChkp4sO/Yq7XgZ2dFJfXguASAkJn+mC+Ldis4UjFvRy2+wA5Js8bKpHX3I3+DHRlPEOp5inZN//FSmQnktiUjGgVP3vJMbETkeSuZtn9RZ6Nq3knkBoS/N0sltkM4iTT4eJ5INoKoAN6+bgSG7ubzovouYkAZPPQNhSjiTDs+w+0GzWRziDthisdc9LRmAtrrNn+nvC1tmxbmJCzU9A4u/o0ZNHIKmyQumiIFz//xSN66HIq89cmLgVUimPfw+zjSqgkmdqF3q5TgF6FM8Xh0= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FzACxBuc+/TJxiOHEjttCEv+tbeW+CE4uSdCtBhvdnO4dhsM6MW2k6tgX0W+?= =?us-ascii?Q?H2UfKoZ+oGuJ7NxEkp/P+RPcq4nOfYQwlRx6MgbaQesjIsGrcqAzLc3PIn74?= =?us-ascii?Q?3+9Y9SotXqb5L1zsEUyLQKuI0c1xddxVauBiPsCbC75C29VIF+fVt/jIBAku?= =?us-ascii?Q?0S8P8sMXYcefrbTQJVH22GnJlcmKooVSYkm5B6bThRripbAp30IPygzChEsw?= =?us-ascii?Q?0fAcQHs8sjhn8onMTKY5frVtPxIEdYPXc3frOtCK00o4biCSWcR+UNIHEzaa?= =?us-ascii?Q?66k6i5rVzVQHBhoVSovVaKVQ3dA4vAzYMT4IWmqAhkqpV0g6h1afBzE9NrTb?= =?us-ascii?Q?/auonCsiFC+SzRCXjpwBYV9uq9EQF4/kDn8tyl/J+S3qSGhfojcDHca2PGeV?= =?us-ascii?Q?jNjYX7UMhGyuS9v8aPhu8FfL5QQpkE41dmKd5v0S6kNgzgF7PWk95mhjHD/m?= =?us-ascii?Q?sZIxdL0EseTyb/+oy36wbARORtzrmQK6wzPo3+NP2OZqUkBVASS6KCpxoKHl?= =?us-ascii?Q?NTVdyb7MUJCxsqn4CsgikfR2pS4KuxYQVUa0CwnHqBu2dDJlDpIO82gxusvY?= =?us-ascii?Q?nkXMwg/uniJzIo5M1WzWCxiuGB2sYMHDJby+W7oW9uCEKCbYZ0Pl+BkxyvL5?= =?us-ascii?Q?Wmzu5h8UvmrBapvbMWrB4m3fJ/IO9LwmeGW6RDufTv0UYi0K1QlmVhlCe4A1?= =?us-ascii?Q?nKJMY/FPkfzu39RYbNN2xdy5s7NAtYQuCtPQRJMhkjSJk1xqZ9lpyQhP32tB?= =?us-ascii?Q?knvpffbmPO5UkzgB37A1fpwEaD7UJdu6eCeqELu9HA9ITKu1IWC9JF4b3aX3?= =?us-ascii?Q?UDPykMJ7uiBvPiZgZYqwNflpZeOX+XzK5tVG86aSc1nINsWX6tQen+n9GHKU?= =?us-ascii?Q?gre1+G/ElhmgBwHsFWlJ5FPoWgIootXAWm10MIG2o2uj0Df7KZB+YoD3gvRx?= =?us-ascii?Q?zhxY8WIFbkDBznqyFF7OIQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 606d7b74-f3e0-4792-112a-08d9e3b9d8a8 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:19.3764 (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 38/41] avcodec/mpegvideo_enc: Avoid allocations for q_int(er|ra)_matrix tables 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Do this by making them part of an MPVMainEncContext; the MPVEncContexts still retain their pointers to access them. (These tables are quite big, so that putting them in the MpegEncContext would have been very wasteful for all the decoders using said structure. But this is no longer a problem: MPVMainEncContext is only used by encoders and allows to directly share the tables when slice-threading is in use.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 24 ++++++++---------------- libavcodec/mpegvideoenc.h | 7 +++++++ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7b55e9c17d..01ed41a2e7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -869,12 +869,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) } if (!(avctx->stats_out = av_mallocz(256)) || - !FF_ALLOCZ_TYPED_ARRAY(s->q_intra_matrix, 32) || - !FF_ALLOCZ_TYPED_ARRAY(s->q_chroma_intra_matrix, 32) || - !FF_ALLOCZ_TYPED_ARRAY(s->q_inter_matrix, 32) || - !FF_ALLOCZ_TYPED_ARRAY(s->q_intra_matrix16, 32) || - !FF_ALLOCZ_TYPED_ARRAY(s->q_chroma_intra_matrix16, 32) || - !FF_ALLOCZ_TYPED_ARRAY(s->q_inter_matrix16, 32) || !FF_ALLOCZ_TYPED_ARRAY(s->reordered_input_picture, MAX_PICTURE_COUNT)) return AVERROR(ENOMEM); @@ -936,6 +930,11 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) s->inter_matrix[j] = avctx->inter_matrix[i]; } + s->q_inter_matrix = m->q_inter_matrix; + s->q_intra_matrix = m->q_intra_matrix; + s->q_inter_matrix16 = m->q_inter_matrix16; + s->q_intra_matrix16 = m->q_intra_matrix16; + /* precompute matrix */ /* for mjpeg, we do include qscale in the matrix */ if (s->out_format != FMT_MJPEG) { @@ -945,10 +944,11 @@ 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; + } else { + s->q_chroma_intra_matrix = m->q_chroma_intra_matrix; + s->q_chroma_intra_matrix16 = m->q_chroma_intra_matrix16; } if ((ret = ff_rate_control_init(m)) < 0) @@ -1013,14 +1013,6 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx) av_freep(&m->cplx_tab); av_freep(&m->bits_tab); - 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= NULL; - s->q_chroma_intra_matrix16= NULL; - av_freep(&s->q_intra_matrix); - av_freep(&s->q_inter_matrix); - av_freep(&s->q_intra_matrix16); - av_freep(&s->q_inter_matrix16); av_freep(&s->reordered_input_picture); av_freep(&s->dct_offset); diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index 23381a31ca..bc69c6ea53 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -98,6 +98,13 @@ typedef struct MPVMainEncContext { int16_t (*b_bidir_back_mv_table_base)[2]; int16_t (*b_direct_mv_table_base)[2]; int16_t (*b_field_mv_table_base)[2]; + + int q_inter_matrix[32][64]; + int q_intra_matrix[32][64]; + int q_chroma_intra_matrix[32][64]; + uint16_t q_inter_matrix16[32][2][64]; + uint16_t q_intra_matrix16[32][2][64]; + uint16_t q_chroma_intra_matrix16[32][2][64]; } MPVMainEncContext; /* mpegvideo_enc common options */ -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".