From patchwork Tue Jul 26 22:08:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36984 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp233477pzb; Wed, 27 Jul 2022 02:33:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u8lgptyGdfldkbpaGVDV5viTDEvYHcIb8dqxde2VyDIoJiRAMY3yBsFoQoLNU1s+CLRgzM X-Received: by 2002:a17:907:28d4:b0:72b:49c0:d04a with SMTP id en20-20020a17090728d400b0072b49c0d04amr17511083ejc.141.1658914433140; Wed, 27 Jul 2022 02:33:53 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd22-20020a170907629600b0072a6d845d96si16091545ejc.8.2022.07.27.02.33.52; Wed, 27 Jul 2022 02:33:53 -0700 (PDT) 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=Pyn2e9+2; 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 DE46368B95E; Wed, 27 Jul 2022 12:31:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2020.outbound.protection.outlook.com [40.92.90.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00A9368B884 for ; Wed, 27 Jul 2022 12:31:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L+sysWzGvVglHK0ck3Eq6O5Vx9lYtpXyQnXRhNxxugEOQZbULyuMOx4heP0VLXgjMSku1+4ozy0i780PDJCBYkOGqMwXQa1cA2km8NXZDK0sriJI9+VJ17Axr742lyhUd2UOeVDs5cGfw4qQLOt2gvUSekq+hh7jkC6HqV73res35/c40UiG6bEM1ieRF4NqtS60wHwnkqC2bZBmI54xOG/Kxgn9Oxna5lx962ob0ewY6hgIHqKQcoYBEICIpT09LIvgeVc9/eI3cq5McKJcdPgQs3bhUxHgasyQcRwDBJkrSGoa7TBpYT7TXbOcFI60/631wzoyvndK7Lz3FUaFYA== 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=G9s5N5Y9EFcHbcxd51Q6O4DA1/0KLvPNjk4ee753GII=; b=TbsWfJxoTTNyyHO78TJUlEsPP7BFnV2j32MIj8qZjc7goGtrPMfijPJRGNoPIOJ2dZQn5ZrUiqr5zwt5xx7692GG4544E6EzsKbnfj0/2EkVnwcc8QUSgEHGGHMfxHPW/bX15lBajmO4ayB3XAodBlkVibYK/KuqacdjkCic1QNMyj96Ua+xo8joCUMbGll7I4gvTnYx4+H07E9zsv91/anYzMX5jWIQZ3rmGC8M1kItTJCL7Zuh9q13Amj2ncozh3ieJVx7fNndsbBnJWkwaIf9P/IgKBUXA4tjDhFneV6C+H1qCgVzpOWR7W4LNug7Un4YCPUc6ispMoEIvVE4Og== 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=G9s5N5Y9EFcHbcxd51Q6O4DA1/0KLvPNjk4ee753GII=; b=Pyn2e9+2xD64biBkwmFDQuPvPVkgw7HtciTqN5PL+M/jxi2eQjCvZOOD4G3O+aEWZZ0G/cHktn49SijHtynuth8QfFsl2kTTg1Tto7Nu4u0oDbn+17MsQJmt1t/SFBjvP2zHMb8bDuL4gf4lwO20BvuOr1evHyxrvt2Jlr60b12STOCzJS20c0Itvm1zHodt4yhCeetJgiA311zPnwVT+8Cw0mQMtsIup5mUP/CilVWWFhlSGlPrxfkWblkITbK77NXLdLgPAWNvJtqlZkPY8ouEKwZcT9I5T54jcPd2dT+1zs29mpGgxkKNvn1lZXnTxStjON1s6MUjz+dNzbseSQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB9174.eurprd01.prod.exchangelabs.com (2603:10a6:10:366::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 22:09:39 +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.5458.025; Tue, 26 Jul 2022 22:09:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:08:03 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XR0haLJ7rAOneDPksyUF4JteWAU7OqRS] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-27-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e99f441-c6d1-426c-0b19-08da6f538893 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd/WIqCvC2BLtUqCEcZLVYXmNwCAbscRMB+0zIMCokdsnOS92gcnCOFwwyDCgGdWJxY2DoW96SyDdlHP9JzC+4dOVXkBxzqEPTbAMtjUTuwA+Y7TBUScFBw56rX0jjF9rjQ43npqp3i3TuprW8kqRVkVWLsLyHXm3tKEt5xjAY2ikoMK+G4r3cUwNBJrIE3V/NY7fMjAIxMS2jlsgsjG5S3+V1ARUqOD8UIzNstiNjRluPbhSHIWSJcVBl93RAot2nFWrULcl6CVsR/xmay+fc+8HNx/FMDd0qMNwnm5boeUuDPFP2p1HkeQu+mg2+q2blod+Ku9NzNXLx/AgA/Ba3plyJopI919vjgmCNCHsY0rs/2wCgDo3jaOt/mJ+Ri85Zi4ILlX4JmAdAiSRH849QUCqJU+b+DuSXTnr8THIJQWc0yFUDLU/0XmuXmgt5Xt+4oUGh2rOULIqC8bkq3K8lQCyveSsl/0/lHuwdbfO1Dl2OEX4aGFrkbxrMEuK/bXr093Qa3Iz6kcHzOepqxbCotVpRb0B2twufUl7kp2bMplAeW0w8stVqj1Q/4uVOA9shaJmuVQ2i6DbDjFu5UQM40x3AImO6AcYHxOVRlZY7gUsh1q5RIx5KSjMtmejpv2hXBYAuJxC/rlXBb7wmbed8J2GORCJGPXn7z2LiVkYWkrgykwd0O5RXE8hM3w5brtk4wpwY25W55WkW5xIcwEkwpMb7hlaB9th5SGe8tb2X9nEkLlWBM9F7FhR1ATt0YXJ8XcqVsHcG0r4vZTzEBwlkXvCShOG5uhO/S5dHe/0EmWkZFifN7OGNqn X-MS-TrafficTypeDiagnostic: DB9PR01MB9174:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8nj9k3UWSE9fQwb0DnpK0FjxTYVaJKNgWdJaLsj6ltWjLdTDU56El4lwm9Hv4rjTUmGWehzZm8z2wZ7wCLW37iTN8YGRsvwe4ZZd3vRcV4sYE4MNZaPTjm4NIiHdriSRZL4Q6BqZqRnI5thnVaIPAQBhj8T7/pUl8hiZLkvg/sNfBat/VABvhyi0+AlPg2dZ/vXakp+W9GKr6Ur7TRznogMQuz5YywLFj8SmGxJwAuSia84uhqzH6ziNbBBpoEmAee5JtFWgbApfm1iOjF6Lf9f0fPvEqY3L4er4hZGTYB2wADxwqMaBCnIf58iOTIKtkSzJCtLOJUR74Pf4/QYgOR6h93LvCZy/niRbnt7OjHRXM95hU29cjj81xsanJDJ2ujEmlDnjF5SpQ5DkCWqTVk1mJQ4lYf//Vh3IauA+mZakJ25OP2bLai7gbsH80uIMyZUzq6CekZo3eRNScOZghFlWKpFjKZv0sX7djhNXvhMpreI1fT8M5bMq2UFOF4M2ycC1nlTYFVJBwv72/0d0oZjpYaHjbJV1xFHzxnHgmx9PVe9Cv1eutpFyBXcgMTP8MdfprIQDevQz2MDLYGfhnYH2nYHwr+UsX7r6p4nhaiZxcxBnzPhSCtg/LLeQ+LA/xGP2vVOVE6o7eVxTQV5EgQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XIXgRvGiDh5qU1RXFrMne6r79dni0TXpV1HQxjXzw3uwHcoZqMvbFGc5siy+EzjETgjZSYnh02khGKMwBAX2WHCezpf810m8LbyVyu9J09FhMk2YLPAAu/vDkejO6/rCve1E8wtdeqERkRcD3nbplxMkkbdXNBm2D1lo/vcZP/cN9h2dqOMKZ0QUp7M+V8Nt60vqjfObqpZOd5z62/kgJFL+3AqhSYg1maDWlLkhZeCU1FNI/HC8cG10pFZE/Ejn9CZsnO9/yWppxIeLiXJCvA06mzw3LF8rtHatRvpD7taM+CZ6aEpavHHbAJ0CoFrAny2zEp+PW77TzoX62+VDkbLSRx0ky6sIH0ODp7yAZgImQCJdn2/76GGlgyEUuzLTVGlJYa7KO9VDTB4Vp028pdHJYbIZSGG0DOxZwI8us2HekJMz3je2ReAIb8gr4zoXSCetzaoO8wRQZK/rua4vUp5HqZDD0ywSJaD9i1k/QjtMDvmA4MSdDwjIlFDG6oGM+LtIk0Zkme6KrmM+RdpCRGiAflXKtUVyTnx2xkd65XeqI7lweECaXKo3tr/TE9YZ9e8EHSmSdw02rLdx7ler9Tf+0lLl8xELkpL6qf3/zgnb4luTtAVxzzMpSFvN0OEErxDN3P4rHFw/FJj/gmFFaBJcCMEglatxsq/wyYxNf/eRsKjIJAWzzTnQgPshNyKJvVfLJm2uus+IbC14Urf2BgV2K3RB3+7270MLFdlT7vZaiKzPL61SvUNTDJB/Yckgu7wvimi6alzlB7OvHyOIjaA2zU0gGtn0DbNsdJ1CqeSy00o6fy7uTo614hGZsm0gh1gX0BRci1lNnnRz0gAW1gMjVDMquYv0F9wgZN3z2HluraN/tbFu0/ycLZNsoz7aHFKKBF2Mf7WVnsMssjtDXUMrG6B41asGO7mBui3kDGL4PNXSVavk7kLr921mI6Cg4T5nJVXRYiZZSgl40PrKfRSIVT1rogzGX2+iLs1cIS5HBAaIdrLuzpy5H1zkCCJ77e+5r2pLatYgtwXqqM7XKIrMMLujnGJYN1MetAxG7NbCflcrTLInRrc1K13anUGDVtJg0fCNnQfPkthtOXcLHWVfj4okR5Z9f1TrxXTmbY2+Hp6J4slqFkjzQIkLkXvljj3gF4cpTkL42Lv7gKXbaAbfLa68IoNP5UTtCkFxTm3mdu8wkJuo7zTmkA4qyuQc7CUoADN+qF278k0jdT9CHkhFDpmmUFEhPDnudIhwSRQOETt7Ihxl9BhFteW2BeQSQ9tUQuOVrXT8YJY8oD3UoFFoNouu1epSKj8zWIrw3ng= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e99f441-c6d1-426c-0b19-08da6f538893 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:09:39.2996 (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: DB9PR01MB9174 Subject: [FFmpeg-devel] [PATCH 28/39] avcodec/snow: Remove unused halfpel_plane 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: lOUsr/txefgX Committed in 5be3a818719d613e2f225cf1532fda01ba106b04 in an unfinished state; never used or finished and always disabled. Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 67 +---------------------------------------------- libavcodec/snow.h | 1 - 2 files changed, 1 insertion(+), 67 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 293a0eb7d9..6442fb7f0d 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -359,7 +359,7 @@ void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, ptrdiff_t st } } }else{ - uint8_t *src= s->last_picture[block->ref]->data[plane_index]; + const uint8_t *src= s->last_picture[block->ref]->data[plane_index]; const int scale= plane_index ? (2*s->mv_scale)>>s->chroma_h_shift : 2*s->mv_scale; int mx= block->mx*scale; int my= block->my*scale; @@ -587,72 +587,12 @@ int ff_snow_common_init_after_header(AVCodecContext *avctx) { return 0; } -#define USE_HALFPEL_PLANE 0 - -static int halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *frame){ - int p,x,y; - - for(p=0; p < s->nb_planes; p++){ - int is_chroma= !!p; - int w= is_chroma ? AV_CEIL_RSHIFT(s->avctx->width, s->chroma_h_shift) : s->avctx->width; - int h= is_chroma ? AV_CEIL_RSHIFT(s->avctx->height, s->chroma_v_shift) : s->avctx->height; - int ls= frame->linesize[p]; - uint8_t *src= frame->data[p]; - - halfpel[1][p] = av_malloc_array(ls, (h + 2 * EDGE_WIDTH)); - halfpel[2][p] = av_malloc_array(ls, (h + 2 * EDGE_WIDTH)); - halfpel[3][p] = av_malloc_array(ls, (h + 2 * EDGE_WIDTH)); - if (!halfpel[1][p] || !halfpel[2][p] || !halfpel[3][p]) { - av_freep(&halfpel[1][p]); - av_freep(&halfpel[2][p]); - av_freep(&halfpel[3][p]); - return AVERROR(ENOMEM); - } - halfpel[1][p] += EDGE_WIDTH * (1 + ls); - halfpel[2][p] += EDGE_WIDTH * (1 + ls); - halfpel[3][p] += EDGE_WIDTH * (1 + ls); - - halfpel[0][p]= src; - for(y=0; y>5; - } - } - for(y=0; y>5; - } - } - src= halfpel[1][p]; - for(y=0; y>5; - } - } - -//FIXME border! - } - return 0; -} - void ff_snow_release_buffer(AVCodecContext *avctx) { SnowContext *s = avctx->priv_data; - int i; if(s->last_picture[s->max_ref_frames-1]->data[0]){ av_frame_unref(s->last_picture[s->max_ref_frames-1]); - for(i=0; i<9; i++) - if(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3]) { - av_free(s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] - EDGE_WIDTH*(1+s->current_picture->linesize[i%3])); - s->halfpel_plane[s->max_ref_frames-1][1+i/3][i%3] = NULL; - } } } @@ -665,11 +605,6 @@ int ff_snow_frame_start(SnowContext *s){ tmp= s->last_picture[s->max_ref_frames-1]; for(i=s->max_ref_frames-1; i>0; i--) s->last_picture[i] = s->last_picture[i-1]; - memmove(s->halfpel_plane+1, s->halfpel_plane, (s->max_ref_frames-1)*sizeof(void*)*4*4); - if(USE_HALFPEL_PLANE && s->current_picture->data[0]) { - if((ret = halfpel_interpol(s, s->halfpel_plane[0], s->current_picture)) < 0) - return ret; - } s->last_picture[0] = s->current_picture; s->current_picture = tmp; diff --git a/libavcodec/snow.h b/libavcodec/snow.h index f5beca66e9..709fef6be5 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -127,7 +127,6 @@ typedef struct SnowContext{ AVFrame *input_picture; ///< new_picture with the internal linesizes AVFrame *current_picture; AVFrame *last_picture[MAX_REF_FRAMES]; - uint8_t *halfpel_plane[MAX_REF_FRAMES][4][4]; AVFrame *mconly_picture; // uint8_t q_context[16]; uint8_t header_state[32];