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 622FC40747 for ; Sun, 30 Jan 2022 06:29:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD7CD68B170; Sun, 30 Jan 2022 08:28:28 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A0AC68B158 for ; Sun, 30 Jan 2022 08:28:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lGGiF0rQZOtdc6SbmJafW50XMz1dFnL+mMovOc5gVNuy5SwdrabwgUMUSuPP5q8qYbVsyFxQGUgNSlGkHF0mvhlAy5azsnGK0szYBQURlYfreMltnMsPvdk9FD6EWoC7OugFaUh7x8++GHwv9qWAFx2kXoBb7pOmLZl24RLLjxR+VABq1E+IPj9BYwUmhuYoUpvK+m4disp5pwvrokJi0bChzR+al1NUYTL1Q6cQG7oIdWHCNsilJAd5HrkHhSG29Y5ezajAe1gGC11YArkXcBk8YHYdNNfxIJNHN1j2w82e5uy3/7fMTzKdw0mfbSRmmV8Wmf4961+KsL+rxSuq4g== 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=uiHiAgKTJFGRrSj2Ff7TtJkyNBNJKffTUpMsetshyTk=; b=YHk2seUaSoFEjqjY6R138dhrdvuG3+JSJESwE1al/pQ8f9F02+AHrwRsdtmBWbsxgQyCo+e7lDSun6MLAFpYcjFZMsmrcEad8hIGnq1VUIsbHbmazgeZvQ0OJI+aGSMkTkz7d8Uxfgj/+M9fhVUXYVHYBH7KWFcQYeunXzHuRUWKSIdg+c64SZlPafp9nYNgsuwSHiDqWiF9YZLnHjPOZlf6FEKpwcmp2ZD/0+gIw/ned0eIAFLcKcoM85VwnkI4SMfe0mqEv6uZc61Bw1djOK39l1mwOQyEmD9E6rycRB+Ea5y2Piv11J4cmach/cookKYggyZYRrftzv060aHJnw== 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=uiHiAgKTJFGRrSj2Ff7TtJkyNBNJKffTUpMsetshyTk=; b=Fvnv18nM/6nW1JXMEAwBugZkt7MC2VxGbxl19+l9t5o++Y04o98+cKGe5p3AlGBWdDSnkZfY6k+ez7tIZoU4ZHvo2KS/rGhvvzkp+ck6MIiSC6KcYCtHal/v6iuM92TOcwJgAZ5GOw35rcjmJFNlk+8bb6HzTRTgOyBVoYm7uKqrCvPF+dPu3O5CO5k3E6aMrmaDth7tR/7sDQLCWUnoeb2giszrZAz9GLJtTTI0L9q7Qh83i4v1UCsUj9MufYiEvQm9O+uo129a1zdSh24N0RUomgN+aiFWLdua5vZUcg1GOT3kksBSyMtMFc7zeryt7A32nQXZEt/cUR5WJd7baw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by PAXPR03MB7666.eurprd03.prod.outlook.com (2603:10a6:102:202::14) 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:28:25 +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:28:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:19 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [kgGbs0zs+R+iUcMBVnVJGmrC+fhYzYXz] 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-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27a2a1fb-8267-43b3-0e15-08d9e3b9b835 X-MS-TrafficTypeDiagnostic: PAXPR03MB7666:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hOtNH3v7Bvo35rn75DGM8KLqqCg672eYTKtXycy07FjbcxGWPeEkCSYDTO+uHBrztdNJmQ5N8vNWmvh19QyPR6HdR2KGmSyEWTaHkTFJHn//lFbZQdOLjV0s66nuKK3/nFNSLJbBT/I/ifTZvTXDsoi5vlDL4x4vgEN85UZDSNQkNM+YFmej6sSc1r3tVpZvgR/IAOUbZbT5qxqntZL8ZIxp/5LRPTX8dOds8COUNk4wgljKxG36KQz4iTy06FmvEfEPwlm2wGAgk/4QhK8Fehwd29t+fWnjH3Aj0LxBBb+uaRK8lPNdqXLrhwIfdBSpycFbT926XLihgn58kyFwKsMnagqraakU0j6c9uunlCs3ljZFCeh0QntuaMM9976giJ9QRX5wOJInvibMk3tZIhCtucq3GPzEWLUtcqEcGvs2xKOtZPAVenrP/pz7IkqS2IQo/ZiXRNrbrNKJArxCpyu4Dmnl1AZEbn5XuAz8VH1NgtQGxcUhP8eiRCkjWNkY9/ccImV0EfVs3mOSdVxjEyehp3Vab3AkB48vkAwkz9+UqmobNU9IOn9RxMACd4nl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?b0kSGa5aBfbgnP9YVCxx5BPN4ApJxkoAGjixL3rrGyGMbUpd5AbDR8EOwF0y?= =?us-ascii?Q?/1mk0+7PEPARE/K0UE5mYk+5q4O4kQhJkvO9dAAp5f1W0xqmWReGHtWs/X9U?= =?us-ascii?Q?sqtzEZiH9310xAeC6YFjS61WCywloLs46omLEUW2IP1WCX/YdQGyI7rDFeQd?= =?us-ascii?Q?f4GSEgKahdW4GSHusIOkQrWSrqapiCo2rN+U/LTV4Q3UHKe2TY2q70bkQz3m?= =?us-ascii?Q?vJiF1bWaJyBqDqQ5nJ81PmDPAhvHZUa5bOdzM1b9K73RFjwU4w0NYOCx40pi?= =?us-ascii?Q?bRc/cOYXaIS1XCsYhaFfyOEqptQSkwgW3/cISFPsdXHOJLj/aq54L7ikZK0Q?= =?us-ascii?Q?MwBbk3P8pK5S//DhNmcVkrWtMHasAm1KacZ/xSwypdm3I0jeiGuMsKMrtFde?= =?us-ascii?Q?aZx38u5CVDSz56E6crM7RkH0bLZxjFO1uf2IvfA9uwOAwDv2uRdAVIY69ZZ2?= =?us-ascii?Q?dna8/aM13u1g3DYocnTYBJ9XKTmqNUiH2AGlt4hGH4fHP+768EaxgHnkYyiD?= =?us-ascii?Q?ubz3aAiCRRYovCVjPvrJ4Va3CGP1IECcNKMjEhnjtJHV+Btj6dDpcp2O2CCO?= =?us-ascii?Q?J9OJAQFQmaPT02i3/qczfDTYaOGvKRJdUmOW0wigMqBjIGR7EusGHFeq8U7z?= =?us-ascii?Q?fGv5RXMZlkS8JNus+ZkuB8JR+dq4x8rK1n2J5/CM0Bnp8n+jigXx/k1knE47?= =?us-ascii?Q?vPQIQcFlMdOWb5pCtT2/xf3haGiOo/HeoKsIlXniKgcuCtdHFI99lMDiLXqu?= =?us-ascii?Q?4qzFuBUYaZoLcvg/FLqPbrAPrmHnCKAcFZ5HZy3OXkr/uBYH08gw/PJ84eM3?= =?us-ascii?Q?qvb5hlgcWuBDi9NNwidW1ulNu0Oml97ZsSU+uBdY0ig9/fEmVTZMTGIq9e63?= =?us-ascii?Q?ss8sNz14IElLdBVeBF8CBJSZEktfq6+gPGI0FTlSeC2J2mu1pu7A5Z54ucT7?= =?us-ascii?Q?QPsgmfxCiAla+2pAP1i3dg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27a2a1fb-8267-43b3-0e15-08d9e3b9b835 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:28:24.9356 (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: PAXPR03MB7666 Subject: [FFmpeg-devel] [PATCH 11/41] 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 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: 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 4bc78841ac..0e38824cca 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 6036a0dec9..d6962448a6 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -27,7 +27,7 @@ #include "wmv2.h" typedef struct WMV2EncContext { - MpegEncContext s; + MSMPEG4EncContext msmpeg4; WMV2Context common; int j_type_bit; int j_type; @@ -42,7 +42,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; @@ -69,13 +69,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); -- 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".