From patchwork Sun Oct 16 20:46:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38745 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1306270pzb; Sun, 16 Oct 2022 13:47:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7xcHghtiYYZrjHrJKnKhXX503/tzih74zfM22fxbnO/XX92XXquxASwjONZYawQGVhjVSt X-Received: by 2002:a17:906:db05:b0:741:5730:270e with SMTP id xj5-20020a170906db0500b007415730270emr5959412ejb.609.1665953223531; Sun, 16 Oct 2022 13:47:03 -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 l22-20020a056402125600b0044f441d2372si7299846edw.88.2022.10.16.13.47.02; Sun, 16 Oct 2022 13:47:03 -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=h17lPiwC; 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 8175D68BC53; Sun, 16 Oct 2022 23:47:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2047.outbound.protection.outlook.com [40.92.89.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 080A568BB00 for ; Sun, 16 Oct 2022 23:46:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iTJwkaGwr4uQeiKmVktZeiz56KPZN/yThkfV+WFPm58sfJyettyp4w0a3p6oIxakW6JwTm5g3gRwsPSfQjkka1mPRdqgfB3zGkal1+4ZvGQVpUODRmfR+P0WJ+KA8NPvKHTYaG4jvyyk3ozBKPWsJRn7HiKHk9wDIJ8XD7J7Poop6FWrjSQGhsTc4FLOWmtNlBt0iyw0OtpAWav3bD9ZFD86pIxh3pFtPHDhmHpyJH2JemfzSZg4StyMbKyr57QTARlqqKkcwczuUMkLbPBOgx6re3QB37lXzZb7/EoxtjrjXTnIJ5Lmi/45LgQrC7B8GLPTC0gulyUZIbbj42Y2Iw== 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=NT75l2NR03yOEoK8HH0yYw3wEuaT1CE5Djp0ury+5BI=; b=f0dkPr1rRwcu8mpYBSeW6fWA+/sdfwjfzu0/F3/bOnTWmpFcuqrTRQBuhHCTovr3dgM9zNYTT38M0q49LBpjya4x6ApcLG+e8tsl0SY+3kOoDiCx6Rc9T8DOa0PUdmKWSRT298f3W4TZb0aQWEjKIvDyWCeC9SXk3YoLQlzRfoINJ+vtuW49NIcrASlv/EK+2PGL9SM4p/M/mzZWhe79/qUuvr217G0OFBapVIu9kn91ghPkzT9mLULluVv6qtrMHdn16LYQ/dJhO7/PVyzk4ENhEaBzcGpEFdYPOiXcDEqOONvsjohCDzuHIFxlqxenDSChMBmmcmUHWNYdX9GfIQ== 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=NT75l2NR03yOEoK8HH0yYw3wEuaT1CE5Djp0ury+5BI=; b=h17lPiwC8JZoflUnH7bB6DbPdw6WG/Q0n4dxxTyJV2Zc4AuSD8X5W38vzZq3YS0z7xfBY386Dx07761j9uyudXWSHyscmeVIO6iWzKDigXO845Ng3hRj1VBVHXx+orZmnIn+/EudWSbbwUUK8ciuUSNHKStJW3AnTkUOsFD/mDcaejQQ62MyXqPMlkIxJwV5bN2EklgPcsR76B/112eaLOdm920SDhoUNdomjRtJWPJa/X/Plc+0PHO4OiHOTWzKYPlVfhmgbUdnTjvSfUbqs8M+Hr2liPbH8mvUH/v572Kv9nxysfsjzDiLvPCn3duYCM1APLZT7W0JjjOpNkGuCA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0090.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Sun, 16 Oct 2022 20:46:52 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f%2]) with mapi id 15.20.5723.033; Sun, 16 Oct 2022 20:46:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Oct 2022 22:46:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [fNbgzmE7vQvUgZ77jUx/3mQBWzxTTp+VbrU+NCRsYFk=] X-ClientProxiedBy: AM6PR08CA0035.eurprd08.prod.outlook.com (2603:10a6:20b:c0::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221016204655.605202-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0090:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e2ffae5-8495-411e-646e-08daafb78dff X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmriMkceEMr8g+y2B+GCHAesgpc10gVkZdOmmhjPBUV83Kq7mQcJiD5PcPKIITuUfIB0xq7XtE611gL157PvomTKe599GDC2CIQps3+PLENjZLRi3tun1k4eNFO9+rtpfYWlHhexbN18gIYFQBROhEcaWOVsdFnz21FgnTBUqidd93IArr9lJulYYgT5Gp3hyWxAt9kJUuPnEp1Pibyc9flPvbmKtJxwgToRXOFstCljtE5zOz7cKvP8srTlZ4lIcDBJkUbpurPodF3aKi/NOpnnu4qTnmW/hCqr5AANDxZVAmj8+U+vo3Aqcn/G2EOJz3W2m6258FgHDkBE90fQajG1+R5S3B85Q3jfwGmYegUJ02ZEEwE9QTcWa/xmU61rdYgLqM//KBEcs/x404LhJEE+SO8J9u7OyFVFwut0M7SA2+I9eXMkJIL5vUfGtSqxDppkbnko2EVSW0X/9f1UIT3jj3PC9qMUaamGOlJKWU8pbsiggThTxkGMIayeNlAO7OaIENDeRCNpOww0m4Wt7OKQeaJresgi4w4GJH5YQ2A1cB9w2ESuaGJdDu6mEa1nbtqvxzsCCmBfICnuLH1rw3NDq6BStD1ZWtdriPmwSbX8lS7uJ+pSJgq4ARVGFYUVxQdRK3XVdWwAvKmj1ZBLmAYjmWolx+ydXc5MFHiy3/IDaYLb+mTPYVMF4t4Ti10/7fmO/6Z7auow3zafONLySo3HHI7W/VkSzsVxCsgGVFsPpf2FnquvkjmvoANJuf0Wzjg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qaFDvtpIzVwGobNj6sFd8ENmHHbeFCITBNzHC2KC/qsngrCHuDOx73N/E4x0qLBGSwk5wlnHgjvIft2CObGZhxSzsqCZWORv9dA6/Ie03GUO1tG14MU43tAMmqwI62mU8PPTFci5/4ydYG8A1yDkLg4olroeyEFQSVh+gFfbPFuyEQMdsPDAP+Q71H990vJX4myr/4kxR7Vd5T2XwVqcAgfMqm+9xJltdk4Uq303OGj8Hfhq3rZRSuFOk3/MYrzMiYAlJDXCD43JJRN6tAZLArzeDjH/F6H0fnukI1LRDHlOfry3GnMxy//PC6GP5E2buTRwSWbQa4LJs35Vrz3/s2QOwi388kRYHPhH4aZ+U8qGXYLnCaxp/2Q88OJB5zGbIXRqbtM+gLNdAUdSnXO8FrS/WCx9AhbjWZ55O0VPP0J5U0F9rorHLrmrKY0omhm1h8p6r9W3RkroH/W3a4JYGoBpxf8VSyGTOR9YAfFLgHVKAw051SGU+thqciUiq67vfLv2N+atKmOnYA2TLxZOdUkAFPaUCEB/ojgIKcudoS6KKfXQ1bOCYEDK+UVDylmKUixuc4VGd4gb9BbufPCYU7bvsrFWzzXCfHVvx1oASGuCbrbEJ9WfTr7pOQ3HFbQI/MMBgEkGFb1K2DceG0zMmiFQEZVv8pqzGH3lV8kvAm9AvnUZ7yon6UWU8ZfC00hw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wSAW13t+H3mwGenVjKM8XQ7D40O0odrM/iOJnckXl7Yfo/1XdaZAqFFtcmcQrTaLki2JoX9CxkCaplw23xWgRNzBfy4uwjJMvaaGYtEB7+5q0yva91tC9T+4twXXDJ778N8hnT5RFBOQmco4wkjRNFbFbJwvoQW93I3xfsGDNZPxaVrwiBCXYYSXR2jDl+mGNdUbQvwpMKo26jmKSNs/FiIOMH496xf/mlZbRzddTe+waZdGspoqcFMRg5XdG+qMlxmzZcmVc5gMtgnGrsq2CuG779/vFCnBqF3Gcg4fMD+5ehPankbf2i+QILy1BFK+R/YlPHLPXWo0z44FZdHflZ5vyr3z5rNwq8nQHz5KVTmRmOC3+ntHQXS3X/1AmSPxsRLQWF0Dcg5uqrPbr9QGIRJQnMDrAG+HVT3ScuJUxwUwEpbYAMlnKaubqSKpt5pdzxOBBc6k5sP25odmyRi+pA79P5WL0x+U0rjTj38HfyfTmSm2G+5NCQbQuCNHJa3GhdOoej0FP9HueSVF9ALAIC73UUlSwIguIXdVQGFtarnGB5pCU2Jlh1KFNfuLC/DbR+XsFM5saiSS3YB6F3aaM2GdOVUIv0+yARuWWD2bKjlrXEl5zOFdT+uANeUv4RutHpuWqnwTk2q//MTcafzpPVisH+uwgkyGg9Wg1r/uBZxPzOzAY6HrakGQCOphF1oql919W9QEsmIH2r9epSTVxW/nvHJq92cBicUYrPEOvZdOeWFaiMGx5oB7q62bkR5WmVht4Dyy8ae9TG1F40N/qVeqJebjbcLcBIBYlaivnpl43y9JWFcro5q7I1VQzSQhX2Y+oyvmwsTW3xgX5ge4sQ+sY6UleOhFc0TBLt8acT8U4Qg0r8ADn0ReTGTJdXHzQT02zjP5Hliam4FXpcLFyDdLPOZB+N7ywPt/b3fwOsxevNdLW3RcjBlZy23yZClvXmdqljCQhTWEbDehK4QAP/qh+OTpdrfK+ErsksHicskSkXsQ/2UV3d0bNBgg2DXm9wwQKG7QyNJSLlhRkFgbwosLV6/pSicUrIj3KMsq+NuX6es715VL+rTwLSXXSeOlRAgN56vL2ZpH3POaXdzK56jO3MRey8dW5sl0TgkaXo9X5UM6b7XpgTcvb14HB8P8XSchhq2t+7lsZ1Oyc3RKYJN6qzB97eTNwFAPROtoLYWorbIuHCO6cog4yeRi0C1ORoDpUC4ELYjxWX6dcdY3qwhZyGM7KXNihRaH0wfDeAgU4KQXYTv6TrR5033emUweMUpcVWlSRRLaY5CDRhYRiRF4W8VTvX97NqeFIxS38rw5YB6JuwVrj63uFAdSoPCF X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e2ffae5-8495-411e-646e-08daafb78dff X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2022 20:46:52.4733 (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: AM8P250MB0090 Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/vc1_block: Remove dead calls to ff_mpeg_draw_horiz_band() 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: jT+xl/ag/BBB The VC-1 decoders don't support draw_horiz_band at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/dxva2_vc1.c | 2 -- libavcodec/vaapi_vc1.c | 2 -- libavcodec/vc1_block.c | 23 ----------------------- 3 files changed, 27 deletions(-) diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index cf660a50d2..12e3de59ec 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -372,8 +372,6 @@ static int dxva2_vc1_end_frame(AVCodecContext *avctx) &ctx_pic->pp, sizeof(ctx_pic->pp), NULL, 0, commit_bitstream_and_slice_buffer); - if (!ret) - ff_mpeg_draw_horiz_band(&v->s, 0, avctx->height); return ret; } diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index d82336a3b3..fb2132e814 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -457,8 +457,6 @@ static int vaapi_vc1_end_frame(AVCodecContext *avctx) if (ret < 0) goto fail; - ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); - fail: return ret; } diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 3267fc269b..ef8ce40e68 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2640,15 +2640,9 @@ static void vc1_decode_i_blocks(VC1Context *v) v->left_blk_idx = (v->left_blk_idx + 1) % (v->end_mb_x + 2); v->cur_blk_idx = (v->cur_blk_idx + 1) % (v->end_mb_x + 2); } - if (!v->s.loop_filter) - ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16); - else if (s->mb_y) - ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16); s->first_slice_line = 0; } - if (v->s.loop_filter) - ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16); /* This is intentionally mb_height and not end_mb_y - unlike in advanced * profile, these only differ are when decoding MSS2 rectangles. */ @@ -2786,15 +2780,9 @@ static int vc1_decode_i_blocks_adv(VC1Context *v) inc_blk_idx(v->left_blk_idx); inc_blk_idx(v->cur_blk_idx); } - if (!v->s.loop_filter) - ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16); - else if (s->mb_y) - ff_mpeg_draw_horiz_band(s, (s->mb_y-1) * 16, 16); s->first_slice_line = 0; } - if (v->s.loop_filter) - ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16); ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1, (s->end_mb_y << v->field_mode) - 1, ER_MB_END); return 0; @@ -2882,12 +2870,8 @@ static void vc1_decode_p_blocks(VC1Context *v) memmove(v->luma_mv_base, v->luma_mv - s->mb_stride, sizeof(v->luma_mv_base[0]) * 2 * s->mb_stride); - if (s->mb_y != s->start_mb_y) - ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16); s->first_slice_line = 0; } - if (s->end_mb_y >= s->start_mb_y) - ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16); ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1, (s->end_mb_y << v->field_mode) - 1, ER_MB_END); } @@ -2964,14 +2948,8 @@ static void vc1_decode_b_blocks(VC1Context *v) memmove(v->is_intra_base, v->is_intra - s->mb_stride, sizeof(v->is_intra_base[0]) * 2 * s->mb_stride); - if (!v->s.loop_filter) - ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16); - else if (s->mb_y) - ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16); s->first_slice_line = 0; } - if (v->s.loop_filter) - ff_mpeg_draw_horiz_band(s, (s->end_mb_y - 1) * 16, 16); ff_er_add_slice(&s->er, 0, s->start_mb_y << v->field_mode, s->mb_width - 1, (s->end_mb_y << v->field_mode) - 1, ER_MB_END); } @@ -2992,7 +2970,6 @@ static void vc1_decode_skip_blocks(VC1Context *v) memcpy(s->dest[0], s->last_picture.f->data[0] + s->mb_y * 16 * s->linesize, s->linesize * 16); memcpy(s->dest[1], s->last_picture.f->data[1] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8); memcpy(s->dest[2], s->last_picture.f->data[2] + s->mb_y * 8 * s->uvlinesize, s->uvlinesize * 8); - ff_mpeg_draw_horiz_band(s, s->mb_y * 16, 16); s->first_slice_line = 0; } s->pict_type = AV_PICTURE_TYPE_P;