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 8394647BAF for ; Tue, 3 Oct 2023 16:03:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 742D468CD20; Tue, 3 Oct 2023 19:03:19 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2096.outbound.protection.outlook.com [40.92.75.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7741068CD09 for ; Tue, 3 Oct 2023 19:03:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A/WQ0rW2LY399l40tCGMMHDX5u9u++vyZxvQN/zEvnXqztPJGMpZNrKNVShxsJeQoRCqLkumlRbVgBCsiyR4Qk0JO6LhfEo4ClkihWtj2cHjLYc5oixAW8qW4C5ssMhx5aY0W7xSgVwdBQmBeyIygQ2CK9Iw1ouoemoPYrZro3aneoVKoWvB2lbHQr2DV07qV43T0y4pvhjRWCxV8tGoRzgUe7ChbuSYV1pESpDscPN5VGagwhlUFXxwReaxjzlfIt5Bz8v5T05RLqm7OfgVT4F8rFZ0MaHklUbaI2+PektGlM7/HxFg6wwObFu+ecZfzxYeBsqwOgTx4/qtMEnD/w== 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=IoPOqdsem1WtH/8gR+aniHCq/ljE+o3ZMZYV8+JOvQs=; b=ZnRnMbTHWAPQZJUNw0L++xcFeiWpmJF5JdzUA+tLZzd8i3DiIaakKBlpqfaAZSDDrUaRfUFxb8PTjpEDTxDVjgQczVAnM4b8WqRoO8V21fCtJnH7z8zX6M+TFYfzvfx1W7IqBRmpHRFy3qjZ9hEozOTrPvZ6+N/VNWCjR2bjq8tVf7Kp1VT9bdgaTiyJcn80Yw0zLN9VBMptm16Rdxxon0JJ/AhpQmkghneKKcEtFWlkf/fvP0sbSqJWPsawUgMD7ok69yCGFUkuw9DM+HAyFHjOqFpdlRiz0qP2XG38l8IsI3FuJUXcZmaoMwnV5dEw+IFI1zL4tK/F6i8Klid0/A== 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=IoPOqdsem1WtH/8gR+aniHCq/ljE+o3ZMZYV8+JOvQs=; b=Am4GvguzflTSJ2uswj7N0i+HLmuE1dLfJzSiCFpo3IRiUnhaT7NFY8V1lmB0KmdhToqU9HGsWQTumnsnT5F6OLBqWdDZJXDREUe63D12Asz8oXkSABJGqBKNfyJddmbL3CE6gAf61CW7O8NJCwQEb9J1g+rmn4ho/6DkbylgJ0C3DqRDSv2vt9tJsvElF6NUA11jCYmdG6lIElo13mo4cMn4pMEgkOaw8F2zZ3Fu8D14WDQyNfW15j+6U5pvPJMUZ92mfhiPFlXBGBRsBgeNbWlYgE14bw9DJJs2OEVBAa6mSOOy4QyCPhVxyOiLeu2ZyYAALQphOcz15T/H59RI9Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0010.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33; Tue, 3 Oct 2023 16:03:02 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Tue, 3 Oct 2023 16:03:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Oct 2023 18:04:04 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [l8a2u6/rOfv0+EzEiyRqrdGTQZptVbpf] X-ClientProxiedBy: ZR0P278CA0123.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231003160404.1982239-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0010:EE_ X-MS-Office365-Filtering-Correlation-Id: b08ae8d6-a395-4de7-9653-08dbc42a389e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5QiTpN0Kb+Z+3kLqk5qYX44TvA3Yuur705F8ld6ruVjW/bc1Fj7++vZ+I7HCcPz1k5RX3xMcDOKHcvk+c4kB/15atp2Wac93ruEojaFzvl7rjlHzotoUzLdRvr9TB8e3pNd1EAEa5FXIa3DMefMLWH/qoGRhdd0jj7h9znBBc2wN1q6nkfL11sidEW1XEkc19jm98JIJn+rG/7vUyGWxQn5e4Zz3089avDPz0r9CZCpzXloQ7SJXHsZyK5NWkQ+8kCV/Lrmkxe2UgM+AzrSq1oIUH3pcjAEyI5QcDsNGr4K+ZhvhdmXedzrJAY3dZxkORtOpvQLbhrG2/HVczya4rRLY+Uek0TJEXOQe6aGN//SniEVHfpaDS7HesEfSrSYk7MgIbwQtKrkDVOZpqJ3M/wtUJolCkVy3xZSSPlNB3OiqHQpLwZT8h5xHO3dUlBA6CfmVinXl3Aa9/SxtWe0SbQd/QRefSXDs6MMemO9znK5MLLzckv5oOP04XNuiGAq5vUzUQTrj/lhlmIj2fu4E1MKWp1mCdNHKhXtQas7MFQ9nFbp7g+4PBzfqY8wdo/9EdcH7/eYC8cw0sQot9UEt32rR+8KggjbRXbu1gNKXdoL7RC+meY318cbXEEJBHn0D X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Tw15Wc8LeM65xTXQ0O99aH+L3mt1VYxtFq7TTlrHU6JMt9nr0Iel2YTjxe74?= =?us-ascii?Q?epemA16qWdl908WneBOqfuemoxNt4aliosOzc4otb97JO0dHUZgNwtDT30CW?= =?us-ascii?Q?YqI1vVR7vGT8Yhkf8+1i9pOAJA6f4nZ/rvYD+rWsKbAhH1QbHLLaNuALzE7s?= =?us-ascii?Q?kDQcXXdPb5nn6qtfXmaS8VnjjiMkFaHKy8rVyyYbd+DpgN3LSVmYfXT4eAsn?= =?us-ascii?Q?MHNInvgD22gtWdMVDtKQhXcYAr9eyMKU4cxo/xLhxadSDVK/Mn/pTfrvgGiE?= =?us-ascii?Q?XocprKQ33Q0Wilm6b1Gc/CivqjHUWzSxNR9y1FvYJVf1RcZWWdPiqXufu2hr?= =?us-ascii?Q?8UCCMplYDaCHRzpcsJiD6RSQH45PJBkUAhbzdqhvQTvcYA6g6nMo6mPQ8SWs?= =?us-ascii?Q?O+cLu+pV6m8Gp0BmPk8aErTPj/2dvq4BCP7zFQ4tSJJv0Jy2O2Gz7N4ULKfm?= =?us-ascii?Q?R1UrvMNtFhejmwWXmXtUJBz9M9yg6HGxTeEa14J1x7VS30i5TRjtn+5WaPXC?= =?us-ascii?Q?e0I10dpHTJtO3PqwiqvPEU7N1S9TjnH6FSf98LyxOweO9x/8LIVOSYPfWtmf?= =?us-ascii?Q?SXaa5cjhOXzm4IDyiFOixunip0dJvQxr2FERZ3YrzyQcCQGydwM+upSGqUJD?= =?us-ascii?Q?pDHRfcUSPX3Fvo9CEPTzpYopKfl8tW7XQ+oH5MJrGoVOFZ7YO7AKK/2UCAJ3?= =?us-ascii?Q?2JGD0AKGPL7N+K00mc7fF1qsjbvBz0QkfmNdqgD3UXqF4yCQnJFy7qP9r21t?= =?us-ascii?Q?SA/ketxth1BtXzxG5i690KwlYmWXAyx3BItAtLQ9JGiDN9BQ5enQtIQc9q5u?= =?us-ascii?Q?A/3AHOhmMl4JQb6ejSb6CKnLWUgpsqzJTblxtqKTXT1/BeKw43KE3eIAYc2I?= =?us-ascii?Q?GWXyp3TfWiQKB0vj7+xVbuGMcB12u2kbHmctKUmyTT+xMxoMQWhmREZa20Es?= =?us-ascii?Q?Hik2Y4J4jnWyiAhWr6tBx2L//HNP4aUbgZvEZd17sMSPw9+/XBvjWu/yKJcO?= =?us-ascii?Q?4giFbfOrRlkF1mFPVMHNnsiVku6cTsgpvyUx9SuwA5e1oI1qTPYVPq5AEi/4?= =?us-ascii?Q?1N5zoNTZNLIOYvRVIW6AQ4ZnBGB02jy9EjyqMdLfeo1pQfLd5TYi8WY/Xm6H?= =?us-ascii?Q?bQcpHFMIoHuXz5x1hVo0Zfk1xmQ4UgbcvapfoVEgTLzEV1jrzn7cZjuZpQ8/?= =?us-ascii?Q?1JkQn/yUFoNAIYSGd0BIM9DYhrAywK17ZhK6ZKje82mqWmYep0gKauucijbS?= =?us-ascii?Q?6gn9wGzIY0KuxcVLW8jQ?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b08ae8d6-a395-4de7-9653-08dbc42a389e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2023 16:03:02.3191 (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: AM8P250MB0010 Subject: [FFmpeg-devel] [PATCH 12/12] avcodec/mpegvideo: Move allocating new_picture to the encoder 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: It is only used by encoders; this unfortunately necessitated to add separate allocations to the SVQ1 encoder which uses motion estimation without being a full member of mpegvideo. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 5 +---- libavcodec/mpegvideo_enc.c | 3 ++- libavcodec/svq1enc.c | 6 ++++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index fc73abab9c..9ed158ac57 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -632,7 +632,6 @@ static void clear_context(MpegEncContext *s) 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)); - memset(&s->new_picture, 0, sizeof(s->new_picture)); memset(s->thread_context, 0, sizeof(s->thread_context)); @@ -720,8 +719,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (!(s->next_picture.f = av_frame_alloc()) || !(s->last_picture.f = av_frame_alloc()) || - !(s->current_picture.f = av_frame_alloc()) || - !(s->new_picture = av_frame_alloc())) + !(s->current_picture.f = av_frame_alloc())) goto fail_nomem; if ((ret = ff_mpv_init_context_frame(s))) @@ -801,7 +799,6 @@ void ff_mpv_common_end(MpegEncContext *s) ff_mpv_picture_free(s->avctx, &s->last_picture); ff_mpv_picture_free(s->avctx, &s->current_picture); ff_mpv_picture_free(s->avctx, &s->next_picture); - av_frame_free(&s->new_picture); s->context_initialized = 0; s->context_reinit = 0; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5bf4b06a11..f669658127 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -821,7 +821,8 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) !FF_ALLOCZ_TYPED_ARRAY(s->q_chroma_intra_matrix16, 32) || !FF_ALLOCZ_TYPED_ARRAY(s->q_inter_matrix16, 32) || !FF_ALLOCZ_TYPED_ARRAY(s->input_picture, MAX_PICTURE_COUNT) || - !FF_ALLOCZ_TYPED_ARRAY(s->reordered_input_picture, MAX_PICTURE_COUNT)) + !FF_ALLOCZ_TYPED_ARRAY(s->reordered_input_picture, MAX_PICTURE_COUNT) || + !(s->new_picture = av_frame_alloc())) return AVERROR(ENOMEM); /* Allocate MV tables; the MV and MB tables will be copied diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 46a484e15f..894ae552bb 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -570,6 +570,7 @@ static av_cold int svq1_encode_end(AVCodecContext *avctx) av_frame_free(&s->current_picture); av_frame_free(&s->last_picture); + av_frame_free(&s->m.new_picture); return 0; } @@ -632,10 +633,11 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx) s->dummy = av_mallocz((s->y_block_width + 1) * s->y_block_height * sizeof(int32_t)); s->m.me.map = av_mallocz(2 * ME_MAP_SIZE * sizeof(*s->m.me.map)); + s->m.new_picture = av_frame_alloc(); s->svq1encdsp.ssd_int8_vs_int16 = ssd_int8_vs_int16_c; - if (!s->m.me.temp || !s->m.me.scratchpad || !s->m.me.map || - !s->mb_type || !s->dummy) + if (!s->m.me.scratchpad || !s->m.me.map || + !s->mb_type || !s->dummy || !s->m.new_picture) return AVERROR(ENOMEM); s->m.me.score_map = s->m.me.map + ME_MAP_SIZE; -- 2.34.1 _______________________________________________ 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".