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 5FB8B442B5 for ; Sun, 4 Sep 2022 23:28:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 519D868A867; Mon, 5 Sep 2022 02:28:20 +0300 (EEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065067.outbound.protection.outlook.com [40.92.65.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEB5368A867 for ; Mon, 5 Sep 2022 02:28:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g1Z9Ai9f8rJL3hEc2HpDSPuqDl6EKytKrI3eLwF1EZxPmrLsduIWHiXz8dft//zaIWv5JiZBCvkJYyu9cNQPvtvdbXa+w/Lfh1iMjmLiQ3Y/0WxdKxGSGhDgPeua2a71YU8FaQ5MH67DBfs6ZPj/Tyj67ZPvmxL7kO+hmi54hsdMW6dMqUKHJFZsTPXXRTX5nx30IiIGvi3Uw4Qk2kY7uWQwgfrQHkHOlZ1UeD7RByXjW6PtY4Y7xtULLSXMecsBYjft7uchxi/49BQqGIFpEfCum1j5gTmpJMH4h/lAGVQYvhsJMut/QMm6e93vDMNeI0dsP3wWKHPV8O6SaFN32g== 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=314/I4FHyNeCe3hil4KkXocv387NuJZkpG7HiPzD4U4=; b=dzUnnwE7NNT/W4mlulptsHphbhOM59eegn1c6DJ7Q63D1bD+aCoET9EIQiNCBX4ESeqPcDZHYMWHKpu+d7/6pfjeZqM0tnL0khYpEHcvn/ZkaR0RyMC0680C4D0Eh8+JnpfWiKy5s1/DSaPiIsTD3jiwNyClD2svWFLkeW0Z5AYusVamA5eGwB4s4l3HLZDJ4n7qlWyRryNvNCfmIENO+RULZQgYd+g6pg0KlXpMfSSMZFOV++N1o4i8UknizuLsoeNxcKPFAjZPG7PkjbAD1IaG8rAlJIzyaTmpUsTTf75BLtwydCCfkNuR52xbeVSwCyXKqtCU9FRZ+huE9HaOxQ== 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=314/I4FHyNeCe3hil4KkXocv387NuJZkpG7HiPzD4U4=; b=b70JeXI0x917sbZnAB4h5MUzmF7IqiATSB5sdwMF0f1fG2t9L8uXzV60btqZMlQlH80bhYbu12qfZeCoNQT5eMXmd8J5yoLv0opXDOXfrhZzkH4Ue8/c+jKqEnDUH/m7pKCtIyRGngzN722UoiIm/hGy+II5AvlP8SkE9qg9pavPhEyPD4/K0ktMWn8CY272w/RfW8ZVSfdVdMHJC8DPr7D0r2TtYfEHT0zDy9O52nSk9ox0pfqpW8mjggaU5sqgU84YAUGZiyJBnEnTwcx2a5d6sJQh2ssN25pvLkIJRVZcNX12TJAZHkUku4o8xxcPphw5FlTLM0Jpv8zHOMyE/A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0011.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3da::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.14; Sun, 4 Sep 2022 23:28:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47%2]) with mapi id 15.20.5588.010; Sun, 4 Sep 2022 23:28:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Sep 2022 01:28:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [e+a9mYryOGH15VN37CZ6KcZw1EQnpullfWfgtBTaKZo=] X-ClientProxiedBy: ZR0P278CA0195.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220904232805.4183067-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e11890c5-1340-4546-08dd-08da8ecd21fd X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kqG5z0YbU95Zj93LT8s1DJcglZ1GFE4bMvI/3w8jUYBOOId+QqWiJEvVfccvjRdrtJ0d7wuY1VQcP+fYUl2S849YXQhZjHvzrXZhoIsMtsFojc7Ns5sXb9BzMGerH37ohbBsYik2JxerMJIHJAWnpPOqhQB09fn+8GUaTg2Hi+fGFmJ08QSrI/eDcgasDIRYOociIVupQE1ZUFzxeFZlKIBWwOM9pRLpW/+aX5OBVcuH1mKFNau20jZPVnevdA5OsCD9FNrvQRCgdfkzSvT/jYXZRNNcgQT33BjMa3Eb8ygOLc9YGroMdjFbNP8zleek3yMDyyZsVuNQZ56hSXJ/PpSSRKR6HY213aeR1CdQ0HKSvCwQSO7MpriX3leDSu2fokDRR5dxr+arvxGYDxD6Hnr4G8b/a3HqYTSHc+R3PULaEWqNBXzqAsu8y9qrXaZg1HcTF3uscb/GeCPTQ6OrMlkW3ZwezDxbgrSL9fYRM+qD50rsdMVtuVrIF8+xcVE/pYVh97ud7YmtFI2VO5LQ4FUlCVTc4nCbGriglMM0tJ2M/WPFnkUewlz7CFxMJfqdG3+Fq5fNAvA3wIipHObOz1JL5fzOdu1aygR60Y++ENAmLlyKpKdyrJrpfQ9ofIDriVhHZs2KmcfFBgoX6PZ6va256OrZX+ERBnPHBc8x+VUiyaut+rIUfzM3VIjRx98apoEMIDLMVfA3/AX9rGLuActlAuptH/eIh9VSbVoxMxyIlZ/L9OUBaEz3Fi/tbczerBLhzx7XPd3UdoJiMDy7TR X-MS-TrafficTypeDiagnostic: AM8P250MB0011:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p+17Sd1t1uSwI/u8PV0mW+LDsXJCSZEpNxM1nin6s6CjNCRiIH5Bfi3o2ahFkFgCwW1bk4lIJ05lNP8QG7yeo582LorBXECLULjC49XB+7Kveme8nSYd9OTPz29uCfpDvNYeOjjbWFnAlkd3BaB84chN/MlXDQIwDUZOphZH4B3dPBSgNIcoRzLH+LxIst9badDuWtGNGSnV5Jge9RXPTlDB9ZN+ddqkjJWkj5RpBrPyD4Ty5C3nGq68dTEp8ROcsS8izLgAKki2F74y3027U94F2DeA7aVPBns6/xyYL/v9zlyf4izK2tK2CCDBkQSW5S7rs7EccCstdzXnE/Hzy/13hJ26lG0lcqmZvcDu9HAaQIGRQScZUC7IP2qJiohC12UOQ3uMAHjuFKCQEKPPunmFAF0T0nRGbL/rigU0BH0F9Yf6wyfm56aE6MjOg1KVKt9pi1Jr5nxHKk83cfJ27QU/ubUI9bLHRjXbAU8pV1q+g9o7nH6HDD0I58yxiBC7BFujFsK4rWVjfmrZXR74oT6i/G26l2AA8l7pZZDbUtUM8191b4pv7PgWs5BInqaxNukVz8stCZCXFvsK+XytgdpXkLpke6U6hfw5AkIqqgyLupgCS3gymGYrOiRe+bRTLxxULfRfFaWeUCYPexW73A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P+ZDXZMJ6q1x+hljXZJzkaGNJU9Za7Oc7SCBREG+Ox+QtwmyXZ9mZvRfuYER?= =?us-ascii?Q?FztTVffPbcEi4RRSCBJ6S6ElwUnK3kLAkWm6kvmHtiI4ylESo9bdIf/Dvvae?= =?us-ascii?Q?l/OU5cZ1VwZXDJaUsyGixDTi/PUfkynMzQzIGGDIoLbT2ZmPeUmGDhMd566I?= =?us-ascii?Q?zWv9HWHfc0PwlAc36N01PPWxBduNHkDpru5QM7al/axVPUudLeKBIQMNpCr/?= =?us-ascii?Q?qLVy3oFBq+WYWXY3NsM6Gn1Pgkf0l5ukEQL6WBQ3Rfxu2QVqSEAMTY7+P59v?= =?us-ascii?Q?HLRr7oCjiINGy8jZPNR8W7bshPVVtaS2hsL7ErKICGA/HBQAtkm+L/uqw3ru?= =?us-ascii?Q?GAXeuzXV+mQpIr0elB19RCqzGOHwvWj9uvYMmuyZegZJ1I4MBqOPdSxM70ul?= =?us-ascii?Q?YNlssdI3uvUMjROakXRcjxLqYdHfecKWOfEo9l7SFbb5axGz1qatHAEwG8Kt?= =?us-ascii?Q?GCf05aj+Lbw2q8pZGBiKZyP60neVyiZXRL2D3eOmUgVnto/yP0snvsJ0VKkF?= =?us-ascii?Q?S0OrddbWT1s/zvsLjmDK6k37yDg73n0C0CvAMdgU80p3qhBRfVTW5YE+aygS?= =?us-ascii?Q?95L6p8sQZdOxFqUPwEpKvSNtr0sapoOAp6SFQL9logdepT2H4zqgb6HRiNkW?= =?us-ascii?Q?RN/7CisWKsZ8CYwZS6SsCMbBWURcRkbFtGygXOSAMS91bmDDq44wNBBao38J?= =?us-ascii?Q?cIqhb9WNSfbU3jMjcchv0pwrxFxJ+r7zgUjiqXOksbZg/xh55StszgTyhJwN?= =?us-ascii?Q?9URmpqQK7tmrKgKrru2exQYd9qwLAZXJSyjTG4UnhrH0W3bq/yJE0BzDX+wl?= =?us-ascii?Q?1TnxnrnyEiaguWJhJFvsWVicy2e0tRvzgU64qyE5cXhfV3unjM0VqNMFfwRl?= =?us-ascii?Q?uXZA9nejvpa2TrMt/zrkJU20GMS6jJCyIz3eAtKFZebfkRkQX04k2CjX1a3W?= =?us-ascii?Q?gE1nzlNUZJwpILszWS7AWsegW/z7isghVsJSxWanF6QKccZJrtDhmRg1m2jg?= =?us-ascii?Q?wFlqsmCYM4sxpOkKBPXHUlwWU9QkAAJhZH43ja2e93VEP4J+R1ElkHrGDC0t?= =?us-ascii?Q?YzGTvst65VGlcr4ikkxuAcPjGcgOUC4mle/ntQXGc17ZU6ZMcRR51qae9a0p?= =?us-ascii?Q?mgOyjQbMe+vqCBcrH7siuQDmNvKsFQ+dxnPL8UEt0eb7pnU2BTJTG2C5RZTC?= =?us-ascii?Q?K6gBKxChFChjJdsaqHyiDQck05yheKcL0Q3SuVIQzTo2T3RasUoY9w2d74WZ?= =?us-ascii?Q?U+HcHgbU3HOYaQfo9tnLOrDE+ajWS92TOne/oi1uaQTWvpar9CT4nMCV3t+x?= =?us-ascii?Q?6t1JMvBwAbbh6lWTzA0c36N7?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e11890c5-1340-4546-08dd-08da8ecd21fd X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2022 23:28:11.7892 (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: AM8P250MB0011 Subject: [FFmpeg-devel] [PATCH] avcodec/ffv1: Only allocate ThreadFrames for the decoder 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: The FFV1 decoder only uses the last frame's data to conceal errors. The encoder does not have this problem and therefore only uses the current frame and none of the ThreadFrames. So only allocate them for the decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/ffv1.c | 13 ------------- libavcodec/ffv1dec.c | 23 ++++++++++++++++++++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index c8781cdaaa..b6204740ed 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -43,11 +43,6 @@ av_cold int ff_ffv1_common_init(AVCodecContext *avctx) s->avctx = avctx; s->flags = avctx->flags; - s->picture.f = av_frame_alloc(); - s->last_picture.f = av_frame_alloc(); - if (!s->picture.f || !s->last_picture.f) - return AVERROR(ENOMEM); - s->width = avctx->width; s->height = avctx->height; @@ -198,14 +193,6 @@ av_cold int ff_ffv1_close(AVCodecContext *avctx) FFV1Context *s = avctx->priv_data; int i, j; - if (s->picture.f) - ff_thread_release_ext_buffer(avctx, &s->picture); - av_frame_free(&s->picture.f); - - if (s->last_picture.f) - ff_thread_release_ext_buffer(avctx, &s->last_picture); - av_frame_free(&s->last_picture.f); - for (j = 0; j < s->max_slice_count; j++) { FFV1Context *fs = s->slice_context[j]; for (i = 0; i < s->plane_count; i++) { diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 794c58cc40..d4bc60a7da 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -823,6 +823,11 @@ static av_cold int decode_init(AVCodecContext *avctx) if ((ret = ff_ffv1_common_init(avctx)) < 0) return ret; + f->picture.f = av_frame_alloc(); + f->last_picture.f = av_frame_alloc(); + if (!f->picture.f || !f->last_picture.f) + return AVERROR(ENOMEM); + if (avctx->extradata_size > 0 && (ret = read_extra_header(f)) < 0) return ret; @@ -1068,6 +1073,22 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) } #endif +static av_cold int ffv1_decode_close(AVCodecContext *avctx) +{ + FFV1Context *const s = avctx->priv_data; + + if (s->picture.f) { + ff_thread_release_ext_buffer(avctx, &s->picture); + av_frame_free(&s->picture.f); + } + + if (s->last_picture.f) { + ff_thread_release_ext_buffer(avctx, &s->last_picture); + av_frame_free(&s->last_picture.f); + } + return ff_ffv1_close(avctx); +} + const FFCodec ff_ffv1_decoder = { .p.name = "ffv1", CODEC_LONG_NAME("FFmpeg video codec #1"), @@ -1075,7 +1096,7 @@ const FFCodec ff_ffv1_decoder = { .p.id = AV_CODEC_ID_FFV1, .priv_data_size = sizeof(FFV1Context), .init = decode_init, - .close = ff_ffv1_close, + .close = ffv1_decode_close, FF_CODEC_DECODE_CB(decode_frame), UPDATE_THREAD_CONTEXT(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/ | -- 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".