From patchwork Wed Aug 17 15:49:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37328 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp167466pzh; Wed, 17 Aug 2022 08:50:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR7mhVx4NynQHW7oHidYPIayWLRIXNR4oj6TbofU2clvzY2ayEgx4irMNv/+2H8IzJPOkRdT X-Received: by 2002:a17:907:75ec:b0:738:4c20:4f73 with SMTP id jz12-20020a17090775ec00b007384c204f73mr10190932ejc.98.1660751414502; Wed, 17 Aug 2022 08:50:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dr20-20020a170907721400b007308e7cd167si14363473ejc.846.2022.08.17.08.50.13; Wed, 17 Aug 2022 08:50:14 -0700 (PDT) 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=Ar5ILSsO; 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 45C3768B8DE; Wed, 17 Aug 2022 18:50:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068031.outbound.protection.outlook.com [40.92.68.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67DC868AE59 for ; Wed, 17 Aug 2022 18:50:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dyN5wuh80Qq/raa0Tx/CTEKVcJ4A7RoWCf4YpF7ZUkfWCYxpNNl29ciY1xLiAuqYwQnbVehIhWqhle4N5wpCIBPHeKrBWUzBe0htHFHs31d/TtddFqv2bZnvn0ptF/S5HJmTZjcdDHh97azT3QrTiNReOLabTenKlwRoreqtBI8rUMmsTo4unDL8is9EYpSwZrLrmbDQsk20CYXrZprCSezgSO/Gq3353DI8Z+oHuBvdRifWuyQNzm/Tg6FwEEATrIMfX8x1f/PBxtv6iTKURpb3L7BwOQc3MBfWtD7DxsodNDLZ+xL25g7S76G+JyKEjxOXtxbT+0T2sBgQc3aDvw== 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=JwENMYk7wWgtO35o3PAP7Zn6d+N7Dnq8bHHXdTjD6nM=; b=bnXQFhum3QmynitFW0R8r5dIsahqmTzqvVYv8a7rWyw6k2/HDmU7ImCJJsO79siA2ccrsYGX2+x9V1KKHe6tKgr6YV6huMR4atmqOOsW2HopZgmJDh8QuG5PS/VmzOFF/wam0vceIrv5QgNHQQmOmmAkmQTm8aj34Rqm3rTnb2qe5KdWUa+M1rnQgXo9doAg8wQwUiX3plzgC6W5cb9u5wwHS0wh99XxBVuM5NsWLExxcVjW6xAgZnMsl6R+0v1rNeSoxQiUKCLa31MFiIjSTtSOS3eiyPArwwHh5cDtX5yOtvmgeAQ3AqcB2mWAS9yDfm8KKzXUMmXvkT8m/BCd2w== 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=JwENMYk7wWgtO35o3PAP7Zn6d+N7Dnq8bHHXdTjD6nM=; b=Ar5ILSsO4D0sOurs8h2Cwd8eR0r0tXkGoFshOGr2FSBFrTNCFd2IfZA+tzO5lJqQutKWdnfKMKCheNOgOOWrGyaezbvTjNxKbXcSvrP381xZ/ITLYuz7TiFnJoP9B/voPkLAJz86rebCHOHw7qnAww/RnI1U+a+X5uMM9T/OrWaQK0f6h1YSbbAua8+kXr6smPt2wGFEhzqeX3S5wKYIWsDPDJv9sAUUQvxOKgZ5QBGP/DvkYp6uWda90xusFwN5xBJ1Bg63fVSRqFUm0tGtIwbmYkMuj0u3Od91PYdvOwkUUyouXZKFY5XqZJkVhsoMCtvDTSvr5lvtRLXlVJQbdQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PA4PR01MB8923.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.28; Wed, 17 Aug 2022 15:50:01 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.028; Wed, 17 Aug 2022 15:50:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Aug 2022 17:49:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [0Qz2mcwgkVpMeavf6v22g/LOhPBcwmz0] X-ClientProxiedBy: ZR0P278CA0120.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220817154954.4108071-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4897be7-5e80-4af2-5420-08da806824c4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTISFcQEGF4mJSjl423AJ2MYIC1d7xVH/z+8IrPUWZuFePcYaLDCIqvLfnv9xG1Va/l6fZ763yduuMBbZnxNuUYNgj1wIcQEHGD6G+vb83qJqoxYJuJP72Guqwi7+st3U8uzFaTg1kcnJ3W7croJX1nnAsTbRNnfNPdign650NTXLDBpajsADxiXpiuFWta++ih57g3f4sQ3WbWBrZbDGqWFx6rUskGCmLoNvT/wmrKibDOdL3UTahVkoMunwhmO/bDAi4MnWM0RvhBtv71ux1zvBT+k7xSKBYT7l6mvQ4CEg82ciO1+xlhq+1aFRIPkkCasaBFE/QCLu0WO72sGmE80aAEGjkbpnWUqp81n4xRyAz0vGyeQWypaDbHWrn2azu14HJhMl7nnhQcRwIcMnCFSJaEiMEWs50eQRVyPi9bIyJqeDi1yU8kouP0H5VMas0SfDlQFIkWHe8+64OLk7ZIWucYk5rs4uFJy7Nxlq2vUIAtVBwQsFVRGcly806w3zRuS+GQx0ieVxXKUAFarY6X4X4CxxlvVOUlTwkvpPhOXTJWCZ6+ecXxRPaCjfK4QbjpoKRQRVt2K9b/XT3d6+AcFrzJ4OcB6V7QK+RwcjBNLqvEmTP8j1TMhEEB14U4IBpYj8rY/yMPCz55X5hTSFHnjykcjX7xTClUVxTlKZZjjCvRUAORBKMgQ27jYkk3lr93v2LLT8yUXx+uJihIPmhq4MTbwO/hodT/ovzZ6NKC0/zwYitm2f2kJT2qVppONdw= X-MS-TrafficTypeDiagnostic: PA4PR01MB8923:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rN2oPbmN6s1q09yqNzrG8y6gyk2xUJCLa6OvDJaEBfr2/i48S/sk7bpPMj6OOsKZeYdcOiFqUyVg3ludH93AHSL+eJFvGsnQkkt7rHBmOYeQu6FFVxSxeLWSDpLumqgpb1c5kJ2U94yauNopz+40oFTG8CDDptVawUfQ4dMcpsEax+h2HDEHXYGBS9jagviDDsjA+JVpLSjlALoCyhXIC+5CUNoQFCAAe+FtyxzV0WtrBSRbt7l0Bacs0ruauAy3GiL8hm9Ky/skqCFBL8gUpwFs/fTjBhN5mzayS9b2bojE1rE4bAzzsiP91URHbVa0nxmI9Du0KdjyAHymV18ysMMUA48U97U7wCp6kMXIWHqStXxhvr9vNmgGkN9Xs9U9iDJ0xpmHz/lSLQXDHsHfq12DACDqduNEi0+fHZVWF/Ky3TugC2ejIBwX2n+jKcmPLdd5ThDv7u2q7eNKVBgIB67TObSf7i1WcAThLmUuRUcVmWW9umejur1kVUGswKgxyQn6qr7T/+85n9sqga+tsn/eGQ77HxUxUqWN3crHnDWGJOPq8A6WqUE88we92/oPY9p0wnsuchDW2R591Vk/XpTTYuXNMPDTOvp+I+HDOT+WT1jUQKtzPaiL5RK0vNhT+jX3O/PUo4uI4iSkb+WJ4w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DvEdN8fJgQWAJN4kC5JsY17W9GrSULn5qSZQk8L9VICJmbIpCypFZ5KYWERkBJiayWB4CwH/nrt2O+JLrjJaipd+5F84n8iXUsL4N6NJ1Z7CHDx2z4RptyLOHwjGsk1os1pObtdBsYwpqwYn+YXhBk0Z6hQlnXDmIQShOOjRhnagH7lLpgvlJx03GkgBN6835dm8yXNZDb2xE0aKAVXN6EIfyDtNNLAGI5GVntan/09y8kLhxUOkNPaTTyJ/gtHtdAxWh1mGIk2fCOjvcARdFYmBHa2iXa10LwuAodphmKFdlt4ULnO+SCze86oZSex+XNSkQHZBwfUr86IRHT9UKbN4PEORoo97Q3eahas9a3dHXM+Y7H3UYTwLmRC+X0+CUvdhkxgKe5FY5D0L5R/2ccI/mGs/sviQL1x0pEH00eyiKfV2EiOfHAgvwGFIjr7KOOnhl7eB3fiT4nRHZ2MxGMFt/5ocMLWdQgLg3lD5Nxyn+SUeUPzG4pvOqSpRqEtq3xkKaAXUxLzmRxvXU/MF6cOZ0X3FxI3JWdgZKCVZXpqm25taZF65Nph21UztOnT2ju+O24ET9lEkvFMcZXBMQL7o8zVTUhEodML3DV9Ck8pMtjRlPROsP0TiUUESO9wPAyweyKT/xYNVFRBBT4m/+dTYxAkMhL83Hp8YLbYdc8gBH4sAOvEH5INcoki+UH7XVD+U7vTZFqCx1TSPet/xp49GTN6xJ+1PtLP+U2/fAituoXMm9DQtTl+jDph6RSsoJE/6WX1f/u0fF8+3uZe5zQQjpCOuEbdzOi+qwYkE6fyREcnq/iaLlgmYe7gZxZqVePDwXFDVJJiIycKOvmpi+AcUtBovFmJYB7Jo492W4muFCFZcuPK5BSvcVayd3ozMzo46o96LRj4YUuZ9a0YbWTwWl3+QQ3SYaYobJmhwognDuh0RAv1VcI5cRaKE1sr956wGJ28PS0KqYxB5x0aB3xph6GawknaxSr3BuNr5rqt6JBrIG+VR59ExqjkBAjkDempamj+pqrOl6EAIXcWD7hCtdzmEdQdKLwzzuP2ci813J/0K5u1Aq4OId2ne+RYLnF4VtKxlRtiAfr0X3OlTViv7KMZXJcagIR3B3uaeIKWYD1MbwfnYM1pEyX7HKWUTUQ2z8EV3YlQTS1ZYVjJg7DPs4ZVbz3jmb9F+/H1x5p9EmKcYV/VGe1CZIRLJTXaLbSSWp1F/0aKZZCzOZUfXmT48PT+4vxBQFvsyX7+XQGBV8tnNm01q03pwvObqEKOEoGUJMco2cFTXTNASjPoGNT3T0F4PEFEnlsYReSFlzcQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4897be7-5e80-4af2-5420-08da806824c4 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2022 15:50:01.1584 (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: PA4PR01MB8923 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mpegvideo: Allocate encoder-only tables in mpegvideo_enc.c 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: bMAJGzmQZf9F This commit moves the encoder-only allocations of the tables owned solely by the main encoder context to mpegvideo_enc.c. This avoids checks in mpegvideo.c for whether we are dealing with an encoder; it also improves modularity (if encoders are disabled, this code will no longer be included in the binary). And it also avoids having to reset these pointers at the beginning of ff_mpv_common_init() (in case the dst context is uninitialized, ff_mpeg_update_thread_context() simply copies the src context into dst which therefore may contain pointers not owned by it, but this does not happen for encoders at all). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 118 +++---------------------------------- libavcodec/mpegvideo_enc.c | 67 ++++++++++++++++++++- 2 files changed, 72 insertions(+), 113 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 1190f29954..86fe5e4022 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -566,61 +566,13 @@ int ff_mpv_init_context_frame(MpegEncContext *s) s->mb_index2xy[s->mb_height * s->mb_width] = (s->mb_height - 1) * s->mb_stride + s->mb_width; // FIXME really needed? - if (s->encoding) { - /* Allocate MV tables */ - if (!FF_ALLOCZ_TYPED_ARRAY(s->p_mv_table_base, mv_table_size) || - !FF_ALLOCZ_TYPED_ARRAY(s->b_forw_mv_table_base, mv_table_size) || - !FF_ALLOCZ_TYPED_ARRAY(s->b_back_mv_table_base, mv_table_size) || - !FF_ALLOCZ_TYPED_ARRAY(s->b_bidir_forw_mv_table_base, mv_table_size) || - !FF_ALLOCZ_TYPED_ARRAY(s->b_bidir_back_mv_table_base, mv_table_size) || - !FF_ALLOCZ_TYPED_ARRAY(s->b_direct_mv_table_base, mv_table_size)) - return AVERROR(ENOMEM); - s->p_mv_table = s->p_mv_table_base + s->mb_stride + 1; - s->b_forw_mv_table = s->b_forw_mv_table_base + s->mb_stride + 1; - s->b_back_mv_table = s->b_back_mv_table_base + s->mb_stride + 1; - s->b_bidir_forw_mv_table = s->b_bidir_forw_mv_table_base + s->mb_stride + 1; - s->b_bidir_back_mv_table = s->b_bidir_back_mv_table_base + s->mb_stride + 1; - s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1; - - /* Allocate MB type table */ - if (!FF_ALLOCZ_TYPED_ARRAY(s->mb_type, mb_array_size) || - !FF_ALLOCZ_TYPED_ARRAY(s->lambda_table, mb_array_size) || - !FF_ALLOC_TYPED_ARRAY (s->cplx_tab, mb_array_size) || - !FF_ALLOC_TYPED_ARRAY (s->bits_tab, mb_array_size)) - return AVERROR(ENOMEM); - -#define ALLOCZ_ARRAYS(p, mult, numb) ((p) = av_calloc(numb, mult * sizeof(*(p)))) - if (s->codec_id == AV_CODEC_ID_MPEG4 || - (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME)) { - int16_t (*tmp1)[2]; - uint8_t *tmp2; - if (!(tmp1 = ALLOCZ_ARRAYS(s->b_field_mv_table_base, 8, mv_table_size)) || - !(tmp2 = ALLOCZ_ARRAYS(s->b_field_select_table[0][0], 2 * 4, mv_table_size)) || - !ALLOCZ_ARRAYS(s->p_field_select_table[0], 2 * 2, mv_table_size)) - return AVERROR(ENOMEM); - - s->p_field_select_table[1] = s->p_field_select_table[0] + 2 * mv_table_size; - tmp1 += s->mb_stride + 1; - - for (int i = 0; i < 2; i++) { - for (int j = 0; j < 2; j++) { - for (int k = 0; k < 2; k++) { - s->b_field_mv_table[i][j][k] = tmp1; - tmp1 += mv_table_size; - } - s->b_field_select_table[i][j] = tmp2; - tmp2 += 2 * mv_table_size; - } - } - } - } - if (s->codec_id == AV_CODEC_ID_MPEG4 || (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME)) { - int16_t (*tmp)[2]; /* interlaced direct mode decoding tables */ - if (!(tmp = ALLOCZ_ARRAYS(s->p_field_mv_table_base, 4, mv_table_size))) + int16_t (*tmp)[2] = av_calloc(mv_table_size, 4 * sizeof(*tmp)); + if (!tmp) return AVERROR(ENOMEM); + s->p_field_mv_table_base = tmp; tmp += s->mb_stride + 1; for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { @@ -663,8 +615,6 @@ int ff_mpv_init_context_frame(MpegEncContext *s) static void clear_context(MpegEncContext *s) { - int i, j, k; - memset(&s->next_picture, 0, sizeof(s->next_picture)); memset(&s->last_picture, 0, sizeof(s->last_picture)); memset(&s->current_picture, 0, sizeof(s->current_picture)); @@ -693,31 +643,10 @@ static void clear_context(MpegEncContext *s) s->bitstream_buffer = NULL; s->allocated_bitstream_buffer_size = 0; s->picture = NULL; - s->mb_type = NULL; - s->p_mv_table_base = NULL; - s->b_forw_mv_table_base = NULL; - s->b_back_mv_table_base = NULL; - s->b_bidir_forw_mv_table_base = NULL; - s->b_bidir_back_mv_table_base = NULL; - s->b_direct_mv_table_base = NULL; - s->p_mv_table = NULL; - s->b_forw_mv_table = NULL; - s->b_back_mv_table = NULL; - s->b_bidir_forw_mv_table = NULL; - s->b_bidir_back_mv_table = NULL; - s->b_direct_mv_table = NULL; - s->b_field_mv_table_base = NULL; s->p_field_mv_table_base = NULL; - for (i = 0; i < 2; i++) { - for (j = 0; j < 2; j++) { - for (k = 0; k < 2; k++) { - s->b_field_mv_table[i][j][k] = NULL; - } - s->b_field_select_table[i][j] = NULL; + for (int i = 0; i < 2; i++) + for (int j = 0; j < 2; j++) s->p_field_mv_table[i][j] = NULL; - } - s->p_field_select_table[i] = NULL; - } s->dc_val_base = NULL; s->coded_block_base = NULL; @@ -730,10 +659,6 @@ static void clear_context(MpegEncContext *s) s->er.error_status_table = NULL; s->er.er_temp_buffer = NULL; s->mb_index2xy = NULL; - s->lambda_table = NULL; - - s->cplx_tab = NULL; - s->bits_tab = NULL; } /** @@ -824,37 +749,12 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) void ff_mpv_free_context_frame(MpegEncContext *s) { - int i, j, k; - free_duplicate_contexts(s); - av_freep(&s->mb_type); - av_freep(&s->p_mv_table_base); - av_freep(&s->b_forw_mv_table_base); - av_freep(&s->b_back_mv_table_base); - av_freep(&s->b_bidir_forw_mv_table_base); - av_freep(&s->b_bidir_back_mv_table_base); - av_freep(&s->b_direct_mv_table_base); - s->p_mv_table = NULL; - s->b_forw_mv_table = NULL; - s->b_back_mv_table = NULL; - s->b_bidir_forw_mv_table = NULL; - s->b_bidir_back_mv_table = NULL; - s->b_direct_mv_table = NULL; - av_freep(&s->b_field_mv_table_base); - av_freep(&s->b_field_select_table[0][0]); av_freep(&s->p_field_mv_table_base); - av_freep(&s->p_field_select_table[0]); - for (i = 0; i < 2; i++) { - for (j = 0; j < 2; j++) { - for (k = 0; k < 2; k++) { - s->b_field_mv_table[i][j][k] = NULL; - } - s->b_field_select_table[i][j] = NULL; + for (int i = 0; i < 2; i++) + for (int j = 0; j < 2; j++) s->p_field_mv_table[i][j] = NULL; - } - s->p_field_select_table[i] = NULL; - } av_freep(&s->dc_val_base); av_freep(&s->coded_block_base); @@ -867,10 +767,6 @@ void ff_mpv_free_context_frame(MpegEncContext *s) av_freep(&s->er.error_status_table); av_freep(&s->er.er_temp_buffer); av_freep(&s->mb_index2xy); - av_freep(&s->lambda_table); - - av_freep(&s->cplx_tab); - av_freep(&s->bits_tab); s->linesize = s->uvlinesize = 0; } diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 63fa0663d3..0b398c56ab 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -313,7 +313,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) MpegEncContext *s = avctx->priv_data; AVCPBProperties *cpb_props; int i, ret; - int mb_array_size; + int mb_array_size, mv_table_size; mpv_encode_defaults(s); @@ -824,12 +824,59 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) !FF_ALLOCZ_TYPED_ARRAY(s->reordered_input_picture, MAX_PICTURE_COUNT)) return AVERROR(ENOMEM); + /* Allocate MV tables; the MV and MB tables will be copied + * to slice contexts by ff_update_duplicate_context(). */ + mv_table_size = (s->mb_height + 2) * s->mb_stride + 1; + if (!FF_ALLOCZ_TYPED_ARRAY(s->p_mv_table_base, mv_table_size) || + !FF_ALLOCZ_TYPED_ARRAY(s->b_forw_mv_table_base, mv_table_size) || + !FF_ALLOCZ_TYPED_ARRAY(s->b_back_mv_table_base, mv_table_size) || + !FF_ALLOCZ_TYPED_ARRAY(s->b_bidir_forw_mv_table_base, mv_table_size) || + !FF_ALLOCZ_TYPED_ARRAY(s->b_bidir_back_mv_table_base, mv_table_size) || + !FF_ALLOCZ_TYPED_ARRAY(s->b_direct_mv_table_base, mv_table_size)) + return AVERROR(ENOMEM); + s->p_mv_table = s->p_mv_table_base + s->mb_stride + 1; + s->b_forw_mv_table = s->b_forw_mv_table_base + s->mb_stride + 1; + s->b_back_mv_table = s->b_back_mv_table_base + s->mb_stride + 1; + s->b_bidir_forw_mv_table = s->b_bidir_forw_mv_table_base + s->mb_stride + 1; + s->b_bidir_back_mv_table = s->b_bidir_back_mv_table_base + s->mb_stride + 1; + s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1; + + /* Allocate MB type table */ mb_array_size = s->mb_stride * s->mb_height; - if (!FF_ALLOCZ_TYPED_ARRAY(s->mc_mb_var, mb_array_size) || + if (!FF_ALLOCZ_TYPED_ARRAY(s->mb_type, mb_array_size) || + !FF_ALLOCZ_TYPED_ARRAY(s->lambda_table, mb_array_size) || + !FF_ALLOC_TYPED_ARRAY (s->cplx_tab, mb_array_size) || + !FF_ALLOC_TYPED_ARRAY (s->bits_tab, mb_array_size) || + !FF_ALLOCZ_TYPED_ARRAY(s->mc_mb_var, mb_array_size) || !FF_ALLOCZ_TYPED_ARRAY(s->mb_var, mb_array_size) || !(s->mb_mean = av_mallocz(mb_array_size))) return AVERROR(ENOMEM); +#define ALLOCZ_ARRAYS(p, mult, numb) ((p) = av_calloc(numb, mult * sizeof(*(p)))) + if (s->codec_id == AV_CODEC_ID_MPEG4 || + (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME)) { + int16_t (*tmp1)[2]; + uint8_t *tmp2; + if (!(tmp1 = ALLOCZ_ARRAYS(s->b_field_mv_table_base, 8, mv_table_size)) || + !(tmp2 = ALLOCZ_ARRAYS(s->b_field_select_table[0][0], 2 * 4, mv_table_size)) || + !ALLOCZ_ARRAYS(s->p_field_select_table[0], 2 * 2, mv_table_size)) + return AVERROR(ENOMEM); + + s->p_field_select_table[1] = s->p_field_select_table[0] + 2 * mv_table_size; + tmp1 += s->mb_stride + 1; + + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 2; j++) { + for (int k = 0; k < 2; k++) { + s->b_field_mv_table[i][j][k] = tmp1; + tmp1 += mv_table_size; + } + s->b_field_select_table[i][j] = tmp2; + tmp2 += 2 * mv_table_size; + } + } + } + if (s->noise_reduction) { if (!FF_ALLOCZ_TYPED_ARRAY(s->dct_offset, 2)) return AVERROR(ENOMEM); @@ -945,6 +992,22 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx) av_freep(&avctx->stats_out); + av_freep(&s->p_mv_table_base); + av_freep(&s->b_forw_mv_table_base); + av_freep(&s->b_back_mv_table_base); + av_freep(&s->b_bidir_forw_mv_table_base); + av_freep(&s->b_bidir_back_mv_table_base); + av_freep(&s->b_direct_mv_table_base); + av_freep(&s->b_field_mv_table_base); + av_freep(&s->b_field_select_table[0][0]); + av_freep(&s->p_field_select_table[0]); + + av_freep(&s->mb_type); + av_freep(&s->lambda_table); + + av_freep(&s->cplx_tab); + av_freep(&s->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;