From patchwork Tue Feb 1 13:07:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp612829iov; Tue, 1 Feb 2022 05:23:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbei7nCWe1tMbTveRrYpuB5a/XdXYvo8eNIxugglGSRHrIDH+1wkhbohOYyIxXToGypDNs X-Received: by 2002:a17:907:7412:: with SMTP id gj18mr20115119ejc.379.1643721790457; Tue, 01 Feb 2022 05:23:10 -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 nc2si10787521ejc.65.2022.02.01.05.23.10; Tue, 01 Feb 2022 05:23:10 -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=Sl5+eBA6; 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 CC88D68B461; Tue, 1 Feb 2022 15:09:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074106.outbound.protection.outlook.com [40.92.74.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC8DB68B2BB for ; Tue, 1 Feb 2022 15:09:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ot5IVdEi5TuymhL730h6xpzMEf6DmEf7bDebEJQU+cGrOMSc8ahQ4WUfcdiDdZxYJyxeSF1832Wd0kC1gRSX6Ss9DW0q6qfO0g9JyqJCFLNTokJWSnzMDHnR92tMZ0Qyr6vKEr0wOty7VwnmY1X0axEG4Mnlf5VJ8iky7a8Hq2QEMQcaVeNeaQiVtGMpaMdG0CfqqhfPlZ95ugZ0cmEz5Jcvul3fL3X2q/H+gy6gCCqJSenjPPu5qXhRrQglgZJGwlyfgHZopoQdODP/Z294DAcse9fOJ8WsGAZx4Bq6i6gOxWcMRIRFCYdR6V+CrrqLwNCooXiMAePPTA9QVXuuqg== 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=siCQRHxnLP0hqtjTdW479WoNqHVd3fI5f9HM7m41QpU=; b=igd/UepLBwXQ256FdOiDEAga2mrOUjGueZ3lkLajdZ+P/MUG2JkqVD4j8LYZ8cllATWhlw8g4udmgpfaQUGXCGDhzNnaaAKou07bgUFSsoleitd7dWMo7vCseJigrQzIplF8KV8cOq4DbnKl4Htwq7NnyMtk+SMvEEckAAaRqBSFmER3J1REjJGl1RVEN59Fcmuusf2n3SdpjTzNXrbZM3jPzQX49o8W87TpgtbRvDYpt36wpaMduSGr7sGlUjgEb/w1wLD9znR+nrfMgx7mw6DHJf9DDQBGmBrdx20fMdPKuvSxAwDyK3F0cYY2bUZdWF/2FijYELkRFYJ+BJFteA== 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=siCQRHxnLP0hqtjTdW479WoNqHVd3fI5f9HM7m41QpU=; b=Sl5+eBA61vRGtvx5cRiZ24pgYFGPIEZABjOhz2OsoRcSy0IXw9YupTJt5KQvrSVI51ADp53ETKFck9WHOXSqSjS8mQ2/wKjHGgNwFmS64zJ98FHSWy35uG5akNlwaV4XDTE+VBb6eSfmadIt8gwQKDTR9Xg2tCH4KxOAUWYHJvurxYLJ9P5E+QRFkV2NlO9m/2wqOd5RTk+2JhUgjBlToWZKFliguRHlbqh6IPQtfPeyrlPmoFwEWS5RZEY+Dl0joQT3xuLn2pWXaXwa4T7m/RH7XjR4z90JfXXRvs3/gkZS/RdCi/Ne4UoZ0txGihzq3L7J2sz16gMfM3vWqBv8sQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB5025.eurprd03.prod.outlook.com (2603:10a6:208:102::19) 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:09: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.4951.011; Tue, 1 Feb 2022 13:09:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:07:02 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [KwmS1wXSIB8a3LiSy0C+RbpD+kSDN2zn] 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-64-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ada52469-fac5-4054-a3fc-08d9e58400d6 X-MS-TrafficTypeDiagnostic: AM0PR03MB5025:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dwZVITZGy8ro6RerrQP4kgpPofzmdcz6vo/HomWZl8IPIbeqTSXKh0NoqGga1NHSlKtpVTAEXXLHqmrarDmyoXYHaNNl63uaO0INnGaDaQ6W80K73PpJYj77KPpD/2L+IX1x8UcvGN2uo15TLYMEAJ8QoRCk/vl3y4TUId+aIsKHc0pZlDQyPr8jshEmxCc14RQFu04GImTuhSF4QfQRKYMr67Huf4poKEc5hWuW5zRcAyFf6LfZvwVS8YEwfWYh6gUAfpFqNORyfWZ5n5nu2sgSjd/SwQHfIRYzbpq9Lh1hvs+JxREkgUM7aqpBxJkJXx+Ax5hbhroOjlZVWdK//NYs8APFpu/gzJ1/bmfFMnPioG5WWa3dwAC5JYsq1gQiVB/iX3/dgQbavte3IyvH0qw0FE8O+Roea4BFgp92JQY5QOXK+knmC5cBUcFgNVSQmq5fg43WAOJVHrqeSUIoNwgkq8KMzHaKpzNUg7Y5IPhAJwCLaxCn5vn6Ar/zh7rsh64SeeT1yKERaIsObPn2GgLEa0N/2FiLO5no806SjBYVE2UKlAURinw6t4VZk3pr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Culvx7zK3+L2K7cfwYd4t1V0Q0lT0wMuMYOssFebjhmUzs/0rYffymEIiHoOEMehMZaQclL6nLUX5OubSRbDbqWpWuKyMTDsl0e6Y4UCLZVb7ay59QzMr6xEy5Y6zpTI6lBcVHfAtrSO/ij7I512Bc43FN6KJc0ojz+PlpyhnLlX2CfYRkoTCtj7MK3klqKKT2nvKzCACXRWk18n44qfX5uAJV4nJ0jcA0Uq5YH4LVEiWH8piJowQJT832D7uxsBHR74ekEEJHJL+c5BheIzyuQ5BTYS7m2sv7XKKXsVUQWrycIyBSgOBnzezxziL3oSYBJciE8KM9eIVg+Ef6IWPVL1dRw0rKcdza76PsTbhsOu90F4UjKf620dp7vK4fNuqw9DUM5E8ux+B/QkQSz+3tj9HtgsyQb8GUGBw42qp3dZUxvgMNTnqJwXCW4qVe1dK68j5t///W4dtRJLW8Omr3CigufTl73Mp1+mkmpjSxUDjiz5iV8BjYIrqgqzJSJV5vZLq70cN8mRMiKXYf8Wbh80RYM+3wXmwaz6TuARalAWYj9Cz1yxlNuHWyMl4vxXPK77wF6LpQaywSZgamY66kar2SvDzscyH8nIY5j8AECDWnN47ro76e2mCPcrlFxCWQr1mPYhraK+OMJ+Tg7Kha8zzMwH4T9jXBtAogVp3nKWWFlKW/ylVFTVELK7h+TzjR6eaVyIMNLQxf6V1zGu1LFDOVCl1w7AjO7uHmUDtWvD/uicbl/NWof/bV3D382BB6Ltp3AkPTBUbxMwHL7ChMFlmuvS0NUIbLzgzr+KeVwkGNuYIkMVs557dNz5GcDgA3xPQx1/8Gf8ndV7j2WEge41QbKYGYJppKmJMLf+pjQ2xkRYDBwAhOlJXfZvK0FZpv+Is/fec2Ullm/yrQl8ItsAEttraq6AUIwgDEhHwWBCqB1LTKXruQK6LX/vzysICrVclk8x2YwiKwA0SwSHxg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ada52469-fac5-4054-a3fc-08d9e58400d6 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:56.3552 (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: AM0PR03MB5025 Subject: [FFmpeg-devel] [PATCH v2 65/69] avcodec/mpegvideo: Move arrays owned by main thread to MPVMainContext 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: FKP+1+9WnUxp This commit moves the base pointers of arrays only allocated by the main thread to MPVMainContext (in case there is a base pointer). Signed-off-by: Andreas Rheinhardt --- These arrays are no longer reset in clear_context() because it is my understanding that there is only one place in the code where these array pointers could become invalid: in ff_mpeg_update_thread_context() where one context is copied over another. Yet only the MPVContext, not the MPVMainContext is copied, so that these base array pointers are always valid. Hopefully this can be checked with the testcase from commit b160fc290cf49b516c5b6ee0730fd9da7fc623b1. libavcodec/mpegvideo.c | 23 ++++++++++------------- libavcodec/mpegvideo.h | 7 ++++--- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 8debf4d6ab..c8eaafcc1c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -575,7 +575,7 @@ int ff_mpv_init_context_frame(MPVMainContext *m) int16_t (*tmp)[2] = av_calloc(mv_table_size, 4 * sizeof(*tmp)); if (!tmp) return AVERROR(ENOMEM); - s->p_field_mv_table_base = tmp; + m->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++) { @@ -587,23 +587,23 @@ int ff_mpv_init_context_frame(MPVMainContext *m) if (s->out_format == FMT_H263) { /* cbp values, cbp, ac_pred, pred_dir */ - if (!(s->coded_block_base = av_mallocz(y_size + (s->mb_height&1)*2*s->b8_stride)) || + if (!(m->coded_block_base = av_mallocz(y_size + (s->mb_height&1)*2*s->b8_stride)) || !(s->cbp_table = av_mallocz(mb_array_size)) || !(s->pred_dir_table = av_mallocz(mb_array_size))) return AVERROR(ENOMEM); - s->coded_block = s->coded_block_base + s->b8_stride + 1; + s->coded_block = m->coded_block_base + s->b8_stride + 1; } if (s->h263_pred || s->h263_plus || !s->encoding) { /* dc values */ // MN: we need these for error resilience of intra-frames - if (!FF_ALLOCZ_TYPED_ARRAY(s->dc_val_base, yc_size)) + if (!FF_ALLOCZ_TYPED_ARRAY(m->dc_val_base, yc_size)) return AVERROR(ENOMEM); - s->dc_val[0] = s->dc_val_base + s->b8_stride + 1; - s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1; + s->dc_val[0] = m->dc_val_base + s->b8_stride + 1; + s->dc_val[1] = m->dc_val_base + y_size + s->mb_stride + 1; s->dc_val[2] = s->dc_val[1] + c_size; for (i = 0; i < yc_size; i++) - s->dc_val_base[i] = 1024; + m->dc_val_base[i] = 1024; } /* which mb is an intra block, init macroblock skip table */ @@ -646,13 +646,10 @@ static void clear_context(MPVMainContext *m) s->bitstream_buffer = NULL; s->allocated_bitstream_buffer_size = 0; s->picture = NULL; - s->p_field_mv_table_base = NULL; for (int i = 0; i < 2; i++) for (int j = 0; j < 2; j++) s->p_field_mv_table[i][j] = NULL; - s->dc_val_base = NULL; - s->coded_block_base = NULL; s->mbintra_table = NULL; s->cbp_table = NULL; s->pred_dir_table = NULL; @@ -761,13 +758,13 @@ void ff_mpv_free_context_frame(MPVMainContext *m) free_duplicate_contexts(m); - av_freep(&s->p_field_mv_table_base); + av_freep(&m->p_field_mv_table_base); for (int i = 0; i < 2; i++) for (int j = 0; j < 2; j++) s->p_field_mv_table[i][j] = NULL; - av_freep(&s->dc_val_base); - av_freep(&s->coded_block_base); + av_freep(&m->dc_val_base); + av_freep(&m->coded_block_base); av_freep(&s->mbintra_table); av_freep(&s->cbp_table); av_freep(&s->pred_dir_table); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 99d474991a..56c1d8118c 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -147,12 +147,10 @@ typedef struct MPVContext { Picture *next_picture_ptr; ///< pointer to the next picture (for bidir pred) Picture *current_picture_ptr; ///< pointer to the current picture int last_dc[3]; ///< last DC values for MPEG-1 - int16_t *dc_val_base; int16_t *dc_val[3]; ///< used for MPEG-4 DC prediction, all 3 arrays must be continuous const uint8_t *y_dc_scale_table; ///< qscale -> y_dc_scale table const uint8_t *c_dc_scale_table; ///< qscale -> c_dc_scale table const uint8_t *chroma_qscale_table; ///< qscale -> chroma_qscale (H.263) - uint8_t *coded_block_base; uint8_t *coded_block; ///< used for coded block pattern prediction (msmpeg4v3, wmv1) int16_t (*ac_val_base)[16]; int16_t (*ac_val[3])[16]; ///< used for MPEG-4 AC prediction, all 3 arrays must be continuous @@ -194,7 +192,6 @@ typedef struct MPVContext { H263DSPContext h263dsp; int f_code; ///< forward MV resolution int b_code; ///< backward MV resolution for B-frames (MPEG-4) - int16_t (*p_field_mv_table_base)[2]; int16_t (*p_mv_table)[2]; ///< MV table (1MV per MB) P-frame encoding int16_t (*b_forw_mv_table)[2]; ///< MV table (1MV per MB) forward mode B-frame encoding int16_t (*b_back_mv_table)[2]; ///< MV table (1MV per MB) backward mode B-frame encoding @@ -509,6 +506,10 @@ typedef struct MPVMainContext { int slice_context_count; ///< number of used thread_contexts /* The first entry of this array points to the above MPVContext. */ MPVContext *thread_context[MAX_THREADS]; + + int16_t *dc_val_base; + uint8_t *coded_block_base; + int16_t (*p_field_mv_table_base)[2]; } MPVMainContext; /**