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 DBF664736E for ; Fri, 6 Oct 2023 02:20:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABC1468CA67; Fri, 6 Oct 2023 05:20:50 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2100.outbound.protection.outlook.com [40.92.73.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C91AC68C9A0 for ; Fri, 6 Oct 2023 05:20:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l1NTKPO8bDSqzmP6El0WSfUn2sO0UZ+p2r0ml63ygJiycG5vbXYwOc1eXFFvfasHDpGP+C4zj0YsXFBp4NxXzgY2w3FuzE3c/iU+HPH2Of2Pddv4o6H+yXVHHLAfN8xzaKXSSfCf7CGNxX95t66J/ZbmDH3L5JuRlatPpBbqgenKIIDT9YuwTzkTURx92Z7ixZ/XfRSGMZ+iRuFniJTnpnQcGIZqXwp7zXQIZCyV9rBtsWNetefnIwFlPFcOfpzwefxzaXZHzgJtPX24Tpc+1qAFosyBlcYYHS3B3tBY+3EmuyanupmizlvE47OB7SKnmMdrDHKkDSaQkWZg3wS75A== 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=3OO74j7DTHUB6ZRQyTLdyKKye4wVLuSKxFs4Jhu0py4=; b=d552n5Cth4/odyxn6wiYQtCYv2qLV3JDAcrVTERJ+ua1HLhDbfvaUPPbTicz/SBJSD3Bu7gTt1bHRPtA+Tm3jI14QkrhtFk8wk9YELt4dR2n9CWTf3xgI2ZmbOGwhcEhPI8TUxQI5Q5kzvOes+cc5EqfgFjDK503UqqcodNQ1bHb+fF0qrT/myxDuAYwToxZBI4gimRdTVvuBL+fM69YojEkazGYkEeryuchgsy99dc7TXC6WvGE2aPu7JY84Kj81LayB0mVXjWAF4B2Hhv6wvwU0nB43HiyVygWOdpcbqQY5oZNz8cxBxqnNcQMXbZRog0Lc6V/9YtpTeIebHNPSg== 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=3OO74j7DTHUB6ZRQyTLdyKKye4wVLuSKxFs4Jhu0py4=; b=P2RpE0lKo1fvndLP4b0LGcvDdoFAz5AJKZ4gcjl3w0HFjdk1T8FQ65Yhc0I8Rz1o6BeYd1o8qB32pG1OyQP1e7Pery+W1nSGkYq2OEA73YL54i2CWpLLcUkjS5Yd/F9t8/ZtoZqXiHEV/UGYgCffV4XtVMV5o5fmmsG3o7toVV/IHYMm8IHr8o7ZGjUe9a62ybwG3YJCD1MvdQECi1vGUw1NuxRkyHEb0MLZtcgkW/humXQa3CSP84a3DrxkgDh4hMi8sdnKgct61w7f8aqnm5DK8gN3fzGJanJ3r86BaS/uTFPoHPpopZgy1KjoI1t3nWu/SUT16//NrHS9wVvKyQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0023.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.35; Fri, 6 Oct 2023 02:20:42 +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; Fri, 6 Oct 2023 02:20:42 +0000 Message-ID: Date: Fri, 6 Oct 2023 04:21:57 +0200 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [9VpZUJlWx4QMs47VCz8RRCkHfnJL0Vy7] X-ClientProxiedBy: FR4P281CA0133.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b9::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0023:EE_ X-MS-Office365-Filtering-Correlation-Id: cb4bfbe8-69fa-412d-50f5-08dbc612d73d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 25lhui6qp5rOcIOa40Am2v6S9hopG231bY1ie0G46wT6bxf7I8lXR42qFVGqynIWIbX7rNW9qkB5jaFX1TS1MU3W4uqVoUyOkEDrCqq7+4Mug6rKx2Aj1nq3Fl0KSc8gz1F4CVm2B9cNpCEpvnm+rs157H4u85PZ+mvoXBGibB3mQa/VIknYJGQHiOdyEnIU0T6YtJ6DROcNRVl2yTsOD/MMbl2TDxW/EGj2t5vgZMb9cbHg2HpmEiUyOnBRrtpmfw1rijGm1BmkAheKtwNbjaCV4IQlqbqy7icQp0kwD269T6fw18WfOopLTY4/7JW37tkoNkv3JG4z+AnwxGLC4hw0B2BLuh7PmGlIs2W5DhDXA0eT3pcjMG6fBC4X8z0NU5/+E87jZ8tF+L87S4lipQKK6OeMUj+2HIT/qrLr907UTkFf88YqNCmkylQNDnf/7pHTaZvxmakZ8bnLEqDC9Z68zmsWkqSi4pF8FISDxZ/HafV6X8lcW1jd2amdZE1GQkzbRCFG+dX7d5QLU1xEkzawCdKtO3cZIYkO3/4cwkDjLlS43WFKfdwitPQ4/EHs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b1RKUW9VeHhxMVR6NEFsS09RblJLeVFOSE1lbnA5Wi81WW5ybmRsNEE4ZHBG?= =?utf-8?B?ZFFoZ1UrZkFRV0cvWUVJUzMvWVpQeWpBd3VYaUVBTU1NejBnOEY5b0hLVExM?= =?utf-8?B?OEV3UFZkSnRqeDV3SXBHRFIyNE81Qk9EOVl2M1RCazdnQklYSXVseC8wQjhH?= =?utf-8?B?blAxYXYvOVhLM3lhWERjeHNxRXdVVkEycnZlcStZeEwvMEJXb1QzekNvT2tJ?= =?utf-8?B?SVhEbFBrMUU2Q2o5aktna1FETHRSTzEzVS83SnhHVDE5NUo1U3V2QkU2YTg0?= =?utf-8?B?V3Jna2lzVzNTaHB5S3dnTThsUG82R3BuYU5qWnFNTjlrcDVkaTN3c0ZGR0ly?= =?utf-8?B?OXBVMjM0VDd5NE13b2pOVWtES24yMHdSYlBmanVxdTc2SGJYVkErMVdSa21p?= =?utf-8?B?Zm5ucE5EdTRFa2xrdkFtSFZqT0wvUjNPVWR4WmV3RVJRN2lCZU1FYXlRd0ZK?= =?utf-8?B?Qzc1TTVKb1BxVFpSclZEVWhHcXhqKzMrdDd3dVNFV2lXUVFOSkMxUXRSc2U0?= =?utf-8?B?Z2s3OThNTnAvNzJEVDRMV1J0aW11SEswN0Yvb3FJZ1UzK3JBSG9Fb1ZjRVNw?= =?utf-8?B?d2ZSc2tRQnNkWk80MGlyK0lJWHJ4Y2hKQVZoeTNIbzJaWWZUeDlZUjhxeDlU?= =?utf-8?B?bHBkajJIUTNreVRrZnVDSHFKTXZSYW9GT1BycmRnU3dySjdUWUZKS2tPZm5X?= =?utf-8?B?VjhCM0RGWURtUGFtM3Vjc1VyVWpEa3Y4VWxITHhBcnVXM2tRNmhUMkM5YytC?= =?utf-8?B?UERmdDhNdU5UWWVwMXpCWEtTN3VwWm14VGoyYzF4ZXFIRVdWaEFjQXRPTUFE?= =?utf-8?B?LzBHWG9vdnVhSlhybkhTSlBBTmtqYkVYNFFxTGcweDdROTZFRXNKRkVNY3Iy?= =?utf-8?B?bERCeW5YVnBkQXZMSlJ1RFJoUG1RMkNXdTBSQjVaZ0t3Z1lEYlBBQ0cwcGpE?= =?utf-8?B?NnpxZDI5UTJaSDVtdlkwK3Vnd3VQcTNIM2dEWUZTWWVvNGc1REdicmpKcHpI?= =?utf-8?B?MU1UYysrTXFvMlBvSHY2V1p5U3RmcmhnakR4SmFoQjhpZXZXK1BRc0RLMTB1?= =?utf-8?B?eFZGdVlTb3ptTnBEbHJEcUNjTmJaWHRBc2F3S2h5aUVZWnhKQ3hyVXlBSEJZ?= =?utf-8?B?WEZQOUZxUzk3emMrVk5jOVVXTURRS0w1Q0hHbERuRHY3OVBjaEYxWGFGS1ZN?= =?utf-8?B?TFBNM254eWlqS2lLUWZ3ODlodVBQQVF6am5FbnZpVzFlMm5Ic0JmdFdad2dn?= =?utf-8?B?Q2huS0UzcGozR0RVUGtMbGhCd3FPakV1ZkEvRG1VckVRTm1oZjhHSmpyRHBm?= =?utf-8?B?aFI4dzJHTTJtb0U2SktjeUw5d0p3M1g0RThYWlQxOURJT3l6RnhsM0s0bjcx?= =?utf-8?B?TVFPNmVxOTY1VDBEbDB0ejhwSXhBOEh3b2N2M3JBRW1zMFpvaUJLRzlBdmtC?= =?utf-8?B?Z1dwdHJDUVJscHE5cmZ4SDY0MG9uL0xRN0cwaFpzeGVDcFVHME1XMm5vYWxQ?= =?utf-8?B?S1hodk4wQ0hPRnpyTm9EVUIrbzg1ajkzNTI1emcraFJRandlbWlRcThISmlw?= =?utf-8?B?TS80ZUNmWE9UWkl5NTJnSmpLSWI5Nm5ROURmT1g4Qkg3dnRiWG43b2hyMjls?= =?utf-8?B?MUxRSHFYVjhKeHZHWTdyWWN2SUp5OGx2SWtwek9mZWtRdW13Wlh1aS9MMGxD?= =?utf-8?Q?3zH10oiMXWsD+Rjx61BX?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb4bfbe8-69fa-412d-50f5-08dbc612d73d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 02:20:42.8814 (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: PR3P250MB0023 Subject: Re: [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 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: Andreas Rheinhardt: > 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; > Will apply this patch tonight unless there are objections. - Andreas _______________________________________________ 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".