From patchwork Tue Feb 1 13:06:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33989 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp603017iov; Tue, 1 Feb 2022 05:10:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJx1p4biBHjn21aNaileg5mEfOQoqGuV5+ZIMydccHLlHMAUBcdCwafAjyvvTw3kJeoqxbzD X-Received: by 2002:a05:6402:d0d:: with SMTP id eb13mr25589118edb.24.1643721022402; Tue, 01 Feb 2022 05:10:22 -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 cr18si8922223ejc.858.2022.02.01.05.10.19; Tue, 01 Feb 2022 05:10:22 -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=vKhIxvfL; 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 15A4C68B318; Tue, 1 Feb 2022 15:07:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071051.outbound.protection.outlook.com [40.92.71.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50F2F68B2AF for ; Tue, 1 Feb 2022 15:07:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AIwPjQkUc3aHNiCbUodE5BxCN2XgB5OfNAQbcksNWXgdKcQg8IUqEu1dRmd+s5HremRfY54wqKO+mawHJGuLytkJkTsuO0GbwnAXmxscdhXMhUJ2ddmp7PbY74xvmokcDyavzbZ3YdSeOdYj4Q/VyGynBiYTgRNu8Mc65oWKZoPGKnlg+PpVwDuVAOTc3a47fsWhbf90Gx4VAHTmC9oWnpVJgxYx399bF/U133mQnh2QYEp/0FZ4x4gzMo6uLcvg5hMSp6UqA09DuPNxJmQ9tjGyOK2TN7drGQZVtxUfr/E0ZmZKKSwUgAmP6DkKNQ/TsbtPKPFVZLb4Rr2pXmuyDg== 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=gvtPO/wpf3MEkkoJtmLVVMmbPyddZDiuxm2PDRi0GF8=; b=SU75YpG7/J0ewOA9/p3cVOz5RJzHtqvohnLnhAsH8qkhj1102e0PFQnZNJkeQnmsz1fztSV3qakc+E2rj4tIU6JaeUtIODMq6YvX3yl2L4XsAoYo8JVccqYeZI8ROAPpszng3NFTRb/oOcT5AGxmLvWSS/wZKVzNdXMTy6aGA/M8S3Njb9L9acR6YopZJftIxxD9BLBk55r0o0qIffxXXS7NEBoLjnMp5RL3wj4b8pvYRRQlXoavksLnDmzc65mJ8OMH8mYlKaYv5m5l1mhMydJRKTLTXj2gvtM9EX5ggFeLcH8vagWz4Mju7UAInXxmLQiqDI/R+DHmiXMzNlVQWw== 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=gvtPO/wpf3MEkkoJtmLVVMmbPyddZDiuxm2PDRi0GF8=; b=vKhIxvfLF/VHfw51jcAmT3ckBAYTHHBCLkNAf1DyXORR5Lih1CR2T2nZmHfeMVBy4YAPDrzftu0cx4lEA/pTlDLxIJ2EO3d4rUryATBP/aS7PoQDxgsxXRg+DT3Z5j9TN+qON3wtJZajOJPet5XddmsHbYaCKIGug3KnZW2dBEVRk7qJFm2O5dWyvTp/XQW1wn+KM0V5UanJnSvRCdzf3tNEQxKPww9yVtzCnuhDAQbHhdqgXhp8fGExaqoB/+KoRzbTxdxjYlNwk+KnZHgAK48Mxz/giS7jhDPmxsIpW2mjyrX2edJuNJFu1GSRTeuhwmNy2R2dwj4BuoEdtnttHA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB6948.eurprd03.prod.outlook.com (2603:10a6:20b:2d9::15) 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:07: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:07:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:12 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [yh+3WTNdo1tFhZmAKy7TjUMZEY7r4Irh] 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-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6bc7cdba-2b8e-4e50-ca2b-08d9e583d265 X-MS-TrafficTypeDiagnostic: AM9PR03MB6948:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZdiB4x3LLdT6l1MB7/iFP5AwIGf8U5bmdCct4ouY8t4AIzQraIq0l8IgUbfdEdjpBuOcT7JbuKq8b/qlJhw9XX7uajpIVwHjxSqqMFukVSs/OjL4Ihc0VipT68ESZshlCftROo993EjEEl4FQvDiwhZRt9xMKBQB4oM7J0felDNv9Cf7RBogzkRAfJQHuVzSo7hBG7VFLzGViFYwkBeRhU/DFAC6gdcv5Rv1jVPYCb1bCC8kyFD9Mftekv7f0KjodF93Ee4+K5j/zs52snTGVDUBAfpoVrhcTG7F8g21Vsy3X/K3veWPEOAP4XPN3Oldn8WeZXNyol0UOqnVYE2tc9JbZIqzAgSnwaVEfeLPuvWggNxfrbOAdkGpeHs2IIu8Gl3KpijmJcKOQwDufGr1ZJE3NeL0h943yNK34a13vLfI3f8FawuFy6PtkrC3PmrStgqcqIR+FLe6v+P6YkG/qttNm9b9wfW35U7d8pA9TDTC6ID/lOMyFDHjFNnfFAoJ4uyYoElFCNVfDG72DR1lt4Q1ihwCjj7N5gOUmB/46mMz7ZZHoGieyhv9BFzjRz0q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1pHVbDIGH5ZaJv65an/nPc2sdGy9zmS94ujVwMJpgcjAWMtTqq01UZ/oZMatnE/U62EmIp+RUUJD/UnAeNxbMflFGWAHK8eoUthsbK1X9dTpGSHiFE66YahDTbCPktbu0dIJzrgoA0jA/k0sDM5yEiWl5cQ/hXqiZZo4Ch2aEEn+Kr/sOkS1bz3FH7qbzKRoGCxSUo6LUNV12r5EdxTpmF+iXoLZaSzlLDFzZzc2oX/WShgP7x71+vUiuWAJ4hbMRvSgUEmTb1l56a84dVOyIu1HDCTE2Ci9Javx7y5DRcNpC0WD4jcWozcMEWu5MmSBNBZRb2VVSFnF5hkPo+ZxgM8/eRRnXXLb0GqYBSXXNDcSC5ASpo7ZRev5oBLHlR/JvuUwBm52FwzkvdBqtFAMjChSvTGBwuwaUWLJ7t7iXmJcwrfnsGsl7DLmNmwmT9qiDeGm6mTkDMxaD0XG9Si4vgYSBSM/KFEBA/RXNl98eohzLYPTTWFknwqoHZ7NKwtuhmIH/1zuRwyRHICpNAaH63yRDqQ1bZfSSHoZEUxxhVzFXTltbkR1/SZb44oVSlYMErq9/RwoKlodAvkvguJHVui69wJ88FD8JpMptniU2ueVnT4mfvKBsZGYVqInifhlVWidKyOexMW+SfSXEQAdT6lrJ6ktOLxFSyZaDu4pRXRtIHxdbAeAvchfrVUhYJ+wY4Qyp6V1g/5rtY2Xt0hQeE5li1j7YJ55Tz70Yf9bEv9ZkilUk9Hy1JAJKdCvM+6V2OkBV0O4CIDYT3IYqxxcZVscEUC/WCXtRoekl/Gpz+FWqQS8ZHIKghNBxI82Nw42JLkE6c6xpMx3gbLqYXu6PtepJxu4EgglVBquy5lbIHGRf6VfS6CAV6VC2W+rgP4f28g/uo1IfKPxRtwPldt6WsuvFqHsfjtWb+pWkPbc9bxsaiakJLEuGMD8VGQtkEljJQkdmNAZe3H+xg94f9mwkg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bc7cdba-2b8e-4e50-ca2b-08d9e583d265 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:07:38.4092 (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: AM9PR03MB6948 Subject: [FFmpeg-devel] [PATCH v2 15/69] avcodec/msmpegenc: Add MSMPEG4EncContext and move ac_stats to it 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: Rm9cCbcevdE0 Also avoid the allocation by making it part of the context. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 2 -- libavcodec/mpegvideo_enc.c | 7 ------- libavcodec/msmpeg4enc.c | 26 +++++++++++++++----------- libavcodec/msmpeg4enc.h | 8 ++++++++ libavcodec/wmv2enc.c | 8 ++++---- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 5e406b9a9c..f5c9789fea 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -422,8 +422,6 @@ typedef struct MpegEncContext { int per_mb_rl_table; int esc3_level_length; int esc3_run_length; - /** [mb_intra][isChroma][level][run][last] */ - int (*ac_stats)[2][MAX_LEVEL+1][MAX_RUN+1][2]; int inter_intra_pred; int mspel; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 07dc575a5b..0dde4edc73 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -813,12 +813,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) ff_pixblockdsp_init(&s->pdsp, avctx); ff_qpeldsp_init(&s->qdsp); - if (s->msmpeg4_version) { - int ac_stats_size = 2 * 2 * (MAX_LEVEL + 1) * (MAX_RUN + 1) * 2 * sizeof(int); - if (!(s->ac_stats = av_mallocz(ac_stats_size))) - return AVERROR(ENOMEM); - } - 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) || @@ -944,7 +938,6 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx) ff_mpv_picture_free(avctx, &s->new_picture); av_freep(&avctx->stats_out); - av_freep(&s->ac_stats); 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); diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 31920b7f0d..c436f78f9d 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -148,8 +148,9 @@ av_cold void ff_msmpeg4_encode_init(MpegEncContext *s) ff_thread_once(&init_static_once, msmpeg4_encode_init_static); } -static void find_best_tables(MpegEncContext * s) +static void find_best_tables(MSMPEG4EncContext *ms) { + MpegEncContext *const s = &ms->s; int i; int best = 0, best_size = INT_MAX; int chroma_best = 0, best_chroma_size = INT_MAX; @@ -169,9 +170,9 @@ static void find_best_tables(MpegEncContext * s) int last; const int last_size= size + chroma_size; for(last=0; last<2; last++){ - int inter_count = s->ac_stats[0][0][level][run][last] + s->ac_stats[0][1][level][run][last]; - int intra_luma_count = s->ac_stats[1][0][level][run][last]; - int intra_chroma_count= s->ac_stats[1][1][level][run][last]; + int inter_count = ms->ac_stats[0][0][level][run][last] + ms->ac_stats[0][1][level][run][last]; + int intra_luma_count = ms->ac_stats[1][0][level][run][last]; + int intra_chroma_count= ms->ac_stats[1][1][level][run][last]; if(s->pict_type==AV_PICTURE_TYPE_I){ size += intra_luma_count *rl_length[i ][level][run][last]; @@ -197,7 +198,7 @@ static void find_best_tables(MpegEncContext * s) if(s->pict_type==AV_PICTURE_TYPE_P) chroma_best= best; - memset(s->ac_stats, 0, sizeof(int)*(MAX_LEVEL+1)*(MAX_RUN+1)*2*2*2); + memset(ms->ac_stats, 0, sizeof(ms->ac_stats)); s->rl_table_index = best; s->rl_chroma_table_index= chroma_best; @@ -215,7 +216,9 @@ static void find_best_tables(MpegEncContext * s) /* write MSMPEG4 compatible frame header */ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) { - find_best_tables(s); + MSMPEG4EncContext *const ms = (MSMPEG4EncContext*)s; + + find_best_tables(ms); align_put_bits(&s->pb); put_bits(&s->pb, 2, s->pict_type - 1); @@ -553,6 +556,7 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr * escape coding (same as H.263) and more VLC tables. */ void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n) { + MSMPEG4EncContext *const ms = (MSMPEG4EncContext*)s; int level, run, last, i, j, last_index; int last_non_zero, sign, slevel; int code, run_diff, dc_pred_dir; @@ -603,10 +607,10 @@ void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n) } if(level<=MAX_LEVEL && run<=MAX_RUN){ - s->ac_stats[s->mb_intra][n>3][level][run][last]++; + ms->ac_stats[s->mb_intra][n>3][level][run][last]++; } - s->ac_stats[s->mb_intra][n > 3][40][63][0]++; //esc3 like + ms->ac_stats[s->mb_intra][n > 3][40][63][0]++; //esc3 like code = get_rl_index(rl, last, run, level); put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); @@ -679,7 +683,7 @@ const AVCodec ff_msmpeg4v2_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &ff_mpv_enc_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .priv_data_size = sizeof(MpegEncContext), + .priv_data_size = sizeof(MSMPEG4EncContext), .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, @@ -693,7 +697,7 @@ const AVCodec ff_msmpeg4v3_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &ff_mpv_enc_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .priv_data_size = sizeof(MpegEncContext), + .priv_data_size = sizeof(MSMPEG4EncContext), .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, @@ -707,7 +711,7 @@ const AVCodec ff_wmv1_encoder = { .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .priv_class = &ff_mpv_enc_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .priv_data_size = sizeof(MpegEncContext), + .priv_data_size = sizeof(MSMPEG4EncContext), .init = ff_mpv_encode_init, .encode2 = ff_mpv_encode_picture, .close = ff_mpv_encode_end, diff --git a/libavcodec/msmpeg4enc.h b/libavcodec/msmpeg4enc.h index 12f8f44232..98044913b1 100644 --- a/libavcodec/msmpeg4enc.h +++ b/libavcodec/msmpeg4enc.h @@ -25,6 +25,14 @@ #include "config.h" #include "mpegvideo.h" #include "put_bits.h" +#include "rl.h" + +typedef struct MSMPEG4EncContext { + MpegEncContext s; + + /** [mb_intra][isChroma][level][run][last] */ + unsigned ac_stats[2][2][MAX_LEVEL + 1][MAX_RUN + 1][2]; +} MSMPEG4EncContext; void ff_msmpeg4_encode_init(MpegEncContext *s); void ff_msmpeg4_encode_picture_header(MpegEncContext *s, int picture_number); diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 2622f833b0..227947c146 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -28,7 +28,7 @@ #include "wmv2enc.h" typedef struct WMV2EncContext { - MpegEncContext s; + MSMPEG4EncContext msmpeg4; WMV2Context common; int j_type_bit; int j_type; @@ -43,7 +43,7 @@ typedef struct WMV2EncContext { static int encode_ext_header(WMV2EncContext *w) { - MpegEncContext *const s = &w->s; + MpegEncContext *const s = &w->msmpeg4.s; PutBitContext pb; int code; @@ -70,13 +70,13 @@ static int encode_ext_header(WMV2EncContext *w) static av_cold int wmv2_encode_init(AVCodecContext *avctx) { WMV2EncContext *const w = avctx->priv_data; - MpegEncContext *const s = &w->s; + MpegEncContext *const s = &w->msmpeg4.s; s->private_ctx = &w->common; if (ff_mpv_encode_init(avctx) < 0) return -1; - ff_wmv2_common_init(&w->s); + ff_wmv2_common_init(s); avctx->extradata_size = 4; avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);