From patchwork Tue Feb 1 13:06:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp609097iov; Tue, 1 Feb 2022 05:18:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyW8zCWoo8446D5MSDszwsEsSrZwtu91c6jR1G2pTGnzvPDp31EUWtM2OI4ZbZJ20k/ihum X-Received: by 2002:a05:6402:1c95:: with SMTP id cy21mr24927929edb.172.1643721486940; Tue, 01 Feb 2022 05:18:06 -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 b65si9644538edf.281.2022.02.01.05.18.05; Tue, 01 Feb 2022 05:18:06 -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="fqLc/DhD"; 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 0485068B3EA; Tue, 1 Feb 2022 15:08:51 +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 A01DA68B3A2 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=fqd7lNc1GDF5LeYPV/5Ch3FZSJDTGyqmSo3v5EPIHbbnEMGIRUoTDY5arqR9n451IpK3kXW31M24NXVEa5OPqS+vdfMxt4b7CcRUvX6xytEJVGDz7CK7cVUvMw40n9mLNvt7lMvXZosqv98VMsLwVJse1Hthbz42EV14kwTYdnWn9Maq6Zl+O8Pjbhs63zyTzJ9ryNK3o1C3aiprcPcgHGC2RqFuHdJ73plRWpuv+/al2TDxpcsZUYkhlZAzBhjSsx28vZE/9qq4aVmBhn+f39krkaABS6Q5E6EXGxqX8ecH/l0+PgSd9adWU+Iq/Pud987EKF9h2MlxlelqXhslGA== 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=S0AKOU2h+huf5lKV+vazlhjENf1krprjBFc2k2VhqUM=; b=iuh1uU/9F29AvnDFuLLHMyA9ct93jMN3PZGmvfAAP3l2ikezt2b96WwdHUZCxZy92fxjcDWn+b7EAVLfdtz12JvAU0Mt+BzbpEj+puKF/GJcmHBCRFxQ80OxQDzdPd+wd2QS3i1b7VPxBKjZfakWnt4/NlUtKtM9wvqZpJg0YA6EdFyrQPXqyS6x/uUgpM53fkm/xnT/aJsJ72AoR8LCkqvC6ITxDDFKbk2KwaLNiQgZlcpKHFHfuEYwQmA3J/X/0joRXfPO2tZrUfE1RdM4wXwDOD5hX5N9NunCIvNMdGLbZPSCYUhk/07M4d8HGovqqQ8b+X2M+uL+rGxX4CIpHg== 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=S0AKOU2h+huf5lKV+vazlhjENf1krprjBFc2k2VhqUM=; b=fqLc/DhD++FMmLDTJpMaxA7CeZ95ov03a3ZGKFU/hAuN9E67Z1N9AVp++lthUkvU9cC0FtufaQhfHsW82xZ6rgT4GXzUGjDOhxoRNs4TRlz/7n9K79A5icRnKMn8BDj95CK+/okUtS/TngdyZlW1To9e55DIlwZVfQf/8oU0CmNGzOkylKAYVR2RR05kLEmUjM0ZSWTTLdtcAkpDRVjASv268FXgEFdfmbI9OHr/Ey+HaRq0+1iVLciGyV7S6ClsA7eDLDEP6GReCrQS2jbZEtavfHqh7vfiF44GDmRObmH4/WRiy+ZY0K8C5XCHB/3I7rAHrZuzgL6dGKeJGTOvNw== 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:45 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [SetAAD0LwmfuVQLcfWQVRRPD+GuwRNI2] 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-47-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f72828a1-48c6-4b0a-fea4-08d9e583ef33 X-MS-TrafficTypeDiagnostic: AM9PR03MB7962:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7bv3ZJHwOvANnFF0R32aWPhdq8fq5tYRqKXN4VJ9eR27pq9mwV4Bo+c86Y5Ncs889dsYZv8sI9vCRhiZ+Udz8griXDxXEeSCUzw0tnxnqkKMBBR853N9hplbB8zvMBQW73LaOish3V1UNiw55fyuCD7MRYOW3MA+mTII9pp7HWA0Vw5EvJRIRI6plFAGUeQLBa1VCu+sZsfS2Nz7SWG/N1KdqphYKuFgI13oZMUnOipZLcyfn/PN5vJSo+09odBlpx/pEU94+NUp+BlieS+28l6tQwnTwGr6jzu/nuBWO1fHy+WAXpUjlngkULYiyRTS6UKRtw3qtfPGpXNoUKmAhhWkY+HO1WIPArk/7f6mg+LkVb/A/yymHwpYvtyXFzTiMFqMiMuxO93Z71UiXBBan4txEUscw6gRzZUvi2gB95+heJWqOQNDyV2R8AxCawAzUcMVOnupEO7rcxNk+AAhpDsypkHhYQRdBeKJEr9XWZzjW1het4cPwWDcbG8917QHlQSxV46AnHHU2+OKrwZHrhMAYzvbcALYpRw+pfcApIc= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: clg8y+u9PyVYJpa0EQo2FtzQZZxjEvS72tJ6fPyjTz0FZ+0ptVV5TYKQeLR3zFV6srAeebzaBVFzyh2+0rfRaZyP1c2hd/BwoyG4g0B3FLFto3HVNKNOnsNcXfp6aZnkd5FDcuOLc4bI0xce2y2sauvuiMr1vWBH8gZJdCVmtu0ocdyImp+om43fzMWNbkMJ0gVkySO8yGlB/KF2A5+LoHFzlu8fWBk6NETEh8a05rD/KsTD9bQiNaUXOXl63ceHFf4n0HMZyNG6sCdNkhcdrMMIhQAZktmD1nQvTSfKavQUb/mT5+BZxAB/BGkRiYsMxlN6I3v00codKEDfpDdct1Pnj/kM9YGYMbP6ayK8qnRD708GFJVRFuqmgCn2wuJsr8bNnYdjNxKff9wZIL3uwdve4nqum5heKTWYkzFvuhfL7AoU00Rj60yZWN1B5w0doypl4FnogjBGTUGJhR/8GtWMwj+fzu5giaMcynO45Jya62OYgS1IsiR67SrCg9siUkxF3wZVm7n5j/tkFpColpgwBK0qTj7i1E4X58+N0s2dFfL4Foo4cbfaL9yG1OMz3Qrox7+gLOBk9Olw3VKFO2TnVUSzw556PRnQxHLuiAfmxHVGTFEjxCBD6qZsoQSXLXdfuYFnE9ryconr1lzgNinS+c2PJuTFXsKctmMokAJK2d668U4drTE/Hd322K4t511qxl+6p2PyINqdrbVNE/As9sUOGdIcavV1zwvAQokw9dRlMzx4v9iap9ffc03DU4lqeH/RBhxxw3+BAtzzSmw5bKyAgHqynROuorqkl+REEYBskf6P5zruuPNVGN6SXx6ddtwSVSCu9ayNCvAoJCIa8fcQIPcnxDIJuEl2fbY7s5bjOLOJgnBesktZlEo8VJz86WUum7GaF6NLCLcagmBSb7DFBYXuODJsjFxF0h6IPZGbzr38Cyc22Q5pndzr52GtPMjDLyRkNCUV43ElVw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f72828a1-48c6-4b0a-fea4-08d9e583ef33 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:26.7055 (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 48/69] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uIxXhSzn+n6s 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 75f1db2a76..0e14cebb3f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -871,12 +871,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); @@ -938,6 +932,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) { @@ -947,10 +946,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) @@ -1015,14 +1015,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 e124555b0a..b83c24debb 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -100,6 +100,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; #define UNI_AC_ENC_INDEX(run,level) ((run)*128 + (level))