From patchwork Mon Jan 10 17:51:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2949112iog; Mon, 10 Jan 2022 09:52:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXzxKC9gJWnolPOjbTjiJ0tX4+B5QDrjlMmZFW5Ovzh3/Jum+Gq3G47vr2297VIF63JzmZ X-Received: by 2002:a05:6402:22af:: with SMTP id cx15mr797342edb.140.1641837134362; Mon, 10 Jan 2022 09:52:14 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v5si4090910edf.618.2022.01.10.09.52.13; Mon, 10 Jan 2022 09:52:14 -0800 (PST) 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=XMWcDhso; 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 7ADA268AB9D; Mon, 10 Jan 2022 19:52:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2075.outbound.protection.outlook.com [40.92.89.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C95668AD39 for ; Mon, 10 Jan 2022 19:51:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BZRhiCGZIg47XimOJOLlBro0UFFd95/WZW/aNATmPHqta6JI50dM4OsbYFO+zN7iD02cW6KTZljoGOjkluatKn49D2UWi7qWgoWwstqqVDUyDrd7JeJmMnFqCcPtlb0Ow0zj0EuuepcJVfZ3EXU8DDykVicNShLr1GAuogC9ABsMaWtQdX0zoOQ8li0C98i8UjoQz42BxstmZbTc1OI6k29REOSbMKaaxe6FjTiAFiuUF9QtUgJ0uJELEGm5j8UYeI6b+66SpLONp8t1a36bCyXANChQ8shxloRyTFLtxkRDL4BNf8lhthmv87OWgTpXCoW+yNvCgsF7TVuCrQgk+w== 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=GeJlKjW/39mPnXz1QpKwKDh2gdc7P1ZgqwFxx+u/Eag=; b=gsqr6J0gWjL3jxW/lzmJJrcFBIBJaqXSgOvnZxgYUC4MVwZb7T5PTOsJoXmuhwY5cRy9Um+OSLqDf0O6l0azd4+5shOuiG/SUNCIS8kA57RSD1PYwTCr3ff6GTGqZtIWQkif6lwHSCRXO9+IMJNm27B9krdWuL6MMfOvb+rfqeFDzSM3ySuqEIkXzQ9Rty56V2E/WTpEczEijtyFnbwAcT4cXKffaAGR7KX5hKO6kGowVHRHXDoFEx+HpQ9wZmtW57xhP1tTxaNj/KMJ/meOOQy3an1f5bxn+DpywztPnUYSQj0GBCP6aJrh07WfgoQhZnw1HmJ4Q2nvRBSdZ2hTlg== 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=GeJlKjW/39mPnXz1QpKwKDh2gdc7P1ZgqwFxx+u/Eag=; b=XMWcDhsoxPYXQuLCtl4x2er+V7CsdmLCncKqX5eRoFIuWUf/VuUUll88aLoYLSdnGmnDzkJV0CG/xtWCBei8jK2jPW/UAXIDXfBTm9376VhNev20zAWNJ5jK/llTVNtix9lH7j9/VNaJiilreX3qJo7BRbTAlPH2/739Ey7LTT5pyNKJC7jVU7yv9wu1HnYWhEieqCsz8a7JaQNcw8PhCzqYS7Li2MLR5mgc5SsPAzpfZNRJwmUarZYOWS9mzGHsnpltUSpzbGyXobjQbs+Gr3ztEc4+3sDwWAGMMksNBRjpsjqlQ5R+Eunjc6Z1FdpITws1sAmyH4Pv0D8OqIEa6A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4213.eurprd03.prod.outlook.com (2603:10a6:20b:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 17:51:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 17:51:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 18:51:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VtcouDiRbt7PiZIcbI3W7KValR9+ixuo] X-ClientProxiedBy: AM0PR10CA0047.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110175146.610875-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 912ac1b2-113e-440b-df46-08d9d461e2b0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1J1bOOsLJxbiXE+tSD1q9MOu7HUx9+xqDPtjMDsD+1BVtK9yYONh4fxAin17s7jAY/8NoqGFMXTA49Rb3Aoc0Fz0Le5tmqZwoSosvd2S8oMUyyY0bAh1hSQ3fl8Wq4E/D+WC8LiqzgmFdeIKr1ud1Mt8JKNx6IWXgbtz+7rVMZx4MRW790G1hKwupUYQJKthpIpKoU1HniweFWMItt4uJG7EZFtf0zP+5gJZVrQaWfobK2yNsDTHdPmLb+hG1OLQpNOFXIQ6Vafosw+d0hdyAqnC1Le2VNyPDHLMptsSl9KWl2JGGJs9Q2X3VIMR2YcHF3cz68BfiO1YwrHCIk0dPNQRWLW8Wd75+gSJXml2x5Tsr0jyKhNoylLBK50K6p/Deiv+/Jd3jNRwCcOHW0/Ph7Te8OSs1EoUQ6+ArheCaZdq2xUld2VK6Djstgmf5Y5A1KRYokY3dCjFxI5Di6RpooNanR1kPtjdYmnZJmergEGYmLFIkslMt/4VME2KrqEmSNhl9z5hu7SWY6nAyx3eseUpbfWO5rs2PbxL0mBHscAWwr011gllfsRx740DDOy0ti9R8hsNQpvMS1cDo78PfetGp6gXM8WtzhQyCJyo8fjCJKsebstvDkQSMtyZEMoiUgcTjqa+4UR+CY8PzEPPeagSAxen/9oRb8XRhV9Sd6N9aIygWtENoEWaCZnEBxnwecRmH8s2eXcjKaxitI22shjtEWs4gjdWEP1btgFQOOtdU= X-MS-TrafficTypeDiagnostic: AM6PR03MB4213:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JY0hI5AfU7pNOZok8zPXOB/U6h9rety+prcxKWTKfSj3xBRGXU5pg/QJMfX0tT+oUUy7Z19pXgp4+dO8i1vk5uk7Qg+ks+oASnObKDnfQ5fozqMlr5B9E1FxzvwWcX/feljjueHZShXPaZyzUWqHMa6gkS0xXYj4q8c4YyTx9ujr3IgMADOX4EEfydXb3NCKxwoft4+Gj7FPQIdrTU2iCI45Pi+0MNGuNRJgiv0A2z0/cCorsxlWwN6ja8NobqQCwume7n/eZSfO+SpPo4Bc43n9kE1ct7wJai2jtZCvhRcS2tIPnySgAY/QBVoUgIILH26CR9j/b+BjATf6cWJhwvcxwkqwcii/o3hXAwNzSsvl7x/46/1L11HkbRo1/frPTGpHIeZW09d1fjHaND/qRYw8cJUYUb25CiKqVmk/i4FVPpGV5VxpVylfUYuE33XdwbVG7puyfVhc8r4MDeskkWg/3jBWWkSJtkzh7exbBt5TQT3/eGrDuCEMZfwalRQaZYLBvQT83DYrJczuFXTq5Lbp948ytGs689Yj8ohwwT5uYVFCAHAaRcobgYKplh5a6YksQDH3bBXryNwyzDnMxA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c+SQGHq1nsIOutJCDWPtV1KyJWLeKGFoZrz/PMYJYoCKS5y7SZC4UdsL+PtQukTi8SiKcx0D0EAs7aEM3mzFJPM1T34qz2FaTBoj47erMIIS60jJw3JqJQbHTnS+fZJf1gGyUmJi+hV2Es1JKp5/NRf4DAhWq66rZqfs59RdrAKLQN59ej7BN8CvxtjYeqoC1zec5BRNL1rJHGEhem7jaMJ6Pzu4tVpaUtokFzMCmWJBmwKYKuA4zLKghto82Qt3i06dx4/HUYX6EnzKH323B7A2Gx+36zh8aHljWS2GZNfPK2pDh9dw7s2cIX4kxiHYMZig/zK4b2sHssu3VNeVEg1Jg23t3h4saVh2oNUtMf/8l88M0dZE4NgJf2eniaKNc6/8Mup40cY08/m5Wc3n9KZyI/TOYXnK206xAOecZGEC+u1+Uf7a5PgdSZZW7ycsuoUf1GFbzuiD+MUplYlDh1V91kaWK+zbcpxeQdrV9CHjKiHyoMTkd4KNell3LdVJ4yhUiVHEpoCLGyJgRu12Cjxtw7QfIP+vXlzUXuw0EshVpCvnyhfc+RHai+8Tofmp5gQRWquhHFtDAfA2Yh8rd9m4zj9pN0IqvOOvtbALOVI9SpP0a3D8eAmSZMhmXwz4pIGpx0bz6F9j4dSoP+vpywnfvRZrfft0UrIrmwyqvxs+oNtUp9i2sGZmNoLTrkWc4no33HFFu5apJbJXfMFqOjIBLIuiMF3+6aw01G8L8bSOzwKJi3UMSwzofHOp0RRHvr7VT/+GcgwGyFuYiSVCUE04qugteqy+SgXe6p5XVDFX5WVJR7qAVSAJX/XeGL/q8Soyr/MrGWQcQQ9mwMFWdviK/6fvra2WjFVz1LF2UZsJ/5q9AlUR0Gor5ygCIfKSWlKsGVRZwHEbiBasGDAX30nq4qLeQK5ymcVDg+XFN2fCBdsPmX6gq4YVaGz6frjZE6xX7CTCzOtcDn/KFCbzFg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 912ac1b2-113e-440b-df46-08d9d461e2b0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 17:51:53.3400 (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: AM6PR03MB4213 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/svq3: Remove dead topright_samples_available variable, code 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: Io+1XU0T9KrK Topright samples are always available. Signed-off-by: Andreas Rheinhardt --- libavcodec/svq3.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 6f3ade8ace..a3f434ff8d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -128,7 +128,6 @@ typedef struct SVQ3Context { int8_t (*intra4x4_pred_mode); unsigned int top_samples_available; - unsigned int topright_samples_available; unsigned int left_samples_available; uint8_t *edge_emu_buffer; @@ -638,15 +637,10 @@ static av_always_inline void hl_decode_mb_predict_luma(SVQ3Context *s, const int dir = s->intra4x4_pred_mode_cache[scan8[i]]; uint8_t *topright; - int nnz, tr; + int nnz; if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) { - const int topright_avail = (s->topright_samples_available << i) & 0x8000; av_assert2(s->mb_y || linesize <= block_offset[i]); - if (!topright_avail) { - tr = ptr[3 - linesize] * 0x01010101u; - topright = (uint8_t *)&tr; - } else - topright = ptr + 4 - linesize; + topright = ptr + 4 - linesize; } else topright = NULL; @@ -721,7 +715,6 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) s->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; s->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; - s->topright_samples_available = 0xFFFF; if (mb_type == 0) { /* SKIP */ if (s->pict_type == AV_PICTURE_TYPE_P ||