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 42BC840B4B for ; Sat, 6 Aug 2022 09:53:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2406E68B6B0; Sat, 6 Aug 2022 12:53:04 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066019.outbound.protection.outlook.com [40.92.66.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE3CF680787 for ; Sat, 6 Aug 2022 12:52:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M/7FtAZPsdvhfAiiY64TEZaI2Ri7jRPf2HpTGFlL0Wa5Fa9MpzagzstXWOWGCcbyeEbexrCF5cIEE+mIWKNzg1PhFNkG7ZJ/N5gAtyXfbRhhcjY88LScbEcd5HaDU4aAWlsGEu+hWEbai34aQC7CVmPdlyHIdiKSOvLacQxJy6XaRhxjV249a89uMwiDMLuOamPFh30Jxi8HANd5/VnEgjN90k5ArP2HRaHgeQteXSbUwbFVahjWZawOkzFvrksVD3BSnryjphVpbHEbxNyWqln+y9SMWZDL1L6DRWEijF8q2Y+PuEgvzoxpync7Dj8kwvQ7qE7e5tl8j79WQXVGgA== 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=7xhYUcuiqo7k4a61s717NHmlKpGaxkqiybNjQl/mLkY=; b=ZyLaZltX4sNVVYpcADX9P8kELkpK3UqQ+6LQ+fyrwUP8/9a84KE+OwOpuRncptFr4ckuyqvGRwaWzHPVdMLVKCctas1J8eAR43RhNGdg/OPhBbppaS7f0MBaQiNsl49eaM9i2yG3CCXnyac+witFVVFrXuI10xqN+d2euCQikKnpDcOq/yVh8aZXQ6TeXRbB2dgRHIv8XOT6QgtxrnAHbqwgNQyqOMEj4CTx9ZZiQBty2Eahspl8UqcUKPnS638Dsy7TbWiFnRWh317LzLSFPp1CA6nEFE+IMIUGY05n2pvboRL8Vw4u6hP5FxsXhrEQES5axVDKby5jcx+CW71eug== 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=7xhYUcuiqo7k4a61s717NHmlKpGaxkqiybNjQl/mLkY=; b=un0m2L15/Cv/dz4FhsE16867vai8WpuYhFQeunzxHBaG4zqsIBqppINx1uLmIZIsT9yrHaeWmYMJzH7fCwNE329WQ+C98srngrucycHGil3YDMHB6R/7CjGwF2IeCAamOg3tWEsBI3C/zB60qxDzHdh7si+YfDFt8QA4PI4ul1nmaMltngGkQ7ko4WSM3h8/Up8C7QehWPBJOyYU3WMXASfLRuQAhGxZ9RdJwnPs1T6sFK0icRIRErjLd++YPV6PonCfs3yeYDbiduInqOIc+0Aeopw/Hj+Y7IFiz5NnlkcsdcY/KCloC3cpECK2EmQd6SHDU59B6f+iOMSMsHBrZQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PA4PR01MB8994.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.17; Sat, 6 Aug 2022 08:25:33 +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.016; Sat, 6 Aug 2022 08:25:33 +0000 Message-ID: Date: Sat, 6 Aug 2022 10:25:30 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [GpucKBGyECWRCEblkjiVwI6SMbKNKpGn] X-ClientProxiedBy: FRYP281CA0008.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <529a522d-3548-4a8d-6143-5d1bf46bf034@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c25b8de-26ee-4de6-267d-08da77853ada X-MS-TrafficTypeDiagnostic: PA4PR01MB8994:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +ossxe7Jhut75qUqSPkOaMW/+we3O6jQcYTcv5+1XTsEi2neuHu4rgAO+sS8x5K9Iab7CJ+yYf92R4CJk0Qzb2YR0FKstSU65Fl2cHoM3gOKURut5TJnad1DXKOUCn/C1MTBPZGzuxEDYWN4YiKnOeWBIyYk8UdlUAZ7OyfhN5m5vy2RS4r8BYE4wq4WHg6QgRLfAjtYZd36rlgL3hujtuyaQhbVUmTnjTYhFn06MXKYjeR2m2yekpzzxMOYn33/zZ0WU77+fs17L73HyVqcQkpctTRNrLry0qXBvAo2dw1fzbx5XEe7991WRWQVgsr7Stu6eWZmI544H8JX/m7uO9vEPYvehTDofjMKjC+IQin5RrYm3R40syEWwvefwIag5lLB4oUsaSlCpPjNFRJ5fu9259RVA3jnU7xKHu5JL1bkv3sIQ8V917XtrR05txekvggjzOM7XLum4aJWJY2tMmwvStrFvTdN0M3/7T10+kczpR4H3kCay91iuR2VAPXxOlLzgb6bY04YyL757LeazN8f96tbq5o2M2KVuFsLCjZjheO91RFxf1GKyzQ/zOqx+WtQO2zOuUCAwnrUnvve02FWnzS29duOVd3sKUhOZGIe7LT662vrXSg6yTLXQEs2DHLg0hDfoTg7BIxjjATTJE/gEwhsXHApRL5aXAyILPL6vasQlgEz6+lKFHni3qcF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dmtRbHdoR25QVWJicmRSbkFoeUZPdzNSeU5RRWFyMU1oZ3BhVk5OcDdxWFZC?= =?utf-8?B?blRlL3F1UTlNZEhBVnlqWm9oUy9jaU9TdWV1SDFBZGgvWk9NdFpDRHlPWFBT?= =?utf-8?B?ZXh3ZXRIMEwyaXRPeks4b0V6R3pSbklIdmpwOUh5OUE4dmdibXNWQklXUkxO?= =?utf-8?B?b2oraVozL2R3UzBSc2RqbGE2ZkczL0NjaHNLeFJzNXhlZmV5Y0N4QTQzcmpX?= =?utf-8?B?Z0V4UzArNVdkaElqZE42cEt5L0IzK1NJQ3RIMVBKbUtTUGVTMVptYk1JNXVq?= =?utf-8?B?UmVwNGRNSEd3eVhVV04yeGVRUnhZMzF2ZE9RZGRYYnJaUUp1NkRxVVNXYzZY?= =?utf-8?B?TExMR1hzQStIRnBiOGt0bDRnZzE3cG1BMGdJNk9UbXlpTitxNExpdGRUd1Jm?= =?utf-8?B?M2l6YVlLbVdMeVNPWTljWWI0YW9LZmZqTzh2Q3diR1k5RjBnbCtSUjBNbFZ0?= =?utf-8?B?ZjNKZEw1aGZjajhSVFk0U05aVTFySU5KNGtqZXk4TnFXVit2b1hEQWlNOXNO?= =?utf-8?B?dy9Jd2g2SmhFb1JsUWdzQlVRY2pWS2FNeDFCZ0tyeExSV05yaG5FdlBaRmMz?= =?utf-8?B?US82WDM0SzFrbXJxRG0rVUdUVDc0eHNzMUVUclN2ck56WmsyOG5tcDBUUjVR?= =?utf-8?B?cmFpSzgvcEEzU1NXRFZxSGp0YjdZZ0ExeGJXUitBTGhza2tJdWIyNDY2N05j?= =?utf-8?B?Ulc4Q0o5TGVhUktoeEN1TCtySi8rSTY5bWdzb2lSUU5Tc05RbzlucXFVV1ZQ?= =?utf-8?B?SlNBOGNWdG9VbTdSNXRGWXFERWc3aDRwa3RzUUFaRnpCVG55VWdyd0NuK0g1?= =?utf-8?B?dEV3UHBSUXZaeXJOUXA3NVBGeUdJRTBESDI0Z0VhdVI5MlBVbFcvbkpFS0N0?= =?utf-8?B?cnFWWjVmdUREL292NnJRelVFT1JxajhFcFdWT2ZvSHIzc1dwQ0N3T0IvbCs3?= =?utf-8?B?ek5qdFc2NTBxMjYvNnhTZ0NCWWsxN1liWHJTSno1ajZrSFpFaTd1WUhtQ3VG?= =?utf-8?B?NkNXRkp6cVJyRGZQajZEcHJmbUpCWU1EMlB2RlZIMEpoa0Q5dkt3Mm9ORml5?= =?utf-8?B?VXhScDBGR1Z3ZnFlUnVJY0NnWmtGQk1SYnF1WjVYd2Y0WDk3WjlaTEZwcDNH?= =?utf-8?B?VzNBUXNZUis4WWkrWXdKRWR0c0RxUWZSQlIwK3dGN0ZrUFZCcDNTYVRxVFlq?= =?utf-8?B?N1FreXd5bmVTdkRMUWYvSGNUYTNpcjNJZWdwYXBSd05LR2RKd05iOWp6ZUlh?= =?utf-8?B?dm1WZTlXR1E4YkUzRTgvcHdNNHFXZWNNaFlwRFFYeU1vMFBXcDMxQTl2UkE5?= =?utf-8?B?WjY4ekVBd0ZGd1htT1p5Sk1tL1BLenpKUEZ6MTJpSDFjVXVDaGlRRnlsVldw?= =?utf-8?B?djVxTHpoNTVYK1lGcUpnREJYcGZqaDZ6eWYrOHd6NGhMM3BvSkVtbzhqT0Ur?= =?utf-8?B?RGNLcHpWbmJ2cDRaL1pLd2p1anU1bithWVcwNENybS9sUXUwL2RuUk9mMWJa?= =?utf-8?B?K25rWEdaVU90VGRwV0RCUFpkZXhmdFRpZzAyUFNWUU1vbldmVEVmZ2ZOdEVS?= =?utf-8?B?anhTc3ZxbEs1M2o5M0pxQ2pBaFNEM2VvbTA4RTRTN2tNTS9sSDlxYUtXc0pJ?= =?utf-8?B?VVpxZFNjZDVRK1Q1SjV2dTlibUxVM05FK243eUxSUlRvbjYyT3pTSWdTNURO?= =?utf-8?B?eW0zbDVqcGw1QjdoWlJTZ2FQdFlsMU5VSHYwMEZnMEdMSTBMLzRjOTdveDNn?= =?utf-8?Q?d1H5vtx8/s/5hMXO5s=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c25b8de-26ee-4de6-267d-08da77853ada X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2022 08:25:33.1202 (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: PA4PR01MB8994 Subject: Re: [FFmpeg-devel] [PATCH 1/9] avcodec/error_resilience: Avoid overhead of AVBuffer API 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: > These buffers are not shared in any way. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/error_resilience.c | 18 +++++++++--------- > libavcodec/error_resilience.h | 4 ++-- > 2 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c > index f957c68d2c..2aa6f1d864 100644 > --- a/libavcodec/error_resilience.c > +++ b/libavcodec/error_resilience.c > @@ -946,17 +946,17 @@ void ff_er_frame_end(ERContext *s) > av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n"); > > for (i = 0; i < 2; i++) { > - s->ref_index_buf[i] = av_buffer_allocz(s->mb_stride * s->mb_height * 4 * sizeof(uint8_t)); > - s->motion_val_buf[i] = av_buffer_allocz((size + 4) * 2 * sizeof(uint16_t)); > - if (!s->ref_index_buf[i] || !s->motion_val_buf[i]) > + s->ref_index[i] = av_calloc(s->mb_stride * s->mb_height, 4 * sizeof(uint8_t)); > + s->motion_val_base[i] = av_calloc(size + 4, 2 * sizeof(uint16_t)); > + if (!s->ref_index[i] || !s->motion_val_base[i]) > break; > - s->cur_pic.ref_index[i] = s->ref_index_buf[i]->data; > - s->cur_pic.motion_val[i] = (int16_t (*)[2])s->motion_val_buf[i]->data + 4; > + s->cur_pic.ref_index[i] = s->ref_index[i]; > + s->cur_pic.motion_val[i] = s->motion_val_base[i] + 4; > } > if (i < 2) { > for (i = 0; i < 2; i++) { > - av_buffer_unref(&s->ref_index_buf[i]); > - av_buffer_unref(&s->motion_val_buf[i]); > + av_freep(&s->ref_index[i]); > + av_freep(&s->motion_val_base[i]); > s->cur_pic.ref_index[i] = NULL; > s->cur_pic.motion_val[i] = NULL; > } > @@ -1343,8 +1343,8 @@ void ff_er_frame_end(ERContext *s) > } > > for (i = 0; i < 2; i++) { > - av_buffer_unref(&s->ref_index_buf[i]); > - av_buffer_unref(&s->motion_val_buf[i]); > + av_freep(&s->ref_index[i]); > + av_freep(&s->motion_val_base[i]); > s->cur_pic.ref_index[i] = NULL; > s->cur_pic.motion_val[i] = NULL; > } > diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h > index 53e5cf2621..47cc8a4fc6 100644 > --- a/libavcodec/error_resilience.h > +++ b/libavcodec/error_resilience.h > @@ -75,8 +75,8 @@ typedef struct ERContext { > ERPicture last_pic; > ERPicture next_pic; > > - AVBufferRef *ref_index_buf[2]; > - AVBufferRef *motion_val_buf[2]; > + int8_t *ref_index[2]; > + int16_t (*motion_val_base[2])[2]; > > uint16_t pp_time; > uint16_t pb_time; Will apply this patchset tomorrow 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".